gnomemm r1642 - in goocanvasmm/trunk: . goocanvas/src
- From: murrayc svn gnome org
- To: svn-commits-list gnome org
- Subject: gnomemm r1642 - in goocanvasmm/trunk: . goocanvas/src
- Date: Sun, 27 Jul 2008 09:33:10 +0000 (UTC)
Author: murrayc
Date: Sun Jul 27 09:33:09 2008
New Revision: 1642
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1642&view=rev
Log:
2008-07-27 Murray Cumming <murrayc murrayc com>
* goocanvas/src/libgoocanvas_docs.xml: Regenerated.
* goocanvas/src/libgoocanvas_enums.defs: Regenerated.
* goocanvas/src/libgoocanvas_signals.defs: Corrected the Event signals by
hand.
* goocanvas/src/libgoocanvas_signals.defs.patch: Created this patch
to do the same in future.
Added:
goocanvasmm/trunk/goocanvas/src/libgoocanvas_signals.defs.patch
Modified:
goocanvasmm/trunk/ChangeLog
goocanvasmm/trunk/goocanvas/src/libgoocanvas_docs.xml
goocanvasmm/trunk/goocanvas/src/libgoocanvas_enums.defs
goocanvasmm/trunk/goocanvas/src/libgoocanvas_signals.defs
Modified: goocanvasmm/trunk/goocanvas/src/libgoocanvas_docs.xml
==============================================================================
--- goocanvasmm/trunk/goocanvas/src/libgoocanvas_docs.xml (original)
+++ goocanvasmm/trunk/goocanvas/src/libgoocanvas_docs.xml Sun Jul 27 09:33:09 2008
@@ -81,19 +81,20 @@
<return></return>
</function>
-<function name="goo_canvas_points_unref">
+<function name="goo_canvas_style_get_parent">
<description>
-Decrements the reference count of the given #GooCanvasPoints struct,
-freeing it if the reference count falls to zero.
+Gets the parent of the style.
+
</description>
<parameters>
-<parameter name="points">
-<parameter_description> a #GooCanvasPoints struct.
+<parameter name="style">
+<parameter_description> a style.
</parameter_description>
</parameter>
</parameters>
-<return></return>
+<return> the parent of the given style, or %NULL.
+</return>
</function>
<function name="goo_canvas_item_model_set_child_properties_valist">
@@ -165,6 +166,55 @@
</return>
</function>
+<function name="goo_canvas_item_allocate_area">
+<description>
+This function is only intended to be used when implementing new canvas
+items, specifically layout items such as #GooCanvasTable.
+
+It allocates an area to a child #GooCanvasItem.
+
+Note that the parent layout item will use a transform to move each of its
+children for the layout, so there is no need for the child item to
+reposition itself. It only needs to recalculate its device bounds.
+
+To help recalculate the item's device bounds, the @x_offset and @y_offset
+of the child item's allocated position from its requested position are
+provided. Simple items can just add these to their bounds.
+
+</description>
+<parameters>
+<parameter name="item">
+<parameter_description> a #GooCanvasItem.
+</parameter_description>
+</parameter>
+<parameter name="cr">
+<parameter_description> a cairo context.
+</parameter_description>
+</parameter>
+<parameter name="requested_area">
+<parameter_description> the area that the item originally requested, in the
+parent's coordinate space.
+</parameter_description>
+</parameter>
+<parameter name="allocated_area">
+<parameter_description> the area that the item has been allocated, in the parent's
+coordinate space.
+</parameter_description>
+</parameter>
+<parameter name="x_offset">
+<parameter_description> the x offset of the allocated area from the requested area in
+the device coordinate space.
+</parameter_description>
+</parameter>
+<parameter name="y_offset">
+<parameter_description> the y offset of the allocated area from the requested area in
+the device coordinate space.
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
<function name="goo_canvas_item_model_get_child_properties">
<description>
Gets the values of one or more child properties of @child.
@@ -197,12 +247,10 @@
<return></return>
</function>
-<function name="goo_canvas_item_get_transform_for_child">
+<function name="goo_canvas_item_rotate">
<description>
-Gets the transformation matrix of an item combined with any special
-transform needed for the given child. These special transforms are used
-by layout items such as #GooCanvasTable.
-
+Rotates the item's coordinate system by the given amount, about the given
+origin.
</description>
<parameters>
@@ -210,17 +258,20 @@
<parameter_description> an item.
</parameter_description>
</parameter>
-<parameter name="child">
-<parameter_description> a child of @item.
+<parameter name="degrees">
+<parameter_description> the clockwise angle of rotation.
</parameter_description>
</parameter>
-<parameter name="transform">
-<parameter_description> the place to store the transform.
+<parameter name="cx">
+<parameter_description> the x coordinate of the origin of the rotation.
+</parameter_description>
+</parameter>
+<parameter name="cy">
+<parameter_description> the y coordinate of the origin of the rotation.
</parameter_description>
</parameter>
</parameters>
-<return> %TRUE if a transform is set.
-</return>
+<return></return>
</function>
<function name="goo_canvas_get_item">
@@ -361,22 +412,6 @@
<return></return>
</function>
-<function name="goo_canvas_style_get_parent">
-<description>
-Gets the parent of the style.
-
-
-</description>
-<parameters>
-<parameter name="style">
-<parameter_description> a style.
-</parameter_description>
-</parameter>
-</parameters>
-<return> the parent of the given style, or %NULL.
-</return>
-</function>
-
<function name="goo_canvas_item_model_rotate">
<description>
Rotates the model's coordinate system by the given amount, about the given
@@ -404,21 +439,6 @@
<return></return>
</function>
-<function name="goo_canvas_line_dash_unref">
-<description>
-Decrements the reference count of the dash pattern. If it falls to 0
-it is freed.
-
-</description>
-<parameters>
-<parameter name="dash">
-<parameter_description> a #GooCanvasLineDash.
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
<function name="goo_canvas_path_model_new">
<description>
Creates a new path model.
@@ -564,14 +584,25 @@
<return></return>
</function>
-<function name="goo_canvas_style_line_dash_id">
+<function name="goo_canvas_style_set_fill_options">
<description>
-Unique #GQuark identifier used for the standard line dash property.
+Sets the standard cairo fill options using the given style.
+
</description>
<parameters>
+<parameter name="style">
+<parameter_description> a style.
+</parameter_description>
+</parameter>
+<parameter name="cr">
+<parameter_description> a cairo context.
+</parameter_description>
+</parameter>
</parameters>
-<return></return>
+<return> %TRUE if a paint source is set, or %FALSE if the fill should
+be skipped.
+</return>
</function>
<function name="goo_canvas_keyboard_ungrab">
@@ -846,55 +877,14 @@
</return>
</function>
-<function name="goo_canvas_rect_model_new">
+<function name="goo_canvas_style_fill_pattern_id">
<description>
-Creates a new rectangle item.
-
-&lt;!--PARAMETERS--&gt;
-
-Here's an example showing how to create a rectangle at (100,100) with a
-width of 200 and a height of 100.
-
-&lt;informalexample&gt;&lt;programlisting&gt;
-GooCanvasItemModel *rect = goo_canvas_rect_model_new (mygroup, 100.0, 100.0, 200.0, 100.0,
-"stroke-color", "red",
-"line-width", 5.0,
-"fill-color", "blue",
-NULL);
-&lt;/programlisting&gt;&lt;/informalexample&gt;
-
+Unique #GQuark identifier used for the standard fill pattern property.
</description>
<parameters>
-<parameter name="parent">
-<parameter_description> the parent model, or %NULL. If a parent is specified, it will
-assume ownership of the item, and the item will automatically be freed when
-it is removed from the parent. Otherwise call g_object_unref() to free it.
-</parameter_description>
-</parameter>
-<parameter name="x">
-<parameter_description> the x coordinate of the left of the rectangle.
-</parameter_description>
-</parameter>
-<parameter name="y">
-<parameter_description> the y coordinate of the top of the rectangle.
-</parameter_description>
-</parameter>
-<parameter name="width">
-<parameter_description> the width of the rectangle.
-</parameter_description>
-</parameter>
-<parameter name="height">
-<parameter_description> the height of the rectangle.
-</parameter_description>
-</parameter>
-<parameter name="Varargs">
-<parameter_description> optional pairs of property names and values, and a terminating %NULL.
-</parameter_description>
-</parameter>
</parameters>
-<return> a new rectangle model.
-</return>
+<return></return>
</function>
<function name="goo_canvas_item_get_parent">
@@ -936,33 +926,22 @@
<return></return>
</function>
-<function name="goo_canvas_get_item_at">
+<function name="goo_canvas_item_ensure_updated">
<description>
-Gets the item at the given point.
+This function is only intended to be used when implementing new canvas
+items.
+It updates the canvas immediately, if an update is scheduled.
+This ensures that all item bounds are up-to-date.
</description>
<parameters>
-<parameter name="canvas">
-<parameter_description> a #GooCanvas.
-</parameter_description>
-</parameter>
-<parameter name="x">
-<parameter_description> the x coordinate of the point.
-</parameter_description>
-</parameter>
-<parameter name="y">
-<parameter_description> the y coordinate of the point
-</parameter_description>
-</parameter>
-<parameter name="is_pointer_event">
-<parameter_description> %TRUE if the "pointer-events" property of
-items should be used to determine which parts of the item are tested.
+<parameter name="item">
+<parameter_description> a #GooCanvasItem.
</parameter_description>
</parameter>
</parameters>
-<return> the item found at the given point, or %NULL if no item was found.
-</return>
+<return></return>
</function>
<function name="goo_canvas_item_simple_changed">
@@ -986,18 +965,52 @@
<return></return>
</function>
-<function name="goo_canvas_grab_focus">
+<function name="goo_canvas_item_model_animate">
<description>
-Grabs the keyboard focus for the given item.
+Animates a model from its current position to the given offsets, scale
+and rotation.
</description>
<parameters>
-<parameter name="canvas">
-<parameter_description> a #GooCanvas.
+<parameter name="model">
+<parameter_description> an item model.
</parameter_description>
</parameter>
-<parameter name="item">
-<parameter_description> the item to grab the focus.
+<parameter name="x">
+<parameter_description> the final x coordinate.
+</parameter_description>
+</parameter>
+<parameter name="y">
+<parameter_description> the final y coordinate.
+</parameter_description>
+</parameter>
+<parameter name="scale">
+<parameter_description> the final scale.
+</parameter_description>
+</parameter>
+<parameter name="degrees">
+<parameter_description> the final rotation. This can be negative to rotate anticlockwise,
+and can also be greater than 360 to rotate a number of times.
+</parameter_description>
+</parameter>
+<parameter name="absolute">
+<parameter_description> if the @x, @y, @scale and @degrees values are absolute, or
+relative to the current transform. Note that absolute animations only work
+if the model currently has a simple transform. If the model has a shear or
+some other complicated transform it may result in strange animations.
+</parameter_description>
+</parameter>
+<parameter name="duration">
+<parameter_description> the duration of the animation, in milliseconds (1/1000ths of a
+second).
+</parameter_description>
+</parameter>
+<parameter name="step_time">
+<parameter_description> the time between each animation step, in milliseconds.
+</parameter_description>
+</parameter>
+<parameter name="type">
+<parameter_description> specifies what happens when the animation finishes.
</parameter_description>
</parameter>
</parameters>
@@ -1084,18 +1097,54 @@
<return></return>
</function>
-<function name="goo_canvas_item_model_set_style">
+<function name="goo_canvas_create_item">
<description>
-Sets the model's style, by copying the properties from the given style.
+This function is only intended to be used when implementing new canvas
+items, typically container items such as #GooCanvasGroup.
+
+It creates a new canvas item for the given item model, and recursively
+creates items for any children.
+
+It uses the create_item() virtual method if it has been set.
+Subclasses of #GooCanvas can define this method if they want to use
+custom views for items.
+
+It emits the #GooCanvas::item-created signal after creating the view, so
+application code can connect signal handlers to the new view if desired.
+
</description>
<parameters>
+<parameter name="canvas">
+<parameter_description> a #GooCanvas.
+</parameter_description>
+</parameter>
<parameter name="model">
-<parameter_description> an item model.
+<parameter_description> the item model to create a canvas item for.
</parameter_description>
</parameter>
-<parameter name="style">
-<parameter_description> a style.
+</parameters>
+<return> a new canvas item.
+</return>
+</function>
+
+<function name="goo_canvas_scroll_to">
+<description>
+Scrolls the canvas, placing the given point as close to the top-left of
+the view as possible.
+
+</description>
+<parameters>
+<parameter name="canvas">
+<parameter_description> a #GooCanvas.
+</parameter_description>
+</parameter>
+<parameter name="left">
+<parameter_description> the x coordinate to scroll to.
+</parameter_description>
+</parameter>
+<parameter name="top">
+<parameter_description> the y coordinate to scroll to.
</parameter_description>
</parameter>
</parameters>
@@ -1138,68 +1187,6 @@
<return></return>
</function>
-<function name="goo_canvas_table_new">
-<description>
-Creates a new table item.
-
-&lt;!--PARAMETERS--&gt;
-
-Here's an example showing how to create a table with a square, a circle and
-a triangle in it:
-
-&lt;informalexample&gt;&lt;programlisting&gt;
-GooCanvasItem *table, *square, *circle, *triangle;
-
-table = goo_canvas_table_new (root,
-"row-spacing", 4.0,
-"column-spacing", 4.0,
-NULL);
-goo_canvas_item_translate (table, 400, 200);
-
-square = goo_canvas_rect_new (table, 0.0, 0.0, 50.0, 50.0,
-"fill-color", "red",
-NULL);
-goo_canvas_item_set_child_properties (table, square,
-"row", 0,
-"column", 0,
-NULL);
-
-circle = goo_canvas_ellipse_new (table, 0.0, 0.0, 25.0, 25.0,
-"fill-color", "blue",
-NULL);
-goo_canvas_item_set_child_properties (table, circle,
-"row", 0,
-"column", 1,
-NULL);
-
-triangle = goo_canvas_polyline_new (table, TRUE, 3,
-25.0, 0.0, 0.0, 50.0, 50.0, 50.0,
-"fill-color", "yellow",
-NULL);
-goo_canvas_item_set_child_properties (table, triangle,
-"row", 0,
-"column", 2,
-NULL);
-&lt;/programlisting&gt;&lt;/informalexample&gt;
-
-
-</description>
-<parameters>
-<parameter name="parent">
-<parameter_description> the parent item, or %NULL. If a parent is specified, it will assume
-ownership of the item, and the item will automatically be freed when it is
-removed from the parent. Otherwise call g_object_unref() to free it.
-</parameter_description>
-</parameter>
-<parameter name="Varargs">
-<parameter_description> optional pairs of property names and values, and a terminating %NULL.
-</parameter_description>
-</parameter>
-</parameters>
-<return> a new table item.
-</return>
-</function>
-
<function name="goo_canvas_item_model_set_child_properties">
<description>
Sets the values of one or more child properties of @child.
@@ -1222,23 +1209,24 @@
<return></return>
</function>
-<function name="goo_canvas_item_simple_check_style">
+<function name="goo_canvas_get_scale">
<description>
-This function is intended to be used by subclasses of #GooCanvasItemSimple,
-typically in their update() or get_requested_area() methods.
+Gets the current scale of the canvas.
+
+The scale specifies the magnification factor of the canvas, e.g. if an item
+has a width of 2 pixels and the scale is set to 3, it will be displayed with
+a width of 2 x 3 = 6 pixels.
-It ensures that the item's style is setup correctly. If the item has its
-own #GooCanvasStyle it makes sure the parent is set correctly. If it
-doesn't have its own style it uses the parent item's style.
</description>
<parameters>
-<parameter name="item">
-<parameter_description> a #GooCanvasItemSimple.
+<parameter name="canvas">
+<parameter_description> a #GooCanvas.
</parameter_description>
</parameter>
</parameters>
-<return></return>
+<return> the current scale setting.
+</return>
</function>
<function name="goo_canvas_item_model_get_parent">
@@ -1278,6 +1266,33 @@
<return></return>
</function>
+<function name="goo_canvas_item_model_skew_y">
+<description>
+Skews the model's coordinate system along the y axis by the given amount,
+about the given origin.
+
+</description>
+<parameters>
+<parameter name="model">
+<parameter_description> an item model.
+</parameter_description>
+</parameter>
+<parameter name="degrees">
+<parameter_description> the skew angle.
+</parameter_description>
+</parameter>
+<parameter name="cx">
+<parameter_description> the x coordinate of the origin of the skew transform.
+</parameter_description>
+</parameter>
+<parameter name="cy">
+<parameter_description> the y coordinate of the origin of the skew transform.
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
<function name="goo_canvas_item_model_is_container">
<description>
Tests to see if the given item model is a container.
@@ -1345,30 +1360,26 @@
<return></return>
</function>
-<function name="goo_canvas_style_get_property">
+<function name="goo_canvas_item_get_child_properties">
<description>
-Gets the value of a property.
-
-This searches though all the #GooCanvasStyle's own list of property settings
-and also all ancestor #GooCanvasStyle objects.
-
-Note that it returns a pointer to the internal #GValue setting, which should
-not be changed.
-
+Gets the values of one or more child properties of @child.
</description>
<parameters>
-<parameter name="style">
-<parameter_description> a style.
+<parameter name="item">
+<parameter_description> a #GooCanvasItem.
</parameter_description>
</parameter>
-<parameter name="property_id">
-<parameter_description> the property identifier.
+<parameter name="child">
+<parameter_description> a child #GooCanvasItem.
+</parameter_description>
+</parameter>
+<parameter name="Varargs">
+<parameter_description> pairs of property names and value pointers, and a terminating %NULL.
</parameter_description>
</parameter>
</parameters>
-<return> the property value, or %NULL if it isn't set.
-</return>
+<return></return>
</function>
<function name="goo_canvas_get_root_item">
@@ -1387,36 +1398,30 @@
</return>
</function>
-<function name="goo_canvas_style_fill_pattern_id">
+<function name="goo_canvas_style_get_property">
<description>
-Unique #GQuark identifier used for the standard fill pattern property.
+Gets the value of a property.
-</description>
-<parameters>
-</parameters>
-<return></return>
-</function>
+This searches though all the #GooCanvasStyle's own list of property settings
+and also all ancestor #GooCanvasStyle objects.
+
+Note that it returns a pointer to the internal #GValue setting, which should
+not be changed.
-<function name="goo_canvas_item_get_child_properties">
-<description>
-Gets the values of one or more child properties of @child.
</description>
<parameters>
-<parameter name="item">
-<parameter_description> a #GooCanvasItem.
-</parameter_description>
-</parameter>
-<parameter name="child">
-<parameter_description> a child #GooCanvasItem.
+<parameter name="style">
+<parameter_description> a style.
</parameter_description>
</parameter>
-<parameter name="Varargs">
-<parameter_description> pairs of property names and value pointers, and a terminating %NULL.
+<parameter name="property_id">
+<parameter_description> the property identifier.
</parameter_description>
</parameter>
</parameters>
-<return></return>
+<return> the property value, or %NULL if it isn't set.
+</return>
</function>
<function name="goo_canvas_style_set_parent">
@@ -1499,26 +1504,22 @@
</return>
</function>
-<function name="goo_canvas_item_set_child_properties_valist">
+<function name="goo_canvas_parse_path_data">
<description>
-Sets the values of one or more child properties of @child.
+Parses the given SVG path specification string.
+
</description>
<parameters>
-<parameter name="item">
-<parameter_description> a #GooCanvasItem.
-</parameter_description>
-</parameter>
-<parameter name="child">
-<parameter_description> a child #GooCanvasItem.
-</parameter_description>
-</parameter>
-<parameter name="var_args">
-<parameter_description> pairs of property names and values, and a terminating %NULL.
+<parameter name="path_data">
+<parameter_description> the sequence of path commands, specified as a string using the
+same syntax as in the &lt;ulink url="http://www.w3.org/Graphics/SVG/"&gt;Scalable
+Vector Graphics (SVG)&lt;/ulink&gt; path element.
</parameter_description>
</parameter>
</parameters>
-<return></return>
+<return> a #GArray of #GooCanvasPathCommand elements.
+</return>
</function>
<function name="goo_canvas_item_add_child">
@@ -1544,63 +1545,32 @@
<return></return>
</function>
-<function name="goo_canvas_rect_new">
+<function name="goo_canvas_item_get_canvas">
<description>
-Creates a new rectangle item.
-
-&lt;!--PARAMETERS--&gt;
-
-Here's an example showing how to create a rectangle at (100,100) with a
-width of 200 and a height of 100.
-
-&lt;informalexample&gt;&lt;programlisting&gt;
-GooCanvasItem *rect = goo_canvas_rect_new (mygroup, 100.0, 100.0, 200.0, 100.0,
-"stroke-color", "red",
-"line-width", 5.0,
-"fill-color", "blue",
-NULL);
-&lt;/programlisting&gt;&lt;/informalexample&gt;
-
+Returns: the #GooCanvas.
</description>
<parameters>
-<parameter name="parent">
-<parameter_description> the parent item, or %NULL. If a parent is specified, it will assume
-ownership of the item, and the item will automatically be freed when it is
-removed from the parent. Otherwise call g_object_unref() to free it.
-</parameter_description>
-</parameter>
-<parameter name="x">
-<parameter_description> the x coordinate of the left of the rectangle.
-</parameter_description>
-</parameter>
-<parameter name="y">
-<parameter_description> the y coordinate of the top of the rectangle.
-</parameter_description>
-</parameter>
-<parameter name="width">
-<parameter_description> the width of the rectangle.
-</parameter_description>
-</parameter>
-<parameter name="height">
-<parameter_description> the height of the rectangle.
-</parameter_description>
-</parameter>
-<parameter name="Varargs">
-<parameter_description> optional pairs of property names and values, and a terminating %NULL.
+<parameter name="item">
+<parameter_description> a #GooCanvasItem.
</parameter_description>
</parameter>
</parameters>
-<return> a new rectangle item.
+<return> the #GooCanvas.
</return>
</function>
<function name="goo_canvas_item_set_parent">
<description>
This function is only intended to be used when implementing new canvas
-items, specifically container items such as #GooCanvasGroup.
-
-It sets the parent of the item.
+items (specifically container items such as #GooCanvasGroup).
+It sets the parent of the child item.
+&lt;!--PARAMETERS--&gt;
+&lt;note&gt;&lt;para&gt;
+This function cannot be used to add an item to a group
+or to change the parent of an item.
+To do that use the #GooCanvasItem:parent property.
+&lt;/para&gt;&lt;/note&gt;
</description>
<parameters>
@@ -1775,42 +1745,83 @@
</return>
</function>
-<function name="goo_canvas_get_items_in_area">
+<function name="goo_canvas_rect_model_new">
<description>
-Gets a list of items inside or outside a given area.
+Creates a new rectangle item.
+
+&lt;!--PARAMETERS--&gt;
+
+Here's an example showing how to create a rectangle at (100,100) with a
+width of 200 and a height of 100.
+
+&lt;informalexample&gt;&lt;programlisting&gt;
+GooCanvasItemModel *rect = goo_canvas_rect_model_new (mygroup, 100.0, 100.0, 200.0, 100.0,
+"stroke-color", "red",
+"line-width", 5.0,
+"fill-color", "blue",
+NULL);
+&lt;/programlisting&gt;&lt;/informalexample&gt;
</description>
<parameters>
-<parameter name="canvas">
-<parameter_description> a #GooCanvas.
+<parameter name="parent">
+<parameter_description> the parent model, or %NULL. If a parent is specified, it will
+assume ownership of the item, and the item will automatically be freed when
+it is removed from the parent. Otherwise call g_object_unref() to free it.
</parameter_description>
</parameter>
-<parameter name="area">
-<parameter_description> the area to compare with each item's bounds.
+<parameter name="x">
+<parameter_description> the x coordinate of the left of the rectangle.
</parameter_description>
</parameter>
-<parameter name="inside_area">
-<parameter_description> %TRUE if items inside @area should be returned, or %FALSE if
-items outside @area should be returned.
+<parameter name="y">
+<parameter_description> the y coordinate of the top of the rectangle.
</parameter_description>
</parameter>
-<parameter name="allow_overlaps">
-<parameter_description> %TRUE if items which are partly inside and partly outside
-should be returned.
+<parameter name="width">
+<parameter_description> the width of the rectangle.
</parameter_description>
</parameter>
-<parameter name="include_containers">
-<parameter_description> %TRUE if containers should be checked as well as
-normal items.
+<parameter name="height">
+<parameter_description> the height of the rectangle.
+</parameter_description>
+</parameter>
+<parameter name="Varargs">
+<parameter_description> optional pairs of property names and values, and a terminating %NULL.
</parameter_description>
</parameter>
</parameters>
-<return> a list of items in the given area, or %NULL if no items are found.
-The list should be freed with g_list_free().
+<return> a new rectangle model.
</return>
</function>
+<function name="goo_canvas_item_model_set_child_property">
+<description>
+Sets a child property of @child.
+
+</description>
+<parameters>
+<parameter name="model">
+<parameter_description> a #GooCanvasItemModel.
+</parameter_description>
+</parameter>
+<parameter name="child">
+<parameter_description> a child #GooCanvasItemModel.
+</parameter_description>
+</parameter>
+<parameter name="property_name">
+<parameter_description> the name of the child property to set.
+</parameter_description>
+</parameter>
+<parameter name="value">
+<parameter_description> the value to set the property to.
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
<function name="goo_canvas_item_lower">
<description>
Lowers an item in the stacking order.
@@ -1935,36 +1946,28 @@
<return></return>
</function>
-<function name="goo_canvas_item_get_child_property">
+<function name="goo_canvas_get_root_item_model">
<description>
-Gets a child property of @child.
+Gets the root item model of the canvas.
+
</description>
<parameters>
-<parameter name="item">
-<parameter_description> a #GooCanvasItem.
-</parameter_description>
-</parameter>
-<parameter name="child">
-<parameter_description> a child #GooCanvasItem.
-</parameter_description>
-</parameter>
-<parameter name="property_name">
-<parameter_description> the name of the child property to get.
-</parameter_description>
-</parameter>
-<parameter name="value">
-<parameter_description> a location to return the value.
+<parameter name="canvas">
+<parameter_description> a #GooCanvas.
</parameter_description>
</parameter>
</parameters>
-<return></return>
+<return> the root item model, or %NULL if there is no root item model.
+</return>
</function>
-<function name="goo_canvas_item_rotate">
+<function name="goo_canvas_item_get_transform_for_child">
<description>
-Rotates the item's coordinate system by the given amount, about the given
-origin.
+Gets the transformation matrix of an item combined with any special
+transform needed for the given child. These special transforms are used
+by layout items such as #GooCanvasTable.
+
</description>
<parameters>
@@ -1972,159 +1975,203 @@
<parameter_description> an item.
</parameter_description>
</parameter>
-<parameter name="degrees">
-<parameter_description> the clockwise angle of rotation.
-</parameter_description>
-</parameter>
-<parameter name="cx">
-<parameter_description> the x coordinate of the origin of the rotation.
+<parameter name="child">
+<parameter_description> a child of @item.
</parameter_description>
</parameter>
-<parameter name="cy">
-<parameter_description> the y coordinate of the origin of the rotation.
+<parameter name="transform">
+<parameter_description> the place to store the transform.
</parameter_description>
</parameter>
</parameters>
-<return></return>
+<return> %TRUE if a transform is set.
+</return>
</function>
-<function name="goo_canvas_item_ensure_updated">
+<function name="goo_canvas_get_item_at">
<description>
-This function is only intended to be used when implementing new canvas
-items.
+Gets the item at the given point.
-It updates the canvas immediately, if an update is scheduled.
-This ensures that all item bounds are up-to-date.
</description>
<parameters>
-<parameter name="item">
-<parameter_description> a #GooCanvasItem.
+<parameter name="canvas">
+<parameter_description> a #GooCanvas.
+</parameter_description>
+</parameter>
+<parameter name="x">
+<parameter_description> the x coordinate of the point.
+</parameter_description>
+</parameter>
+<parameter name="y">
+<parameter_description> the y coordinate of the point
+</parameter_description>
+</parameter>
+<parameter name="is_pointer_event">
+<parameter_description> %TRUE if the "pointer-events" property of
+items should be used to determine which parts of the item are tested.
</parameter_description>
</parameter>
</parameters>
-<return></return>
+<return> the item found at the given point, or %NULL if no item was found.
+</return>
</function>
<function name="SECTION">
<description>
-GooCanvasWidget provides support for placing any GtkWidget in the canvas.
+#GooCanvas is the main widget containing a number of canvas items.
+
+Here is a simple example:
+
+&lt;informalexample&gt;&lt;programlisting&gt;
+&num;include &lt;goocanvas.h&gt;
-Note that there are a number of limitations in the use of #GooCanvasWidget:
+static gboolean on_rect_button_press (GooCanvasItem *view,
+GooCanvasItem *target,
+GdkEventButton *event,
+gpointer data);
+
+int
+main (int argc, char *argv[])
+{
+GtkWidget *window, *scrolled_win, *canvas;
+GooCanvasItem *root, *rect_item, *text_item;
+
+/&ast; Initialize GTK+. &ast;/
+gtk_set_locale&nbsp;();
+gtk_init (&amp;argc, &amp;argv);
+
+/&ast; Create the window and widgets. &ast;/
+window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+gtk_window_set_default_size (GTK_WINDOW (window), 640, 600);
+gtk_widget_show (window);
+g_signal_connect (window, "delete_event", (GtkSignalFunc) on_delete_event,
+NULL);
-&lt;itemizedlist&gt;&lt;listitem&gt;&lt;para&gt;
-It doesn't support any transformation besides simple translation.
-This means you can't scale a canvas with a #GooCanvasWidget in it.
-&lt;/para&gt;&lt;/listitem&gt;&lt;listitem&gt;&lt;para&gt;
-It doesn't support layering, so you can't place other items beneath
-or above the #GooCanvasWidget.
-&lt;/para&gt;&lt;/listitem&gt;&lt;listitem&gt;&lt;para&gt;
-It doesn't support rendering of widgets to a given cairo_t, which
-means you can't output the widget to a pdf or postscript file.
-&lt;/para&gt;&lt;/listitem&gt;&lt;listitem&gt;&lt;para&gt;
-It doesn't have a model/view variant like the other standard items,
-so it can only be used in a simple canvas without a model.
-&lt;/para&gt;&lt;/listitem&gt;&lt;/itemizedlist&gt;
+scrolled_win = gtk_scrolled_window_new (NULL, NULL);
+gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_win),
+GTK_SHADOW_IN);
+gtk_widget_show (scrolled_win);
+gtk_container_add (GTK_CONTAINER (window), scrolled_win);
+
+canvas = goo_canvas_new&nbsp;();
+gtk_widget_set_size_request (canvas, 600, 450);
+goo_canvas_set_bounds (GOO_CANVAS (canvas), 0, 0, 1000, 1000);
+gtk_widget_show (canvas);
+gtk_container_add (GTK_CONTAINER (scrolled_win), canvas);
+
+root = goo_canvas_get_root_item (GOO_CANVAS (canvas));
+
+/&ast; Add a few simple items. &ast;/
+rect_item = goo_canvas_rect_new (root, 100, 100, 400, 400,
+"line-width", 10.0,
+"radius-x", 20.0,
+"radius-y", 10.0,
+"stroke-color", "yellow",
+"fill-color", "red",
+NULL);
+
+text_item = goo_canvas_text_new (root, "Hello World", 300, 300, -1,
+GTK_ANCHOR_CENTER,
+"font", "Sans 24",
+NULL);
+goo_canvas_item_rotate (text_item, 45, 300, 300);
+
+/&ast; Connect a signal handler for the rectangle item. &ast;/
+g_signal_connect (rect_item, "button_press_event",
+(GtkSignalFunc) on_rect_button_press, NULL);
+
+/&ast; Pass control to the GTK+ main event loop. &ast;/
+gtk_main&nbsp;();
+
+return 0;
+}
+
+
+/&ast; This handles button presses in item views. We simply output a message to
+the console. &ast;/
+static gboolean
+on_rect_button_press (GooCanvasItem *item,
+GooCanvasItem *target,
+GdkEventButton *event,
+gpointer data)
+{
+g_print ("rect item received button press event\n");
+return TRUE;
+}
+
+&lt;/programlisting&gt;&lt;/informalexample&gt;
</description>
<parameters>
<parameter name="Title">
-<parameter_description> GooCanvasWidget
+<parameter_description> GooCanvas
</parameter_description>
</parameter>
<parameter name="Short_Description">
-<parameter_description> an embedded widget item.
+<parameter_description> the main canvas widget.
</parameter_description>
</parameter>
</parameters>
<return></return>
</function>
-<function name="goo_canvas_parse_path_data">
+<function name="goo_canvas_item_set_child_properties_valist">
<description>
-Parses the given SVG path specification string.
-
+Sets the values of one or more child properties of @child.
</description>
<parameters>
-<parameter name="path_data">
-<parameter_description> the sequence of path commands, specified as a string using the
-same syntax as in the &lt;ulink url="http://www.w3.org/Graphics/SVG/"&gt;Scalable
-Vector Graphics (SVG)&lt;/ulink&gt; path element.
+<parameter name="item">
+<parameter_description> a #GooCanvasItem.
</parameter_description>
</parameter>
-</parameters>
-<return> a #GArray of #GooCanvasPathCommand elements.
-</return>
-</function>
-
-<function name="goo_canvas_line_dash_new">
-<description>
-Creates a new dash pattern.
-
-
-</description>
-<parameters>
-<parameter name="num_dashes">
-<parameter_description> the number of dashes and gaps in the pattern.
+<parameter name="child">
+<parameter_description> a child #GooCanvasItem.
</parameter_description>
</parameter>
-<parameter name="Varargs">
-<parameter_description> the length of each dash and gap.
+<parameter name="var_args">
+<parameter_description> pairs of property names and values, and a terminating %NULL.
</parameter_description>
</parameter>
</parameters>
-<return> a new dash pattern.
-</return>
+<return></return>
</function>
-<function name="goo_canvas_item_allocate_area">
+<function name="goo_canvas_line_dash_new">
<description>
-This function is only intended to be used when implementing new canvas
-items, specifically layout items such as #GooCanvasTable.
-
-It allocates an area to a child #GooCanvasItem.
-
-Note that the parent layout item will use a transform to move each of its
-children for the layout, so there is no need for the child item to
-reposition itself. It only needs to recalculate its device bounds.
+Creates a new dash pattern.
-To help recalculate the item's device bounds, the @x_offset and @y_offset
-of the child item's allocated position from its requested position are
-provided. Simple items can just add these to their bounds.
</description>
<parameters>
-<parameter name="item">
-<parameter_description> a #GooCanvasItem.
-</parameter_description>
-</parameter>
-<parameter name="cr">
-<parameter_description> a cairo context.
-</parameter_description>
-</parameter>
-<parameter name="requested_area">
-<parameter_description> the area that the item originally requested, in the
-parent's coordinate space.
-</parameter_description>
-</parameter>
-<parameter name="allocated_area">
-<parameter_description> the area that the item has been allocated, in the parent's
-coordinate space.
+<parameter name="num_dashes">
+<parameter_description> the number of dashes and gaps in the pattern.
</parameter_description>
</parameter>
-<parameter name="x_offset">
-<parameter_description> the x offset of the allocated area from the requested area in
-the device coordinate space.
+<parameter name="Varargs">
+<parameter_description> the length of each dash and gap.
</parameter_description>
</parameter>
-<parameter name="y_offset">
-<parameter_description> the y offset of the allocated area from the requested area in
-the device coordinate space.
+</parameters>
+<return> a new dash pattern.
+</return>
+</function>
+
+<function name="goo_canvas_item_get_model">
+<description>
+Gets the model of the given canvas item.
+
+
+</description>
+<parameters>
+<parameter name="item">
+<parameter_description> a #GooCanvasItem.
</parameter_description>
</parameter>
</parameters>
-<return></return>
+<return> the item's model, or %NULL if it has no model.
+</return>
</function>
<function name="goo_canvas_item_model_remove_child">
@@ -2145,83 +2192,92 @@
<return></return>
</function>
-<function name="goo_canvas_create_item">
+<function name="goo_canvas_rect_new">
<description>
-This function is only intended to be used when implementing new canvas
-items, typically container items such as #GooCanvasGroup.
+Creates a new rectangle item.
-It creates a new canvas item for the given item model, and recursively
-creates items for any children.
+&lt;!--PARAMETERS--&gt;
-It uses the create_item() virtual method if it has been set.
-Subclasses of #GooCanvas can define this method if they want to use
-custom views for items.
+Here's an example showing how to create a rectangle at (100,100) with a
+width of 200 and a height of 100.
-It emits the #GooCanvas::item-created signal after creating the view, so
-application code can connect signal handlers to the new view if desired.
+&lt;informalexample&gt;&lt;programlisting&gt;
+GooCanvasItem *rect = goo_canvas_rect_new (mygroup, 100.0, 100.0, 200.0, 100.0,
+"stroke-color", "red",
+"line-width", 5.0,
+"fill-color", "blue",
+NULL);
+&lt;/programlisting&gt;&lt;/informalexample&gt;
</description>
<parameters>
-<parameter name="canvas">
-<parameter_description> a #GooCanvas.
+<parameter name="parent">
+<parameter_description> the parent item, or %NULL. If a parent is specified, it will assume
+ownership of the item, and the item will automatically be freed when it is
+removed from the parent. Otherwise call g_object_unref() to free it.
</parameter_description>
</parameter>
-<parameter name="model">
-<parameter_description> the item model to create a canvas item for.
+<parameter name="x">
+<parameter_description> the x coordinate of the left of the rectangle.
</parameter_description>
</parameter>
-</parameters>
-<return> a new canvas item.
-</return>
-</function>
-
-<function name="goo_canvas_item_model_animate">
-<description>
-Animates a model from its current position to the given offsets, scale
-and rotation.
-
-</description>
-<parameters>
-<parameter name="model">
-<parameter_description> an item model.
+<parameter name="y">
+<parameter_description> the y coordinate of the top of the rectangle.
</parameter_description>
</parameter>
-<parameter name="x">
-<parameter_description> the final x coordinate.
+<parameter name="width">
+<parameter_description> the width of the rectangle.
</parameter_description>
</parameter>
-<parameter name="y">
-<parameter_description> the final y coordinate.
+<parameter name="height">
+<parameter_description> the height of the rectangle.
</parameter_description>
</parameter>
-<parameter name="scale">
-<parameter_description> the final scale.
+<parameter name="Varargs">
+<parameter_description> optional pairs of property names and values, and a terminating %NULL.
</parameter_description>
</parameter>
-<parameter name="degrees">
-<parameter_description> the final rotation. This can be negative to rotate anticlockwise,
-and can also be greater than 360 to rotate a number of times.
+</parameters>
+<return> a new rectangle item.
+</return>
+</function>
+
+<function name="goo_canvas_item_get_child_properties_valist">
+<description>
+Gets the values of one or more child properties of @child.
+
+</description>
+<parameters>
+<parameter name="item">
+<parameter_description> a #GooCanvasItem.
</parameter_description>
</parameter>
-<parameter name="absolute">
-<parameter_description> if the @x, @y, @scale and @degrees values are absolute, or
-relative to the current transform. Note that absolute animations only work
-if the model currently has a simple transform. If the model has a shear or
-some other complicated transform it may result in strange animations.
+<parameter name="child">
+<parameter_description> a child #GooCanvasItem.
</parameter_description>
</parameter>
-<parameter name="duration">
-<parameter_description> the duration of the animation, in milliseconds (1/1000ths of a
-second).
+<parameter name="var_args">
+<parameter_description> pairs of property names and value pointers, and a terminating
+%NULL.
</parameter_description>
</parameter>
-<parameter name="step_time">
-<parameter_description> the time between each animation step, in milliseconds.
+</parameters>
+<return></return>
+</function>
+
+<function name="goo_canvas_grab_focus">
+<description>
+Grabs the keyboard focus for the given item.
+
+</description>
+<parameters>
+<parameter name="canvas">
+<parameter_description> a #GooCanvas.
</parameter_description>
</parameter>
-<parameter name="type">
-<parameter_description> specifies what happens when the animation finishes.
+<parameter name="item">
+<parameter_description> the item to grab the focus.
</parameter_description>
</parameter>
</parameters>
@@ -2280,19 +2336,29 @@
</return>
</function>
-<function name="goo_canvas_item_get_canvas">
+<function name="goo_canvas_text_get_natural_extents">
<description>
-Returns: the #GooCanvas.
+Gets the natural extents of the text, in the text item's coordinate space.
+
+The final extents of the text may be different, if the text item is placed
+in a layout container such as #GooCanvasTable.
</description>
<parameters>
-<parameter name="item">
-<parameter_description> a #GooCanvasItem.
+<parameter name="text">
+<parameter_description> a #GooCanvasText.
+</parameter_description>
+</parameter>
+<parameter name="ink_rect">
+<parameter_description> the location to return the ink rect, or %NULL.
+</parameter_description>
+</parameter>
+<parameter name="logical_rect">
+<parameter_description> the location to return the logical rect, or %NULL.
</parameter_description>
</parameter>
</parameters>
-<return> the #GooCanvas.
-</return>
+<return></return>
</function>
<function name="goo_canvas_item_set_child_properties">
@@ -2317,22 +2383,6 @@
<return></return>
</function>
-<function name="goo_canvas_item_get_model">
-<description>
-Gets the model of the given canvas item.
-
-
-</description>
-<parameters>
-<parameter name="item">
-<parameter_description> a #GooCanvasItem.
-</parameter_description>
-</parameter>
-</parameters>
-<return> the item's model, or %NULL if it has no model.
-</return>
-</function>
-
<function name="goo_canvas_item_simple_check_in_path">
<description>
This function is intended to be used by subclasses of #GooCanvasItemSimple.
@@ -2534,32 +2584,19 @@
</return>
</function>
-<function name="goo_canvas_item_get_requested_area">
+<function name="goo_canvas_points_unref">
<description>
-This function is only intended to be used when implementing new canvas
-items, specifically layout items such as #GooCanvasTable.
-
-It gets the requested area of a child item.
-
+Decrements the reference count of the given #GooCanvasPoints struct,
+freeing it if the reference count falls to zero.
</description>
<parameters>
-<parameter name="item">
-<parameter_description> a #GooCanvasItem.
-</parameter_description>
-</parameter>
-<parameter name="cr">
-<parameter_description> a cairo context.
-</parameter_description>
-</parameter>
-<parameter name="requested_area">
-<parameter_description> a #GooCanvasBounds to return the requested area in, in the
-parent's coordinate space.
+<parameter name="points">
+<parameter_description> a #GooCanvasPoints struct.
</parameter_description>
</parameter>
</parameters>
-<return> %TRUE if the item should be allocated space.
-</return>
+<return></return>
</function>
<function name="goo_canvas_update">
@@ -2624,25 +2661,32 @@
<return></return>
</function>
-<function name="goo_canvas_request_redraw">
+<function name="goo_canvas_item_get_requested_area">
<description>
-This function is only intended to be used by subclasses of #GooCanvas or
-#GooCanvasItem implementations.
+This function is only intended to be used when implementing new canvas
+items, specifically layout items such as #GooCanvasTable.
+
+It gets the requested area of a child item.
-Requests that the given bounds be redrawn.
</description>
<parameters>
-<parameter name="canvas">
-<parameter_description> a #GooCanvas.
+<parameter name="item">
+<parameter_description> a #GooCanvasItem.
</parameter_description>
</parameter>
-<parameter name="bounds">
-<parameter_description> the bounds to redraw.
+<parameter name="cr">
+<parameter_description> a cairo context.
+</parameter_description>
+</parameter>
+<parameter name="requested_area">
+<parameter_description> a #GooCanvasBounds to return the requested area in, in the
+parent's coordinate space.
</parameter_description>
</parameter>
</parameters>
-<return></return>
+<return> %TRUE if the item should be allocated space.
+</return>
</function>
<function name="goo_canvas_item_simple_user_bounds_to_parent">
@@ -2710,7 +2754,8 @@
</parameter_description>
</parameter>
</parameters>
-<return> the child at the given stack position.
+<return> the child at the given stack position, or %NULL if @child_num
+is out of range.
</return>
</function>
@@ -2840,7 +2885,15 @@
<function name="goo_canvas_item_model_set_parent">
<description>
-Sets the parent of the model.
+This function is only intended to be used when implementing new canvas
+item models (specifically container models such as #GooCanvasGroupModel).
+It sets the parent of the child model.
+&lt;!--PARAMETERS--&gt;
+&lt;note&gt;&lt;para&gt;
+This function cannot be used to add a model to a group
+or to change the parent of a model.
+To do that use the #GooCanvasItemModel:parent property.
+&lt;/para&gt;&lt;/note&gt;
</description>
<parameters>
@@ -2907,23 +2960,86 @@
<return></return>
</function>
-<function name="goo_canvas_item_get_child">
-<description>
-Gets the child item at the given stack position.
+<function name="goo_canvas_item_get_child">
+<description>
+Gets the child item at the given stack position.
+
+
+</description>
+<parameters>
+<parameter name="item">
+<parameter_description> a container item.
+</parameter_description>
+</parameter>
+<parameter name="child_num">
+<parameter_description> the position of a child in the container's stack.
+</parameter_description>
+</parameter>
+</parameters>
+<return> the child item at the given stack position, or %NULL if @child_num
+is out of range.
+</return>
+</function>
+
+<function name="goo_canvas_table_new">
+<description>
+Creates a new table item.
+
+&lt;!--PARAMETERS--&gt;
+
+Here's an example showing how to create a table with a square, a circle and
+a triangle in it:
+
+&lt;informalexample&gt;&lt;programlisting&gt;
+GooCanvasItem *table, *square, *circle, *triangle;
+
+table = goo_canvas_table_new (root,
+"row-spacing", 4.0,
+"column-spacing", 4.0,
+NULL);
+goo_canvas_item_translate (table, 400, 200);
+
+square = goo_canvas_rect_new (table, 0.0, 0.0, 50.0, 50.0,
+"fill-color", "red",
+NULL);
+goo_canvas_item_set_child_properties (table, square,
+"row", 0,
+"column", 0,
+NULL);
+
+circle = goo_canvas_ellipse_new (table, 0.0, 0.0, 25.0, 25.0,
+"fill-color", "blue",
+NULL);
+goo_canvas_item_set_child_properties (table, circle,
+"row", 0,
+"column", 1,
+NULL);
+
+triangle = goo_canvas_polyline_new (table, TRUE, 3,
+25.0, 0.0, 0.0, 50.0, 50.0, 50.0,
+"fill-color", "yellow",
+NULL);
+goo_canvas_item_set_child_properties (table, triangle,
+"row", 0,
+"column", 2,
+NULL);
+&lt;/programlisting&gt;&lt;/informalexample&gt;
</description>
<parameters>
-<parameter name="item">
-<parameter_description> a container item.
+<parameter name="parent">
+<parameter_description> the parent item, or %NULL. If a parent is specified, it will assume
+ownership of the item, and the item will automatically be freed when it is
+removed from the parent. Otherwise call g_object_unref() to free it.
</parameter_description>
</parameter>
-<parameter name="child_num">
-<parameter_description> the position of a child in the container's stack.
+<parameter name="Varargs">
+<parameter_description> optional pairs of property names and values, and a terminating %NULL.
</parameter_description>
</parameter>
</parameters>
-<return> the child item at the given stack position.
+<return> a new table item.
</return>
</function>
@@ -2994,27 +3110,15 @@
<return></return>
</function>
-<function name="goo_canvas_item_model_skew_y">
+<function name="goo_canvas_line_dash_unref">
<description>
-Skews the model's coordinate system along the y axis by the given amount,
-about the given origin.
+Decrements the reference count of the dash pattern. If it falls to 0
+it is freed.
</description>
<parameters>
-<parameter name="model">
-<parameter_description> an item model.
-</parameter_description>
-</parameter>
-<parameter name="degrees">
-<parameter_description> the skew angle.
-</parameter_description>
-</parameter>
-<parameter name="cx">
-<parameter_description> the x coordinate of the origin of the skew transform.
-</parameter_description>
-</parameter>
-<parameter name="cy">
-<parameter_description> the y coordinate of the origin of the skew transform.
+<parameter name="dash">
+<parameter_description> a #GooCanvasLineDash.
</parameter_description>
</parameter>
</parameters>
@@ -3037,25 +3141,12 @@
</return>
</function>
-<function name="goo_canvas_item_get_child_properties_valist">
+<function name="goo_canvas_style_line_dash_id">
<description>
-Gets the values of one or more child properties of @child.
+Unique #GQuark identifier used for the standard line dash property.
</description>
<parameters>
-<parameter name="item">
-<parameter_description> a #GooCanvasItem.
-</parameter_description>
-</parameter>
-<parameter name="child">
-<parameter_description> a child #GooCanvasItem.
-</parameter_description>
-</parameter>
-<parameter name="var_args">
-<parameter_description> pairs of property names and value pointers, and a terminating
-%NULL.
-</parameter_description>
-</parameter>
</parameters>
<return></return>
</function>
@@ -3263,26 +3354,61 @@
<return></return>
</function>
-<function name="goo_canvas_get_scale">
+<function name="goo_canvas_item_get_simple_transform">
<description>
-Gets the current scale of the canvas.
-
-The scale specifies the magnification factor of the canvas, e.g. if an item
-has a width of 2 pixels and the scale is set to 3, it will be displayed with
-a width of 2 x 3 = 6 pixels.
+This function can be used to get the position, scale and rotation of an
+item, providing that the item has a simple transformation matrix
+(e.g. set with goo_canvas_item_set_simple_transform(), or using a
+combination of simple translate, scale and rotate operations). If the item
+has a complex transformation matrix the results will be incorrect.
</description>
<parameters>
-<parameter name="canvas">
-<parameter_description> a #GooCanvas.
+<parameter name="item">
+<parameter_description> an item.
+</parameter_description>
+</parameter>
+<parameter name="x">
+<parameter_description> returns the x coordinate of the origin of the item's coordinate space.
+</parameter_description>
+</parameter>
+<parameter name="y">
+<parameter_description> returns the y coordinate of the origin of the item's coordinate space.
+</parameter_description>
+</parameter>
+<parameter name="scale">
+<parameter_description> returns the scale of the item.
+</parameter_description>
+</parameter>
+<parameter name="rotation">
+<parameter_description> returns the clockwise rotation of the item, in degrees (0-360).
</parameter_description>
</parameter>
</parameters>
-<return> the current scale setting.
+<return> %TRUE if a transform is set.
</return>
</function>
+<function name="goo_canvas_item_simple_check_style">
+<description>
+This function is intended to be used by subclasses of #GooCanvasItemSimple,
+typically in their update() or get_requested_area() methods.
+
+It ensures that the item's style is setup correctly. If the item has its
+own #GooCanvasStyle it makes sure the parent is set correctly. If it
+doesn't have its own style it uses the parent item's style.
+
+</description>
+<parameters>
+<parameter name="item">
+<parameter_description> a #GooCanvasItemSimple.
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
<function name="goo_canvas_get_items_at">
<description>
Gets all items at the given point.
@@ -3356,6 +3482,42 @@
<return></return>
</function>
+<function name="goo_canvas_item_model_get_simple_transform">
+<description>
+This function can be used to get the position, scale and rotation of an
+item model, providing that the model has a simple transformation matrix
+(e.g. set with goo_canvas_item_model_set_simple_transform(), or using a
+combination of simple translate, scale and rotate operations). If the model
+has a complex transformation matrix the results will be incorrect.
+
+
+</description>
+<parameters>
+<parameter name="model">
+<parameter_description> an item model.
+</parameter_description>
+</parameter>
+<parameter name="x">
+<parameter_description> returns the x coordinate of the origin of the model's coordinate space.
+</parameter_description>
+</parameter>
+<parameter name="y">
+<parameter_description> returns the y coordinate of the origin of the model's coordinate space.
+</parameter_description>
+</parameter>
+<parameter name="scale">
+<parameter_description> returns the scale of the model.
+</parameter_description>
+</parameter>
+<parameter name="rotation">
+<parameter_description> returns the clockwise rotation of the model, in degrees (0-360).
+</parameter_description>
+</parameter>
+</parameters>
+<return> %TRUE if a transform is set.
+</return>
+</function>
+
<function name="goo_canvas_item_model_get_child_properties_valist">
<description>
Gets the values of one or more child properties of @child.
@@ -3552,6 +3714,27 @@
</return>
</function>
+<function name="goo_canvas_request_redraw">
+<description>
+This function is only intended to be used by subclasses of #GooCanvas or
+#GooCanvasItem implementations.
+
+Requests that the given bounds be redrawn.
+
+</description>
+<parameters>
+<parameter name="canvas">
+<parameter_description> a #GooCanvas.
+</parameter_description>
+</parameter>
+<parameter name="bounds">
+<parameter_description> the bounds to redraw.
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
<function name="goo_canvas_item_remove_child">
<description>
Removes the child item at the given position.
@@ -3641,30 +3824,40 @@
<return></return>
</function>
-<function name="goo_canvas_item_model_set_child_property">
+<function name="goo_canvas_get_items_in_area">
<description>
-Sets a child property of @child.
+Gets a list of items inside or outside a given area.
+
</description>
<parameters>
-<parameter name="model">
-<parameter_description> a #GooCanvasItemModel.
+<parameter name="canvas">
+<parameter_description> a #GooCanvas.
</parameter_description>
</parameter>
-<parameter name="child">
-<parameter_description> a child #GooCanvasItemModel.
+<parameter name="area">
+<parameter_description> the area to compare with each item's bounds.
</parameter_description>
</parameter>
-<parameter name="property_name">
-<parameter_description> the name of the child property to set.
+<parameter name="inside_area">
+<parameter_description> %TRUE if items inside @area should be returned, or %FALSE if
+items outside @area should be returned.
</parameter_description>
</parameter>
-<parameter name="value">
-<parameter_description> the value to set the property to.
+<parameter name="allow_overlaps">
+<parameter_description> %TRUE if items which are partly inside and partly outside
+should be returned.
+</parameter_description>
+</parameter>
+<parameter name="include_containers">
+<parameter_description> %TRUE if containers should be checked as well as
+normal items.
</parameter_description>
</parameter>
</parameters>
-<return></return>
+<return> a list of items in the given area, or %NULL if no items are found.
+The list should be freed with g_list_free().
+</return>
</function>
<function name="goo_canvas_line_dash_ref">
@@ -3876,23 +4069,18 @@
<return></return>
</function>
-<function name="goo_canvas_scroll_to">
+<function name="goo_canvas_item_model_set_style">
<description>
-Scrolls the canvas, placing the given point as close to the top-left of
-the view as possible.
+Sets the model's style, by copying the properties from the given style.
</description>
<parameters>
-<parameter name="canvas">
-<parameter_description> a #GooCanvas.
-</parameter_description>
-</parameter>
-<parameter name="left">
-<parameter_description> the x coordinate to scroll to.
+<parameter name="model">
+<parameter_description> an item model.
</parameter_description>
</parameter>
-<parameter name="top">
-<parameter_description> the y coordinate to scroll to.
+<parameter name="style">
+<parameter_description> a style.
</parameter_description>
</parameter>
</parameters>
@@ -4084,20 +4272,30 @@
<return></return>
</function>
-<function name="goo_canvas_get_root_item_model">
+<function name="goo_canvas_item_get_child_property">
<description>
-Gets the root item model of the canvas.
-
+Gets a child property of @child.
</description>
<parameters>
-<parameter name="canvas">
-<parameter_description> a #GooCanvas.
+<parameter name="item">
+<parameter_description> a #GooCanvasItem.
+</parameter_description>
+</parameter>
+<parameter name="child">
+<parameter_description> a child #GooCanvasItem.
+</parameter_description>
+</parameter>
+<parameter name="property_name">
+<parameter_description> the name of the child property to get.
+</parameter_description>
+</parameter>
+<parameter name="value">
+<parameter_description> a location to return the value.
</parameter_description>
</parameter>
</parameters>
-<return> the root item model, or %NULL if there is no root item model.
-</return>
+<return></return>
</function>
<function name="goo_canvas_style_fill_rule_id">
@@ -4316,27 +4514,6 @@
<return></return>
</function>
-<function name="goo_canvas_style_set_fill_options">
-<description>
-Sets the standard cairo fill options using the given style.
-
-
-</description>
-<parameters>
-<parameter name="style">
-<parameter_description> a style.
-</parameter_description>
-</parameter>
-<parameter name="cr">
-<parameter_description> a cairo context.
-</parameter_description>
-</parameter>
-</parameters>
-<return> %TRUE if a paint source is set, or %FALSE if the fill should
-be skipped.
-</return>
-</function>
-
<function name="goo_canvas_item_model_class_list_child_properties">
<description>
This function is only intended to be used when implementing new canvas
Modified: goocanvasmm/trunk/goocanvas/src/libgoocanvas_enums.defs
==============================================================================
--- goocanvasmm/trunk/goocanvas/src/libgoocanvas_enums.defs (original)
+++ goocanvasmm/trunk/goocanvas/src/libgoocanvas_enums.defs Sun Jul 27 09:33:09 2008
@@ -1,4 +1,4 @@
-;; From goocanvas/src/goocanvasitem.h
+;; From /home/murrayc/svn/gnome220/goocanvas/src/goocanvasitem.h
(define-enum-extended CanvasAnimateType
(in-module "Goo")
@@ -11,7 +11,7 @@
)
)
-;; From goocanvas/src/goocanvasutils.h
+;; From /home/murrayc/svn/gnome220/goocanvas/src/goocanvasutils.h
(define-flags-extended CanvasPointerEvents
(in-module "Goo")
Modified: goocanvasmm/trunk/goocanvas/src/libgoocanvas_signals.defs
==============================================================================
--- goocanvasmm/trunk/goocanvas/src/libgoocanvas_signals.defs (original)
+++ goocanvasmm/trunk/goocanvas/src/libgoocanvas_signals.defs Sun Jul 27 09:33:09 2008
@@ -2181,7 +2181,7 @@
(return-type "void")
(when "first")
(parameters
- '("GParam" "p0")
+ '("GParamSpec*" "p0")
)
)
@@ -2191,7 +2191,7 @@
(when "last")
(parameters
'("GooCanvasItem*" "p0")
- '("GdkEvent*" "p1")
+ '("GdkEventButton*" "p1")
)
)
@@ -2201,7 +2201,7 @@
(when "last")
(parameters
'("GooCanvasItem*" "p0")
- '("GdkEvent*" "p1")
+ '("GdkEventButton*" "p1")
)
)
@@ -2211,7 +2211,7 @@
(when "last")
(parameters
'("GooCanvasItem*" "p0")
- '("GdkEvent*" "p1")
+ '("GdkEventMotion*" "p1")
)
)
@@ -2221,7 +2221,7 @@
(when "last")
(parameters
'("GooCanvasItem*" "p0")
- '("GdkEvent*" "p1")
+ '("GdkEventKey*" "p1")
)
)
@@ -2231,7 +2231,7 @@
(when "last")
(parameters
'("GooCanvasItem*" "p0")
- '("GdkEvent*" "p1")
+ '("GdkEventKey*" "p1")
)
)
@@ -2241,7 +2241,7 @@
(when "last")
(parameters
'("GooCanvasItem*" "p0")
- '("GdkEvent*" "p1")
+ '("GdkEventCrossing*" "p1")
)
)
@@ -2251,7 +2251,7 @@
(when "last")
(parameters
'("GooCanvasItem*" "p0")
- '("GdkEvent*" "p1")
+ '("GdkEventCrossing*" "p1")
)
)
@@ -2261,7 +2261,7 @@
(when "last")
(parameters
'("GooCanvasItem*" "p0")
- '("GdkEvent*" "p1")
+ '("GdkEventFocus*" "p1")
)
)
@@ -2271,7 +2271,7 @@
(when "last")
(parameters
'("GooCanvasItem*" "p0")
- '("GdkEvent*" "p1")
+ '("GdkEventFocus*" "p1")
)
)
@@ -2281,7 +2281,7 @@
(when "last")
(parameters
'("GooCanvasItem*" "p0")
- '("GdkEvent*" "p1")
+ '("GdkEventGrabBroken*" "p1")
)
)
@@ -2364,7 +2364,7 @@
(return-type "void")
(when "first")
(parameters
- '("GParam" "p0")
+ '("GParamSpec*" "p0")
)
)
Added: goocanvasmm/trunk/goocanvas/src/libgoocanvas_signals.defs.patch
==============================================================================
--- (empty file)
+++ goocanvasmm/trunk/goocanvas/src/libgoocanvas_signals.defs.patch Sun Jul 27 09:33:09 2008
@@ -0,0 +1,112 @@
+Index: libgoocanvas_signals.defs
+===================================================================
+--- libgoocanvas_signals.defs (revision 1641)
++++ libgoocanvas_signals.defs (working copy)
+@@ -2181,7 +2181,7 @@
+ (return-type "void")
+ (when "first")
+ (parameters
+- '("GParam" "p0")
++ '("GParamSpec*" "p0")
+ )
+ )
+
+@@ -2191,7 +2191,7 @@
+ (when "last")
+ (parameters
+ '("GooCanvasItem*" "p0")
+- '("GdkEvent*" "p1")
++ '("GdkEventButton*" "p1")
+ )
+ )
+
+@@ -2201,7 +2201,7 @@
+ (when "last")
+ (parameters
+ '("GooCanvasItem*" "p0")
+- '("GdkEvent*" "p1")
++ '("GdkEventButton*" "p1")
+ )
+ )
+
+@@ -2211,7 +2211,7 @@
+ (when "last")
+ (parameters
+ '("GooCanvasItem*" "p0")
+- '("GdkEvent*" "p1")
++ '("GdkEventMotion*" "p1")
+ )
+ )
+
+@@ -2221,7 +2221,7 @@
+ (when "last")
+ (parameters
+ '("GooCanvasItem*" "p0")
+- '("GdkEvent*" "p1")
++ '("GdkEventKey*" "p1")
+ )
+ )
+
+@@ -2231,7 +2231,7 @@
+ (when "last")
+ (parameters
+ '("GooCanvasItem*" "p0")
+- '("GdkEvent*" "p1")
++ '("GdkEventKey*" "p1")
+ )
+ )
+
+@@ -2241,7 +2241,7 @@
+ (when "last")
+ (parameters
+ '("GooCanvasItem*" "p0")
+- '("GdkEvent*" "p1")
++ '("GdkEventCrossing*" "p1")
+ )
+ )
+
+@@ -2251,7 +2251,7 @@
+ (when "last")
+ (parameters
+ '("GooCanvasItem*" "p0")
+- '("GdkEvent*" "p1")
++ '("GdkEventCrossing*" "p1")
+ )
+ )
+
+@@ -2261,7 +2261,7 @@
+ (when "last")
+ (parameters
+ '("GooCanvasItem*" "p0")
+- '("GdkEvent*" "p1")
++ '("GdkEventFocus*" "p1")
+ )
+ )
+
+@@ -2271,7 +2271,7 @@
+ (when "last")
+ (parameters
+ '("GooCanvasItem*" "p0")
+- '("GdkEvent*" "p1")
++ '("GdkEventFocus*" "p1")
+ )
+ )
+
+@@ -2281,7 +2281,7 @@
+ (when "last")
+ (parameters
+ '("GooCanvasItem*" "p0")
+- '("GdkEvent*" "p1")
++ '("GdkEventGrabBroken*" "p1")
+ )
+ )
+
+@@ -2364,7 +2364,7 @@
+ (return-type "void")
+ (when "first")
+ (parameters
+- '("GParam" "p0")
++ '("GParamSpec*" "p0")
+ )
+ )
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]