summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ganv/item.h12
-rw-r--r--src/Canvas.cpp8
-rw-r--r--src/Port.cpp3
-rwxr-xr-xsrc/ganv_test.py12
-rw-r--r--src/group.c2
-rw-r--r--src/item.c4
6 files changed, 26 insertions, 15 deletions
diff --git a/ganv/item.h b/ganv/item.h
index 3e57662..d6e9cc5 100644
--- a/ganv/item.h
+++ b/ganv/item.h
@@ -138,8 +138,20 @@ void ganv_item_set(GanvItem* item, const gchar* first_arg_name, ...);
void ganv_item_set_valist(GanvItem* item,
const gchar* first_arg_name, va_list args);
+/**
+ * ganv_item_get_canvas:
+ * @item: The item.
+ *
+ * Return value: (transfer none): The canvas @item is on.
+ */
struct _GanvCanvas* ganv_item_get_canvas(GanvItem* item);
+/**
+ * ganv_item_get_parent:
+ * @item: The item.
+ *
+ * Return value: (transfer none): The parent of @item.
+ */
GanvItem* ganv_item_get_parent(GanvItem* item);
void ganv_item_raise(GanvItem* item);
diff --git a/src/Canvas.cpp b/src/Canvas.cpp
index 681b437..4478b59 100644
--- a/src/Canvas.cpp
+++ b/src/Canvas.cpp
@@ -156,7 +156,7 @@ public:
static const uint32_t SELECT_RECT_FILL_COLOUR = 0x2E444577;
static const uint32_t SELECT_RECT_BORDER_COLOUR = 0x2E4445FF;
-/** Order edges by (tail, head) */
+/* Order edges by (tail, head) */
struct TailHeadOrder {
inline bool operator()(const GanvEdge* a, const GanvEdge* b) const {
return ((a->impl->tail < b->impl->tail)
@@ -165,7 +165,7 @@ struct TailHeadOrder {
}
};
-/** Order edges by (head, tail) */
+/* Order edges by (head, tail) */
struct HeadTailOrder {
inline bool operator()(const GanvEdge* a, const GanvEdge* b) const {
return ((a->impl->head < b->impl->head)
@@ -1562,7 +1562,7 @@ GanvCanvasImpl::port_event(GdkEvent* event, GanvPort* port)
return false;
}
-/** Called when two ports are 'joined' (connected or disconnected) */
+/* Called when two ports are 'joined' (connected or disconnected) */
void
GanvCanvasImpl::ports_joined(GanvPort* port1, GanvPort* port2)
{
@@ -1608,7 +1608,7 @@ GanvCanvasImpl::port_clicked(GdkEvent* event, GanvPort* port)
}
}
-/** Update animated "rubber band" selection effect. */
+/* Update animated "rubber band" selection effect. */
gboolean
GanvCanvasImpl::on_animate_timeout(gpointer data)
{
diff --git a/src/Port.cpp b/src/Port.cpp
index 48d44f0..aab9766 100644
--- a/src/Port.cpp
+++ b/src/Port.cpp
@@ -31,8 +31,7 @@ on_value_changed(GanvPort* port, double value, void* portmm)
((Port*)portmm)->signal_value_changed.emit(value);
}
-/** Contruct a Port on an existing module.
- */
+/* Construct a Port on an existing module. */
Port::Port(Module& module,
const std::string& name,
bool is_input,
diff --git a/src/ganv_test.py b/src/ganv_test.py
index 1488224..1ea53c2 100755
--- a/src/ganv_test.py
+++ b/src/ganv_test.py
@@ -9,12 +9,12 @@ win.connect("destroy", lambda obj: Gtk.main_quit())
canvas = Ganv.Canvas.new(1024, 768)
module = Ganv.Module(canvas=canvas,
label="Test")
-iport = Ganv.Port(module=module,
- is_input=True,
- label="In")
-oport = Ganv.Port(module=module,
- is_input=False,
- label="In")
+# iport = Ganv.Port(module=module,
+# is_input=True,
+# label="In")
+# oport = Ganv.Port(module=module,
+# is_input=False,
+# label="In")
win.add(canvas)
win.show_all()
diff --git a/src/group.c b/src/group.c
index 4e7731a..20ef354 100644
--- a/src/group.c
+++ b/src/group.c
@@ -275,7 +275,7 @@ ganv_group_point(GanvItem* item, double x, double y, GanvItem** actual_item)
}
}
-/** Get bounds of child item in group-relative coordinates. */
+/* Get bounds of child item in group-relative coordinates. */
static void
get_child_bounds(GanvItem* child, double* x1, double* y1, double* x2, double* y2)
{
diff --git a/src/item.c b/src/item.c
index c022ac8..f931e94 100644
--- a/src/item.c
+++ b/src/item.c
@@ -87,7 +87,7 @@ ganv_item_init(GanvItem* item)
* @first_arg_name: A list of object argument name/value pairs, NULL-terminated,
* used to configure the item. For example, "fill_color", "black",
* "width_units", 5.0, NULL.
- * @Varargs:
+ * @...: first argument value, second argument name, second argument value, ...
*
* Creates a new canvas item with @parent as its parent group. The item is
* created at the top of its parent's stack, and starts up as visible. The item
@@ -351,7 +351,7 @@ ganv_item_invoke_update(GanvItem* item, int flags)
* ganv_item_set:
* @item: A canvas item.
* @first_arg_name: The list of object argument name/value pairs used to configure the item.
- * @Varargs:
+ * @...: first argument value, second argument name, second argument value, ...
*
* Configures a canvas item. The arguments in the item are set to the specified
* values, and the item is repainted as appropriate.