[goocanvasmm] Adapt to latest goocanvas API, using the new AnchorType enum.



commit 69604cb6b1f84a1df05411c66eeaa4ea0947ce75
Author: Murray Cumming <murrayc murrayc com>
Date:   Mon Sep 6 12:44:02 2010 +0200

    Adapt to latest goocanvas API, using the new AnchorType enum.
    
    * goocanvas/src/libgoocanvas_enums.defs:
    * goocanvas/src/libgoocanvas_methods.defs:
    * goocanvas/src/libgoocanvas_signals.defs: Regenerated.
    * codegen/m4/convert_libgoocanvasmm.m4:
    * goocanvas/src/canvas.hg:
    * goocanvas/src/enums.hg:
    * goocanvas/src/text.[hg|ccg]:
    * goocanvas/src/textmodel.[hg|ccg]
    * goocanvas/src/widget.hg: Use AnchorType instead of Gtk::AnchorTYpe.

 ChangeLog                               |   14 +
 codegen/m4/convert_libgoocanvasmm.m4    |    2 +-
 goocanvas/src/canvas.hg                 |    2 +-
 goocanvas/src/enums.hg                  |    1 +
 goocanvas/src/libgoocanvas_enums.defs   |  121 +++-
 goocanvas/src/libgoocanvas_methods.defs |  171 +----
 goocanvas/src/libgoocanvas_signals.defs | 1142 +++++++++++++++----------------
 goocanvas/src/text.ccg                  |    4 +-
 goocanvas/src/text.hg                   |    6 +-
 goocanvas/src/textmodel.ccg             |    4 +-
 goocanvas/src/textmodel.hg              |    6 +-
 goocanvas/src/widget.hg                 |    3 +-
 12 files changed, 737 insertions(+), 739 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 6d1073d..9d33dfe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2010-09-06  Murray Cumming  <murrayc murrayc com>
+
+	Adapt to latest goocanvas API, using the new AnchorType enum.
+
+	* goocanvas/src/libgoocanvas_enums.defs:
+	* goocanvas/src/libgoocanvas_methods.defs:
+	* goocanvas/src/libgoocanvas_signals.defs: Regenerated.
+	* codegen/m4/convert_libgoocanvasmm.m4:
+	* goocanvas/src/canvas.hg:
+	* goocanvas/src/enums.hg:
+	* goocanvas/src/text.[hg|ccg]:
+	* goocanvas/src/textmodel.[hg|ccg]
+	* goocanvas/src/widget.hg: Use AnchorType instead of Gtk::AnchorTYpe.
+
 2010-09-02  Murray Cumming  <murrayc murrayc com>
 
 	Fix the build with the latest cairomm.
diff --git a/codegen/m4/convert_libgoocanvasmm.m4 b/codegen/m4/convert_libgoocanvasmm.m4
index 53d25ff..68e2efc 100644
--- a/codegen/m4/convert_libgoocanvasmm.m4
+++ b/codegen/m4/convert_libgoocanvasmm.m4
@@ -45,5 +45,5 @@ _CONVERSION(`const Cairo::Matrix*',`const cairo_matrix_t*',`((const cairo_matrix
 # GooCairoPattern* is actually a cairo_pattern_t*:
 _CONVERSION(`Cairo::RefPtr<Cairo::Pattern>', `GooCairoPattern*',__CONVERT_REFPTR_TO_P)
 
-_CONVERSION(`Gtk::AnchorType',`AnchorType',`($2)($3)')
+_CONVERSION(`GooCanvasAnchorType',`AnchorType',`($2)($3)')
 
diff --git a/goocanvas/src/canvas.hg b/goocanvas/src/canvas.hg
index 5067b10..2cd6673 100644
--- a/goocanvas/src/canvas.hg
+++ b/goocanvas/src/canvas.hg
@@ -135,7 +135,7 @@ public:
   _WRAP_PROPERTY("scale", double)
   _WRAP_PROPERTY("scale-x", double)
   _WRAP_PROPERTY("scale-y", double)
-  _WRAP_PROPERTY("anchor", Gtk::AnchorType)
+  _WRAP_PROPERTY("anchor", AnchorType)
   _WRAP_PROPERTY("x1", double)
   _WRAP_PROPERTY("y1", double)
   _WRAP_PROPERTY("x2", double)
diff --git a/goocanvas/src/enums.hg b/goocanvas/src/enums.hg
index 9299d0c..25e8a9d 100644
--- a/goocanvas/src/enums.hg
+++ b/goocanvas/src/enums.hg
@@ -29,6 +29,7 @@ namespace Goocanvas
 _WRAP_ENUM(PointerEvents,GooCanvasPointerEvents, s#^CANVAS_##)
 _WRAP_ENUM(ItemVisibility,GooCanvasItemVisibility, s#^CANVAS_##)
 _WRAP_ENUM(PathCommandType,GooCanvasPathCommandType, s#^CANVAS_##)
+_WRAP_ENUM(AnchorType,GooCanvasAnchorType, s#^CANVAS_##)
 
 } //namespace Goocanvas
 
diff --git a/goocanvas/src/libgoocanvas_enums.defs b/goocanvas/src/libgoocanvas_enums.defs
index 843b217..b1f49b6 100644
--- a/goocanvas/src/libgoocanvas_enums.defs
+++ b/goocanvas/src/libgoocanvas_enums.defs
@@ -1,4 +1,13 @@
-;; From /home/murrayc/checkouts/gnome224/goocanvas/src/goocanvasitem.h
+;; From goocanvasitem.h
+
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GOO_CANVAS_ANIMATE_FREEZE,
+;;   GOO_CANVAS_ANIMATE_RESET,
+;;   GOO_CANVAS_ANIMATE_RESTART,
+;;   GOO_CANVAS_ANIMATE_BOUNCE
+;; } GooCanvasAnimateType;
 
 (define-enum-extended CanvasAnimateType
   (in-module "Goo")
@@ -11,7 +20,26 @@
   )
 )
 
-;; From /home/murrayc/checkouts/gnome224/goocanvas/src/goocanvasutils.h
+;; From goocanvasutils.h
+
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GOO_CANVAS_EVENTS_VISIBLE_MASK	= 1 << 0,
+;;   GOO_CANVAS_EVENTS_PAINTED_MASK	= 1 << 1,
+;;   GOO_CANVAS_EVENTS_FILL_MASK		= 1 << 2,
+;;   GOO_CANVAS_EVENTS_STROKE_MASK		= 1 << 3,
+;; 
+;;   GOO_CANVAS_EVENTS_NONE		= 0,
+;;   GOO_CANVAS_EVENTS_VISIBLE_PAINTED	= GOO_CANVAS_EVENTS_VISIBLE_MASK | GOO_CANVAS_EVENTS_PAINTED_MASK | GOO_CANVAS_EVENTS_FILL_MASK | GOO_CANVAS_EVENTS_STROKE_MASK,
+;;   GOO_CANVAS_EVENTS_VISIBLE_FILL	= GOO_CANVAS_EVENTS_VISIBLE_MASK | GOO_CANVAS_EVENTS_FILL_MASK,
+;;   GOO_CANVAS_EVENTS_VISIBLE_STROKE	= GOO_CANVAS_EVENTS_VISIBLE_MASK | GOO_CANVAS_EVENTS_STROKE_MASK,
+;;   GOO_CANVAS_EVENTS_VISIBLE		= GOO_CANVAS_EVENTS_VISIBLE_MASK | GOO_CANVAS_EVENTS_FILL_MASK | GOO_CANVAS_EVENTS_STROKE_MASK,
+;;   GOO_CANVAS_EVENTS_PAINTED		= GOO_CANVAS_EVENTS_PAINTED_MASK | GOO_CANVAS_EVENTS_FILL_MASK | GOO_CANVAS_EVENTS_STROKE_MASK,
+;;   GOO_CANVAS_EVENTS_FILL		= GOO_CANVAS_EVENTS_FILL_MASK,
+;;   GOO_CANVAS_EVENTS_STROKE		= GOO_CANVAS_EVENTS_STROKE_MASK,
+;;   GOO_CANVAS_EVENTS_ALL			= GOO_CANVAS_EVENTS_FILL_MASK | GOO_CANVAS_EVENTS_STROKE_MASK
+;; } GooCanvasPointerEvents;
 
 (define-flags-extended CanvasPointerEvents
   (in-module "Goo")
@@ -21,18 +49,27 @@
     '("painted-mask" "GOO_CANVAS_EVENTS_PAINTED_MASK" "1 << 1")
     '("fill-mask" "GOO_CANVAS_EVENTS_FILL_MASK" "1 << 2")
     '("stroke-mask" "GOO_CANVAS_EVENTS_STROKE_MASK" "1 << 3")
-    '("none" "GOO_CANVAS_EVENTS_NONE" "0")
-    '("visible-painted" "GOO_CANVAS_EVENTS_VISIBLE_PAINTED" "0x1")
-    '("visible-fill" "GOO_CANVAS_EVENTS_VISIBLE_FILL" "0x1")
-    '("visible-stroke" "GOO_CANVAS_EVENTS_VISIBLE_STROKE" "0x1")
-    '("visible" "GOO_CANVAS_EVENTS_VISIBLE" "0x1")
-    '("painted" "GOO_CANVAS_EVENTS_PAINTED" "0x2")
+    '("none" "GOO_CANVAS_EVENTS_NONE" "0x0")
+    '("visible-painted" "GOO_CANVAS_EVENTS_VISIBLE_PAINTED" "0xF")
+    '("visible-fill" "GOO_CANVAS_EVENTS_VISIBLE_FILL" "0x5")
+    '("visible-stroke" "GOO_CANVAS_EVENTS_VISIBLE_STROKE" "0x9")
+    '("visible" "GOO_CANVAS_EVENTS_VISIBLE" "0xD")
+    '("painted" "GOO_CANVAS_EVENTS_PAINTED" "0xE")
     '("fill" "GOO_CANVAS_EVENTS_FILL" "0x4")
     '("stroke" "GOO_CANVAS_EVENTS_STROKE" "0x8")
-    '("all" "GOO_CANVAS_EVENTS_ALL" "0x4")
+    '("all" "GOO_CANVAS_EVENTS_ALL" "0xC")
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GOO_CANVAS_ITEM_HIDDEN			= 0,
+;;   GOO_CANVAS_ITEM_INVISIBLE			= 1,
+;;   GOO_CANVAS_ITEM_VISIBLE			= 2,
+;;   GOO_CANVAS_ITEM_VISIBLE_ABOVE_THRESHOLD	= 3
+;; } GooCanvasItemVisibility;
+
 (define-enum-extended CanvasItemVisibility
   (in-module "Goo")
   (c-name "GooCanvasItemVisibility")
@@ -44,6 +81,26 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   /* Simple commands like moveto and lineto: MmZzLlHhVv. */
+;;   GOO_CANVAS_PATH_MOVE_TO,
+;;   GOO_CANVAS_PATH_CLOSE_PATH,
+;;   GOO_CANVAS_PATH_LINE_TO,
+;;   GOO_CANVAS_PATH_HORIZONTAL_LINE_TO,
+;;   GOO_CANVAS_PATH_VERTICAL_LINE_TO,
+;; 
+;;   /* Bezier curve commands: CcSsQqTt. */
+;;   GOO_CANVAS_PATH_CURVE_TO,
+;;   GOO_CANVAS_PATH_SMOOTH_CURVE_TO,
+;;   GOO_CANVAS_PATH_QUADRATIC_CURVE_TO,
+;;   GOO_CANVAS_PATH_SMOOTH_QUADRATIC_CURVE_TO,
+;; 
+;;   /* The elliptical arc commands: Aa. */
+;;   GOO_CANVAS_PATH_ELLIPTICAL_ARC
+;; } GooCanvasPathCommandType;
+
 (define-enum-extended CanvasPathCommandType
   (in-module "Goo")
   (c-name "GooCanvasPathCommandType")
@@ -61,3 +118,49 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GOO_CANVAS_ANCHOR_CENTER,
+;;   GOO_CANVAS_ANCHOR_NORTH,
+;;   GOO_CANVAS_ANCHOR_NORTH_WEST,
+;;   GOO_CANVAS_ANCHOR_NORTH_EAST,
+;;   GOO_CANVAS_ANCHOR_SOUTH,
+;;   GOO_CANVAS_ANCHOR_SOUTH_WEST,
+;;   GOO_CANVAS_ANCHOR_SOUTH_EAST,
+;;   GOO_CANVAS_ANCHOR_WEST,
+;;   GOO_CANVAS_ANCHOR_EAST,
+;;   GOO_CANVAS_ANCHOR_N		= GOO_CANVAS_ANCHOR_NORTH,
+;;   GOO_CANVAS_ANCHOR_NW		= GOO_CANVAS_ANCHOR_NORTH_WEST,
+;;   GOO_CANVAS_ANCHOR_NE		= GOO_CANVAS_ANCHOR_NORTH_EAST,
+;;   GOO_CANVAS_ANCHOR_S		= GOO_CANVAS_ANCHOR_SOUTH,
+;;   GOO_CANVAS_ANCHOR_SW		= GOO_CANVAS_ANCHOR_SOUTH_WEST,
+;;   GOO_CANVAS_ANCHOR_SE		= GOO_CANVAS_ANCHOR_SOUTH_EAST,
+;;   GOO_CANVAS_ANCHOR_W		= GOO_CANVAS_ANCHOR_WEST,
+;;   GOO_CANVAS_ANCHOR_E		= GOO_CANVAS_ANCHOR_EAST
+;; } GooCanvasAnchorType;
+
+(define-enum-extended CanvasAnchorType
+  (in-module "Goo")
+  (c-name "GooCanvasAnchorType")
+  (values
+    '("center" "GOO_CANVAS_ANCHOR_CENTER" "0")
+    '("north" "GOO_CANVAS_ANCHOR_NORTH" "1")
+    '("north-west" "GOO_CANVAS_ANCHOR_NORTH_WEST" "2")
+    '("north-east" "GOO_CANVAS_ANCHOR_NORTH_EAST" "3")
+    '("south" "GOO_CANVAS_ANCHOR_SOUTH" "4")
+    '("south-west" "GOO_CANVAS_ANCHOR_SOUTH_WEST" "5")
+    '("south-east" "GOO_CANVAS_ANCHOR_SOUTH_EAST" "6")
+    '("west" "GOO_CANVAS_ANCHOR_WEST" "7")
+    '("east" "GOO_CANVAS_ANCHOR_EAST" "8")
+    '("n" "GOO_CANVAS_ANCHOR_N" "1")
+    '("nw" "GOO_CANVAS_ANCHOR_NW" "2")
+    '("ne" "GOO_CANVAS_ANCHOR_NE" "3")
+    '("s" "GOO_CANVAS_ANCHOR_S" "4")
+    '("sw" "GOO_CANVAS_ANCHOR_SW" "5")
+    '("se" "GOO_CANVAS_ANCHOR_SE" "6")
+    '("w" "GOO_CANVAS_ANCHOR_W" "7")
+    '("e" "GOO_CANVAS_ANCHOR_E" "8")
+  )
+)
+
diff --git a/goocanvas/src/libgoocanvas_methods.defs b/goocanvas/src/libgoocanvas_methods.defs
index 12e11a1..d6eb77d 100644
--- a/goocanvas/src/libgoocanvas_methods.defs
+++ b/goocanvas/src/libgoocanvas_methods.defs
@@ -238,26 +238,32 @@
   )
 )
 
