gnomemm r2130 - in goocanvasmm/trunk: . goocanvas/src

[murrayc svn gnome org]

Author: murrayc
Date: Wed Mar 25 11:29:55 2009
New Revision: 2130
URL: http://svn.gnome.org/viewvc/gnomemm?rev=2130&view=rev

Log:
2009-03-25  Murray Cumming  <murrayc murrayc com>

* goocanvas/src/Makefile.am:
* goocanvas/src/libgoocanvas.defs:
* goocanvas/src/libgoocanvas_fake_properties.defs: Added this file, 
written by hand.
* goocanvas/src/item.hg:
* goocanvas/src/itemmodel.hg: Add fake x, y, width, and height 
properties in these base classes.
These properties are not really in GooCanvasItemModel, but they are 
actually implemented in all derived GooCanvasItemModel classes 
individually. That is a GooCanvas design error, but the patch to fix it 
has not yet been accepted. See bug #555097 

* goocanvas/src/ellipse.hg:
* goocanvas/src/grid.hg:
* goocanvas/src/gridmodel.hg:
* goocanvas/src/group.hg:
* goocanvas/src/image.hg:
* goocanvas/src/imagemodel.hg:
* goocanvas/src/path.hg:
* goocanvas/src/polyline.hg:
* goocanvas/src/rect.hg:
* goocanvas/src/rectmodel.hg:
* goocanvas/src/table.hg:
* goocanvas/src/tablemodel.hg:
* goocanvas/src/text.hg:
* goocanvas/src/widget.hg: Removed the x, y, width, and height 
properties from the derived classes.

Added:
   goocanvasmm/trunk/goocanvas/src/libgoocanvas_fake_properties.defs
Modified:
   goocanvasmm/trunk/ChangeLog
   goocanvasmm/trunk/goocanvas/src/Makefile.am
   goocanvasmm/trunk/goocanvas/src/ellipse.hg
   goocanvasmm/trunk/goocanvas/src/grid.hg
   goocanvasmm/trunk/goocanvas/src/gridmodel.hg
   goocanvasmm/trunk/goocanvas/src/group.hg
   goocanvasmm/trunk/goocanvas/src/image.hg
   goocanvasmm/trunk/goocanvas/src/imagemodel.hg
   goocanvasmm/trunk/goocanvas/src/item.hg
   goocanvasmm/trunk/goocanvas/src/itemmodel.hg
   goocanvasmm/trunk/goocanvas/src/libgoocanvas.defs
   goocanvasmm/trunk/goocanvas/src/path.hg
   goocanvasmm/trunk/goocanvas/src/polyline.hg
   goocanvasmm/trunk/goocanvas/src/rect.hg
   goocanvasmm/trunk/goocanvas/src/rectmodel.hg
   goocanvasmm/trunk/goocanvas/src/table.hg
   goocanvasmm/trunk/goocanvas/src/tablemodel.hg
   goocanvasmm/trunk/goocanvas/src/text.hg
   goocanvasmm/trunk/goocanvas/src/widget.hg

Modified: goocanvasmm/trunk/goocanvas/src/Makefile.am
==============================================================================
--- goocanvasmm/trunk/goocanvas/src/Makefile.am	(original)
+++ goocanvasmm/trunk/goocanvas/src/Makefile.am	Wed Mar 25 11:29:55 2009
@@ -5,8 +5,8 @@
 sublib_namespace = Goocanvas
 sublib_parentdir = goocanvasmm
 files_defs	= libgoocanvas.defs libgoocanvas_methods.defs libgoocanvas_signals.defs \
-                  libgoocanvas_enums.defs libgoocanvas_vfuncs.defs libgoocanvas_others.defs libgoocanvas_docs.xml \
-                  libgoocanvas_docs_override.xml
+                  libgoocanvas_enums.defs libgoocanvas_vfuncs.defs libgoocanvas_others.defs libgoocanvas_fake_properties.defs \
+                  libgoocanvas_docs.xml libgoocanvas_docs_override.xml
 
 include $(top_srcdir)/build_shared/Makefile_gensrc.am_fragment
 

