[goocanvasmm/goocanvasmm-1.0] Fix the build with fatal warnings with gtkmm 2.22.

[Murray Cumming <murrayc src gnome org>]

commit addabc1e3d1c4a329447301ae031a23f4e7ce3ac
Author: Murray Cumming <murrayc murrayc com>
Date:   Mon Oct 18 13:56:09 2010 +0200

    Fix the build with fatal warnings with gtkmm 2.22.
    
    * goocanvas/src/bounds.hg:
    * goocanvas/src/canvas.hg:
    * goocanvas/src/item.ccg:
    * goocanvas/src/item.hg:
    * goocanvas/src/itemmodel.[hg|ccg]:
    * goocanvas/src/itemsimple.hg:
    * goocanvas/src/style.hg: Rearranged the includes to fix the build with
      the awkard gdkmm deprecations.

 ChangeLog                   |   13 +++++++++++++
 goocanvas/src/bounds.hg     |    4 ++--
 goocanvas/src/canvas.hg     |   13 ++++++-------
 goocanvas/src/item.ccg      |   14 +++++++-------
 goocanvas/src/item.hg       |   10 ++++------
 goocanvas/src/itemmodel.ccg |   10 +++++-----
 goocanvas/src/itemmodel.hg  |   12 ++++++------
 goocanvas/src/itemsimple.hg |    6 ++----
 goocanvas/src/style.hg      |    4 ++--
 9 files changed, 47 insertions(+), 39 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 8577708..080cb09 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-18  Murray Cumming  <murrayc murrayc com>
+
+	Fix the build with fatal warnings with gtkmm 2.22.
+
+	* goocanvas/src/bounds.hg:
+	* goocanvas/src/canvas.hg:
+	* goocanvas/src/item.ccg:
+	* goocanvas/src/item.hg:
+	* goocanvas/src/itemmodel.[hg|ccg]:
+	* goocanvas/src/itemsimple.hg:
+	* goocanvas/src/style.hg: Rearranged the includes to fix the build with
+  the awkard gdkmm deprecations.
+
 2010-09-02  Murray Cumming  <murrayc murrayc com>
 
 	Fix the build with the latest cairomm.
diff --git a/goocanvas/src/bounds.hg b/goocanvas/src/bounds.hg
index f68fd17..4a1be69 100644
--- a/goocanvas/src/bounds.hg
+++ b/goocanvas/src/bounds.hg
@@ -15,7 +15,8 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <goocanvasitem.h>
+#include <gdkmm.h>
+#include <goocanvasitem.h> //For GooCanvasBounds.
 
 _DEFS(goocanvasmm,libgoocanvas)
 
@@ -43,4 +44,3 @@ public:
 };
 
 }
-
diff --git a/goocanvas/src/canvas.hg b/goocanvas/src/canvas.hg
index 5067b10..aaeabb1 100644
--- a/goocanvas/src/canvas.hg
+++ b/goocanvas/src/canvas.hg
@@ -15,18 +15,18 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <goocanvasmm/item.h>
-#include <goocanvasmm/itemmodel.h>
-#include <goocanvasmm/itemsimple.h>
-#include <goocanvasmm/style.h>
-#include <goocanvasmm/widget.h>
+
 
 #include <gtkmm/adjustment.h>
 #include <gtkmm/container.h>
 #include <gdkmm/cursor.h>
 #include <cairomm/context.h>
 #include <gtkmm/papersize.h> //For Gtk::Unit
-
+#include <goocanvasmm/item.h>
+#include <goocanvasmm/itemmodel.h>
+#include <goocanvasmm/itemsimple.h>
+#include <goocanvasmm/style.h>
+#include <goocanvasmm/widget.h>
 
 
 _DEFS(goocanvasmm,libgoocanvas)
@@ -156,4 +156,3 @@ protected:
 };
 
 } //namespace Goocanvas
-
diff --git a/goocanvas/src/item.ccg b/goocanvas/src/item.ccg
index 97f9085..1c7502f 100644
--- a/goocanvas/src/item.ccg
+++ b/goocanvas/src/item.ccg
@@ -16,9 +16,10 @@
  */
 
 
+#include <goocanvasmm/canvas.h>
 #include <goocanvasutils.h>
 #include <goocanvasenumtypes.h>
-#include <goocanvasmm/canvas.h>
+
 
 namespace Goocanvas
 {
@@ -32,17 +33,17 @@ Bounds Item::get_bounds() const
 
 void Item::raise()
 {
-  goo_canvas_item_raise(gobj(), NULL); 
+  goo_canvas_item_raise(gobj(), NULL);
 }
 
 void Item::lower()
 {
-  goo_canvas_item_lower(gobj(), NULL); 
+  goo_canvas_item_lower(gobj(), NULL);
 }
 
 void Item::add_child(const Glib::RefPtr<Item>& child)
 {
-  goo_canvas_item_add_child(gobj(), Glib::unwrap(child), -1); 
+  goo_canvas_item_add_child(gobj(), Glib::unwrap(child), -1);
 }
 
 // We need to hand-code this vfunc to write the result back into the
@@ -150,7 +151,7 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
     if(base && base->get_items_at)
       return (*base->get_items_at)(self, x, y, cr, is_pointer_event, parent_is_visible, found_items);
   }
-  
+
   return 0;
 }
 
