[glom/feature_choices_related_layout: 3/4] Fix the build for the latest goocanvasmm and gtkmm API.

[Murray Cumming <murrayc src gnome org>]

commit 3cc0d5fc39adeb71430fc1def4e0ac9ba4268d47
Author: Murray Cumming <murrayc murrayc com>
Date:   Mon Sep 6 13:24:14 2010 +0200

    Fix the build for the latest goocanvasmm and gtkmm API.
    
    * glom/mode_design/relationships_overview/canvas_group_dbtable.cc:
    * glom/mode_design/relationships_overview/dialog_relationships_over
    view.cc:
    * glom/print_layout/canvas_print_layout.[h|cc]:
    * glom/utility_widgets/canvas/canvas_text_movable.[h|cc]:
      Use Goocanvas::AnchorType instead of (removed) Gtk::AnchorType.

 ChangeLog                                          |   11 +++++++++++
 .../relationships_overview/canvas_group_dbtable.cc |    4 ++--
 .../dialog_relationships_overview.cc               |    2 +-
 glom/print_layout/canvas_print_layout.cc           |    4 ++--
 glom/print_layout/canvas_print_layout.h            |    2 +-
 glom/utility_widgets/canvas/canvas_text_movable.cc |    4 ++--
 glom/utility_widgets/canvas/canvas_text_movable.h  |    4 ++--
 7 files changed, 21 insertions(+), 10 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index e69efeb..3116479 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-09-06  Murray Cumming  <murrayc murrayc com>
+
+	Fix the build for the latest goocanvasmm and gtkmm API.
+
+	* glom/mode_design/relationships_overview/canvas_group_dbtable.cc:
+	* glom/mode_design/relationships_overview/dialog_relationships_over
+	view.cc:
+	* glom/print_layout/canvas_print_layout.[h|cc]:
+	* glom/utility_widgets/canvas/canvas_text_movable.[h|cc]:
+  Use Goocanvas::AnchorType instead of (removed) Gtk::AnchorType.
+
 2010-09-02  Murray Cumming  <murrayc murrayc com>
 
 	Fix the build with latest gtkmm.
diff --git a/glom/mode_design/relationships_overview/canvas_group_dbtable.cc b/glom/mode_design/relationships_overview/canvas_group_dbtable.cc
index 05db937..509cbc6 100644
--- a/glom/mode_design/relationships_overview/canvas_group_dbtable.cc
+++ b/glom/mode_design/relationships_overview/canvas_group_dbtable.cc
@@ -61,7 +61,7 @@ CanvasGroupDbTable::CanvasGroupDbTable(const Glib::ustring& table_name, const Gl
   const Glib::ustring title = "<b>" + table_title + "</b>";
   Glib::RefPtr<CanvasTextMovable> m_text = CanvasTextMovable::create(title,
     x + margin, y + margin, m_table_width - margin*2,
-    Gtk::ANCHOR_NORTH_WEST);
+    Goocanvas::ANCHOR_NORTH_WEST);
   m_text->property_font() = "sans 10";
   m_text->property_use_markup() = true;
   m_text->set_movement_allowed(false, false); //Move only as part of the parent group.
@@ -92,7 +92,7 @@ CanvasGroupDbTable::CanvasGroupDbTable(const Glib::ustring& table_name, const Gl
 
     Glib::RefPtr<CanvasTextMovable> text_item = CanvasTextMovable::create(title, 
       x + margin, y + margin + field_y, m_table_width - margin*2,
-      Gtk::ANCHOR_NORTH_WEST);
+      Goocanvas::ANCHOR_NORTH_WEST);
     text_item->property_font() = "sans 10";
     text_item->property_use_markup() = true;
     text_item->set_movement_allowed(false, false); //Move only as part of the parent group.
diff --git a/glom/mode_design/relationships_overview/dialog_relationships_overview.cc b/glom/mode_design/relationships_overview/dialog_relationships_overview.cc
index 20ed690..803df01 100644
--- a/glom/mode_design/relationships_overview/dialog_relationships_overview.cc
+++ b/glom/mode_design/relationships_overview/dialog_relationships_overview.cc
@@ -328,7 +328,7 @@ void Dialog_RelationshipsOverview::draw_lines()
           const double text_y = ((from_field_y + to_field_y) / 2) + y_offset;
           Glib::RefPtr<CanvasTextMovable> text = CanvasTextMovable::create(relationship->get_title_or_name(),
             text_x, text_y, -1, //TODO: Calc a suitable width.
-            Gtk::ANCHOR_CENTER);
+            Goocanvas::ANCHOR_CENTER);
           text->property_font() = "sans 10";
           text->property_use_markup() = true;
           text->set_movement_allowed(false, false); //Move only as part of the parent group.