Modified: goocanvasmm/trunk/goocanvas/src/ellipse.hg
==============================================================================
--- goocanvasmm/trunk/goocanvas/src/ellipse.hg	(original)
+++ goocanvasmm/trunk/goocanvas/src/ellipse.hg	Wed Mar 25 11:29:55 2009
@@ -36,10 +36,12 @@
 
   _WRAP_CREATE(double center_x = 0.0, double center_y = 0.0, double radius_x = 0.0, double radius_y = 0.0)
 
-  _WRAP_PROPERTY("x", double)
-  _WRAP_PROPERTY("y", double)
-  _WRAP_PROPERTY("width", double)
-  _WRAP_PROPERTY("height", double)
+  //We put these in item.hg instead.
+  //See the comment there.
+  //_WRAP_PROPERTY("x", double)
+  //_WRAP_PROPERTY("y", double)
+  //_WRAP_PROPERTY("width", double)
+  //_WRAP_PROPERTY("height", double)
   _WRAP_PROPERTY("center-x", double)
   _WRAP_PROPERTY("center-y", double)
   _WRAP_PROPERTY("radius-x", double)

Modified: goocanvasmm/trunk/goocanvas/src/grid.hg
==============================================================================
--- goocanvasmm/trunk/goocanvas/src/grid.hg	(original)
+++ goocanvasmm/trunk/goocanvas/src/grid.hg	Wed Mar 25 11:29:55 2009
@@ -35,10 +35,12 @@
 
   _WRAP_CREATE(double x = 0, double y = 0, double width = 0, double height = 0, double x_step = 0, double y_step = 0, double x_offset = 0, double y_offset = 0)
 
-  _WRAP_PROPERTY("x", double)
-  _WRAP_PROPERTY("y", double)
-  _WRAP_PROPERTY("width", double)
-  _WRAP_PROPERTY("height", double)
+  //We put these in item.hg instead.
+  //See the comment there.
+  //_WRAP_PROPERTY("x", double)
+  //_WRAP_PROPERTY("y", double)
+  //_WRAP_PROPERTY("width", double)
+  //_WRAP_PROPERTY("height", double)
   _WRAP_PROPERTY("x-step", double)
   _WRAP_PROPERTY("y-step", double)
   _WRAP_PROPERTY("x-offset", double)

Modified: goocanvasmm/trunk/goocanvas/src/gridmodel.hg
==============================================================================
--- goocanvasmm/trunk/goocanvas/src/gridmodel.hg	(original)
+++ goocanvasmm/trunk/goocanvas/src/gridmodel.hg	Wed Mar 25 11:29:55 2009
@@ -35,10 +35,12 @@
 
   _WRAP_CREATE(double x = 0, double y = 0, double width = 0, double height = 0, double x_step = 0, double y_step = 0, double x_offset = 0, double y_offset = 0)
 
-  _WRAP_PROPERTY("x", double)
-  _WRAP_PROPERTY("y", double)
-  _WRAP_PROPERTY("width", double)
-  _WRAP_PROPERTY("height", double)
+  //We put these in item.hg instead.
+  //See the comment there.
+  //_WRAP_PROPERTY("x", double)
+  //_WRAP_PROPERTY("y", double)
+  //_WRAP_PROPERTY("width", double)
+  //_WRAP_PROPERTY("height", double)
   _WRAP_PROPERTY("x-step", double)
   _WRAP_PROPERTY("y-step", double)
   _WRAP_PROPERTY("x-offset", double)

Modified: goocanvasmm/trunk/goocanvas/src/group.hg
==============================================================================
--- goocanvasmm/trunk/goocanvas/src/group.hg	(original)
+++ goocanvasmm/trunk/goocanvas/src/group.hg	Wed Mar 25 11:29:55 2009
@@ -37,10 +37,12 @@
 
   _WRAP_CREATE()
 
-  _WRAP_PROPERTY("x", double)
-  _WRAP_PROPERTY("y", double)
-  _WRAP_PROPERTY("width", double)
-  _WRAP_PROPERTY("height", double)
+  //We put these in item.hg instead.
+  //See the comment there.
+  //_WRAP_PROPERTY("x", double)
+  //_WRAP_PROPERTY("y", double)
+  //_WRAP_PROPERTY("width", double)
+  //_WRAP_PROPERTY("height", double)
 };
 
 

