[goocanvasmm] Fix the build with the latest gtkmm 3 API.

[Murray Cumming <murrayc src gnome org>]

commit 4dc0a4c231f2dbb7f6f304e6eb4eda5d7c64f756
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Sep 29 09:34:55 2010 +0200

    Fix the build with the latest gtkmm 3 API.
    
    * goocanvas/src/canvas.[hg|ccg]: Use Gtk::Adjustment via RefPtr.

 ChangeLog                |    8 +++++++-
 goocanvas/src/canvas.ccg |    3 +--
 goocanvas/src/canvas.hg  |    8 +++-----
 3 files changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 01513dd..49014d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,15 @@
+2010-09-29  Murray Cumming  <murrayc murrayc com>
+
+	Fix the build with the latest gtkmm 3 API.
+
+	* goocanvas/src/canvas.[hg|ccg]: Use Gtk::Adjustment via RefPtr.
+
 2010-09-15  Murray Cumming  <murrayc murrayc com>
 
 	Replace use of Gtk::AlignmentEnum with Gtk::Align.
 
 	* goocanvas/src/table.[hg|ccg]:
-	* goocanvas/src/tablemodel.[hg|ccg]: This fixes the build with 
+	* goocanvas/src/tablemodel.[hg|ccg]: This fixes the build with
 	gtkmm from git master.
 
 2010-09-06  Murray Cumming  <murrayc murrayc com>
diff --git a/goocanvas/src/canvas.ccg b/goocanvas/src/canvas.ccg
index d225a10..3d7b652 100644
--- a/goocanvas/src/canvas.ccg
+++ b/goocanvas/src/canvas.ccg
@@ -28,7 +28,7 @@ Gdk::GrabStatus Canvas::pointer_grab(const Glib::RefPtr<Item>& item, Gdk::EventM
 
 void Canvas::render(const Cairo::RefPtr<Cairo::Context>& context, double scale)
 {
-  goo_canvas_render(gobj(), (context)->cobj(), NULL, scale); 
+  goo_canvas_render(gobj(), (context)->cobj(), NULL, scale);
 }
 
 void Canvas::get_bounds(Bounds& bounds) const
@@ -47,4 +47,3 @@ void Canvas::set_bounds(const Bounds& bounds)
 }
 
 } //namespace Goocanvas
-
diff --git a/goocanvas/src/canvas.hg b/goocanvas/src/canvas.hg
index 2cd6673..09d8446 100644
--- a/goocanvas/src/canvas.hg
+++ b/goocanvas/src/canvas.hg
@@ -123,10 +123,9 @@ public:
   _WRAP_METHOD(void register_widget_item(const Glib::RefPtr<Goocanvas::Widget>& widget), goo_canvas_register_widget_item)
   _WRAP_METHOD(void unregister_widget_item(const Glib::RefPtr<Goocanvas::Widget>& widget), goo_canvas_unregister_widget_item)
 
-#m4 _CONVERSION(`Gtk::Adjustment*',`GtkAdjustment*',__FP2P)
-#m4 _CONVERSION(`GtkAdjustment*',`Gtk::Adjustment*',__RP2P)
-
-  _WRAP_SIGNAL(void set_scroll_adjustments(Gtk::Adjustment* hadjustment, Gtk::Adjustment* vadjustment), "set_scroll_adjustments")
+#m4 _CONVERSION(`GtkAdjustment*',`const Glib::RefPtr<Gtk::Adjustment>&',`Glib::wrap($3, true)')
+#m4 _CONVERSION(`const Glib::RefPtr<Gtk::Adjustment>&',`GtkAdjustment*',__CONVERT_REFPTR_TO_P)
+  _WRAP_SIGNAL(void set_scroll_adjustments(const Glib::RefPtr<Gtk::Adjustment>& hadjustment, const Glib::RefPtr<Gtk::Adjustment>& vadjustment), "set_scroll_adjustments")
 
 #m4 _CONVERSION(`GooCanvasItem*',`const Glib::RefPtr<Item>&',`Glib::wrap($3, true)')
 #m4 _CONVERSION(`GooCanvasItemModel*',`const Glib::RefPtr<ItemModel>&',`Glib::wrap($3, true)')
@@ -156,4 +155,3 @@ protected:
 };
 
 } //namespace Goocanvas
-