-
-;; From goocanvasatk.h
-
-(define-function goo_canvas_accessible_factory_get_type
-  (c-name "goo_canvas_accessible_factory_get_type")
-  (return-type "GType")
-)
-
-(define-function goo_canvas_item_accessible_factory_get_type
-  (c-name "goo_canvas_item_accessible_factory_get_type")
-  (return-type "GType")
-)
-
-(define-function goo_canvas_widget_accessible_factory_get_type
-  (c-name "goo_canvas_widget_accessible_factory_get_type")
-  (return-type "GType")
+(define-enum CanvasAnchorType
+  (in-module "Goo")
+  (c-name "GooCanvasAnchorType")
+  (gtype-id "GOO_TYPE_CANVAS_ANCHOR_TYPE")
+  (values
+    '("center" "GOO_CANVAS_ANCHOR_CENTER")
+    '("north" "GOO_CANVAS_ANCHOR_NORTH")
+    '("north-west" "GOO_CANVAS_ANCHOR_NORTH_WEST")
+    '("north-east" "GOO_CANVAS_ANCHOR_NORTH_EAST")
+    '("south" "GOO_CANVAS_ANCHOR_SOUTH")
+    '("south-west" "GOO_CANVAS_ANCHOR_SOUTH_WEST")
+    '("south-east" "GOO_CANVAS_ANCHOR_SOUTH_EAST")
+    '("west" "GOO_CANVAS_ANCHOR_WEST")
+    '("east" "GOO_CANVAS_ANCHOR_EAST")
+    '("n" "GOO_CANVAS_ANCHOR_N")
+    '("nw" "GOO_CANVAS_ANCHOR_NW")
+    '("ne" "GOO_CANVAS_ANCHOR_NE")
+    '("s" "GOO_CANVAS_ANCHOR_S")
+    '("sw" "GOO_CANVAS_ANCHOR_SW")
+    '("se" "GOO_CANVAS_ANCHOR_SE")
+    '("w" "GOO_CANVAS_ANCHOR_W")
+    '("e" "GOO_CANVAS_ANCHOR_E")
+  )
 )
 
 
-
 ;; From goocanvasellipse.h
 
 (define-function goo_canvas_ellipse_get_type
@@ -322,6 +328,11 @@
   (return-type "GType")
 )
 
+(define-function goo_canvas_anchor_type_get_type
+  (c-name "goo_canvas_anchor_type_get_type")
+  (return-type "GType")
+)
+
 
 
 ;; From goocanvasgrid.h
@@ -1848,120 +1859,6 @@
 
 
 
-;; From goocanvasprivate.h
-
-(define-function goo_canvas_util_ptr_array_insert
-  (c-name "goo_canvas_util_ptr_array_insert")
-  (return-type "none")
-  (parameters
-    '("GPtrArray*" "ptr_array")
-    '("gpointer" "data")
-    '("gint" "index")
-  )
-)
-
-(define-function goo_canvas_util_ptr_array_move
-  (c-name "goo_canvas_util_ptr_array_move")
-  (return-type "none")
-  (parameters
-    '("GPtrArray*" "ptr_array")
-    '("gint" "old_index")
-    '("gint" "new_index")
-  )
-)
-
-(define-function goo_canvas_util_ptr_array_find_index
-  (c-name "goo_canvas_util_ptr_array_find_index")
-  (return-type "gint")
-  (parameters
-    '("GPtrArray*" "ptr_array")
-    '("gpointer" "data")
-  )
-)
-
-(define-function goo_canvas_cairo_pattern_from_pixbuf
-  (c-name "goo_canvas_cairo_pattern_from_pixbuf")
-  (return-type "cairo_pattern_t*")
-  (parameters
-    '("GdkPixbuf*" "pixbuf")
-  )
-)
-
-(define-function goo_canvas_cairo_surface_from_pixbuf
-  (c-name "goo_canvas_cairo_surface_from_pixbuf")
-  (return-type "cairo_surface_t*")
-  (parameters
-    '("GdkPixbuf*" "pixbuf")
-  )
-)
-
-(define-function goo_canvas_convert_colors_to_rgba
-  (c-name "goo_canvas_convert_colors_to_rgba")
-  (return-type "guint")
-  (parameters
-    '("double" "red")
-    '("double" "green")
-    '("double" "blue")
-    '("double" "alpha")
-  )
-)
-
-(define-function goo_canvas_get_rgba_value_from_pattern
-  (c-name "goo_canvas_get_rgba_value_from_pattern")
-  (return-type "none")
-  (parameters
-    '("cairo_pattern_t*" "pattern")
-    '("GValue*" "value")
-  )
-)
-
-(define-function goo_canvas_set_style_property_from_pattern
-  (c-name "goo_canvas_set_style_property_from_pattern")
-  (return-type "none")
-  (parameters
-    '("GooCanvasStyle*" "style")
-    '("GQuark" "property_id")
-    '("cairo_pattern_t*" "pattern")
-  )
-)
-
-(define-function goo_canvas_create_pattern_from_color_value
-  (c-name "goo_canvas_create_pattern_from_color_value")
-  (return-type "cairo_pattern_t*")
-  (parameters
-    '("const-GValue*" "value")
-  )
-)
-
-(define-function goo_canvas_create_pattern_from_rgba_value
-  (c-name "goo_canvas_create_pattern_from_rgba_value")
-  (return-type "cairo_pattern_t*")
-  (parameters
-    '("const-GValue*" "value")
-  )
-)
-
-(define-function goo_canvas_create_pattern_from_pixbuf_value
-  (c-name "goo_canvas_create_pattern_from_pixbuf_value")
-  (return-type "cairo_pattern_t*")
-  (parameters
-    '("const-GValue*" "value")
-  )
-)
-
-(define-function goo_canvas_boolean_handled_accumulator
-  (c-name "goo_canvas_boolean_handled_accumulator")
-  (return-type "gboolean")
-  (parameters
-    '("GSignalInvocationHint*" "ihint")
-    '("GValue*" "return_accu")
-    '("const-GValue*" "handler_return")
-    '("gpointer" "dummy")
-  )
-)
-
-
-
 ;; From goocanvasrect.h
 
 (define-function goo_canvas_rect_get_type
@@ -2128,7 +2025,7 @@
     '("gdouble" "x")
     '("gdouble" "y")
     '("gdouble" "width")
-    '("GtkAnchorType" "anchor")
+    '("GooCanvasAnchorType" "anchor")
   )
   (varargs #t)
 )
@@ -2158,7 +2055,7 @@
     '("gdouble" "x")
     '("gdouble" "y")
     '("gdouble" "width")
-    '("GtkAnchorType" "anchor")
+    '("GooCanvasAnchorType" "anchor")
   )
   (varargs #t)
 )