Modified: goocanvasmm/trunk/goocanvas/src/image.hg
==============================================================================
--- goocanvasmm/trunk/goocanvas/src/image.hg	(original)
+++ goocanvasmm/trunk/goocanvas/src/image.hg	Wed Mar 25 11:29:55 2009
@@ -38,12 +38,14 @@
   _WRAP_CREATE(double x = 0.0, double y = 0.0)
   _WRAP_CREATE(const Glib::RefPtr<Gdk::Pixbuf>& pixbuf, double x = 0.0, double y = 0.0)
 
-  _WRAP_PROPERTY("height", double)
+  //We put these in item.hg instead.
+  //See the comment there.
+  //_WRAP_PROPERTY("x", double)
+  //_WRAP_PROPERTY("y", double)
+  //_WRAP_PROPERTY("width", double)
+  //_WRAP_PROPERTY("height", double)
   _WRAP_PROPERTY("pattern", Cairo::RefPtr<Cairo::Pattern>)
   _WRAP_PROPERTY("pixbuf", Glib::RefPtr<Gdk::Pixbuf>)
-  _WRAP_PROPERTY("width", double)
-  _WRAP_PROPERTY("x", double)
-  _WRAP_PROPERTY("y", double)
 
 protected:
 

Modified: goocanvasmm/trunk/goocanvas/src/imagemodel.hg
==============================================================================
--- goocanvasmm/trunk/goocanvas/src/imagemodel.hg	(original)
+++ goocanvasmm/trunk/goocanvas/src/imagemodel.hg	Wed Mar 25 11:29:55 2009
@@ -40,12 +40,15 @@
 
   _WRAP_CREATE(const Glib::RefPtr<Gdk::Pixbuf>& pixbuf, double x, double y)
   _WRAP_CREATE(double x, double y)
-  _WRAP_PROPERTY("height", double)
+
+  //We put these in item.hg instead.
+  //See the comment there.
+  //_WRAP_PROPERTY("x", double)
+  //_WRAP_PROPERTY("y", double)
+  //_WRAP_PROPERTY("width", double)
+  //_WRAP_PROPERTY("height", double)
   _WRAP_PROPERTY("pattern",Cairo::RefPtr<Cairo::Pattern>)
   _WRAP_PROPERTY("pixbuf",Glib::RefPtr<Gdk::Pixbuf>)
-  _WRAP_PROPERTY("width", double)
-  _WRAP_PROPERTY("x", double)
-  _WRAP_PROPERTY("y", double)
 
 protected:
 

Modified: goocanvasmm/trunk/goocanvas/src/item.hg
==============================================================================
--- goocanvasmm/trunk/goocanvas/src/item.hg	(original)
+++ goocanvasmm/trunk/goocanvas/src/item.hg	Wed Mar 25 11:29:55 2009
@@ -168,6 +168,15 @@
   _WRAP_PROPERTY("description", Glib::ustring)
   _WRAP_PROPERTY("can-focus", bool)
 
+  //These properties are not really in GooCanvasItem, but they are actually 
+  //implemented in all derived GooCanvasItem classes individually. 
+  //That is a GooCanvas design error, but the patch to fix it has 
+  //not yet been accepted: http://bugzilla.gnome.org/show_bug.cgi?id=555097 
+  _WRAP_PROPERTY("x", double)
+  _WRAP_PROPERTY("y", double)
+  _WRAP_PROPERTY("width", double)
+  _WRAP_PROPERTY("height", double)
+
 protected:
 
 #m4 _CONVERSION(`Glib::RefPtr<Item>', `GooCanvasItem*', `(($3) ? ($3)->gobj() : 0)')

Modified: goocanvasmm/trunk/goocanvas/src/itemmodel.hg
==============================================================================
--- goocanvasmm/trunk/goocanvas/src/itemmodel.hg	(original)
+++ goocanvasmm/trunk/goocanvas/src/itemmodel.hg	Wed Mar 25 11:29:55 2009
@@ -112,6 +112,15 @@
   _WRAP_PROPERTY("visibility", ItemVisibility)
   _WRAP_PROPERTY("visibility-threshold", double)
 
