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

[murrayc svn gnome org]

Author: murrayc
Date: Mon Dec  1 11:02:45 2008
New Revision: 1822
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1822&view=rev

Log:
2008-12-01  Murray Cumming  <murrayc murrayc com>

* goocanvas/src/canvas.hg: Added get_static_root_item() and 
get_static_root_item_model().
* goocanvas/src/libgoocanvas_vfuncs.defs:
* goocanvas/src/item.hg: Added set/get_is_static() and the vfuncs.
Added animation_finished signal.
* goocanvas/src/itemmodel.hg: Added animation_finished signal.

Modified:
   goocanvasmm/trunk/ChangeLog
   goocanvasmm/trunk/goocanvas/src/canvas.hg
   goocanvasmm/trunk/goocanvas/src/item.hg
   goocanvasmm/trunk/goocanvas/src/itemmodel.hg
   goocanvasmm/trunk/goocanvas/src/libgoocanvas_vfuncs.defs

Modified: goocanvasmm/trunk/goocanvas/src/canvas.hg
==============================================================================
--- goocanvasmm/trunk/goocanvas/src/canvas.hg	(original)
+++ goocanvasmm/trunk/goocanvas/src/canvas.hg	Mon Dec  1 11:02:45 2008
@@ -51,6 +51,14 @@
   _WRAP_METHOD(Glib::RefPtr<const ItemModel> get_root_item_model() const, goo_canvas_get_root_item_model, constversion)
   _WRAP_METHOD(void set_root_item_model(const Glib::RefPtr<ItemModel>& model), goo_canvas_set_root_item_model)
 
+  _WRAP_METHOD(Glib::RefPtr<Item> get_static_root_item(), goo_canvas_get_static_root_item)
+  _WRAP_METHOD(Glib::RefPtr<const Item> get_static_root_item() const, goo_canvas_get_static_root_item, constversion)
+  _WRAP_METHOD(void set_static_root_item(const Glib::RefPtr<Item>& item), goo_canvas_set_static_root_item)
+
+  _WRAP_METHOD(Glib::RefPtr<ItemModel> get_static_root_item_model(), goo_canvas_get_static_root_item_model, refreturn)
+  _WRAP_METHOD(Glib::RefPtr<const ItemModel> get_static_root_item_model() const, goo_canvas_get_static_root_item_model, constversion)
+  _WRAP_METHOD(void set_static_root_item_model(const Glib::RefPtr<ItemModel>& model), goo_canvas_set_static_root_item_model)
+
   _WRAP_METHOD(Glib::RefPtr<Item> get_item(const Glib::RefPtr<ItemModel>& model), goo_canvas_get_item, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const Item> get_item(const Glib::RefPtr<ItemModel>& model) const, goo_canvas_get_item, constversion)
 
@@ -87,6 +95,7 @@
   _WRAP_METHOD(void convert_from_pixels(double& x, double& y) const, goo_canvas_convert_from_pixels)
   _WRAP_METHOD(void convert_to_item_space(const Glib::RefPtr<Item>& item, double& x, double& y) const, goo_canvas_convert_to_item_space)
   _WRAP_METHOD(void convert_from_item_space(const Glib::RefPtr<Item>& item, double& x, double& y) const, goo_canvas_convert_from_item_space)
+  _WRAP_METHOD(void convert_bounds_to_item_space(const Glib::RefPtr<Item>& item, Bounds& bounds) const, goo_canvas_convert_bounds_to_item_space)
 
   //TODO: Use C++ types?
 #m4 _CONVERSION(`const Gdk::Cursor&',`GdkCursor*',__FCR2P)
@@ -105,6 +114,7 @@
   _WRAP_METHOD(void update(), goo_canvas_update)
   _WRAP_METHOD(void request_update(), goo_canvas_request_update)
   _WRAP_METHOD(void request_redraw(const Bounds& bounds), goo_canvas_request_redraw)
+  _WRAP_METHOD(void request_item_redraw(const Bounds& bounds, bool is_static = false), goo_canvas_request_item_redraw)
   _WRAP_METHOD(double get_default_line_width() const, goo_canvas_get_default_line_width)
 
   _WRAP_METHOD(void register_widget_item(const Glib::RefPtr<Goocanvas::Widget>& widget), goo_canvas_register_widget_item)

Modified: goocanvasmm/trunk/goocanvas/src/item.hg
==============================================================================
--- goocanvasmm/trunk/goocanvas/src/item.hg	(original)
+++ goocanvasmm/trunk/goocanvas/src/item.hg	Mon Dec  1 11:02:45 2008
@@ -136,6 +136,8 @@
   _WRAP_METHOD(void animate(double x, double y, double scale, double degrees, bool absolute, int duration, int step_time, GooCanvasAnimateType type), goo_canvas_item_animate)
   _WRAP_METHOD(void stop_animation(), goo_canvas_item_stop_animation)
 
+  _WRAP_METHOD(bool get_is_static() const, goo_canvas_item_get_is_static)
+  _WRAP_METHOD(void set_is_static(bool is_static = true), goo_canvas_item_set_is_static)
 
   //_WRAP_SIGNAL(void child_added(int child_num), "child_added")
   //_WRAP_SIGNAL(void child_moved(int old_position, int new_position), "child_moved")
@@ -154,6 +156,7 @@
   _WRAP_SIGNAL(bool key_release_event(const Glib::RefPtr<Item>& target, GdkEventKey* event), "key_release_event")
   _WRAP_SIGNAL(bool grab_broken_event(const Glib::RefPtr<Item>& target, GdkEventGrabBroken* event), "grab_broken_event")
   _WRAP_SIGNAL(void child_notify(GParamSpec* pspec), "child_notify")
+  _WRAP_SIGNAL(void animation_finished(bool stopped), "animation_finished")
 
   _WRAP_PROPERTY("parent", Glib::RefPtr<Item>)
   _WRAP_PROPERTY("visibility", ItemVisibility)
@@ -227,6 +230,9 @@
   _WRAP_VFUNC(void set_style(const Glib::RefPtr<Style>& style), set_style)
   _WRAP_VFUNC(bool is_visible() const, is_visible)
   _WRAP_VFUNC(double get_requested_height(const Cairo::RefPtr<Cairo::Context>& cr, double width), get_requested_height)
+  _WRAP_VFUNC(bool get_is_static() const, get_is_static)
+  _WRAP_VFUNC(void set_is_static(bool is_static), set_is_static)
+
 
   /* Virtual methods that model/view items must implement. */
 #m4 _CONVERSION(`Glib::RefPtr<ItemModel>', `GooCanvasItemModel*', `(($3) ? ($3)->gobj() : 0)')
@@ -234,6 +240,7 @@
 #m4 _CONVERSION(`GooCanvasItemModel*', `const Glib::RefPtr<ItemModel>&', `Glib::wrap($3, true)')
   _WRAP_VFUNC(Glib::RefPtr<ItemModel> get_model() const, get_model)
   _WRAP_VFUNC(void set_model(const Glib::RefPtr<ItemModel>& model), set_model)
+
 };
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS

Modified: goocanvasmm/trunk/goocanvas/src/itemmodel.hg
==============================================================================
--- goocanvasmm/trunk/goocanvas/src/itemmodel.hg	(original)
+++ goocanvasmm/trunk/goocanvas/src/itemmodel.hg	Mon Dec  1 11:02:45 2008
@@ -101,6 +101,7 @@
   _WRAP_SIGNAL(void child_moved (int old_child_num, int new_child_num), "child-moved")
   _WRAP_SIGNAL(void changed (bool recompute_bounds), "changed")
   _WRAP_SIGNAL(void child_notify(GParamSpec* pspec), "child_notify")
+  _WRAP_SIGNAL(void animation_finished(bool stopped), "animation_finished")
 
   _WRAP_PROPERTY("parent", Glib::RefPtr<ItemModel>)
   _WRAP_PROPERTY("can-focus", bool)

Modified: goocanvasmm/trunk/goocanvas/src/libgoocanvas_vfuncs.defs
==============================================================================
--- goocanvasmm/trunk/goocanvas/src/libgoocanvas_vfuncs.defs	(original)
+++ goocanvasmm/trunk/goocanvas/src/libgoocanvas_vfuncs.defs	Mon Dec  1 11:02:45 2008
@@ -300,6 +300,19 @@
 	)
 )
 
+(define-vfunc get_is_static
+	(of-object "GooCanvasItem")
+	(return-type "gboolean")
+)
+
+(define-vfunc set_is_static
+	(of-object "GooCanvasItem")
+	(return-type "void")
+	(parameters
+		'("gboolean" "is_static")
+        )
+)
+
 ; GooCanvasItemModel
 
 (define-vfunc get_n_children