@@ -171,7 +172,7 @@ Glib::ListHandle<Glib::RefPtr<Item> > Item::get_items_at_vfunc(double x, double
   // ownership.
   if(base && base->get_items_at)
     return Glib::ListHandle<Glib::RefPtr<Item> >((*base->get_items_at)(const_cast<GooCanvasItem*>(gobj()), x, y, context->cobj(), static_cast<int>(is_pointer_event), static_cast<int>(is_parent_visible), found_items.data()), Glib::OWNERSHIP_SHALLOW);
-  
+
   return Glib::ListHandle<Glib::RefPtr<Item> >(NULL, Glib::OWNERSHIP_SHALLOW);
 }
 
@@ -186,4 +187,3 @@ Glib::ListHandle< Glib::RefPtr<const Item> > Item::get_items_at(double x, double
 }
 
 } //namespace Goocanvas
-
diff --git a/goocanvas/src/item.hg b/goocanvas/src/item.hg
index e76a8c0..bbf7814 100644
--- a/goocanvas/src/item.hg
+++ b/goocanvas/src/item.hg
@@ -20,7 +20,6 @@
 #include <goocanvasmm/enums.h>
 #include <goocanvasmm/style.h>
 #include <cairomm/cairomm.h>
-#include <goocanvasitem.h>
 
 _DEFS(goocanvasmm,libgoocanvas)
 _PINCLUDE(glibmm/private/interface_p.h)
@@ -168,10 +167,10 @@ public:
   _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 
+  //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)
@@ -280,4 +279,3 @@ void Item::set_child_property(const Glib::RefPtr<Item>& child, const Glib::ustri
 #endif /* DOXYGEN_SHOULD_SKIP_THIS */
 
 } //namespace Goocanvas
-
diff --git a/goocanvas/src/itemmodel.ccg b/goocanvas/src/itemmodel.ccg
index 9878936..254cd1e 100644
--- a/goocanvas/src/itemmodel.ccg
+++ b/goocanvas/src/itemmodel.ccg
@@ -15,26 +15,26 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <goocanvasenumtypes.h>
 #include <goocanvasmm/canvas.h>
-
+#include <goocanvasitemmodel.h>
+#include <goocanvasenumtypes.h>
 
 namespace Goocanvas
 {
 
 void ItemModel::raise()
 {
-  goo_canvas_item_model_raise(gobj(), NULL); 
+  goo_canvas_item_model_raise(gobj(), NULL);
 }
 
 void ItemModel::lower()
 {
-  goo_canvas_item_model_lower(gobj(), NULL); 
+  goo_canvas_item_model_lower(gobj(), NULL);
 }
 
 void ItemModel::add_child(const Glib::RefPtr<ItemModel>& child)
 {
-  goo_canvas_item_model_add_child(gobj(), Glib::unwrap(child), -1); 
+  goo_canvas_item_model_add_child(gobj(), Glib::unwrap(child), -1);
 }
 
 } //namespace Goocanvas
diff --git a/goocanvas/src/itemmodel.hg b/goocanvas/src/itemmodel.hg
index 2997544..6fe953c 100644
--- a/goocanvas/src/itemmodel.hg
+++ b/goocanvas/src/itemmodel.hg
@@ -17,14 +17,15 @@
  */
 
 #include <cairomm/cairomm.h>
-#include <goocanvasitemmodel.h>
 #include <goocanvasmm/style.h>
 #include <goocanvasmm/enums.h>
 
 _DEFS(goocanvasmm,libgoocanvas)
 _PINCLUDE(glibmm/private/interface_p.h)
+_PINCLUDE(goocanvasitem.h)
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
+extern "C" { typedef struct _GooCanvasItemModelIface GooCanvasItemModelIface; }
 extern "C" { typedef union _GooCanvasPathCommand GooCanvasPathCommand; }
 #endif /* DOXYGEN_SHOULD_SKIP_THIS */
 
@@ -112,10 +113,10 @@ public:
   _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 
+  //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)
@@ -150,4 +151,3 @@ protected:
 };
 
 }
-
diff --git a/goocanvas/src/itemsimple.hg b/goocanvas/src/itemsimple.hg
index a8ef857..46003f3 100644
--- a/goocanvas/src/itemsimple.hg
+++ b/goocanvas/src/itemsimple.hg
@@ -15,13 +15,12 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <glibmm/object.h>
 #include <gdkmm/pixbuf.h>
-#include <cairomm/cairomm.h>
-
 #include <goocanvasmm/item.h>
 #include <goocanvasmm/linedash.h>
 #include <goocanvasmm/style.h>
+#include <glibmm/object.h>
+#include <cairomm/cairomm.h>
 
 _DEFS(goocanvasmm,libgoocanvas)
 _PINCLUDE(glibmm/private/object_p.h)
@@ -105,4 +104,3 @@ protected:
 };
 
 } //namespace Goocanvas
-
diff --git a/goocanvas/src/style.hg b/goocanvas/src/style.hg
index 76203d6..5032155 100644
--- a/goocanvas/src/style.hg
+++ b/goocanvas/src/style.hg
@@ -20,7 +20,8 @@
 #include <cairomm/context.h>
 #include <cairomm/refptr.h>
 
-#include <goocanvasstyle.h>
+#include <gdkmm.h>
+#include <goocanvasstyle.h> //For the template implementations.
 
 _DEFS(goocanvasmm,libgoocanvas)
 _PINCLUDE(glibmm/private/object_p.h)
@@ -70,4 +71,3 @@ void Style::set_property(GQuark property_id, const PropertyType& value)
 }
 
 }
-