[goocanvasmm] Adapt to Gtk::PackOptions as an enum class.

[Murray Cumming <murrayc src gnome org>]

commit e3dd325fcd8b1f294881086d5bd7225fcf84c573
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Apr 27 22:35:14 2017 +0200

    Adapt to Gtk::PackOptions as an enum class.

 examples/coordinates/window.cc           |   12 ++++++------
 examples/demo/primitives.cc              |    4 ++--
 examples/drag_to_canvas/examplewindow.cc |    6 +++---
 examples/table/examplewindow.cc          |    2 +-
 examples/tablemodel/examplewindow.cc     |    6 +++---
 examples/text/window.cc                  |   20 ++++++++++----------
 goocanvas/src/table.ccg                  |    8 ++++----
 goocanvas/src/table.hg                   |    2 +-
 goocanvas/src/tablemodel.ccg             |    8 ++++----
 goocanvas/src/tablemodel.hg              |    2 +-
 tests/child_properties/main.cc           |    2 +-
 11 files changed, 36 insertions(+), 36 deletions(-)
---
diff --git a/examples/coordinates/window.cc b/examples/coordinates/window.cc
index f081579..263eb80 100644
--- a/examples/coordinates/window.cc
+++ b/examples/coordinates/window.cc
@@ -28,7 +28,7 @@ ExampleWindow::ExampleWindow()
 {
   set_title("goocanvasmm Example");
 
-  m_box.pack_start(m_label_origin, Gtk::PACK_SHRINK);
+  m_box.pack_start(m_label_origin, Gtk::PackOptions::SHRINK);
   m_label_origin.set_xalign(0.0);
 
   m_canvas.set_size_request(640, 480);
@@ -52,18 +52,18 @@ ExampleWindow::ExampleWindow()
   sw->add(m_canvas);
   m_box.pack_start(*sw);
 
-  m_box.pack_start(m_button_box, Gtk::PACK_SHRINK);
+  m_box.pack_start(m_button_box, Gtk::PackOptions::SHRINK);
   
-  m_button_box.pack_start(m_button_translate, Gtk::PACK_SHRINK);
+  m_button_box.pack_start(m_button_translate, Gtk::PackOptions::SHRINK);
   m_button_translate.signal_clicked().connect(sigc::mem_fun(*this, &ExampleWindow::on_button_translate));
 
-  m_button_box.pack_start(m_button_setxy, Gtk::PACK_SHRINK);
+  m_button_box.pack_start(m_button_setxy, Gtk::PackOptions::SHRINK);
   m_button_setxy.signal_clicked().connect(sigc::mem_fun(*this, &ExampleWindow::on_button_setxy));
 
-  m_button_box.pack_start(m_button_scale, Gtk::PACK_SHRINK);
+  m_button_box.pack_start(m_button_scale, Gtk::PackOptions::SHRINK);
   m_button_scale.signal_clicked().connect(sigc::mem_fun(*this, &ExampleWindow::on_button_scale));
 
-  m_box.pack_start(m_label_status, Gtk::PACK_SHRINK);
+  m_box.pack_start(m_label_status, Gtk::PackOptions::SHRINK);
   m_label_status.set_xalign(0.0);
   add(m_box);
 
diff --git a/examples/demo/primitives.cc b/examples/demo/primitives.cc
index bf5118d..6d91751 100644
--- a/examples/demo/primitives.cc
+++ b/examples/demo/primitives.cc
@@ -27,7 +27,7 @@ Primitives::Primitives()
   _vbox = Gtk::manage(new Gtk::Box(Gtk::Orientation::VERTICAL));
 
   auto lbl = Gtk::manage(new Gtk::Label("Drag an item with button 1. Click button 2 on an item to lower it, 
or button 3 to raise it."));
-  _vbox->pack_start(*lbl, Gtk::PACK_SHRINK);
+  _vbox->pack_start(*lbl, Gtk::PackOptions::SHRINK);
 
 
 //====
@@ -42,7 +42,7 @@ Primitives::Primitives()
 
   _scrolled_window = Gtk::manage(new Gtk::ScrolledWindow());
   _scrolled_window->add(*_canvas);
-  _vbox->pack_start(*_scrolled_window, Gtk::PACK_EXPAND_WIDGET);
+  _vbox->pack_start(*_scrolled_window, Gtk::PackOptions::EXPAND_WIDGET);
 
 //====
 }
diff --git a/examples/drag_to_canvas/examplewindow.cc b/examples/drag_to_canvas/examplewindow.cc
index eeda711..4f0a4a5 100644
--- a/examples/drag_to_canvas/examplewindow.cc
+++ b/examples/drag_to_canvas/examplewindow.cc
@@ -32,11 +32,11 @@ ExampleWindow::ExampleWindow()
   m_drag_targets.push_back( Gtk::TargetEntry("goocanvasmm_example_drag_item", Gtk::TargetFlags::SAME_APP) );
 
   add(m_vbox);
-  m_vbox.pack_start(m_hbox, Gtk::PACK_SHRINK);
+  m_vbox.pack_start(m_hbox, Gtk::PackOptions::SHRINK);
 
-  m_hbox.pack_start(m_button_rect, Gtk::PACK_SHRINK);
+  m_hbox.pack_start(m_button_rect, Gtk::PackOptions::SHRINK);
   make_widget_draggable(m_button_rect, DRAG_ITEM_RECTANGLE);
-  m_hbox.pack_start(m_button_ellipse, Gtk::PACK_SHRINK);
+  m_hbox.pack_start(m_button_ellipse, Gtk::PackOptions::SHRINK);
   make_widget_draggable(m_button_ellipse, DRAG_ITEM_ELLIPSE);
 
   m_canvas.set_size_request(640, 480);
diff --git a/examples/table/examplewindow.cc b/examples/table/examplewindow.cc
index d53729c..db48bac 100644
--- a/examples/table/examplewindow.cc
+++ b/examples/table/examplewindow.cc
@@ -61,7 +61,7 @@ ExampleWindow::ExampleWindow()
 void ExampleWindow::add_text_to_cell(const Glib::RefPtr<Goocanvas::Table>& table, const Glib::ustring& text, 
guint row, guint col)
 {
   auto text_item = Goocanvas::Text::create(text);
-  table->attach(text_item, col, col+1, row, row+1, Gtk::PACK_EXPAND_WIDGET, Gtk::PACK_SHRINK);
+  table->attach(text_item, col, col+1, row, row+1, Gtk::PackOptions::EXPAND_WIDGET, 
Gtk::PackOptions::SHRINK);
 }
 
 bool
diff --git a/examples/tablemodel/examplewindow.cc b/examples/tablemodel/examplewindow.cc
index 9a2a03a..e4f8e5c 100644
--- a/examples/tablemodel/examplewindow.cc
+++ b/examples/tablemodel/examplewindow.cc
@@ -64,14 +64,14 @@ ExampleWindow::ExampleWindow()
   sw2->add(m_second_canvas);
 
   auto box = Gtk::manage(new Gtk::Box(Gtk::Orientation::VERTICAL, 6));
-  box->pack_start(*sw1, Gtk::PACK_EXPAND_WIDGET);
-  box->pack_start(*sw2, Gtk::PACK_EXPAND_WIDGET);
+  box->pack_start(*sw1, Gtk::PackOptions::EXPAND_WIDGET);
+  box->pack_start(*sw2, Gtk::PackOptions::EXPAND_WIDGET);
   add(*box);
 }
 
 void ExampleWindow::add_text_to_cell(const Glib::RefPtr<Goocanvas::TableModel>& table, const Glib::ustring& 
text, guint row, guint col)
 {
   auto text_item = Goocanvas::TextModel::create(text);
-  table->attach(text_item, col, col+1, row, row+1, Gtk::PACK_EXPAND_WIDGET, Gtk::PACK_SHRINK);
+  table->attach(text_item, col, col+1, row, row+1, Gtk::PackOptions::EXPAND_WIDGET, 
Gtk::PackOptions::SHRINK);
 }
 
diff --git a/examples/text/window.cc b/examples/text/window.cc
index a1e7d29..35107e1 100644
--- a/examples/text/window.cc
+++ b/examples/text/window.cc
@@ -32,7 +32,7 @@ ExampleWindow::ExampleWindow()
 {
   set_title("goocanvasmm Example");
 
-  m_box.pack_start(m_label_origin, Gtk::PACK_SHRINK);
+  m_box.pack_start(m_label_origin, Gtk::PackOptions::SHRINK);
   m_label_origin.set_xalign(0.0);
 
   m_canvas.set_size_request(640, 480);
@@ -63,29 +63,29 @@ ExampleWindow::ExampleWindow()
   sw->add(m_canvas);
   m_box.pack_start(*sw);
 
-  m_box.pack_start(m_button_box1, Gtk::PACK_SHRINK);
+  m_box.pack_start(m_button_box1, Gtk::PackOptions::SHRINK);
   
-  m_button_box1.pack_start(m_button_translate, Gtk::PACK_SHRINK);
+  m_button_box1.pack_start(m_button_translate, Gtk::PackOptions::SHRINK);
   m_button_translate.signal_clicked().connect(sigc::mem_fun(*this, &ExampleWindow::on_button_translate));
 
-  m_button_box1.pack_start(m_button_setxy, Gtk::PACK_SHRINK);
+  m_button_box1.pack_start(m_button_setxy, Gtk::PackOptions::SHRINK);
   m_button_setxy.signal_clicked().connect(sigc::mem_fun(*this, &ExampleWindow::on_button_setxy));
 
-  m_button_box1.pack_start(m_button_scale, Gtk::PACK_SHRINK);
+  m_button_box1.pack_start(m_button_scale, Gtk::PackOptions::SHRINK);
   m_button_scale.signal_clicked().connect(sigc::mem_fun(*this, &ExampleWindow::on_button_scale));
 
-  m_button_box1.pack_start(m_button_zoom, Gtk::PACK_SHRINK);
+  m_button_box1.pack_start(m_button_zoom, Gtk::PackOptions::SHRINK);
   m_button_zoom.signal_clicked().connect(sigc::mem_fun(*this, &ExampleWindow::on_button_zoom_canvas));
 
-  m_box.pack_start(m_button_box2, Gtk::PACK_SHRINK);
+  m_box.pack_start(m_button_box2, Gtk::PackOptions::SHRINK);
 
-  m_button_box2.pack_start(m_button_set_width, Gtk::PACK_SHRINK);
+  m_button_box2.pack_start(m_button_set_width, Gtk::PackOptions::SHRINK);
   m_button_set_width.signal_clicked().connect(sigc::mem_fun(*this, &ExampleWindow::on_button_set_width));
 
-  m_button_box2.pack_start(m_button_set_width_unlimited, Gtk::PACK_SHRINK);
+  m_button_box2.pack_start(m_button_set_width_unlimited, Gtk::PackOptions::SHRINK);
   m_button_set_width_unlimited.signal_clicked().connect(sigc::mem_fun(*this, 
&ExampleWindow::on_button_set_width_unlimited));
 
-  m_box.pack_start(m_label_status, Gtk::PACK_SHRINK);
+  m_box.pack_start(m_label_status, Gtk::PackOptions::SHRINK);
   m_label_status.set_xalign(0.0);
   add(m_box);
 
diff --git a/goocanvas/src/table.ccg b/goocanvas/src/table.ccg
index 1791ef7..bd53adf 100644
--- a/goocanvas/src/table.ccg
+++ b/goocanvas/src/table.ccg
@@ -25,11 +25,11 @@ namespace Goocanvas
 
 void Table::attach(const Glib::RefPtr<Item>& item, guint left_attach, guint right_attach, guint top_attach, 
guint bottom_attach, Gtk::PackOptions xoptions, Gtk::PackOptions yoptions, double left_padding, double 
right_padding, double top_padding, double bottom_padding)
 {
-  const gboolean x_expand = (xoptions == Gtk::PACK_EXPAND_PADDING) || (xoptions == Gtk::PACK_EXPAND_WIDGET);
-  const gboolean x_fill = (xoptions == Gtk::PACK_EXPAND_WIDGET);
+  const gboolean x_expand = (xoptions == Gtk::PackOptions::EXPAND_PADDING) || (xoptions == 
Gtk::PackOptions::EXPAND_WIDGET);
+  const gboolean x_fill = (xoptions == Gtk::PackOptions::EXPAND_WIDGET);
   const gboolean x_shrink = !x_expand;
-  const gboolean y_expand = (yoptions == Gtk::PACK_EXPAND_PADDING) || (yoptions == Gtk::PACK_EXPAND_WIDGET);
-  const gboolean y_fill = (yoptions == Gtk::PACK_EXPAND_WIDGET);
+  const gboolean y_expand = (yoptions == Gtk::PackOptions::EXPAND_PADDING) || (yoptions == 
Gtk::PackOptions::EXPAND_WIDGET);
+  const gboolean y_fill = (yoptions == Gtk::PackOptions::EXPAND_WIDGET);
   const gboolean y_shrink = !y_expand;
 
   add_child(item);
diff --git a/goocanvas/src/table.hg b/goocanvas/src/table.hg
index 95a644e..aca8ced 100644
--- a/goocanvas/src/table.hg
+++ b/goocanvas/src/table.hg
@@ -51,7 +51,7 @@ public:
    * @param top_padding The padding at the top.
    * @param bottom_padding The padding at the bottom.
    */
-  void attach(const Glib::RefPtr<Item>& item, guint left_attach, guint right_attach, guint top_attach, guint 
bottom_attach, Gtk::PackOptions xoptions = Gtk::PACK_EXPAND_WIDGET, Gtk::PackOptions yoptions = 
Gtk::PACK_EXPAND_WIDGET, double left_padding = 0.0, double right_padding = 0.0, double top_padding = 0.0, 
double bottom_padding = 0.0);
+  void attach(const Glib::RefPtr<Item>& item, guint left_attach, guint right_attach, guint top_attach, guint 
bottom_attach, Gtk::PackOptions xoptions = Gtk::PackOptions::EXPAND_WIDGET, Gtk::PackOptions yoptions = 
Gtk::PackOptions::EXPAND_WIDGET, 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<Item>& child, Gtk::Align xalign = Gtk::Align::START, Gtk::Align yalign = 
Gtk::Align::START);
 
diff --git a/goocanvas/src/tablemodel.ccg b/goocanvas/src/tablemodel.ccg
index 1eb4d2b..3eb71ca 100644
--- a/goocanvas/src/tablemodel.ccg
+++ b/goocanvas/src/tablemodel.ccg
@@ -25,11 +25,11 @@ namespace Goocanvas
 
 void TableModel::attach(const Glib::RefPtr<ItemModel>& item, guint left_attach, guint right_attach, guint 
top_attach, guint bottom_attach, Gtk::PackOptions xoptions, Gtk::PackOptions yoptions, double left_padding, 
double right_padding, double top_padding, double bottom_padding)
 {
-  const gboolean x_expand = (xoptions == Gtk::PACK_EXPAND_PADDING) || (xoptions == Gtk::PACK_EXPAND_WIDGET);
-  const gboolean x_fill = (xoptions == Gtk::PACK_EXPAND_WIDGET);
+  const gboolean x_expand = (xoptions == Gtk::PackOptions::EXPAND_PADDING) || (xoptions == 
Gtk::PackOptions::EXPAND_WIDGET);
+  const gboolean x_fill = (xoptions == Gtk::PackOptions::EXPAND_WIDGET);
   const gboolean x_shrink = !x_expand;
-  const gboolean y_expand = (yoptions == Gtk::PACK_EXPAND_PADDING) || (yoptions == Gtk::PACK_EXPAND_WIDGET);
-  const gboolean y_fill = (yoptions == Gtk::PACK_EXPAND_WIDGET);
+  const gboolean y_expand = (yoptions == Gtk::PackOptions::EXPAND_PADDING) || (yoptions == 
Gtk::PackOptions::EXPAND_WIDGET);
+  const gboolean y_fill = (yoptions == Gtk::PackOptions::EXPAND_WIDGET);
   const gboolean y_shrink = !y_expand;
 
   add_child(item);
diff --git a/goocanvas/src/tablemodel.hg b/goocanvas/src/tablemodel.hg
index f603de6..b0d4df9 100644
--- a/goocanvas/src/tablemodel.hg
+++ b/goocanvas/src/tablemodel.hg
@@ -36,7 +36,7 @@ public:
 
   _WRAP_CREATE()
 
-  void attach(const Glib::RefPtr<ItemModel>& item, guint left_attach, guint right_attach, guint top_attach, 
guint bottom_attach, Gtk::PackOptions xoptions = Gtk::PACK_EXPAND_WIDGET, Gtk::PackOptions yoptions = 
Gtk::PACK_EXPAND_WIDGET, double left_padding = 0.0, double right_padding = 0.0, double top_padding = 0.0, 
double bottom_padding = 0.0);
+  void attach(const Glib::RefPtr<ItemModel>& item, guint left_attach, guint right_attach, guint top_attach, 
guint bottom_attach, Gtk::PackOptions xoptions = Gtk::PackOptions::EXPAND_WIDGET, Gtk::PackOptions yoptions = 
Gtk::PackOptions::EXPAND_WIDGET, 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, Gtk::Align xalign = Gtk::Align::START, Gtk::Align 
yalign = Gtk::Align::START);
 
diff --git a/tests/child_properties/main.cc b/tests/child_properties/main.cc
index 8bbca3f..ffa7a8a 100644
--- a/tests/child_properties/main.cc
+++ b/tests/child_properties/main.cc
@@ -28,7 +28,7 @@ main()
 
   //Add a child to the table:
   auto child = Goocanvas::Text::create("test");
-  table->attach(child, 2, 3, 5, 6, Gtk::PACK_EXPAND_WIDGET, Gtk::PACK_SHRINK);
+  table->attach(child, 2, 3, 5, 6, Gtk::PackOptions::EXPAND_WIDGET, Gtk::PackOptions::SHRINK);
 
   //Examine the child property: