GNOME.org
 

[gtkmm] C++11: Box: Make PackOptions an enum class.

commit 248eae21b44b49f8f596fe086a02a1b7bac2036a
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Apr 27 11:55:02 2017 +0200

    C++11: Box: Make PackOptions an enum class.
    
    This would avoid the implicit conversions noticed in the previous
    commit, though we don't have that exact problem anyway now that we have
    removed the bool parameters from pack_start/pack_end().

 demos/gtk-demo/demowindow.cc                      |    2 +-
 demos/gtk-demo/example_buttonbox.cc               |    4 ++--
 demos/gtk-demo/example_change_display.cc          |    6 +++---
 demos/gtk-demo/example_colorsel.cc                |    2 +-
 demos/gtk-demo/example_dialog.cc                  |   18 +++++++++---------
 demos/gtk-demo/example_drawingarea.cc             |    4 ++--
 demos/gtk-demo/example_iconbrowser.cc             |    6 +++---
 demos/gtk-demo/example_iconview.cc                |    4 ++--
 demos/gtk-demo/example_images.cc                  |   12 ++++++------
 demos/gtk-demo/example_menus.cc                   |    6 +++---
 demos/gtk-demo/example_panes.cc                   |    4 ++--
 demos/gtk-demo/example_sizegroup.cc               |    4 ++--
 demos/gtk-demo/example_stacksidebar.cc            |    6 +++---
 demos/gtk-demo/example_treeview_editable_cells.cc |    4 ++--
 demos/gtk-demo/example_treeview_liststore.cc      |    2 +-
 demos/gtk-demo/example_treeview_treestore.cc      |    2 +-
 gtk/src/bin.ccg                                   |    2 +-
 gtk/src/box.ccg                                   |    8 ++++----
 gtk/src/box.hg                                    |    8 ++++----
 tests/delete_cpp_child/main.cc                    |    4 ++--
 tests/dialog/main.cc                              |    4 ++--
 21 files changed, 56 insertions(+), 56 deletions(-)
---
diff --git a/demos/gtk-demo/demowindow.cc b/demos/gtk-demo/demowindow.cc
index 221e01c..fee21fe 100644
--- a/demos/gtk-demo/demowindow.cc
+++ b/demos/gtk-demo/demowindow.cc
@@ -84,7 +84,7 @@ DemoWindow::DemoWindow()
   m_SideBar.set_policy(Gtk::PolicyType::NEVER, Gtk::PolicyType::AUTOMATIC);
   m_SideBar.get_style_context()->add_class("sidebar");
   m_SideBar.add(m_TreeView);
-  m_HBox.pack_start(m_SideBar, Gtk::PACK_SHRINK);
+  m_HBox.pack_start(m_SideBar, Gtk::PackOptions::SHRINK);
 
   //Notebook:
   m_Notebook.popup_enable();
diff --git a/demos/gtk-demo/example_buttonbox.cc b/demos/gtk-demo/example_buttonbox.cc
index 8cdd44a..dd3a62d 100644
--- a/demos/gtk-demo/example_buttonbox.cc
+++ b/demos/gtk-demo/example_buttonbox.cc
@@ -42,7 +42,7 @@ Example_ButtonBox::Example_ButtonBox()
 
   m_Frame_Horizontal.set_margin_top(10);
   m_Frame_Horizontal.set_margin_bottom(10);
-  m_VBox_Main.pack_start(m_Frame_Horizontal, Gtk::PACK_EXPAND_WIDGET);
+  m_VBox_Main.pack_start(m_Frame_Horizontal, Gtk::PackOptions::EXPAND_WIDGET);
   m_Frame_Horizontal.set_margin_top(10);
   m_Frame_Horizontal.set_margin_bottom(10);
 
@@ -54,7 +54,7 @@ Example_ButtonBox::Example_ButtonBox()
   m_VBox.pack_start( *(create_button_box(true, "Start", 40, Gtk::ButtonBoxStyle::START)) );
   m_VBox.pack_start( *(create_button_box(true, "End", 40, Gtk::ButtonBoxStyle::END)) );
 