+  //These properties are not really in GooCanvasItemModel, but they are actually 
+  //implemented in all derived GooCanvasItemModel classes individually. 
+  //That is a GooCanvas design error, but the patch to fix it has 
+  //not yet been accepted: http://bugzilla.gnome.org/show_bug.cgi?id=555097 
+  _WRAP_PROPERTY("x", double)
+  _WRAP_PROPERTY("y", double)
+  _WRAP_PROPERTY("width", double)
+  _WRAP_PROPERTY("height", double)
+
 protected:
 #m4 _CONVERSION(`Glib::RefPtr<ItemModel>', `GooCanvasItemModel*', `(($3) ? ($3)->gobj() : 0)')
 #m4 _CONVERSION(`GooCanvasItemModel*', `Glib::RefPtr<ItemModel>', `Glib::wrap($3, true)')

Modified: goocanvasmm/trunk/goocanvas/src/libgoocanvas.defs
==============================================================================
--- goocanvasmm/trunk/goocanvas/src/libgoocanvas.defs	(original)
+++ goocanvasmm/trunk/goocanvas/src/libgoocanvas.defs	Wed Mar 25 11:29:55 2009
@@ -3,3 +3,4 @@
 (include libgoocanvas_vfuncs.defs)
 (include libgoocanvas_enums.defs)
 (include libgoocanvas_others.defs)
+(include libgoocanvas_fake_properties.defs)

Added: goocanvasmm/trunk/goocanvas/src/libgoocanvas_fake_properties.defs
==============================================================================
--- (empty file)
+++ goocanvasmm/trunk/goocanvas/src/libgoocanvas_fake_properties.defs	Wed Mar 25 11:29:55 2009
@@ -0,0 +1,81 @@
+;; These are hand-coded to make gmmproc think that GooCanvasItem has 
+;; properties which are actually implemented in all derived GooCanvasItem 
+;; classes individually. That is a design error, but the patch to fix it has 
+;; not yet been accepted: http://bugzilla.gnome.org/show_bug.cgi?id=555097 
+
+;; GooCanvasItem
+
+(define-property x
+  (of-object "GooCanvasItem")
+  (prop-type "GParamDouble")
+  (docs "The x coordinate of the left side of the item")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property y
+  (of-object "GooCanvasItem")
+  (prop-type "GParamDouble")
+  (docs "The y coordinate of the top of the item")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property width
+  (of-object "GooCanvasItem")
+  (prop-type "GParamDouble")
+  (docs "The width of the item")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property height
+  (of-object "GooCanvasItem")
+  (prop-type "GParamDouble")
+  (docs "The height of the item")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+;; GooCanvasItemModel
+
+(define-property x
+  (of-object "GooCanvasItemModel")
+  (prop-type "GParamDouble")
+  (docs "The x coordinate of the left side of the item")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property y
+  (of-object "GooCanvasItemModel")
+  (prop-type "GParamDouble")
+  (docs "The y coordinate of the top of the item")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property width
+  (of-object "GooCanvasItemModel")
+  (prop-type "GParamDouble")
+  (docs "The width of the item")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property height
+  (of-object "GooCanvasItemModel")
+  (prop-type "GParamDouble")
+  (docs "The height of the item")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+

Modified: goocanvasmm/trunk/goocanvas/src/path.hg
==============================================================================
--- goocanvasmm/trunk/goocanvas/src/path.hg	(original)
+++ goocanvasmm/trunk/goocanvas/src/path.hg	Wed Mar 25 11:29:55 2009
@@ -41,10 +41,12 @@
 
   _WRAP_CREATE(const Glib::ustring& data)
 
-  _WRAP_PROPERTY("x", double)
-  _WRAP_PROPERTY("y", double)
-  _WRAP_PROPERTY("width", double)
-  _WRAP_PROPERTY("height", double)
+  //We put these in item.hg instead.
+  //See the comment there.
+  //_WRAP_PROPERTY("x", double)
+  //_WRAP_PROPERTY("y", double)
+  //_WRAP_PROPERTY("width", double)
+  //_WRAP_PROPERTY("height", double)
   _WRAP_PROPERTY("data", Glib::ustring)
 };
 

Modified: goocanvasmm/trunk/goocanvas/src/polyline.hg
==============================================================================
--- goocanvasmm/trunk/goocanvas/src/polyline.hg	(original)
+++ goocanvasmm/trunk/goocanvas/src/polyline.hg	Wed Mar 25 11:29:55 2009
@@ -39,10 +39,12 @@
   _WRAP_CREATE(bool close_path, const Points& coords)
   _WRAP_CREATE(double x1, double y1, double x2, double y2)
 
-  _WRAP_PROPERTY("x", double)
-  _WRAP_PROPERTY("y", double)
-  _WRAP_PROPERTY("width", double)
-  _WRAP_PROPERTY("height", double)
+  //We put these in item.hg instead.
+  //See the comment there.
+  //_WRAP_PROPERTY("x", double)
+  //_WRAP_PROPERTY("y", double)
+  //_WRAP_PROPERTY("width", double)
+  //_WRAP_PROPERTY("height", double)
   _WRAP_PROPERTY("arrow-length", double)
   _WRAP_PROPERTY("arrow-tip-length", double)
   _WRAP_PROPERTY("arrow-width", double)

Modified: goocanvasmm/trunk/goocanvas/src/rect.hg
==============================================================================
--- goocanvasmm/trunk/goocanvas/src/rect.hg	(original)
+++ goocanvasmm/trunk/goocanvas/src/rect.hg	Wed Mar 25 11:29:55 2009
@@ -37,12 +37,14 @@
 
   _WRAP_CREATE(double x = 0.0, double y = 0.0, double width = 0.0, double height = 0.0)
 
-  _WRAP_PROPERTY("height", double)
+  //We put these in item.hg instead.
+  //See the comment there.
+  //_WRAP_PROPERTY("x", double)
+  //_WRAP_PROPERTY("y", double)
+  //_WRAP_PROPERTY("width", double)
+  //_WRAP_PROPERTY("height", double)
   _WRAP_PROPERTY("radius-x", double)
   _WRAP_PROPERTY("radius-y", double)
-  _WRAP_PROPERTY("width", double)
-  _WRAP_PROPERTY("x", double)
-  _WRAP_PROPERTY("y", double)
 };
 
 }