diff --git a/glom/print_layout/canvas_print_layout.cc b/glom/print_layout/canvas_print_layout.cc
index db1d4c1..100dcea 100644
--- a/glom/print_layout/canvas_print_layout.cc
+++ b/glom/print_layout/canvas_print_layout.cc
@@ -703,8 +703,8 @@ void Canvas_PrintLayout::fill_with_data_portal(const Glib::RefPtr<CanvasLayoutIt
     LayoutGroup::type_list_items::iterator iter_child_layout_items = child_layout_items.begin();
     for(int col = 0; col < cols_count; ++col)
     {
-      //Glib::RefPtr<Goocanvas::Item> canvas_child = base_item->get_cell_child(row, col); //TODO: Add this to GooCanvas::Table.
-      Glib::RefPtr<Goocanvas::Item> canvas_child = get_canvas_table_cell_child(canvas_table, row, col); //TODO: Add this to GooCanvas::Table.
+      //Glib::RefPtr<Goocanvas::Item> canvas_child = base_item->get_cell_child(row, col); //TODO: Add this to Goocanvas::Table.
+      Glib::RefPtr<Goocanvas::Item> canvas_child = get_canvas_table_cell_child(canvas_table, row, col); //TODO: Add this to Goocanvas::Table.
       if(!canvas_child)
         std::cerr << G_STRFUNC << ": canvas_child is NULL." << std::endl;
 
diff --git a/glom/print_layout/canvas_print_layout.h b/glom/print_layout/canvas_print_layout.h
index 34100a1..ee8c8ac 100644
--- a/glom/print_layout/canvas_print_layout.h
+++ b/glom/print_layout/canvas_print_layout.h
@@ -79,7 +79,7 @@ private:
   void fill_with_data_portal(const Glib::RefPtr<CanvasLayoutItem>& canvas_item, const Gnome::Gda::Value& foreign_key_value);
   static void set_canvas_item_field_value(const Glib::RefPtr<Goocanvas::Item> canvas_item, const sharedptr<LayoutItem_Field> field, const Gnome::Gda::Value& value);
 
-  static Glib::RefPtr<Goocanvas::Item> get_canvas_table_cell_child(const Glib::RefPtr<Goocanvas::Table>& table, int row, int col); //TODO: Add this to GooCanvas::Table.
+  static Glib::RefPtr<Goocanvas::Item> get_canvas_table_cell_child(const Glib::RefPtr<Goocanvas::Table>& table, int row, int col); //TODO: Add this to Goocanvas::Table.
   
   type_vecLayoutFields get_portal_fields_to_show(const sharedptr<LayoutItem_Portal>& portal);
 
diff --git a/glom/utility_widgets/canvas/canvas_text_movable.cc b/glom/utility_widgets/canvas/canvas_text_movable.cc
index ed58602..521b5fe 100644
--- a/glom/utility_widgets/canvas/canvas_text_movable.cc
+++ b/glom/utility_widgets/canvas/canvas_text_movable.cc
@@ -27,7 +27,7 @@ namespace Glom
 {
 
 
-CanvasTextMovable::CanvasTextMovable(const Glib::ustring& text, double x, double y, double width, Gtk::AnchorType anchor)
+CanvasTextMovable::CanvasTextMovable(const Glib::ustring& text, double x, double y, double width, Goocanvas::AnchorType anchor)
 : Goocanvas::Text(text, x, y, width, anchor), 
   m_snap_corner(CORNER_TOP_LEFT) //arbitrary default.
 {
@@ -48,7 +48,7 @@ void CanvasTextMovable::init()
   signal_leave_notify_event().connect(sigc::mem_fun(*this, &CanvasItemMovable::on_leave_notify_event));
 }
 
-Glib::RefPtr<CanvasTextMovable> CanvasTextMovable::create(const Glib::ustring& string, double x, double y, double width, Gtk::AnchorType anchor)
+Glib::RefPtr<CanvasTextMovable> CanvasTextMovable::create(const Glib::ustring& string, double x, double y, double width, Goocanvas::AnchorType anchor)
 {
   return Glib::RefPtr<CanvasTextMovable>(new CanvasTextMovable(string, x, y, width, anchor));
 }
diff --git a/glom/utility_widgets/canvas/canvas_text_movable.h b/glom/utility_widgets/canvas/canvas_text_movable.h
index 35ad14d..ee94a99 100644
--- a/glom/utility_widgets/canvas/canvas_text_movable.h
+++ b/glom/utility_widgets/canvas/canvas_text_movable.h
@@ -32,13 +32,13 @@ class CanvasTextMovable
     public CanvasItemMovable
 {
 private:
-  explicit CanvasTextMovable(const Glib::ustring& string = Glib::ustring(), double x = 0.0, double y = 0.0, double width = 0.0, Gtk::AnchorType anchor = Gtk::ANCHOR_NORTH_WEST);
+  explicit CanvasTextMovable(const Glib::ustring& string = Glib::ustring(), double x = 0.0, double y = 0.0, double width = 0.0, Goocanvas::AnchorType anchor = Goocanvas::ANCHOR_NORTH_WEST);
   virtual ~CanvasTextMovable();
 
   void init();
 
 public:
-  static Glib::RefPtr<CanvasTextMovable> create(const Glib::ustring& string = Glib::ustring(), double x = 0.0, double y = 0.0, double width = 0.0, Gtk::AnchorType anchor = Gtk::ANCHOR_NORTH_WEST);
+  static Glib::RefPtr<CanvasTextMovable> create(const Glib::ustring& string = Glib::ustring(), double x = 0.0, double y = 0.0, double width = 0.0, Goocanvas::AnchorType anchor = Goocanvas::ANCHOR_NORTH_WEST);
 
   enum Corners
   {