-  m_VBox_Main.pack_start(m_Frame_Vertical, Gtk::PACK_EXPAND_WIDGET);
+  m_VBox_Main.pack_start(m_Frame_Vertical, Gtk::PackOptions::EXPAND_WIDGET);
 
   m_HBox.property_margin() = 10;
   m_Frame_Vertical.add(m_HBox);
diff --git a/demos/gtk-demo/example_change_display.cc b/demos/gtk-demo/example_change_display.cc
index ad156b8..88e0f15 100644
--- a/demos/gtk-demo/example_change_display.cc
+++ b/demos/gtk-demo/example_change_display.cc
@@ -119,9 +119,9 @@ Example_ChangeDisplay::Example_ChangeDisplay()
   //Display:
   {
     setup_frame(m_Frame_Display, m_TreeView_Display, m_ButtonBox_Display);
-    m_ButtonBox_Display.pack_start(m_Button_Display_Open, Gtk::PACK_SHRINK);
+    m_ButtonBox_Display.pack_start(m_Button_Display_Open, Gtk::PackOptions::SHRINK);
     m_Button_Display_Open.signal_clicked().connect( sigc::mem_fun(*this, 
&Example_ChangeDisplay::on_button_display_open) );
-    m_ButtonBox_Display.pack_start(m_Button_Display_Close, Gtk::PACK_SHRINK);
+    m_ButtonBox_Display.pack_start(m_Button_Display_Close, Gtk::PackOptions::SHRINK);
     m_Button_Display_Close.signal_clicked().connect( sigc::mem_fun(*this, 
&Example_ChangeDisplay::on_button_display_close) );
 
     //Setup TreeView:
@@ -168,7 +168,7 @@ void Example_ChangeDisplay::setup_frame(Gtk::Frame& frame, Gtk::TreeView& treevi
   auto refSelection = treeview.get_selection();
   refSelection->set_mode(Gtk::SelectionMode::BROWSE);
 
-  pHBox->pack_start(buttonbox, Gtk::PACK_SHRINK);
+  pHBox->pack_start(buttonbox, Gtk::PackOptions::SHRINK);
 }
 
 void Example_ChangeDisplay::initialize_displays()
diff --git a/demos/gtk-demo/example_colorsel.cc b/demos/gtk-demo/example_colorsel.cc
index ab8a7c4..20aa481 100644
--- a/demos/gtk-demo/example_colorsel.cc
+++ b/demos/gtk-demo/example_colorsel.cc
@@ -59,7 +59,7 @@ Example_ColorSel::Example_ColorSel()
   m_Button.set_halign(Gtk::Align::END);
   m_Button.set_valign(Gtk::Align::CENTER);
 
-  m_VBox.pack_start(m_Button, Gtk::PACK_SHRINK);
+  m_VBox.pack_start(m_Button, Gtk::PackOptions::SHRINK);
 
   m_Button.signal_clicked().connect(sigc::mem_fun(*this, &Example_ColorSel::on_button_clicked));
 }
diff --git a/demos/gtk-demo/example_dialog.cc b/demos/gtk-demo/example_dialog.cc
index 04847b8..ddf77ff 100644
--- a/demos/gtk-demo/example_dialog.cc
+++ b/demos/gtk-demo/example_dialog.cc
@@ -78,22 +78,22 @@ Example_Dialog::Example_Dialog()
 
 
   /* Standard message dialog */
-  m_VBox.pack_start(m_HBox, Gtk::PACK_SHRINK);
+  m_VBox.pack_start(m_HBox, Gtk::PackOptions::SHRINK);
   m_Button_Message.signal_clicked().connect(sigc::mem_fun(*this, &Example_Dialog::on_button_message));
