[goocanvasmm] Replace use of Gtk::AlignmentEnum with Gtk::Align.



commit df9387543a6fedacbc8ef81a4fb5d1f591219476
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Sep 15 22:34:18 2010 +0200

    Replace use of Gtk::AlignmentEnum with Gtk::Align.
    
    * goocanvas/src/table.[hg|ccg]:
    * goocanvas/src/tablemodel.[hg|ccg]: This fixes the build with
    gtkmm from git master.

 ChangeLog                    |    8 ++++++++
 goocanvas/src/table.ccg      |    2 +-
 goocanvas/src/table.hg       |    2 +-
 goocanvas/src/tablemodel.ccg |    2 +-
 goocanvas/src/tablemodel.hg  |    2 +-
 5 files changed, 12 insertions(+), 4 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 9d33dfe..01513dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+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 
+	gtkmm from git master.
+
 2010-09-06  Murray Cumming  <murrayc murrayc com>
 
 	Adapt to latest goocanvas API, using the new AnchorType enum.
diff --git a/goocanvas/src/table.ccg b/goocanvas/src/table.ccg
index dae5682..f6e111e 100644
--- a/goocanvas/src/table.ccg
+++ b/goocanvas/src/table.ccg
@@ -59,7 +59,7 @@ void Table::set_align(const Glib::RefPtr<Item>& child, double xalign, double yal
                                        static_cast<void*>(0));
 }
 
-void Table::set_align(const Glib::RefPtr<Item>& child, Gtk::AlignmentEnum xalign, Gtk::AlignmentEnum yalign)
+void Table::set_align(const Glib::RefPtr<Item>& child, Gtk::Align xalign, Gtk::Align yalign)
 {
   set_align(child, _gtkmm_align_float_from_enum(xalign), _gtkmm_align_float_from_enum(yalign));
 }
diff --git a/goocanvas/src/table.hg b/goocanvas/src/table.hg
index 6742e51..0619e13 100644
--- a/goocanvas/src/table.hg
+++ b/goocanvas/src/table.hg
@@ -55,7 +55,7 @@ public:
   // TODO: We should get rid of this overload with the next gtkmm API/ABI break.
   // See http://bugzilla.gnome.org/show_bug.cgi?id=142849.
   void set_align(const Glib::RefPtr<Item>& child, double xalign = 0.0, double yalign = 0.0);
-  void set_align(const Glib::RefPtr<Item>& child, Gtk::AlignmentEnum xalign = Gtk::ALIGN_LEFT, Gtk::AlignmentEnum yalign = Gtk::ALIGN_TOP);
+  void set_align(const Glib::RefPtr<Item>& child, Gtk::Align xalign = Gtk::ALIGN_START, Gtk::Align yalign = Gtk::ALIGN_START);
 
   //We put these in item.hg instead.
   //See the comment there.
diff --git a/goocanvas/src/tablemodel.ccg b/goocanvas/src/tablemodel.ccg
index 97fa483..35bb27a 100644
--- a/goocanvas/src/tablemodel.ccg
+++ b/goocanvas/src/tablemodel.ccg
@@ -59,7 +59,7 @@ void TableModel::set_align(const Glib::RefPtr<ItemModel>& child, double xalign,
                                             static_cast<void*>(0));
 }
 
-void TableModel::set_align(const Glib::RefPtr<ItemModel>& child, Gtk::AlignmentEnum xalign, Gtk::AlignmentEnum yalign)
+void TableModel::set_align(const Glib::RefPtr<ItemModel>& child, Gtk::Align xalign, Gtk::Align yalign)
 {
   set_align(child, _gtkmm_align_float_from_enum(xalign), _gtkmm_align_float_from_enum(yalign));
 }
diff --git a/goocanvas/src/tablemodel.hg b/goocanvas/src/tablemodel.hg
index 4312738..7c2878b 100644
--- a/goocanvas/src/tablemodel.hg
+++ b/goocanvas/src/tablemodel.hg
@@ -38,7 +38,7 @@ public:
   void attach(const Glib::RefPtr<ItemModel>& item, guint left_attach, guint right_attach, guint top_attach, guint bottom_attach, Gtk::AttachOptions xoptions = Gtk::FILL | Gtk::EXPAND, Gtk::AttachOptions yoptions = Gtk::FILL | Gtk::EXPAND, double left_padding = 0.0, double right_padding = 0.0, double top_padding = 0.0, double bottom_padding = 0.0);
 
   void set_align(const Glib::RefPtr<ItemModel>& child, double xalign = 0.0, double yalign = 0.0);
-  void set_align(const Glib::RefPtr<ItemModel>& child, Gtk::AlignmentEnum xalign = Gtk::ALIGN_LEFT, Gtk::AlignmentEnum yalign = Gtk::ALIGN_TOP);
+  void set_align(const Glib::RefPtr<ItemModel>& child, Gtk::Align xalign = Gtk::ALIGN_START, Gtk::Align yalign = Gtk::ALIGN_START);
 
   //We put these in item.hg instead.
   //See the comment there.



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]