@@ -2301,11 +2198,3 @@
 )
 
 
-
-;; From stamp-goocanvasenumtypes.h
-
-
-
-;; From stamp-goocanvasmarshal.h
-
-
diff --git a/goocanvas/src/libgoocanvas_signals.defs b/goocanvas/src/libgoocanvas_signals.defs
index d9be693..39d72c1 100644
--- a/goocanvas/src/libgoocanvas_signals.defs
+++ b/goocanvas/src/libgoocanvas_signals.defs
@@ -20,15 +20,6 @@
   )
 )
 
-(define-property user-data
-  (of-object "GooCanvas")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property name
   (of-object "GooCanvas")
   (prop-type "GParamString")
@@ -227,6 +218,15 @@
   (construct-only #f)
 )
 
+(define-property double-buffered
+  (of-object "GooCanvas")
+  (prop-type "GParamBoolean")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property border-width
   (of-object "GooCanvas")
   (prop-type "GParamUInt")
@@ -281,15 +281,6 @@
   (construct-only #f)
 )
 
-(define-property anchor
-  (of-object "GooCanvas")
-  (prop-type "GParamEnum")
-  (docs "Where to place the canvas when it is smaller than the widget's allocated area")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property x1
   (of-object "GooCanvas")
   (prop-type "GParamDouble")
@@ -427,37 +418,37 @@
 
 ;; From GooCanvasEllipse
 
-(define-property description
+(define-property can-focus
   (of-object "GooCanvasEllipse")
-  (prop-type "GParamString")
-  (docs "A description of the item for use by assistive technologies")
+  (prop-type "GParamBoolean")
+  (docs "If the item can take the keyboard focus")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property tooltip
+(define-property description
   (of-object "GooCanvasEllipse")
   (prop-type "GParamString")
-  (docs "The tooltip to display for the item")
+  (docs "A description of the item for use by assistive technologies")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property visibility-threshold
+(define-property parent
   (of-object "GooCanvasEllipse")
-  (prop-type "GParamDouble")
-  (docs "The scale threshold at which the item becomes visible")
+  (prop-type "GParamObject")
+  (docs "The parent item")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property visibility
+(define-property pointer-events
   (of-object "GooCanvasEllipse")
-  (prop-type "GParamEnum")
-  (docs "When the canvas item is visible")
+  (prop-type "GParamFlags")
+  (docs "Specifies when the item receives pointer events")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -472,37 +463,37 @@
   (construct-only #f)
 )
 
-(define-property parent
+(define-property tooltip
   (of-object "GooCanvasEllipse")
-  (prop-type "GParamObject")
-  (docs "The parent item")
+  (prop-type "GParamString")
+  (docs "The tooltip to display for the item")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property pointer-events
+(define-property transform
   (of-object "GooCanvasEllipse")
-  (prop-type "GParamFlags")
-  (docs "Specifies when the item receives pointer events")
+  (prop-type "GParamBoxed")
+  (docs "The transformation matrix of the item")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property can-focus
+(define-property visibility
   (of-object "GooCanvasEllipse")
-  (prop-type "GParamBoolean")
-  (docs "If the item can take the keyboard focus")
+  (prop-type "GParamEnum")
+  (docs "When the canvas item is visible")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property transform
+(define-property visibility-threshold
   (of-object "GooCanvasEllipse")
-  (prop-type "GParamBoxed")
-  (docs "The transformation matrix of the item")
+  (prop-type "GParamDouble")
+  (docs "The scale threshold at which the item becomes visible")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -771,19 +762,10 @@
 
 ;; From GooCanvasEllipseModel
 
-(define-property title
-  (of-object "GooCanvasEllipseModel")
-  (prop-type "GParamString")
-  (docs "A short context-rich description of the item for use by assistive technologies")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property visibility-threshold
+(define-property can-focus
   (of-object "GooCanvasEllipseModel")
-  (prop-type "GParamDouble")
-  (docs "The scale threshold at which the item becomes visible")
+  (prop-type "GParamBoolean")
+  (docs "If the item can take the keyboard focus")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -798,28 +780,28 @@
   (construct-only #f)
 )
 
-(define-property visibility
+(define-property parent
   (of-object "GooCanvasEllipseModel")
-  (prop-type "GParamEnum")
-  (docs "When the canvas item is visible")
+  (prop-type "GParamObject")
+  (docs "The parent item model")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property can-focus
+(define-property pointer-events
   (of-object "GooCanvasEllipseModel")
-  (prop-type "GParamBoolean")
-  (docs "If the item can take the keyboard focus")
+  (prop-type "GParamFlags")
+  (docs "Specifies when the item receives pointer events")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property transform
+(define-property title
   (of-object "GooCanvasEllipseModel")
-  (prop-type "GParamBoxed")
-  (docs "The transformation matrix of the item")
+  (prop-type "GParamString")
+  (docs "A short context-rich description of the item for use by assistive technologies")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -834,19 +816,28 @@
   (construct-only #f)
 )
 
-(define-property parent
+(define-property transform
   (of-object "GooCanvasEllipseModel")
-  (prop-type "GParamObject")
-  (docs "The parent item model")
+  (prop-type "GParamBoxed")
+  (docs "The transformation matrix of the item")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property pointer-events
+(define-property visibility
   (of-object "GooCanvasEllipseModel")
-  (prop-type "GParamFlags")
-  (docs "Specifies when the item receives pointer events")
+  (prop-type "GParamEnum")
+  (docs "When the canvas item is visible")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property visibility-threshold
+  (of-object "GooCanvasEllipseModel")
+  (prop-type "GParamDouble")
+  (docs "The scale threshold at which the item becomes visible")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -1115,10 +1106,10 @@
 
 ;; From GooCanvasGrid
 
-(define-property visibility
+(define-property can-focus
   (of-object "GooCanvasGrid")
-  (prop-type "GParamEnum")
-  (docs "When the canvas item is visible")
+  (prop-type "GParamBoolean")
+  (docs "If the item can take the keyboard focus")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -1133,10 +1124,10 @@
   (construct-only #f)
 )
 
-(define-property visibility-threshold
+(define-property parent
   (of-object "GooCanvasGrid")
-  (prop-type "GParamDouble")
-  (docs "The scale threshold at which the item becomes visible")
+  (prop-type "GParamObject")
+  (docs "The parent item")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -1151,46 +1142,46 @@
   (construct-only #f)
 )
 
-(define-property parent
+(define-property title
   (of-object "GooCanvasGrid")
-  (prop-type "GParamObject")
-  (docs "The parent item")
+  (prop-type "GParamString")
+  (docs "A short context-rich description of the item for use by assistive technologies")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property transform
+(define-property tooltip
   (of-object "GooCanvasGrid")
-  (prop-type "GParamBoxed")
-  (docs "The transformation matrix of the item")
+  (prop-type "GParamString")
+  (docs "The tooltip to display for the item")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property tooltip
+(define-property transform
   (of-object "GooCanvasGrid")
-  (prop-type "GParamString")
-  (docs "The tooltip to display for the item")
+  (prop-type "GParamBoxed")
+  (docs "The transformation matrix of the item")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property can-focus
+(define-property visibility
   (of-object "GooCanvasGrid")
-  (prop-type "GParamBoolean")
-  (docs "If the item can take the keyboard focus")
+  (prop-type "GParamEnum")
+  (docs "When the canvas item is visible")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property title
+(define-property visibility-threshold
   (of-object "GooCanvasGrid")
-  (prop-type "GParamString")
-  (docs "A short context-rich description of the item for use by assistive technologies")
+  (prop-type "GParamDouble")
+  (docs "The scale threshold at which the item becomes visible")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -1621,19 +1612,10 @@
 
 ;; From GooCanvasGridModel
 
-(define-property title
-  (of-object "GooCanvasGridModel")
-  (prop-type "GParamString")
-  (docs "A short context-rich description of the item for use by assistive technologies")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property visibility-threshold
+(define-property can-focus
   (of-object "GooCanvasGridModel")
-  (prop-type "GParamDouble")
-  (docs "The scale threshold at which the item becomes visible")
+  (prop-type "GParamBoolean")
+  (docs "If the item can take the keyboard focus")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -1648,28 +1630,28 @@
   (construct-only #f)
 )
 
-(define-property visibility
+(define-property parent
   (of-object "GooCanvasGridModel")
-  (prop-type "GParamEnum")
-  (docs "When the canvas item is visible")
+  (prop-type "GParamObject")
+  (docs "The parent item model")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property can-focus
+(define-property pointer-events
   (of-object "GooCanvasGridModel")
-  (prop-type "GParamBoolean")
-  (docs "If the item can take the keyboard focus")
+  (prop-type "GParamFlags")
+  (docs "Specifies when the item receives pointer events")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property transform
+(define-property title
   (of-object "GooCanvasGridModel")
-  (prop-type "GParamBoxed")
-  (docs "The transformation matrix of the item")
+  (prop-type "GParamString")
+  (docs "A short context-rich description of the item for use by assistive technologies")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -1684,19 +1666,28 @@
   (construct-only #f)
 )
 
-(define-property parent
+(define-property transform
   (of-object "GooCanvasGridModel")
-  (prop-type "GParamObject")
-  (docs "The parent item model")
+  (prop-type "GParamBoxed")
+  (docs "The transformation matrix of the item")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property pointer-events
+(define-property visibility
   (of-object "GooCanvasGridModel")
-  (prop-type "GParamFlags")
-  (docs "Specifies when the item receives pointer events")
+  (prop-type "GParamEnum")
+  (docs "When the canvas item is visible")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property visibility-threshold
+  (of-object "GooCanvasGridModel")
+  (prop-type "GParamDouble")
+  (docs "The scale threshold at which the item becomes visible")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -2127,10 +2118,10 @@
 
 ;; From GooCanvasGroup
 
-(define-property visibility
+(define-property can-focus
   (of-object "GooCanvasGroup")
-  (prop-type "GParamEnum")
-  (docs "When the canvas item is visible")
+  (prop-type "GParamBoolean")
+  (docs "If the item can take the keyboard focus")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -2145,10 +2136,10 @@
   (construct-only #f)
 )
 
-(define-property visibility-threshold
+(define-property parent
   (of-object "GooCanvasGroup")
-  (prop-type "GParamDouble")
-  (docs "The scale threshold at which the item becomes visible")
+  (prop-type "GParamObject")
+  (docs "The parent item")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -2163,46 +2154,46 @@
   (construct-only #f)
 )
 
-(define-property parent
+(define-property title
   (of-object "GooCanvasGroup")
-  (prop-type "GParamObject")
-  (docs "The parent item")
+  (prop-type "GParamString")
+  (docs "A short context-rich description of the item for use by assistive technologies")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property transform
+(define-property tooltip
   (of-object "GooCanvasGroup")
-  (prop-type "GParamBoxed")
-  (docs "The transformation matrix of the item")
+  (prop-type "GParamString")
+  (docs "The tooltip to display for the item")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property tooltip
+(define-property transform
   (of-object "GooCanvasGroup")
-  (prop-type "GParamString")
-  (docs "The tooltip to display for the item")
+  (prop-type "GParamBoxed")
+  (docs "The transformation matrix of the item")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property can-focus
+(define-property visibility
   (of-object "GooCanvasGroup")
-  (prop-type "GParamBoolean")
-  (docs "If the item can take the keyboard focus")
+  (prop-type "GParamEnum")
+  (docs "When the canvas item is visible")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property title
+(define-property visibility-threshold
   (of-object "GooCanvasGroup")
-  (prop-type "GParamString")
-  (docs "A short context-rich description of the item for use by assistive technologies")
+  (prop-type "GParamDouble")
+  (docs "The scale threshold at which the item becomes visible")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -2435,19 +2426,10 @@
 
 ;; From GooCanvasGroupModel
 
-(define-property title
-  (of-object "GooCanvasGroupModel")
-  (prop-type "GParamString")
-  (docs "A short context-rich description of the item for use by assistive technologies")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property visibility-threshold
+(define-property can-focus
   (of-object "GooCanvasGroupModel")
-  (prop-type "GParamDouble")
-  (docs "The scale threshold at which the item becomes visible")
+  (prop-type "GParamBoolean")
+  (docs "If the item can take the keyboard focus")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -2462,28 +2444,28 @@
   (construct-only #f)
 )
 
-(define-property visibility
+(define-property parent
   (of-object "GooCanvasGroupModel")
-  (prop-type "GParamEnum")
-  (docs "When the canvas item is visible")
+  (prop-type "GParamObject")
+  (docs "The parent item model")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property can-focus
+(define-property pointer-events
   (of-object "GooCanvasGroupModel")
-  (prop-type "GParamBoolean")
-  (docs "If the item can take the keyboard focus")
+  (prop-type "GParamFlags")
+  (docs "Specifies when the item receives pointer events")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property transform
+(define-property title
   (of-object "GooCanvasGroupModel")
-  (prop-type "GParamBoxed")
-  (docs "The transformation matrix of the item")
+  (prop-type "GParamString")
+  (docs "A short context-rich description of the item for use by assistive technologies")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -2498,19 +2480,28 @@
   (construct-only #f)
 )
 
-(define-property parent
+(define-property transform
   (of-object "GooCanvasGroupModel")
-  (prop-type "GParamObject")
-  (docs "The parent item model")
+  (prop-type "GParamBoxed")
+  (docs "The transformation matrix of the item")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property pointer-events
+(define-property visibility
   (of-object "GooCanvasGroupModel")
-  (prop-type "GParamFlags")
-  (docs "Specifies when the item receives pointer events")
+  (prop-type "GParamEnum")
+  (docs "When the canvas item is visible")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property visibility-threshold
+  (of-object "GooCanvasGroupModel")
+  (prop-type "GParamDouble")
+  (docs "The scale threshold at which the item becomes visible")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -2743,10 +2734,10 @@
 
 ;; From GooCanvasImage
 
-(define-property visibility
+(define-property can-focus
   (of-object "GooCanvasImage")
-  (prop-type "GParamEnum")
-  (docs "When the canvas item is visible")
+  (prop-type "GParamBoolean")
+  (docs "If the item can take the keyboard focus")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -2761,10 +2752,10 @@
   (construct-only #f)
 )
 
-(define-property visibility-threshold
+(define-property parent
   (of-object "GooCanvasImage")
-  (prop-type "GParamDouble")
-  (docs "The scale threshold at which the item becomes visible")
+  (prop-type "GParamObject")
+  (docs "The parent item")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -2779,46 +2770,46 @@
   (construct-only #f)
 )
 
-(define-property parent
+(define-property title
   (of-object "GooCanvasImage")
-  (prop-type "GParamObject")
-  (docs "The parent item")
+  (prop-type "GParamString")
+  (docs "A short context-rich description of the item for use by assistive technologies")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property transform
+(define-property tooltip
   (of-object "GooCanvasImage")
-  (prop-type "GParamBoxed")
-  (docs "The transformation matrix of the item")
+  (prop-type "GParamString")
+  (docs "The tooltip to display for the item")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property tooltip
+(define-property transform
   (of-object "GooCanvasImage")
-  (prop-type "GParamString")
-  (docs "The tooltip to display for the item")
+  (prop-type "GParamBoxed")
+  (docs "The transformation matrix of the item")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property can-focus
+(define-property visibility
   (of-object "GooCanvasImage")
-  (prop-type "GParamBoolean")
-  (docs "If the item can take the keyboard focus")
+  (prop-type "GParamEnum")
+  (docs "When the canvas item is visible")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property title
+(define-property visibility-threshold
   (of-object "GooCanvasImage")
-  (prop-type "GParamString")
-  (docs "A short context-rich description of the item for use by assistive technologies")
+  (prop-type "GParamDouble")
+  (docs "The scale threshold at which the item becomes visible")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -3078,19 +3069,10 @@
 
 ;; From GooCanvasImageModel
 
-(define-property title
-  (of-object "GooCanvasImageModel")
-  (prop-type "GParamString")
-  (docs "A short context-rich description of the item for use by assistive technologies")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property visibility-threshold
+(define-property can-focus
   (of-object "GooCanvasImageModel")
-  (prop-type "GParamDouble")
-  (docs "The scale threshold at which the item becomes visible")
+  (prop-type "GParamBoolean")
+  (docs "If the item can take the keyboard focus")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -3105,28 +3087,28 @@
   (construct-only #f)
 )
 
-(define-property visibility
+(define-property parent
   (of-object "GooCanvasImageModel")
-  (prop-type "GParamEnum")
-  (docs "When the canvas item is visible")
+  (prop-type "GParamObject")
+  (docs "The parent item model")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property can-focus
+(define-property pointer-events
   (of-object "GooCanvasImageModel")
-  (prop-type "GParamBoolean")
-  (docs "If the item can take the keyboard focus")
+  (prop-type "GParamFlags")
+  (docs "Specifies when the item receives pointer events")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property transform
+(define-property title
   (of-object "GooCanvasImageModel")
-  (prop-type "GParamBoxed")
-  (docs "The transformation matrix of the item")
+  (prop-type "GParamString")
+  (docs "A short context-rich description of the item for use by assistive technologies")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -3141,19 +3123,28 @@
   (construct-only #f)
 )
 
-(define-property parent
+(define-property transform
   (of-object "GooCanvasImageModel")
-  (prop-type "GParamObject")
-  (docs "The parent item model")
+  (prop-type "GParamBoxed")
+  (docs "The transformation matrix of the item")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property pointer-events
+(define-property visibility
   (of-object "GooCanvasImageModel")
-  (prop-type "GParamFlags")
-  (docs "Specifies when the item receives pointer events")
+  (prop-type "GParamEnum")
+  (docs "When the canvas item is visible")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property visibility-threshold
+  (of-object "GooCanvasImageModel")
+  (prop-type "GParamDouble")
+  (docs "The scale threshold at which the item becomes visible")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -3553,10 +3544,10 @@
   )
 )
 
-(define-property visibility
+(define-property can-focus
   (of-object "GooCanvasItem")
-  (prop-type "GParamEnum")
-  (docs "When the canvas item is visible")
+  (prop-type "GParamBoolean")
+  (docs "If the item can take the keyboard focus")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -3571,10 +3562,10 @@
   (construct-only #f)
 )
 
-(define-property visibility-threshold
+(define-property parent
   (of-object "GooCanvasItem")
-  (prop-type "GParamDouble")
-  (docs "The scale threshold at which the item becomes visible")
+  (prop-type "GParamObject")
+  (docs "The parent item")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -3589,46 +3580,46 @@
   (construct-only #f)
 )
 
-(define-property parent
+(define-property title
   (of-object "GooCanvasItem")
-  (prop-type "GParamObject")
-  (docs "The parent item")
+  (prop-type "GParamString")
+  (docs "A short context-rich description of the item for use by assistive technologies")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property transform
+(define-property tooltip
   (of-object "GooCanvasItem")
-  (prop-type "GParamBoxed")
-  (docs "The transformation matrix of the item")
+  (prop-type "GParamString")
+  (docs "The tooltip to display for the item")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property tooltip
+(define-property transform
   (of-object "GooCanvasItem")
-  (prop-type "GParamString")
-  (docs "The tooltip to display for the item")
+  (prop-type "GParamBoxed")
+  (docs "The transformation matrix of the item")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property can-focus
+(define-property visibility
   (of-object "GooCanvasItem")
-  (prop-type "GParamBoolean")
-  (docs "If the item can take the keyboard focus")
+  (prop-type "GParamEnum")
+  (docs "When the canvas item is visible")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property title
+(define-property visibility-threshold
   (of-object "GooCanvasItem")
-  (prop-type "GParamString")
-  (docs "A short context-rich description of the item for use by assistive technologies")
+  (prop-type "GParamDouble")
+  (docs "The scale threshold at which the item becomes visible")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -3691,19 +3682,10 @@
   )
 )
 
-(define-property title
-  (of-object "GooCanvasItemModel")
-  (prop-type "GParamString")
-  (docs "A short context-rich description of the item for use by assistive technologies")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property visibility-threshold
+(define-property can-focus
   (of-object "GooCanvasItemModel")
-  (prop-type "GParamDouble")
-  (docs "The scale threshold at which the item becomes visible")
+  (prop-type "GParamBoolean")
+  (docs "If the item can take the keyboard focus")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -3718,28 +3700,28 @@
   (construct-only #f)
 )
 
-(define-property visibility
+(define-property parent
   (of-object "GooCanvasItemModel")
-  (prop-type "GParamEnum")
-  (docs "When the canvas item is visible")
+  (prop-type "GParamObject")
+  (docs "The parent item model")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property can-focus
+(define-property pointer-events
   (of-object "GooCanvasItemModel")
-  (prop-type "GParamBoolean")
-  (docs "If the item can take the keyboard focus")
+  (prop-type "GParamFlags")
+  (docs "Specifies when the item receives pointer events")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property transform
+(define-property title
   (of-object "GooCanvasItemModel")
-  (prop-type "GParamBoxed")
-  (docs "The transformation matrix of the item")
+  (prop-type "GParamString")
+  (docs "A short context-rich description of the item for use by assistive technologies")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -3754,19 +3736,28 @@
   (construct-only #f)
 )
 
-(define-property parent
+(define-property transform
   (of-object "GooCanvasItemModel")
-  (prop-type "GParamObject")
-  (docs "The parent item model")
+  (prop-type "GParamBoxed")
+  (docs "The transformation matrix of the item")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property pointer-events
+(define-property visibility
   (of-object "GooCanvasItemModel")
-  (prop-type "GParamFlags")
-  (docs "Specifies when the item receives pointer events")
+  (prop-type "GParamEnum")
+  (docs "When the canvas item is visible")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property visibility-threshold
+  (of-object "GooCanvasItemModel")
+  (prop-type "GParamDouble")
+  (docs "The scale threshold at which the item becomes visible")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -3774,10 +3765,10 @@
 
 ;; From GooCanvasItemSimple
 
-(define-property visibility
+(define-property can-focus
   (of-object "GooCanvasItemSimple")
-  (prop-type "GParamEnum")
-  (docs "When the canvas item is visible")
+  (prop-type "GParamBoolean")
+  (docs "If the item can take the keyboard focus")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -3792,10 +3783,10 @@
   (construct-only #f)
 )
 
-(define-property visibility-threshold
+(define-property parent
   (of-object "GooCanvasItemSimple")
-  (prop-type "GParamDouble")
-  (docs "The scale threshold at which the item becomes visible")
+  (prop-type "GParamObject")
+  (docs "The parent item")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -3810,46 +3801,46 @@
   (construct-only #f)
 )
 
-(define-property parent
+(define-property title
   (of-object "GooCanvasItemSimple")
-  (prop-type "GParamObject")
-  (docs "The parent item")
+  (prop-type "GParamString")
+  (docs "A short context-rich description of the item for use by assistive technologies")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property transform
+(define-property tooltip
   (of-object "GooCanvasItemSimple")
-  (prop-type "GParamBoxed")
-  (docs "The transformation matrix of the item")
+  (prop-type "GParamString")
+  (docs "The tooltip to display for the item")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property tooltip
+(define-property transform
   (of-object "GooCanvasItemSimple")
-  (prop-type "GParamString")
-  (docs "The tooltip to display for the item")
+  (prop-type "GParamBoxed")
+  (docs "The transformation matrix of the item")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property can-focus
+(define-property visibility
   (of-object "GooCanvasItemSimple")
-  (prop-type "GParamBoolean")
-  (docs "If the item can take the keyboard focus")
+  (prop-type "GParamEnum")
+  (docs "When the canvas item is visible")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property title
+(define-property visibility-threshold
   (of-object "GooCanvasItemSimple")
-  (prop-type "GParamString")
-  (docs "A short context-rich description of the item for use by assistive technologies")
+  (prop-type "GParamDouble")
+  (docs "The scale threshold at which the item becomes visible")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -4046,19 +4037,10 @@
 
 ;; From GooCanvasItemModelSimple
 
-(define-property title
-  (of-object "GooCanvasItemModelSimple")
-  (prop-type "GParamString")
-  (docs "A short context-rich description of the item for use by assistive technologies")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property visibility-threshold
+(define-property can-focus
   (of-object "GooCanvasItemModelSimple")
-  (prop-type "GParamDouble")
-  (docs "The scale threshold at which the item becomes visible")
+  (prop-type "GParamBoolean")
+  (docs "If the item can take the keyboard focus")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -4073,28 +4055,28 @@
   (construct-only #f)
 )
 
-(define-property visibility
+(define-property parent
   (of-object "GooCanvasItemModelSimple")
-  (prop-type "GParamEnum")
-  (docs "When the canvas item is visible")
+  (prop-type "GParamObject")
+  (docs "The parent item model")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property can-focus
+(define-property pointer-events
   (of-object "GooCanvasItemModelSimple")
-  (prop-type "GParamBoolean")
-  (docs "If the item can take the keyboard focus")
+  (prop-type "GParamFlags")
+  (docs "Specifies when the item receives pointer events")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property transform
+(define-property title
   (of-object "GooCanvasItemModelSimple")
-  (prop-type "GParamBoxed")
-  (docs "The transformation matrix of the item")
+  (prop-type "GParamString")
+  (docs "A short context-rich description of the item for use by assistive technologies")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -4109,19 +4091,28 @@
   (construct-only #f)
 )
 
-(define-property parent
+(define-property transform
   (of-object "GooCanvasItemModelSimple")
-  (prop-type "GParamObject")
-  (docs "The parent item model")
+  (prop-type "GParamBoxed")
+  (docs "The transformation matrix of the item")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property pointer-events
+(define-property visibility
   (of-object "GooCanvasItemModelSimple")
-  (prop-type "GParamFlags")
-  (docs "Specifies when the item receives pointer events")
+  (prop-type "GParamEnum")
+  (docs "When the canvas item is visible")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property visibility-threshold
+  (of-object "GooCanvasItemModelSimple")
+  (prop-type "GParamDouble")
+  (docs "The scale threshold at which the item becomes visible")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -4320,10 +4311,10 @@
 
 ;; From GooCanvasPath
 
-(define-property visibility
+(define-property can-focus
   (of-object "GooCanvasPath")
-  (prop-type "GParamEnum")
-  (docs "When the canvas item is visible")
+  (prop-type "GParamBoolean")
+  (docs "If the item can take the keyboard focus")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -4338,10 +4329,10 @@
   (construct-only #f)
 )
 
-(define-property visibility-threshold
+(define-property parent
   (of-object "GooCanvasPath")
-  (prop-type "GParamDouble")
-  (docs "The scale threshold at which the item becomes visible")
+  (prop-type "GParamObject")
+  (docs "The parent item")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -4356,46 +4347,46 @@
   (construct-only #f)
 )
 
-(define-property parent
+(define-property title
   (of-object "GooCanvasPath")
-  (prop-type "GParamObject")
-  (docs "The parent item")
+  (prop-type "GParamString")
+  (docs "A short context-rich description of the item for use by assistive technologies")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property transform
+(define-property tooltip
   (of-object "GooCanvasPath")
-  (prop-type "GParamBoxed")
-  (docs "The transformation matrix of the item")
+  (prop-type "GParamString")
+  (docs "The tooltip to display for the item")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property tooltip
+(define-property transform
   (of-object "GooCanvasPath")
-  (prop-type "GParamString")
-  (docs "The tooltip to display for the item")
+  (prop-type "GParamBoxed")
+  (docs "The transformation matrix of the item")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property can-focus
+(define-property visibility
   (of-object "GooCanvasPath")
-  (prop-type "GParamBoolean")
-  (docs "If the item can take the keyboard focus")
+  (prop-type "GParamEnum")
+  (docs "When the canvas item is visible")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property title
+(define-property visibility-threshold
   (of-object "GooCanvasPath")
-  (prop-type "GParamString")
-  (docs "A short context-rich description of the item for use by assistive technologies")
+  (prop-type "GParamDouble")
+  (docs "The scale threshold at which the item becomes visible")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -4637,19 +4628,10 @@
 
 ;; From GooCanvasPathModel
 
-(define-property title
-  (of-object "GooCanvasPathModel")
-  (prop-type "GParamString")
-  (docs "A short context-rich description of the item for use by assistive technologies")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property visibility-threshold
+(define-property can-focus
   (of-object "GooCanvasPathModel")
-  (prop-type "GParamDouble")
-  (docs "The scale threshold at which the item becomes visible")
+  (prop-type "GParamBoolean")
+  (docs "If the item can take the keyboard focus")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -4664,28 +4646,28 @@
   (construct-only #f)
 )
 
-(define-property visibility
+(define-property parent
   (of-object "GooCanvasPathModel")
-  (prop-type "GParamEnum")
-  (docs "When the canvas item is visible")
+  (prop-type "GParamObject")
+  (docs "The parent item model")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property can-focus
+(define-property pointer-events
   (of-object "GooCanvasPathModel")
-  (prop-type "GParamBoolean")
-  (docs "If the item can take the keyboard focus")
+  (prop-type "GParamFlags")
+  (docs "Specifies when the item receives pointer events")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property transform
+(define-property title
   (of-object "GooCanvasPathModel")
-  (prop-type "GParamBoxed")
-  (docs "The transformation matrix of the item")
+  (prop-type "GParamString")
+  (docs "A short context-rich description of the item for use by assistive technologies")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -4700,19 +4682,28 @@
   (construct-only #f)
 )
 
-(define-property parent
+(define-property transform
   (of-object "GooCanvasPathModel")
-  (prop-type "GParamObject")
-  (docs "The parent item model")
+  (prop-type "GParamBoxed")
+  (docs "The transformation matrix of the item")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property pointer-events
+(define-property visibility
   (of-object "GooCanvasPathModel")
-  (prop-type "GParamFlags")
-  (docs "Specifies when the item receives pointer events")
+  (prop-type "GParamEnum")
+  (docs "When the canvas item is visible")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property visibility-threshold
+  (of-object "GooCanvasPathModel")
+  (prop-type "GParamDouble")
+  (docs "The scale threshold at which the item becomes visible")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -4956,10 +4947,10 @@
 
 ;; From GooCanvasPolyline
 
-(define-property visibility
+(define-property can-focus
   (of-object "GooCanvasPolyline")
-  (prop-type "GParamEnum")
-  (docs "When the canvas item is visible")
+  (prop-type "GParamBoolean")
+  (docs "If the item can take the keyboard focus")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -4974,10 +4965,10 @@
   (construct-only #f)
 )
 
-(define-property visibility-threshold
+(define-property parent
   (of-object "GooCanvasPolyline")
-  (prop-type "GParamDouble")
-  (docs "The scale threshold at which the item becomes visible")
+  (prop-type "GParamObject")
+  (docs "The parent item")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -4992,46 +4983,46 @@
   (construct-only #f)
 )
 
-(define-property parent
+(define-property title
   (of-object "GooCanvasPolyline")
-  (prop-type "GParamObject")
-  (docs "The parent item")
+  (prop-type "GParamString")
+  (docs "A short context-rich description of the item for use by assistive technologies")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property transform
+(define-property tooltip
   (of-object "GooCanvasPolyline")
-  (prop-type "GParamBoxed")
-  (docs "The transformation matrix of the item")
+  (prop-type "GParamString")
+  (docs "The tooltip to display for the item")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property tooltip
+(define-property transform
   (of-object "GooCanvasPolyline")
-  (prop-type "GParamString")
-  (docs "The tooltip to display for the item")
+  (prop-type "GParamBoxed")
+  (docs "The transformation matrix of the item")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property can-focus
+(define-property visibility
   (of-object "GooCanvasPolyline")
-  (prop-type "GParamBoolean")
-  (docs "If the item can take the keyboard focus")
+  (prop-type "GParamEnum")
+  (docs "When the canvas item is visible")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property title
+(define-property visibility-threshold
   (of-object "GooCanvasPolyline")
-  (prop-type "GParamString")
-  (docs "A short context-rich description of the item for use by assistive technologies")
+  (prop-type "GParamDouble")
+  (docs "The scale threshold at which the item becomes visible")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -5327,46 +5318,46 @@
 
 ;; From GooCanvasPolylineModel
 
-(define-property visibility
+(define-property can-focus
   (of-object "GooCanvasPolylineModel")
-  (prop-type "GParamEnum")
-  (docs "When the canvas item is visible")
+  (prop-type "GParamBoolean")
+  (docs "If the item can take the keyboard focus")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property title
+(define-property description
   (of-object "GooCanvasPolylineModel")
   (prop-type "GParamString")
-  (docs "A short context-rich description of the item for use by assistive technologies")
+  (docs "A description of the item for use by assistive technologies")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property can-focus
+(define-property parent
   (of-object "GooCanvasPolylineModel")
-  (prop-type "GParamBoolean")
-  (docs "If the item can take the keyboard focus")
+  (prop-type "GParamObject")
+  (docs "The parent item model")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property description
+(define-property pointer-events
   (of-object "GooCanvasPolylineModel")
-  (prop-type "GParamString")
-  (docs "A description of the item for use by assistive technologies")
+  (prop-type "GParamFlags")
+  (docs "Specifies when the item receives pointer events")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property pointer-events
+(define-property title
   (of-object "GooCanvasPolylineModel")
-  (prop-type "GParamFlags")
-  (docs "Specifies when the item receives pointer events")
+  (prop-type "GParamString")
+  (docs "A short context-rich description of the item for use by assistive technologies")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -5381,28 +5372,28 @@
   (construct-only #f)
 )
 
-(define-property visibility-threshold
+(define-property transform
   (of-object "GooCanvasPolylineModel")
-  (prop-type "GParamDouble")
-  (docs "The scale threshold at which the item becomes visible")
+  (prop-type "GParamBoxed")
+  (docs "The transformation matrix of the item")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property transform
+(define-property visibility
   (of-object "GooCanvasPolylineModel")
-  (prop-type "GParamBoxed")
-  (docs "The transformation matrix of the item")
+  (prop-type "GParamEnum")
+  (docs "When the canvas item is visible")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property parent
+(define-property visibility-threshold
   (of-object "GooCanvasPolylineModel")
-  (prop-type "GParamObject")
-  (docs "The parent item model")
+  (prop-type "GParamDouble")
+  (docs "The scale threshold at which the item becomes visible")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -5698,19 +5689,19 @@
 
 ;; From GooCanvasRect
 
-(define-property description
+(define-property can-focus
   (of-object "GooCanvasRect")
-  (prop-type "GParamString")
-  (docs "A description of the item for use by assistive technologies")
+  (prop-type "GParamBoolean")
+  (docs "If the item can take the keyboard focus")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property can-focus
+(define-property description
   (of-object "GooCanvasRect")
-  (prop-type "GParamBoolean")
-  (docs "If the item can take the keyboard focus")
+  (prop-type "GParamString")
+  (docs "A description of the item for use by assistive technologies")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -5725,55 +5716,55 @@
   (construct-only #f)
 )
 
-(define-property transform
+(define-property pointer-events
   (of-object "GooCanvasRect")
-  (prop-type "GParamBoxed")
-  (docs "The transformation matrix of the item")
+  (prop-type "GParamFlags")
+  (docs "Specifies when the item receives pointer events")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property visibility-threshold
+(define-property title
   (of-object "GooCanvasRect")
-  (prop-type "GParamDouble")
-  (docs "The scale threshold at which the item becomes visible")
+  (prop-type "GParamString")
+  (docs "A short context-rich description of the item for use by assistive technologies")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property pointer-events
+(define-property tooltip
   (of-object "GooCanvasRect")
-  (prop-type "GParamFlags")
-  (docs "Specifies when the item receives pointer events")
+  (prop-type "GParamString")
+  (docs "The tooltip to display for the item")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property visibility
+(define-property transform
   (of-object "GooCanvasRect")
-  (prop-type "GParamEnum")
-  (docs "When the canvas item is visible")
+  (prop-type "GParamBoxed")
+  (docs "The transformation matrix of the item")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property title
+(define-property visibility
   (of-object "GooCanvasRect")
-  (prop-type "GParamString")
-  (docs "A short context-rich description of the item for use by assistive technologies")
+  (prop-type "GParamEnum")
+  (docs "When the canvas item is visible")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property tooltip
+(define-property visibility-threshold
   (of-object "GooCanvasRect")
-  (prop-type "GParamString")
-  (docs "The tooltip to display for the item")
+  (prop-type "GParamDouble")
+  (docs "The scale threshold at which the item becomes visible")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -6024,46 +6015,46 @@
 
 ;; From GooCanvasRectModel
 
-(define-property visibility
+(define-property can-focus
   (of-object "GooCanvasRectModel")
-  (prop-type "GParamEnum")
-  (docs "When the canvas item is visible")
+  (prop-type "GParamBoolean")
+  (docs "If the item can take the keyboard focus")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property title
+(define-property description
   (of-object "GooCanvasRectModel")
   (prop-type "GParamString")
-  (docs "A short context-rich description of the item for use by assistive technologies")
+  (docs "A description of the item for use by assistive technologies")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property can-focus
+(define-property parent
   (of-object "GooCanvasRectModel")
-  (prop-type "GParamBoolean")
-  (docs "If the item can take the keyboard focus")
+  (prop-type "GParamObject")
+  (docs "The parent item model")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property description
+(define-property pointer-events
   (of-object "GooCanvasRectModel")
-  (prop-type "GParamString")
-  (docs "A description of the item for use by assistive technologies")
+  (prop-type "GParamFlags")
+  (docs "Specifies when the item receives pointer events")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property pointer-events
+(define-property title
   (of-object "GooCanvasRectModel")
-  (prop-type "GParamFlags")
-  (docs "Specifies when the item receives pointer events")
+  (prop-type "GParamString")
+  (docs "A short context-rich description of the item for use by assistive technologies")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -6078,28 +6069,28 @@
   (construct-only #f)
 )
 
-(define-property visibility-threshold
+(define-property transform
   (of-object "GooCanvasRectModel")
-  (prop-type "GParamDouble")
-  (docs "The scale threshold at which the item becomes visible")
+  (prop-type "GParamBoxed")
+  (docs "The transformation matrix of the item")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property transform
+(define-property visibility
   (of-object "GooCanvasRectModel")
-  (prop-type "GParamBoxed")
-  (docs "The transformation matrix of the item")
+  (prop-type "GParamEnum")
+  (docs "When the canvas item is visible")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property parent
+(define-property visibility-threshold
   (of-object "GooCanvasRectModel")
-  (prop-type "GParamObject")
-  (docs "The parent item model")
+  (prop-type "GParamDouble")
+  (docs "The scale threshold at which the item becomes visible")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -6352,19 +6343,19 @@
 
 ;; From GooCanvasTable
 
-(define-property description
+(define-property can-focus
   (of-object "GooCanvasTable")
-  (prop-type "GParamString")
-  (docs "A description of the item for use by assistive technologies")
+  (prop-type "GParamBoolean")
+  (docs "If the item can take the keyboard focus")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property can-focus
+(define-property description
   (of-object "GooCanvasTable")
-  (prop-type "GParamBoolean")
-  (docs "If the item can take the keyboard focus")
+  (prop-type "GParamString")
+  (docs "A description of the item for use by assistive technologies")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -6379,55 +6370,55 @@
   (construct-only #f)
 )
 
-(define-property transform
+(define-property pointer-events
   (of-object "GooCanvasTable")
-  (prop-type "GParamBoxed")
-  (docs "The transformation matrix of the item")
+  (prop-type "GParamFlags")
+  (docs "Specifies when the item receives pointer events")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property visibility-threshold
+(define-property title
   (of-object "GooCanvasTable")
-  (prop-type "GParamDouble")
-  (docs "The scale threshold at which the item becomes visible")
+  (prop-type "GParamString")
+  (docs "A short context-rich description of the item for use by assistive technologies")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property pointer-events
+(define-property tooltip
   (of-object "GooCanvasTable")
-  (prop-type "GParamFlags")
-  (docs "Specifies when the item receives pointer events")
+  (prop-type "GParamString")
+  (docs "The tooltip to display for the item")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property visibility
+(define-property transform
   (of-object "GooCanvasTable")
-  (prop-type "GParamEnum")
-  (docs "When the canvas item is visible")
+  (prop-type "GParamBoxed")
+  (docs "The transformation matrix of the item")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property title
+(define-property visibility
   (of-object "GooCanvasTable")
-  (prop-type "GParamString")
-  (docs "A short context-rich description of the item for use by assistive technologies")
+  (prop-type "GParamEnum")
+  (docs "When the canvas item is visible")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property tooltip
+(define-property visibility-threshold
   (of-object "GooCanvasTable")
-  (prop-type "GParamString")
-  (docs "The tooltip to display for the item")
+  (prop-type "GParamDouble")
+  (docs "The scale threshold at which the item becomes visible")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -6732,46 +6723,46 @@
 
 ;; From GooCanvasTableModel
 
-(define-property visibility
+(define-property can-focus
   (of-object "GooCanvasTableModel")
-  (prop-type "GParamEnum")
-  (docs "When the canvas item is visible")
+  (prop-type "GParamBoolean")
+  (docs "If the item can take the keyboard focus")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property title
+(define-property description
   (of-object "GooCanvasTableModel")
   (prop-type "GParamString")
-  (docs "A short context-rich description of the item for use by assistive technologies")
+  (docs "A description of the item for use by assistive technologies")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property can-focus
+(define-property parent
   (of-object "GooCanvasTableModel")
-  (prop-type "GParamBoolean")
-  (docs "If the item can take the keyboard focus")
+  (prop-type "GParamObject")
+  (docs "The parent item model")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property description
+(define-property pointer-events
   (of-object "GooCanvasTableModel")
-  (prop-type "GParamString")
-  (docs "A description of the item for use by assistive technologies")
+  (prop-type "GParamFlags")
+  (docs "Specifies when the item receives pointer events")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property pointer-events
+(define-property title
   (of-object "GooCanvasTableModel")
-  (prop-type "GParamFlags")
-  (docs "Specifies when the item receives pointer events")
+  (prop-type "GParamString")
+  (docs "A short context-rich description of the item for use by assistive technologies")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -6786,28 +6777,28 @@
   (construct-only #f)
 )
 
-(define-property visibility-threshold
+(define-property transform
   (of-object "GooCanvasTableModel")
-  (prop-type "GParamDouble")
-  (docs "The scale threshold at which the item becomes visible")
+  (prop-type "GParamBoxed")
+  (docs "The transformation matrix of the item")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property transform
+(define-property visibility
   (of-object "GooCanvasTableModel")
-  (prop-type "GParamBoxed")
-  (docs "The transformation matrix of the item")
+  (prop-type "GParamEnum")
+  (docs "When the canvas item is visible")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property parent
+(define-property visibility-threshold
   (of-object "GooCanvasTableModel")
-  (prop-type "GParamObject")
-  (docs "The parent item model")
+  (prop-type "GParamDouble")
+  (docs "The scale threshold at which the item becomes visible")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -7112,19 +7103,19 @@
 
 ;; From GooCanvasText
 
-(define-property description
+(define-property can-focus
   (of-object "GooCanvasText")
-  (prop-type "GParamString")
-  (docs "A description of the item for use by assistive technologies")
+  (prop-type "GParamBoolean")
+  (docs "If the item can take the keyboard focus")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property can-focus
+(define-property description
   (of-object "GooCanvasText")
-  (prop-type "GParamBoolean")
-  (docs "If the item can take the keyboard focus")
+  (prop-type "GParamString")
+  (docs "A description of the item for use by assistive technologies")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -7139,55 +7130,55 @@
   (construct-only #f)
 )
 
-(define-property transform
+(define-property pointer-events
   (of-object "GooCanvasText")
-  (prop-type "GParamBoxed")
-  (docs "The transformation matrix of the item")
+  (prop-type "GParamFlags")
+  (docs "Specifies when the item receives pointer events")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property visibility-threshold
+(define-property title
   (of-object "GooCanvasText")
-  (prop-type "GParamDouble")
-  (docs "The scale threshold at which the item becomes visible")
+  (prop-type "GParamString")
+  (docs "A short context-rich description of the item for use by assistive technologies")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property pointer-events
+(define-property tooltip
   (of-object "GooCanvasText")
-  (prop-type "GParamFlags")
-  (docs "Specifies when the item receives pointer events")
+  (prop-type "GParamString")
+  (docs "The tooltip to display for the item")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property visibility
+(define-property transform
   (of-object "GooCanvasText")
-  (prop-type "GParamEnum")
-  (docs "When the canvas item is visible")
+  (prop-type "GParamBoxed")
+  (docs "The transformation matrix of the item")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property title
+(define-property visibility
   (of-object "GooCanvasText")
-  (prop-type "GParamString")
-  (docs "A short context-rich description of the item for use by assistive technologies")
+  (prop-type "GParamEnum")
+  (docs "When the canvas item is visible")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property tooltip
+(define-property visibility-threshold
   (of-object "GooCanvasText")
-  (prop-type "GParamString")
-  (docs "The tooltip to display for the item")
+  (prop-type "GParamDouble")
+  (docs "The scale threshold at which the item becomes visible")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -7403,7 +7394,7 @@
 (define-property width
   (of-object "GooCanvasText")
   (prop-type "GParamDouble")
-  (docs "The width to use to layout the text")
+  (docs "The width to use to layout the text, or -1 to let the text use as much horizontal space as needed")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -7412,7 +7403,7 @@
 (define-property height
   (of-object "GooCanvasText")
   (prop-type "GParamDouble")
-  (docs "The height to use to layout the text, or -1 to use the natural height")
+  (docs "The height to use to layout the text, or -1 to let the text use as much vertical space as needed")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -7474,46 +7465,46 @@
 
 ;; From GooCanvasTextModel
 
-(define-property visibility
+(define-property can-focus
   (of-object "GooCanvasTextModel")
-  (prop-type "GParamEnum")
-  (docs "When the canvas item is visible")
+  (prop-type "GParamBoolean")
+  (docs "If the item can take the keyboard focus")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property title
+(define-property description
   (of-object "GooCanvasTextModel")
   (prop-type "GParamString")
-  (docs "A short context-rich description of the item for use by assistive technologies")
+  (docs "A description of the item for use by assistive technologies")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property can-focus
+(define-property parent
   (of-object "GooCanvasTextModel")
-  (prop-type "GParamBoolean")
-  (docs "If the item can take the keyboard focus")
+  (prop-type "GParamObject")
+  (docs "The parent item model")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property description
+(define-property pointer-events
   (of-object "GooCanvasTextModel")
-  (prop-type "GParamString")
-  (docs "A description of the item for use by assistive technologies")
+  (prop-type "GParamFlags")
+  (docs "Specifies when the item receives pointer events")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property pointer-events
+(define-property title
   (of-object "GooCanvasTextModel")
-  (prop-type "GParamFlags")
-  (docs "Specifies when the item receives pointer events")
+  (prop-type "GParamString")
+  (docs "A short context-rich description of the item for use by assistive technologies")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -7528,28 +7519,28 @@
   (construct-only #f)
 )
 
-(define-property visibility-threshold
+(define-property transform
   (of-object "GooCanvasTextModel")
-  (prop-type "GParamDouble")
-  (docs "The scale threshold at which the item becomes visible")
+  (prop-type "GParamBoxed")
+  (docs "The transformation matrix of the item")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property transform
+(define-property visibility
   (of-object "GooCanvasTextModel")
-  (prop-type "GParamBoxed")
-  (docs "The transformation matrix of the item")
+  (prop-type "GParamEnum")
+  (docs "When the canvas item is visible")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property parent
+(define-property visibility-threshold
   (of-object "GooCanvasTextModel")
-  (prop-type "GParamObject")
-  (docs "The parent item model")
+  (prop-type "GParamDouble")
+  (docs "The scale threshold at which the item becomes visible")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -7765,7 +7756,7 @@
 (define-property width
   (of-object "GooCanvasTextModel")
   (prop-type "GParamDouble")
-  (docs "The width to use to layout the text")
+  (docs "The width to use to layout the text, or -1 to let the text use as much horizontal space as needed")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -7774,7 +7765,7 @@
 (define-property height
   (of-object "GooCanvasTextModel")
   (prop-type "GParamDouble")
-  (docs "The height to use to layout the text, or -1 to use the natural height")
+  (docs "The height to use to layout the text, or -1 to let the text use as much vertical space as needed")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -7836,10 +7827,10 @@
 
 ;; From GooCanvasWidget
 
-(define-property description
+(define-property anchor
   (of-object "GooCanvasWidget")
-  (prop-type "GParamString")
-  (docs "A description of the item for use by assistive technologies")
+  (prop-type "GParamEnum")
+  (docs "How to position the widget relative to the item's x and y coordinate settings")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -7854,6 +7845,15 @@
   (construct-only #f)
 )
 
+(define-property description
+  (of-object "GooCanvasWidget")
+  (prop-type "GParamString")
+  (docs "A description of the item for use by assistive technologies")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property parent
   (of-object "GooCanvasWidget")
   (prop-type "GParamObject")
@@ -7863,55 +7863,55 @@
   (construct-only #f)
 )
 
-(define-property transform
+(define-property pointer-events
   (of-object "GooCanvasWidget")
-  (prop-type "GParamBoxed")
-  (docs "The transformation matrix of the item")
+  (prop-type "GParamFlags")
+  (docs "Specifies when the item receives pointer events")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property visibility-threshold
+(define-property title
   (of-object "GooCanvasWidget")
-  (prop-type "GParamDouble")
-  (docs "The scale threshold at which the item becomes visible")
+  (prop-type "GParamString")
+  (docs "A short context-rich description of the item for use by assistive technologies")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property pointer-events
+(define-property tooltip
   (of-object "GooCanvasWidget")
-  (prop-type "GParamFlags")
-  (docs "Specifies when the item receives pointer events")
+  (prop-type "GParamString")
+  (docs "The tooltip to display for the item")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property visibility
+(define-property transform
   (of-object "GooCanvasWidget")
-  (prop-type "GParamEnum")
-  (docs "When the canvas item is visible")
+  (prop-type "GParamBoxed")
+  (docs "The transformation matrix of the item")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property title
+(define-property visibility
   (of-object "GooCanvasWidget")
-  (prop-type "GParamString")
-  (docs "A short context-rich description of the item for use by assistive technologies")
+  (prop-type "GParamEnum")
+  (docs "When the canvas item is visible")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property tooltip
+(define-property visibility-threshold
   (of-object "GooCanvasWidget")
-  (prop-type "GParamString")
-  (docs "The tooltip to display for the item")
+  (prop-type "GParamDouble")
+  (docs "The scale threshold at which the item becomes visible")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -8150,13 +8150,3 @@
   (writable #t)
   (construct-only #f)
 )
-
-(define-property anchor
-  (of-object "GooCanvasWidget")
-  (prop-type "GParamEnum")
-  (docs "How to position the widget relative to the item's x and y coordinate settings")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
diff --git a/goocanvas/src/text.ccg b/goocanvas/src/text.ccg
index a090fab..a6f5b2a 100644
--- a/goocanvas/src/text.ccg
+++ b/goocanvas/src/text.ccg
@@ -23,9 +23,9 @@ _PINCLUDE(goocanvasmm/private/itemsimple_p.h)
 namespace Goocanvas
 {
 
-Text::Text(const Glib::ustring& text, double x, double y, double width, Gtk::AnchorType anchor)
+Text::Text(const Glib::ustring& text, double x, double y, double width, AnchorType anchor)
 : 
-  _CONSTRUCT("text", text.c_str(), "x", x, "y", y, "width", width, "anchor", (GtkAnchorType)anchor)
+  _CONSTRUCT("text", text.c_str(), "x", x, "y", y, "width", width, "anchor", (GooCanvasAnchorType)anchor)
 {
 }
 
diff --git a/goocanvas/src/text.hg b/goocanvas/src/text.hg
index 550c656..1e0f2b7 100644
--- a/goocanvas/src/text.hg
+++ b/goocanvas/src/text.hg
@@ -30,12 +30,12 @@ class Text : public Goocanvas::ItemSimple
   _CLASS_GOBJECT(Text,GooCanvasText,GOO_CANVAS_TEXT,Goocanvas::ItemSimple,GooCanvasItemSimple)
 protected:
 
-  explicit Text(const Glib::ustring& text = Glib::ustring(), double x = 0.0, double y = 0.0, double width = -1, Gtk::AnchorType anchor = Gtk::ANCHOR_NORTH_WEST);
+  explicit Text(const Glib::ustring& text = Glib::ustring(), double x = 0.0, double y = 0.0, double width = -1, AnchorType anchor = ANCHOR_NORTH_WEST);
   _IGNORE(goo_canvas_text_new)
 
 public:
 
-  _WRAP_CREATE(const Glib::ustring& text = Glib::ustring(), double x = 0.0, double y = 0.0, double width = 0.0, Gtk::AnchorType anchor = Gtk::ANCHOR_NORTH_WEST)
+  _WRAP_CREATE(const Glib::ustring& text = Glib::ustring(), double x = 0.0, double y = 0.0, double width = 0.0, AnchorType anchor = ANCHOR_NORTH_WEST)
 
 #m4 _CONVERSION(`Pango::Rectangle&',`PangoRectangle*',`($3).gobj()')
   _WRAP_METHOD(void get_natural_extents(Pango::Rectangle& ink_rect, Pango::Rectangle& logical_rect) const, goo_canvas_text_get_natural_extents)
@@ -47,7 +47,7 @@ public:
   //_WRAP_PROPERTY("width", double)
   //_WRAP_PROPERTY("height", double)
   _WRAP_PROPERTY("alignment", Pango::Alignment)
-  _WRAP_PROPERTY("anchor", Gtk::AnchorType)
+  _WRAP_PROPERTY("anchor", AnchorType)
   _WRAP_PROPERTY("ellipsize",Pango::EllipsizeMode)
   _WRAP_PROPERTY("text", Glib::ustring)
   _WRAP_PROPERTY("use-markup", bool)
diff --git a/goocanvas/src/textmodel.ccg b/goocanvas/src/textmodel.ccg
index 88f6e2f..2893edf 100644
--- a/goocanvas/src/textmodel.ccg
+++ b/goocanvas/src/textmodel.ccg
@@ -23,9 +23,9 @@ _PINCLUDE(goocanvasmm/private/itemmodelsimple_p.h)
 namespace Goocanvas
 {
 
-TextModel::TextModel(const Glib::ustring& string, double x, double y, double width, Gtk::AnchorType anchor)
+TextModel::TextModel(const Glib::ustring& string, double x, double y, double width, AnchorType anchor)
 : 
-  _CONSTRUCT("text", string.c_str(), "x", x, "y", y, "width", width, "anchor", (GtkAnchorType)anchor)
+  _CONSTRUCT("text", string.c_str(), "x", x, "y", y, "width", width, "anchor", (GooCanvasAnchorType)anchor)
 {
 }
 
diff --git a/goocanvas/src/textmodel.hg b/goocanvas/src/textmodel.hg
index fe0c819..34713b0 100644
--- a/goocanvas/src/textmodel.hg
+++ b/goocanvas/src/textmodel.hg
@@ -30,15 +30,15 @@ class TextModel : public Goocanvas::ItemModelSimple
   _CLASS_GOBJECT(TextModel,GooCanvasTextModel,GOO_CANVAS_TEXT_MODEL,Goocanvas::ItemModelSimple,GooCanvasItemModelSimple)
 protected:
 
-  TextModel(const Glib::ustring& string = Glib::ustring(), double x = 0.0, double y = 0.0, double width = -1, Gtk::AnchorType anchor = Gtk::ANCHOR_NORTH_WEST);
+  TextModel(const Glib::ustring& string = Glib::ustring(), double x = 0.0, double y = 0.0, double width = -1, AnchorType anchor = ANCHOR_NORTH_WEST);
   _IGNORE(goo_canvas_text_model_new)
 
 public:
 
-  _WRAP_CREATE(const Glib::ustring& string = Glib::ustring(), double x = 0.0, double y = 0.0, double width = -1, Gtk::AnchorType anchor = Gtk::ANCHOR_NORTH_WEST)
+  _WRAP_CREATE(const Glib::ustring& string = Glib::ustring(), double x = 0.0, double y = 0.0, double width = -1, AnchorType anchor = ANCHOR_NORTH_WEST)
 
   _WRAP_PROPERTY("alignment", Pango::Alignment)
-  _WRAP_PROPERTY("anchor", Gtk::AnchorType)
+  _WRAP_PROPERTY("anchor", AnchorType)
   _WRAP_PROPERTY("font", Glib::ustring)
   _WRAP_PROPERTY("font-desc", Pango::FontDescription) //TODO: Use pointer? */
   _WRAP_PROPERTY("text", Glib::ustring)
diff --git a/goocanvas/src/widget.hg b/goocanvas/src/widget.hg
index 11971b4..7cf835f 100644
--- a/goocanvas/src/widget.hg
+++ b/goocanvas/src/widget.hg
@@ -18,6 +18,7 @@
 
 #include <gtkmm/widget.h>
 #include <goocanvasmm/itemsimple.h>
+#include <goocanvasmm/enums.h>
 
 _DEFS(goocanvasmm,libgoocanvas)
 _PINCLUDE(goocanvasmm/private/itemsimple_p.h)
@@ -45,7 +46,7 @@ public:
   //_WRAP_PROPERTY("width", double)
   //_WRAP_PROPERTY("height", double)
   _WRAP_PROPERTY("widget", Gtk::Widget*)
-  _WRAP_PROPERTY("anchor", Gtk::AnchorType)
+  _WRAP_PROPERTY("anchor", AnchorType)
 };
 
 }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]