-  m_HBox.pack_start(m_Button_Message, Gtk::PACK_SHRINK);
-  m_VBox.pack_start(*(Gtk::manage(new Gtk::Separator(Gtk::Orientation::HORIZONTAL))), Gtk::PACK_SHRINK);
+  m_HBox.pack_start(m_Button_Message, Gtk::PackOptions::SHRINK);
+  m_VBox.pack_start(*(Gtk::manage(new Gtk::Separator(Gtk::Orientation::HORIZONTAL))), 
Gtk::PackOptions::SHRINK);
 
 
   /* Interactive dialog*/
-  m_VBox.pack_start(m_HBox2, Gtk::PACK_SHRINK);
+  m_VBox.pack_start(m_HBox2, Gtk::PackOptions::SHRINK);
   m_Button_Interactive.signal_clicked().connect(sigc::mem_fun(*this, 
&Example_Dialog::on_button_interactive));
-  m_HBox2.pack_start(m_VBox2, Gtk::PACK_SHRINK);
-  m_VBox2.pack_start(m_Button_Interactive, Gtk::PACK_SHRINK);
+  m_HBox2.pack_start(m_VBox2, Gtk::PackOptions::SHRINK);
+  m_VBox2.pack_start(m_Button_Interactive, Gtk::PackOptions::SHRINK);
 
 
   m_Grid.set_row_spacing(4);
   m_Grid.set_column_spacing(4);
-  m_HBox2.pack_start(m_Grid, Gtk::PACK_SHRINK);
+  m_HBox2.pack_start(m_Grid, Gtk::PackOptions::SHRINK);
 
   m_Grid.attach(m_Label1, 0, 0, 1, 1);
   m_Grid.attach(m_Entry1, 1, 0, 1, 1);