Modified: goocanvasmm/trunk/goocanvas/src/rectmodel.hg
==============================================================================
--- goocanvasmm/trunk/goocanvas/src/rectmodel.hg	(original)
+++ goocanvasmm/trunk/goocanvas/src/rectmodel.hg	Wed Mar 25 11:29:55 2009
@@ -38,12 +38,14 @@
 
   _WRAP_CREATE(double x, double y, double width, double height)
 
-  _WRAP_PROPERTY("height", double)
+  //We put these in item.hg instead.
+  //See the comment there.
+  //_WRAP_PROPERTY("x", double)
+  //_WRAP_PROPERTY("y", double)
+  //_WRAP_PROPERTY("width", double)
+  //_WRAP_PROPERTY("height", double)
   _WRAP_PROPERTY("radius-x", double)
   _WRAP_PROPERTY("radius-y", double)
-  _WRAP_PROPERTY("width", double)
-  _WRAP_PROPERTY("x", double)
-  _WRAP_PROPERTY("y", double)
 
 };
 

Modified: goocanvasmm/trunk/goocanvas/src/table.hg
==============================================================================
--- goocanvasmm/trunk/goocanvas/src/table.hg	(original)
+++ goocanvasmm/trunk/goocanvas/src/table.hg	Wed Mar 25 11:29:55 2009
@@ -57,10 +57,12 @@
   void set_align(const Glib::RefPtr<Item>& child, double xalign = 0.0, double yalign = 0.0);
   void set_align(const Glib::RefPtr<Item>& child, Gtk::AlignmentEnum xalign = Gtk::ALIGN_LEFT, Gtk::AlignmentEnum yalign = Gtk::ALIGN_TOP);
 
