[goocanvasmm] Class hierarchy for class GridModel changed

[Murray Cumming <murrayc src gnome org>]

commit e6212f6bd2d65bc130c488e4b153e8665823c182
Author: Andreas Klaedtke <andreas klaedtke gmx net>
Date:   Sun Jun 12 20:53:30 2011 +0100

    Class hierarchy for class GridModel changed
    
    GridModel was derived from ItemSimple, this patch derives it from
    ItemModelSimple (Goocanvasmm Bug #651355).

 ChangeLog                   |    6 ++++++
 goocanvas/src/gridmodel.ccg |    2 +-
 goocanvas/src/gridmodel.hg  |    7 +++++--
 3 files changed, 12 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index d42067b..18f411e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-28  Andreas Klaedtke  <andreas klaedtke gmx net>
+ 
+ 	Class hierarchy for class GridModel changed (Bug #651355).
+ 	
+ 	* various files: GridModel is now derived from ItemModelSimple.
+	
 2011-06-12  Kjell Ahlstedt  <kjell ahlstedt bredband net>
 
 	Correct null pointer conversion from Goocanvas::Canvas* to GooCanvas*.
diff --git a/goocanvas/src/gridmodel.ccg b/goocanvas/src/gridmodel.ccg
index e6b5a67..f60f604 100644
--- a/goocanvas/src/gridmodel.ccg
+++ b/goocanvas/src/gridmodel.ccg
@@ -18,7 +18,7 @@
 
 #include <goocanvasgrid.h>
 
-_PINCLUDE(goocanvasmm/private/itemsimple_p.h)
+_PINCLUDE(goocanvasmm/private/itemmodelsimple_p.h)
 
 namespace Goocanvas
 {
diff --git a/goocanvas/src/gridmodel.hg b/goocanvas/src/gridmodel.hg
index dafdaa1..cc26b9d 100644
--- a/goocanvas/src/gridmodel.hg
+++ b/goocanvas/src/gridmodel.hg
@@ -16,17 +16,20 @@
  */
 
 
+#include <glibmm/object.h>
+#include <goocanvasmm/itemmodelsimple.h>
 #include <goocanvasmm/group.h>
 #include <gtkmm/enums.h>
 
 _DEFS(goocanvasmm,libgoocanvas)
+_PINCLUDE(glibmm/private/object_p.h)
 
 namespace Goocanvas
 {
 
-class GridModel : public Goocanvas::ItemSimple
+class GridModel : public Goocanvas::ItemModelSimple
 {
-  _CLASS_GOBJECT(GridModel, GooCanvasGridModel, GOO_CANVAS_GRID_MODEL, Goocanvas::ItemSimple, GooCanvasItemSimple)
+  _CLASS_GOBJECT(GridModel, GooCanvasGridModel, GOO_CANVAS_GRID_MODEL, Goocanvas::ItemModelSimple, GooCanvasItemModelSimple)
 protected:
   explicit GridModel(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);
   _IGNORE(goo_canvas_grid_model_new)