@@ -142,8 +142,8 @@ Dialog_Interactive::Dialog_Interactive(Gtk::Window& parent, const Glib::ustring&
   add_button("_OK", Gtk::ResponseType::OK);
   add_button("_Cancel", Gtk::ResponseType::CANCEL);
 
-  get_content_area()->pack_start(m_HBox, Gtk::PACK_SHRINK);
-  m_HBox.pack_start(m_Image, Gtk::PACK_SHRINK);
+  get_content_area()->pack_start(m_HBox, Gtk::PackOptions::SHRINK);
+  m_HBox.pack_start(m_Image, Gtk::PackOptions::SHRINK);
 
   m_Grid.set_row_spacing(4);
   m_Grid.set_column_spacing(4);
diff --git a/demos/gtk-demo/example_drawingarea.cc b/demos/gtk-demo/example_drawingarea.cc
index 41bb277..b07856c 100644
--- a/demos/gtk-demo/example_drawingarea.cc
+++ b/demos/gtk-demo/example_drawingarea.cc
@@ -61,7 +61,7 @@ Example_DrawingArea::Example_DrawingArea()
    * Create the checkerboard area
    */
   m_Label_Checkerboard.set_markup("<u>Checkerboard pattern</u>");
-  m_VBox.pack_start(m_Label_Checkerboard, Gtk::PACK_SHRINK);
+  m_VBox.pack_start(m_Label_Checkerboard, Gtk::PackOptions::SHRINK);
 
   m_Frame_Checkerboard.set_shadow_type(Gtk::ShadowType::IN);
   m_VBox.pack_start(m_Frame_Checkerboard);
@@ -78,7 +78,7 @@ Example_DrawingArea::Example_DrawingArea()
    * Create the scribble area
    */
   m_Label_Scribble.set_markup("<u>Scribble area</u>");
-  m_VBox.pack_start(m_Label_Scribble, Gtk::PACK_SHRINK);
+  m_VBox.pack_start(m_Label_Scribble, Gtk::PackOptions::SHRINK);
 
   m_Frame_Scribble.set_shadow_type(Gtk::ShadowType::IN);
   m_VBox.pack_start(m_Frame_Scribble);
diff --git a/demos/gtk-demo/example_iconbrowser.cc b/demos/gtk-demo/example_iconbrowser.cc
index b9285e0..38a419e 100644
--- a/demos/gtk-demo/example_iconbrowser.cc
+++ b/demos/gtk-demo/example_iconbrowser.cc
@@ -211,11 +211,11 @@ Example_IconBrowser::Example_IconBrowser()
 
   // Main part of the window.
   add(m_hbox);
-  m_hbox.pack_start(m_context_list, Gtk::PACK_SHRINK);
+  m_hbox.pack_start(m_context_list, Gtk::PackOptions::SHRINK);
   m_context_list.set_selection_mode(Gtk::SelectionMode::SINGLE);
-  m_hbox.pack_start(m_vseparator, Gtk::PACK_SHRINK);
+  m_hbox.pack_start(m_vseparator, Gtk::PackOptions::SHRINK);
   m_hbox.pack_start(m_vcontent_box);
-  m_vcontent_box.pack_start(m_search_bar, Gtk::PACK_SHRINK);
+  m_vcontent_box.pack_start(m_search_bar, Gtk::PackOptions::SHRINK);
   m_search_bar.add(m_search_entry);
   // The search bar is shown when the search toggle button is pressed.
   m_binding_search_button_search_entry = Glib::Binding::bind_property(
diff --git a/demos/gtk-demo/example_iconview.cc b/demos/gtk-demo/example_iconview.cc
index 43545cc..f331f48 100644
--- a/demos/gtk-demo/example_iconview.cc
+++ b/demos/gtk-demo/example_iconview.cc
@@ -80,7 +80,7 @@ Example_IconView::Example_IconView()
     std::cout << error.what() << std::endl;
   }
 
-  m_VBox.pack_start(m_Toolbar, Gtk::PACK_SHRINK);
+  m_VBox.pack_start(m_Toolbar, Gtk::PackOptions::SHRINK);
 
   m_ButtonUp.set_is_important();
   m_ButtonUp.set_sensitive();
@@ -93,7 +93,7 @@ Example_IconView::Example_IconView()
   m_ScrolledWindow.set_shadow_type(Gtk::ShadowType::ETCHED_IN);
   m_ScrolledWindow.set_policy(Gtk::PolicyType::AUTOMATIC, Gtk::PolicyType::AUTOMATIC);
 
-  m_VBox.pack_start(m_ScrolledWindow, Gtk::PACK_EXPAND_WIDGET);
+  m_VBox.pack_start(m_ScrolledWindow, Gtk::PackOptions::EXPAND_WIDGET);
 
   //Create the data model:
   m_model = Gtk::ListStore::create(m_columns);
diff --git a/demos/gtk-demo/example_images.cc b/demos/gtk-demo/example_images.cc
index 06e4838..e7896f9 100644
--- a/demos/gtk-demo/example_images.cc
+++ b/demos/gtk-demo/example_images.cc
@@ -57,13 +57,13 @@ Example_Images::Example_Images()
   /* Image */
 
   m_Label_Image.set_markup("<u>Image loaded from a file</u>");
-  m_VBox.pack_start(m_Label_Image, Gtk::PACK_SHRINK);
+  m_VBox.pack_start(m_Label_Image, Gtk::PackOptions::SHRINK);
 
   m_Frame_Image.set_shadow_type(Gtk::ShadowType::IN);
 
   m_Frame_Image.set_halign(Gtk::Align::CENTER);
   m_Frame_Image.set_valign(Gtk::Align::CENTER);
-  m_VBox.pack_start(m_Frame_Image, Gtk::PACK_SHRINK);
+  m_VBox.pack_start(m_Frame_Image, Gtk::PackOptions::SHRINK);
 
   auto pImage = Gtk::manage(new Gtk::Image());
   pImage->set_from_resource("/images/gtk-logo-rgb.gif");
@@ -72,13 +72,13 @@ Example_Images::Example_Images()
   /* Animation */
 
   m_Label_Animation.set_markup("<u>Animation loaded from a file</u>");
-  m_VBox.pack_start(m_Label_Animation, Gtk::PACK_SHRINK);
+  m_VBox.pack_start(m_Label_Animation, Gtk::PackOptions::SHRINK);
 
   m_Frame_Animation.set_shadow_type(Gtk::ShadowType::IN);
 
   m_Frame_Animation.set_halign(Gtk::Align::CENTER);
   m_Frame_Animation.set_valign(Gtk::Align::CENTER);
-  m_VBox.pack_start(m_Frame_Animation, Gtk::PACK_SHRINK);
+  m_VBox.pack_start(m_Frame_Animation, Gtk::PackOptions::SHRINK);
 
   pImage = Gtk::manage(new Gtk::Image());
   pImage->set_from_resource("/images/floppybuddy.gif");
@@ -87,11 +87,11 @@ Example_Images::Example_Images()
   /* Progressive */
 
   m_Label_Progressive.set_markup("<u>Progressive image loading</u>");
-  m_VBox.pack_start(m_Label_Progressive, Gtk::PACK_SHRINK);
+  m_VBox.pack_start(m_Label_Progressive, Gtk::PackOptions::SHRINK);
 
   m_Frame_Progressive.set_shadow_type(Gtk::ShadowType::IN);
 
-  m_VBox.pack_start(m_Frame_Progressive, Gtk::PACK_SHRINK);
+  m_VBox.pack_start(m_Frame_Progressive, Gtk::PackOptions::SHRINK);
 
   /* Create an empty image for now; the progressive loader
    * will create the pixbuf and fill it in.
diff --git a/demos/gtk-demo/example_menus.cc b/demos/gtk-demo/example_menus.cc
index c31fd03..f3ac374 100644
--- a/demos/gtk-demo/example_menus.cc
+++ b/demos/gtk-demo/example_menus.cc
@@ -63,7 +63,7 @@ Example_Menus::Example_Menus()
 
   add(m_VBox1);
 
-  m_VBox1.pack_start(m_MenuBar, Gtk::PACK_SHRINK);
+  m_VBox1.pack_start(m_MenuBar, Gtk::PackOptions::SHRINK);
 
   {
     //Note:: It's generally easier to use the Gtk::Builder API.
@@ -111,11 +111,11 @@ Example_Menus::Example_Menus()
     pMenuItem->show();
   }
 
-  m_VBox1.pack_start(m_Separator, Gtk::PACK_SHRINK);
+  m_VBox1.pack_start(m_Separator, Gtk::PackOptions::SHRINK);
 
 
   m_VBox_Sub2.property_margin() = 10;
-  m_VBox1.pack_start(m_VBox_Sub2, Gtk::PACK_SHRINK);
+  m_VBox1.pack_start(m_VBox_Sub2, Gtk::PackOptions::SHRINK);
 
   m_Button.signal_clicked().connect(sigc::mem_fun(*this, &Example_Menus::on_button_clicked));
 
diff --git a/demos/gtk-demo/example_panes.cc b/demos/gtk-demo/example_panes.cc
index 32c7ed1..2366636 100644
--- a/demos/gtk-demo/example_panes.cc
+++ b/demos/gtk-demo/example_panes.cc
@@ -75,8 +75,8 @@ Example_Panes::Example_Panes()
   pFrame3->set_size_request(60, 80);
 
   // Now create check buttons to control sizing
-  pVBox->pack_start(*Gtk::manage(new PaneOptions(*pHPaned, "Horizontal", "Left", "Right")), 
Gtk::PACK_SHRINK);
-  pVBox->pack_start(*Gtk::manage(new PaneOptions(*pVPaned, "Vertical", "Top", "Bottom")),   
Gtk::PACK_SHRINK);
+  pVBox->pack_start(*Gtk::manage(new PaneOptions(*pHPaned, "Horizontal", "Left", "Right")), 
Gtk::PackOptions::SHRINK);
+  pVBox->pack_start(*Gtk::manage(new PaneOptions(*pVPaned, "Vertical", "Top", "Bottom")),   
Gtk::PackOptions::SHRINK);
 }
 
 Example_Panes::~Example_Panes()
diff --git a/demos/gtk-demo/example_sizegroup.cc b/demos/gtk-demo/example_sizegroup.cc
index c1ef187..526904d 100644
--- a/demos/gtk-demo/example_sizegroup.cc
+++ b/demos/gtk-demo/example_sizegroup.cc
@@ -82,7 +82,7 @@ Example_SizeGroup::Example_SizeGroup()
 
   /* And another frame holding line style options
    */
-  m_VBox.pack_start(m_Frame_Line, Gtk::PACK_SHRINK);
+  m_VBox.pack_start(m_Frame_Line, Gtk::PackOptions::SHRINK);
 
   m_Grid_Line.property_margin() = 5;
   m_Grid_Line.set_row_spacing(5);
@@ -105,7 +105,7 @@ Example_SizeGroup::Example_SizeGroup()
   add_row(m_Grid_Line, 1, m_refSizeGroup, "_Line ends", end_options);
 
   /* And a check button to turn grouping on and off */
-  m_VBox.pack_start(m_CheckButton, Gtk::PACK_SHRINK);
+  m_VBox.pack_start(m_CheckButton, Gtk::PackOptions::SHRINK);
   m_CheckButton.set_active();
   m_CheckButton.signal_toggled().connect(sigc::mem_fun(*this, &Example_SizeGroup::on_checkbutton_toggled));
 }