-  _WRAP_PROPERTY("x", double)
-  _WRAP_PROPERTY("y", double)
-  _WRAP_PROPERTY("width", double)
-  _WRAP_PROPERTY("height", double)
+  //We put these in item.hg instead.
+  //See the comment there.
+  //_WRAP_PROPERTY("x", double)
+  //_WRAP_PROPERTY("y", double)
+  //_WRAP_PROPERTY("width", double)
+  //_WRAP_PROPERTY("height", double)
   _WRAP_PROPERTY("row-spacing", double)
   _WRAP_PROPERTY("column-spacing", double)
   _WRAP_PROPERTY("homogeneous-rows", bool)

Modified: goocanvasmm/trunk/goocanvas/src/tablemodel.hg
==============================================================================
--- goocanvasmm/trunk/goocanvas/src/tablemodel.hg	(original)
+++ goocanvasmm/trunk/goocanvas/src/tablemodel.hg	Wed Mar 25 11:29:55 2009
@@ -40,8 +40,12 @@
   void set_align(const Glib::RefPtr<ItemModel>& child, double xalign = 0.0, double yalign = 0.0);
   void set_align(const Glib::RefPtr<ItemModel>& child, Gtk::AlignmentEnum xalign = Gtk::ALIGN_LEFT, Gtk::AlignmentEnum yalign = Gtk::ALIGN_TOP);
 
-  _WRAP_PROPERTY("width", double)
-  _WRAP_PROPERTY("height", double)
+  //We put these in item.hg instead.
+  //See the comment there.
+  //_WRAP_PROPERTY("x", double)
+  //_WRAP_PROPERTY("y", double)
+  //_WRAP_PROPERTY("width", double)
+  //_WRAP_PROPERTY("height", double)
   _WRAP_PROPERTY("row-spacing", double)
   _WRAP_PROPERTY("column-spacing", double)
   _WRAP_PROPERTY("homogeneous-rows", bool)

Modified: goocanvasmm/trunk/goocanvas/src/text.hg
==============================================================================
--- goocanvasmm/trunk/goocanvas/src/text.hg	(original)
+++ goocanvasmm/trunk/goocanvas/src/text.hg	Wed Mar 25 11:29:55 2009
@@ -40,10 +40,12 @@
 #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)
 
-  _WRAP_PROPERTY("x", double)
-  _WRAP_PROPERTY("y", double)
-  _WRAP_PROPERTY("width", double)
-  _WRAP_PROPERTY("height", double)
+  //We put these in item.hg instead.
+  //See the comment there.
+  //_WRAP_PROPERTY("x", double)
+  //_WRAP_PROPERTY("y", double)
+  //_WRAP_PROPERTY("width", double)
+  //_WRAP_PROPERTY("height", double)
   _WRAP_PROPERTY("alignment", Pango::Alignment)
   _WRAP_PROPERTY("anchor", Gtk::AnchorType)
   _WRAP_PROPERTY("ellipsize",Pango::EllipsizeMode)

Modified: goocanvasmm/trunk/goocanvas/src/widget.hg
==============================================================================
--- goocanvasmm/trunk/goocanvas/src/widget.hg	(original)
+++ goocanvasmm/trunk/goocanvas/src/widget.hg	Wed Mar 25 11:29:55 2009
@@ -38,11 +38,13 @@
 
   _WRAP_CREATE(Gtk::Widget& widget, double x = 0.0, double y = 0.0, double width = 0.0, double height = 0.0)
 
+  //We put these in item.hg instead.
+  //See the comment there.
+  //_WRAP_PROPERTY("x", double)
+  //_WRAP_PROPERTY("y", double)
+  //_WRAP_PROPERTY("width", double)
+  //_WRAP_PROPERTY("height", double)
   _WRAP_PROPERTY("widget", Gtk::Widget*)
-  _WRAP_PROPERTY("x", double)
-  _WRAP_PROPERTY("y", double)
-  _WRAP_PROPERTY("width", double)
-  _WRAP_PROPERTY("height", double)
   _WRAP_PROPERTY("anchor", Gtk::AnchorType)
 };