[goocanvasmm] Use Gdk::Cursor via RefPtr.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [goocanvasmm] Use Gdk::Cursor via RefPtr.
- Date: Wed, 5 Jan 2011 12:05:43 +0000 (UTC)
commit a6e960e383c0d0f2753b4d3fde0ddde5a99c29dc
Author: Murray Cumming <murrayc murrayc com>
Date: Wed Jan 5 13:05:28 2011 +0100
Use Gdk::Cursor via RefPtr.
* codegen/m4/convert_libgoocanvasmm.m4: Added a conversion.
* goocanvas/src/canvas.hg: pointer_grab(): Take the Gdk::Cursor as a RefPtr<>,
as is now necessary with gtkmm 3.
ChangeLog | 8 ++++++++
codegen/m4/convert_libgoocanvasmm.m4 | 2 ++
goocanvas/src/canvas.hg | 4 +---
3 files changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index ee6b5e9..bf791eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-01-05 Murray Cumming <murrayc murrayc com>
+
+ Use Gdk::Cursor via RefPtr.
+
+ * codegen/m4/convert_libgoocanvasmm.m4: Added a conversion.
+ * goocanvas/src/canvas.hg: pointer_grab(): Take the Gdk::Cursor as a RefPtr<>,
+ as is now necessary with gtkmm 3.
+
2010-12-16 Murray Cumming <murrayc murrayc com>
Fix the build with the latest gtkmm from git master.
diff --git a/codegen/m4/convert_libgoocanvasmm.m4 b/codegen/m4/convert_libgoocanvasmm.m4
index 68e2efc..47cd2a4 100644
--- a/codegen/m4/convert_libgoocanvasmm.m4
+++ b/codegen/m4/convert_libgoocanvasmm.m4
@@ -47,3 +47,5 @@ _CONVERSION(`Cairo::RefPtr<Cairo::Pattern>', `GooCairoPattern*',__CONVERT_REFPTR
_CONVERSION(`GooCanvasAnchorType',`AnchorType',`($2)($3)')
+_CONVERSION(`const Glib::RefPtr<Gdk::Cursor>&',`GdkCursor*',__CONVERT_REFPTR_TO_P)
+
diff --git a/goocanvas/src/canvas.hg b/goocanvas/src/canvas.hg
index fc03f74..7074858 100644
--- a/goocanvas/src/canvas.hg
+++ b/goocanvas/src/canvas.hg
@@ -100,9 +100,7 @@ public:
_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)
- _WRAP_METHOD(Gdk::GrabStatus pointer_grab(const Glib::RefPtr<Item>& item, Gdk::EventMask mask, const Gdk::Cursor& cursor, guint32 time), goo_canvas_pointer_grab)
+ _WRAP_METHOD(Gdk::GrabStatus pointer_grab(const Glib::RefPtr<Item>& item, Gdk::EventMask mask, const Glib::RefPtr<Gdk::Cursor>& cursor, guint32 time), goo_canvas_pointer_grab)
Gdk::GrabStatus pointer_grab(const Glib::RefPtr<Item>& item, Gdk::EventMask mask, guint32 time);
_WRAP_METHOD(void pointer_ungrab(const Glib::RefPtr<Item>& item, guint32 time), goo_canvas_pointer_ungrab)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]