diff --git a/demos/gtk-demo/example_stacksidebar.cc b/demos/gtk-demo/example_stacksidebar.cc
index cd99128..fe9392f 100644
--- a/demos/gtk-demo/example_stacksidebar.cc
+++ b/demos/gtk-demo/example_stacksidebar.cc
@@ -50,9 +50,9 @@ Example_StackSidebar::Example_StackSidebar()
 
   add(m_Box);
 
-  m_Box.pack_start(m_StackSidebar, Gtk::PACK_SHRINK);
-  m_Box.pack_start(m_Separator, Gtk::PACK_SHRINK);
-  m_Box.pack_start(m_Stack, Gtk::PACK_EXPAND_WIDGET);
+  m_Box.pack_start(m_StackSidebar, Gtk::PackOptions::SHRINK);
+  m_Box.pack_start(m_Separator, Gtk::PackOptions::SHRINK);
+  m_Box.pack_start(m_Stack, Gtk::PackOptions::EXPAND_WIDGET);
 
   m_Stack.set_transition_type(Gtk::StackTransitionType::SLIDE_UP_DOWN);
   m_StackSidebar.set_stack(m_Stack);
diff --git a/demos/gtk-demo/example_treeview_editable_cells.cc 
b/demos/gtk-demo/example_treeview_editable_cells.cc
index 54e17ef..d0c81f9 100644
--- a/demos/gtk-demo/example_treeview_editable_cells.cc
+++ b/demos/gtk-demo/example_treeview_editable_cells.cc
@@ -108,7 +108,7 @@ Example_TreeView_EditableCells::Example_TreeView_EditableCells()
 
   m_VBox.property_margin() = 5;
   add(m_VBox);
-  m_VBox.pack_start(m_Label, Gtk::PACK_SHRINK);
+  m_VBox.pack_start(m_Label, Gtk::PackOptions::SHRINK);
 
   m_ScrolledWindow.set_shadow_type(Gtk::ShadowType::ETCHED_IN);
   m_ScrolledWindow.set_policy(Gtk::PolicyType::AUTOMATIC, Gtk::PolicyType::AUTOMATIC);
@@ -126,7 +126,7 @@ Example_TreeView_EditableCells::Example_TreeView_EditableCells()
   m_ScrolledWindow.add(m_TreeView);
 
   /* some buttons */
-  m_VBox.pack_start(m_HBox, Gtk::PACK_SHRINK);
+  m_VBox.pack_start(m_HBox, Gtk::PackOptions::SHRINK);
 
   m_HBox.pack_start(m_Button_Add);
   m_Button_Add.signal_clicked().connect(
diff --git a/demos/gtk-demo/example_treeview_liststore.cc b/demos/gtk-demo/example_treeview_liststore.cc
index befaeed..cfe758f 100644
--- a/demos/gtk-demo/example_treeview_liststore.cc
+++ b/demos/gtk-demo/example_treeview_liststore.cc
@@ -107,7 +107,7 @@ Example_TreeView_ListStore::Example_TreeView_ListStore()
 
   m_VBox.property_margin() = 8;
   add(m_VBox);
-  m_VBox.pack_start(m_Label, Gtk::PACK_SHRINK);
+  m_VBox.pack_start(m_Label, Gtk::PackOptions::SHRINK);
 
   m_ScrolledWindow.set_shadow_type(Gtk::ShadowType::ETCHED_IN);
   m_ScrolledWindow.set_policy(Gtk::PolicyType::NEVER, Gtk::PolicyType::AUTOMATIC);
diff --git a/demos/gtk-demo/example_treeview_treestore.cc b/demos/gtk-demo/example_treeview_treestore.cc
index 59fbc40..e1553c4 100644
--- a/demos/gtk-demo/example_treeview_treestore.cc
+++ b/demos/gtk-demo/example_treeview_treestore.cc
@@ -153,7 +153,7 @@ Example_TreeView_TreeStore::Example_TreeView_TreeStore()
 
   m_VBox.property_margin() = 8;
   add(m_VBox);
-  m_VBox.pack_start(m_Label, Gtk::PACK_SHRINK);
+  m_VBox.pack_start(m_Label, Gtk::PackOptions::SHRINK);
 
   m_ScrolledWindow.set_shadow_type(Gtk::ShadowType::ETCHED_IN);
   m_ScrolledWindow.set_policy(Gtk::PolicyType::AUTOMATIC, Gtk::PolicyType::AUTOMATIC);
diff --git a/gtk/src/bin.ccg b/gtk/src/bin.ccg
index 023c301..7004a85 100644
--- a/gtk/src/bin.ccg
+++ b/gtk/src/bin.ccg
@@ -53,7 +53,7 @@ Bin::add_pixlabel(const std::string& pixfile,
 
   //Put them in a Box:
   auto hbox = manage(new Box(Orientation::HORIZONTAL, 5));
-  hbox->pack_start(*pmap, PACK_SHRINK);
+  hbox->pack_start(*pmap, PackOptions::SHRINK);
   hbox->pack_start(*label);
 
   //And put that Box in this:
diff --git a/gtk/src/box.ccg b/gtk/src/box.ccg
index c2902fa..293b181 100644
--- a/gtk/src/box.ccg
+++ b/gtk/src/box.ccg
@@ -25,8 +25,8 @@ namespace Gtk
 
 void Box::pack_start(Widget& child, PackOptions options)
 {
-  const bool expand = (options == PACK_EXPAND_PADDING) || (options == PACK_EXPAND_WIDGET);
-  const bool fill = (options == PACK_EXPAND_WIDGET);
+  const bool expand = (options == PackOptions::EXPAND_PADDING) || (options == PackOptions::EXPAND_WIDGET);
+  const bool fill = (options == PackOptions::EXPAND_WIDGET);
 
   child.property_hexpand() = expand;
   child.property_halign() = fill ? Gtk::Align::FILL : Gtk::Align::START;
@@ -36,8 +36,8 @@ void Box::pack_start(Widget& child, PackOptions options)
 
 void Box::pack_end(Widget& child, PackOptions options)
 {
-  bool expand = (options == PACK_EXPAND_PADDING) || (options == PACK_EXPAND_WIDGET);
-  bool fill = (options == PACK_EXPAND_WIDGET);
+  const bool expand = (options == PackOptions::EXPAND_PADDING) || (options == PackOptions::EXPAND_WIDGET);
+  const bool fill = (options == PackOptions::EXPAND_WIDGET);
 
   child.property_hexpand() = expand;
   child.property_halign() = fill ? Gtk::Align::FILL : Gtk::Align::END;
diff --git a/gtk/src/box.hg b/gtk/src/box.hg
index 4efcfc9..9fc1f32 100644
--- a/gtk/src/box.hg
+++ b/gtk/src/box.hg
@@ -29,11 +29,11 @@ namespace Gtk
 /** Packing options for adding child widgets to a Box with pack_start() and pack_end().
  * @ingroup gtkmmEnums
  */
-enum PackOptions
+enum class PackOptions
 {
-  PACK_SHRINK, /**< Space is contracted to the child widget size. */
-  PACK_EXPAND_PADDING, /**< Space is expanded, with extra space filled with padding. */
-  PACK_EXPAND_WIDGET /**< Space is expanded, with extra space filled by increasing the child widget size. */
+  SHRINK, /**< Space is contracted to the child widget size. */
+  EXPAND_PADDING, /**< Space is expanded, with extra space filled with padding. */
+  EXPAND_WIDGET /**< Space is expanded, with extra space filled by increasing the child widget size. */
 };
 
 /** The Box widget organizes child widgets into a rectangular area.
diff --git a/tests/delete_cpp_child/main.cc b/tests/delete_cpp_child/main.cc
index 2b0a4c9..199c75c 100644
--- a/tests/delete_cpp_child/main.cc
+++ b/tests/delete_cpp_child/main.cc
@@ -24,13 +24,13 @@ AppWindow::AppWindow()
 
     Gtk::Button* button = Gtk::manage(new Gtk::Button("Delete Label"));
 
-    vbox->pack_start(*button, Gtk::PACK_SHRINK);
+    vbox->pack_start(*button, Gtk::PackOptions::SHRINK);
 
 
     //m_label = manage (new Gtk::Label ("test"));
     m_label = new Gtk::Label("test");
     g_warning("m_label -> ref_count: %d\n", G_OBJECT(m_label->gobj())->ref_count);
-    vbox->pack_start(*m_label, Gtk::PACK_SHRINK);
+    vbox->pack_start(*m_label, Gtk::PackOptions::SHRINK);
     g_warning("m_label -> ref_count: %d\n", G_OBJECT(m_label->gobj())->ref_count);
 
     button->signal_clicked().connect( sigc::mem_fun(*this, &AppWindow::on_button_clicked));
diff --git a/tests/dialog/main.cc b/tests/dialog/main.cc
index caa6598..108072f 100644
--- a/tests/dialog/main.cc
+++ b/tests/dialog/main.cc
@@ -24,13 +24,13 @@ AppWindow::AppWindow()
 
     Gtk::Button* button = Gtk::manage (new Gtk::Button ("Delete Label"));
 
-    vbox->pack_start(*button, Gtk::PACK_SHRINK);
+    vbox->pack_start(*button, Gtk::PackOptions::SHRINK);
 
 
     //m_label = manage (new Gtk::Label ("test"));
     m_label = new Gtk::Label ("test");
     g_warning("m_label -> ref_count: %d\n", G_OBJECT(m_label->gobj())->ref_count);
-    vbox->pack_start(*m_label, Gtk::PACK_SHRINK);
+    vbox->pack_start(*m_label, Gtk::PackOptions::SHRINK);
     g_warning("m_label -> ref_count: %d\n", G_OBJECT(m_label->gobj())->ref_count);
 
     button->signal_clicked ().connect( sigc::mem_fun(*this, &AppWindow::on_button_clicked) );
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]