GNOME.org
 

[glom/gtkmm4v4] gtkmm4: Adapt to PackOptions as an enum class.

commit e5dbf904bf532b1ceced087b636f9e50c287598e
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Apr 28 09:31:24 2017 +0200

    gtkmm4: Adapt to PackOptions as an enum class.

 glom/appwindow.cc                                  |    2 +-
 glom/filechooser_export.cc                         |    2 +-
 glom/frame_glom.cc                                 |   16 ++++++++--------
 glom/mode_data/box_data_details.cc                 |   16 ++++++++--------
 glom/mode_data/datawidget/datawidget.cc            |    8 ++++----
 glom/mode_data/db_adddel/db_adddel_withbuttons.cc  |    8 ++++----
 glom/mode_data/flowtablewithfields.cc              |    4 ++--
 glom/mode_design/fields/dialog_fielddefinition.cc  |    4 ++--
 .../layout/layout_item_dialogs/box_formatting.cc   |    6 +++---
 .../print_layouts/window_print_layout_edit.cc      |    2 +-
 .../window_relationships_overview.cc               |    2 +-
 glom/mode_find/box_data_details_find.cc            |    2 +-
 glom/mode_find/box_data_list_find.cc               |    4 ++--
 glom/print_layout/canvas_layout_item.cc            |    6 +++---
 glom/utility_widgets/adddel/adddel_withbuttons.cc  |   10 +++++-----
 .../filechooserdialog_saveextras.cc                |    2 +-
 glom/utility_widgets/flowtable.cc                  |    4 ++--
 glom/utility_widgets/notebook_noframe.cc           |   10 +++++-----
 18 files changed, 54 insertions(+), 54 deletions(-)
---
diff --git a/glom/appwindow.cc b/glom/appwindow.cc
index d1aa940..3c01e03 100644
--- a/glom/appwindow.cc
+++ b/glom/appwindow.cc
@@ -120,7 +120,7 @@ AppWindow::AppWindow(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>&
 
   m_menubar = std::make_unique<Gtk::MenuBar>(gmenu);
   m_menubar->show();
-  m_box_top->pack_start(*m_menubar, Gtk::PackOptions::PACK_SHRINK);
+  m_box_top->pack_start(*m_menubar, Gtk::PackOptions::SHRINK);
 
   //TODO: Remove our use of add_accelerator() in application.cc,
   //if there is ever an easier way to make the 'accel's from the .glade file just work.
diff --git a/glom/filechooser_export.cc b/glom/filechooser_export.cc
index 7200efe..08d374e 100644
--- a/glom/filechooser_export.cc
+++ b/glom/filechooser_export.cc
@@ -40,7 +40,7 @@ FileChooser_Export::FileChooser_Export()
   add_button(_("_Cancel"), Gtk::ResponseType::CANCEL);
   add_button(_("_Export"), Gtk::ResponseType::OK);
 
-  m_extra_widget.pack_start(m_button_format, Gtk::PackOptions::PACK_SHRINK);
+  m_extra_widget.pack_start(m_button_format, Gtk::PackOptions::SHRINK);
 
 #ifndef GLOM_ENABLE_CLIENT_ONLY
   m_button_format.signal_clicked().connect(
diff --git a/glom/frame_glom.cc b/glom/frame_glom.cc
index e8fd1a9..060e11d 100644
--- a/glom/frame_glom.cc
+++ b/glom/frame_glom.cc
@@ -112,7 +112,7 @@ Frame_Glom::Frame_Glom(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>
   //We don't use Glade for these, so it easier to modify them for the Maemo port.
   m_box_quick_find = Gtk::manage(new Gtk::Box(Gtk::Orientation::HORIZONTAL, 
Utils::to_utype(UiUtils::DefaultSpacings::SMALL)));
   auto label = Gtk::manage(new Gtk::Label(_("Quick _search:"), true));
-  m_box_quick_find->pack_start(*label, Gtk::PackOptions::PACK_SHRINK);
+  m_box_quick_find->pack_start(*label, Gtk::PackOptions::SHRINK);
 
   m_entry_quick_find = Gtk::manage(new Gtk::Entry());
 
@@ -121,11 +121,11 @@ Frame_Glom::Frame_Glom(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>
 
   label->set_mnemonic_widget(*m_entry_quick_find);
 
-  m_box_quick_find->pack_start(*m_entry_quick_find, Gtk::PackOptions::PACK_EXPAND_WIDGET);
+  m_box_quick_find->pack_start(*m_entry_quick_find, Gtk::PackOptions::EXPAND_WIDGET);
   m_button_quick_find = Gtk::manage(new Gtk::Button(_("_Find"), true));
   m_button_quick_find->signal_clicked().connect(
     sigc::mem_fun(*this, &Frame_Glom::on_button_quickfind) );
-  m_box_quick_find->pack_start(*m_button_quick_find, Gtk::PackOptions::PACK_SHRINK);
+  m_box_quick_find->pack_start(*m_button_quick_find, Gtk::PackOptions::SHRINK);
   m_box_quick_find->hide();
 
   PlaceHolder* placeholder_quickfind = nullptr;
@@ -135,12 +135,12 @@ Frame_Glom::Frame_Glom(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>
 
   //Add the Records/Found widgets at the right of the notebook tabs:
   m_box_records_count.pack_start(
-    *Gtk::manage(new Gtk::Label(_("Records:"))), Gtk::PackOptions::PACK_SHRINK);
-  m_box_records_count.pack_start(m_label_records_count, Gtk::PackOptions::PACK_SHRINK);
+    *Gtk::manage(new Gtk::Label(_("Records:"))), Gtk::PackOptions::SHRINK);
+  m_box_records_count.pack_start(m_label_records_count, Gtk::PackOptions::SHRINK);
   m_box_records_count.pack_start(
-    *Gtk::manage(new Gtk::Label(_("Found:"))), Gtk::PackOptions::PACK_SHRINK);
-  m_box_records_count.pack_start(m_label_found_count, Gtk::PackOptions::PACK_SHRINK);
-  m_box_records_count.pack_start(m_button_find_all, Gtk::PackOptions::PACK_SHRINK);
+    *Gtk::manage(new Gtk::Label(_("Found:"))), Gtk::PackOptions::SHRINK);
+  m_box_records_count.pack_start(m_label_found_count, Gtk::PackOptions::SHRINK);
+  m_box_records_count.pack_start(m_button_find_all, Gtk::PackOptions::SHRINK);
   m_notebook_data.set_action_widget(&m_box_records_count, Gtk::PackType::END);
   m_button_find_all.signal_clicked().connect(
     sigc::mem_fun(*this, &Frame_Glom::on_button_find_all) );
diff --git a/glom/mode_data/box_data_details.cc b/glom/mode_data/box_data_details.cc
index 6e273c5..7caf08d 100644
--- a/glom/mode_data/box_data_details.cc
+++ b/glom/mode_data/box_data_details.cc
@@ -79,7 +79,7 @@ Box_Data_Details::Box_Data_Details(bool bWithNavButtons /* = true */)
   m_ScrolledWindow.set_shadow_type(Gtk::ShadowType::NONE); //ShadowType::IN is Recommended by the GNOME HIG, 
but looks odd.
 
 #ifndef GLOM_ENABLE_CLIENT_ONLY
-  m_hbox_content.pack_start(m_Dragbar, Gtk::PackOptions::PACK_SHRINK);
+  m_hbox_content.pack_start(m_Dragbar, Gtk::PackOptions::SHRINK);
   m_Dragbar.hide();
 #endif
 
@@ -117,8 +117,8 @@ Box_Data_Details::Box_Data_Details(bool bWithNavButtons /* = true */)
   m_Button_Nav_Last.set_tooltip_text(_("View the last record in the list."));
 
   //Add or delete record:
-  m_hbox_buttons.pack_start(m_Button_New, Gtk::PackOptions::PACK_SHRINK);
-  m_hbox_buttons.pack_start(m_Button_Del,  Gtk::PackOptions::PACK_SHRINK);
+  m_hbox_buttons.pack_start(m_Button_New, Gtk::PackOptions::SHRINK);
+  m_hbox_buttons.pack_start(m_Button_Del,  Gtk::PackOptions::SHRINK);
 
   m_hbox_buttons.set_child_secondary(m_Button_New, true);
   m_hbox_buttons.set_child_secondary(m_Button_Del, true);
@@ -130,10 +130,10 @@ Box_Data_Details::Box_Data_Details(bool bWithNavButtons /* = true */)
   //Navigation:
   if(bWithNavButtons)
   {
-    m_hbox_buttons.pack_start(m_Button_Nav_First, Gtk::PackOptions::PACK_SHRINK);
-    m_hbox_buttons.pack_start(m_Button_Nav_Prev, Gtk::PackOptions::PACK_SHRINK);
-    m_hbox_buttons.pack_start(m_Button_Nav_Next, Gtk::PackOptions::PACK_SHRINK);
-    m_hbox_buttons.pack_start(m_Button_Nav_Last, Gtk::PackOptions::PACK_SHRINK);
+    m_hbox_buttons.pack_start(m_Button_Nav_First, Gtk::PackOptions::SHRINK);
+    m_hbox_buttons.pack_start(m_Button_Nav_Prev, Gtk::PackOptions::SHRINK);
+    m_hbox_buttons.pack_start(m_Button_Nav_Next, Gtk::PackOptions::SHRINK);
+    m_hbox_buttons.pack_start(m_Button_Nav_Last, Gtk::PackOptions::SHRINK);
   }
 
   //Link buttons to handlers:
@@ -142,7 +142,7 @@ Box_Data_Details::Box_Data_Details(bool bWithNavButtons /* = true */)
   m_Button_Nav_Next.signal_clicked().connect(sigc::mem_fun(*this, &Box_Data_Details::on_button_nav_next));
   m_Button_Nav_Last.signal_clicked().connect(sigc::mem_fun(*this, &Box_Data_Details::on_button_nav_last));
 
-  pack_start(m_hbox_buttons, Gtk::PackOptions::PACK_SHRINK);
+  pack_start(m_hbox_buttons, Gtk::PackOptions::SHRINK);
 
   m_ignore_signals = false;
 }
diff --git a/glom/mode_data/datawidget/datawidget.cc b/glom/mode_data/datawidget/datawidget.cc
index faefaf2..f48ac96 100644
--- a/glom/mode_data/datawidget/datawidget.cc
+++ b/glom/mode_data/datawidget/datawidget.cc
@@ -211,7 +211,7 @@ DataWidget::DataWidget(const std::shared_ptr<LayoutItem_Field>& field, const Gli
       auto button_date = Gtk::manage(new Gtk::Button(_("..."))); //TODO: A better label/icon for "Choose 
Date".
       button_date->set_tooltip_text(_("Choose a date from an on-screen calendar."));
       button_date->show();
-      hbox_parent->pack_start(*button_date, Gtk::PackOptions::PACK_SHRINK);
+      hbox_parent->pack_start(*button_date, Gtk::PackOptions::SHRINK);
       button_date->signal_clicked().connect(sigc::mem_fun(*this, &DataWidget::on_button_choose_date));
     }
 
@@ -220,7 +220,7 @@ DataWidget::DataWidget(const std::shared_ptr<LayoutItem_Field>& field, const Gli
       //Add a button for related record navigation:
       m_button_go_to_details = Gtk::manage(new Gtk::Button(_("_Open"), true));
       m_button_go_to_details->set_tooltip_text(_("Open the record identified by this ID, in the other 
table."));
-      hbox_parent->pack_start(*m_button_go_to_details, Gtk::PackOptions::PACK_SHRINK);
+      hbox_parent->pack_start(*m_button_go_to_details, Gtk::PackOptions::SHRINK);
       m_button_go_to_details->signal_clicked().connect(sigc::mem_fun(*this, 
&DataWidget::on_button_open_details));
 
       //Add an additional button to make it easier to choose an ID for this field.
@@ -230,12 +230,12 @@ DataWidget::DataWidget(const std::shared_ptr<LayoutItem_Field>& field, const Gli
       {
         auto button_select = Gtk::manage(new Gtk::Button(_("_Find"), true));
         button_select->set_tooltip_text(_("Enter search criteria to identify records in the other table, to 
choose an ID for this field."));
-        hbox_parent->pack_start(*button_select, Gtk::PackOptions::PACK_SHRINK);
+        hbox_parent->pack_start(*button_select, Gtk::PackOptions::SHRINK);
         button_select->signal_clicked().connect(sigc::mem_fun(*this, &DataWidget::on_button_select_id));
 
         auto button_new = Gtk::manage(new Gtk::Button(_("_New"), true));
         button_new->set_tooltip_text(_("Enter details for a new record in the other table, then use its ID 
for this field."));
-        hbox_parent->pack_start(*button_new, Gtk::PackOptions::PACK_SHRINK);
+        hbox_parent->pack_start(*button_new, Gtk::PackOptions::SHRINK);
         button_new->signal_clicked().connect(sigc::mem_fun(*this, &DataWidget::on_button_new_id));
       }
     }
diff --git a/glom/mode_data/db_adddel/db_adddel_withbuttons.cc 
b/glom/mode_data/db_adddel/db_adddel_withbuttons.cc
index ba02122..723a0f8 100644
--- a/glom/mode_data/db_adddel/db_adddel_withbuttons.cc
+++ b/glom/mode_data/db_adddel/db_adddel_withbuttons.cc
@@ -36,18 +36,18 @@ DbAddDel_WithButtons::DbAddDel_WithButtons()
   m_ButtonBox.set_spacing(Utils::to_utype(UiUtils::DefaultSpacings::SMALL));
 
   setup_buttons();
-  pack_start(m_ButtonBox, Gtk::PackOptions::PACK_SHRINK);
+  pack_start(m_ButtonBox, Gtk::PackOptions::SHRINK);
 
   //Link buttons to handlers:
 
   m_Button_Add.signal_clicked().connect(sigc::mem_fun(*this, &DbAddDel_WithButtons::on_button_add));
-  m_ButtonBox.pack_end(m_Button_Add, Gtk::PackOptions::PACK_SHRINK);
+  m_ButtonBox.pack_end(m_Button_Add, Gtk::PackOptions::SHRINK);
 
   m_Button_Del.signal_clicked().connect(sigc::mem_fun(*this, &DbAddDel_WithButtons::on_button_del));
   m_Button_Edit.signal_clicked().connect(sigc::mem_fun(*this, &DbAddDel_WithButtons::on_button_edit));
 
-  m_ButtonBox.pack_end(m_Button_Del, Gtk::PackOptions::PACK_SHRINK);
-  m_ButtonBox.pack_end(m_Button_Edit, Gtk::PackOptions::PACK_SHRINK);
+  m_ButtonBox.pack_end(m_Button_Del, Gtk::PackOptions::SHRINK);
+  m_ButtonBox.pack_end(m_Button_Edit, Gtk::PackOptions::SHRINK);
 
   setup_buttons();
 }
diff --git a/glom/mode_data/flowtablewithfields.cc b/glom/mode_data/flowtablewithfields.cc
index afaf5ef..e1e260a 100644
--- a/glom/mode_data/flowtablewithfields.cc
+++ b/glom/mode_data/flowtablewithfields.cc
@@ -546,9 +546,9 @@ void FlowTableWithFields::add_button(const std::shared_ptr<LayoutItem_Button>& l
     auto box_button = Gtk::manage(new Gtk::Box(Gtk::Orientation::HORIZONTAL));
     box_button->show();
     if(alignment == Formatting::HorizontalAlignment::RIGHT)
-      box_button->pack_end(*button, Gtk::PackOptions::PACK_SHRINK);
+      box_button->pack_end(*button, Gtk::PackOptions::SHRINK);
     else
-      box_button->pack_start(*button, Gtk::PackOptions::PACK_SHRINK);
+      box_button->pack_start(*button, Gtk::PackOptions::SHRINK);
 
     widget_to_add = box_button;
     expand = true;
diff --git a/glom/mode_design/fields/dialog_fielddefinition.cc 
b/glom/mode_design/fields/dialog_fielddefinition.cc
index 7607f94..cf3efc5 100644
--- a/glom/mode_design/fields/dialog_fielddefinition.cc
+++ b/glom/mode_design/fields/dialog_fielddefinition.cc
@@ -153,10 +153,10 @@ void Dialog_FieldDefinition::set_field(const std::shared_ptr<const Field>& field
   if(!pLabel->get_text().empty())
   {
     pLabel->set_valign(Gtk::Align::START); //Because the widget might be multiline.
-    m_box_default_value_simple->pack_start(*pLabel, Gtk::PackOptions::PACK_SHRINK);
+    m_box_default_value_simple->pack_start(*pLabel, Gtk::PackOptions::SHRINK);
   }
 
-  m_box_default_value_simple->pack_end(*m_data_idget_default_value_simple, 
Gtk::PackOptions::PACK_EXPAND_WIDGET);
+  m_box_default_value_simple->pack_end(*m_data_idget_default_value_simple, Gtk::PackOptions::EXPAND_WIDGET);
   m_data_idget_default_value_simple->set_value(default_value);
   m_data_idget_default_value_simple->show();
 
diff --git a/glom/mode_design/layout/layout_item_dialogs/box_formatting.cc 
b/glom/mode_design/layout/layout_item_dialogs/box_formatting.cc
index fd8b6d6..be177c3 100644
--- a/glom/mode_design/layout/layout_item_dialogs/box_formatting.cc
+++ b/glom/mode_design/layout/layout_item_dialogs/box_formatting.cc
@@ -200,13 +200,13 @@ void Box_Formatting::set_is_for_non_editable()
   //Add labels (because we will hide the checkboxes):
   auto label = Gtk::manage(new Gtk::Label(_("Font")));
   label->show();
-  m_hbox_font->pack_start(*label, Gtk::PackOptions::PACK_SHRINK);
+  m_hbox_font->pack_start(*label, Gtk::PackOptions::SHRINK);
   label = Gtk::manage(new Gtk::Label(_("Foreground Color")));
   label->show();
-  m_hbox_color_foreground->pack_start(*label, Gtk::PackOptions::PACK_SHRINK);
+  m_hbox_color_foreground->pack_start(*label, Gtk::PackOptions::SHRINK);
   label = Gtk::manage(new Gtk::Label(_("Background Color")));
   label->show();
-  m_hbox_color_background->pack_start(*label, Gtk::PackOptions::PACK_SHRINK);
+  m_hbox_color_background->pack_start(*label, Gtk::PackOptions::SHRINK);
 
   enforce_constraints();
 }
diff --git a/glom/mode_design/print_layouts/window_print_layout_edit.cc 
b/glom/mode_design/print_layouts/window_print_layout_edit.cc
index 7c1078d..dd056c5 100644
--- a/glom/mode_design/print_layouts/window_print_layout_edit.cc
+++ b/glom/mode_design/print_layouts/window_print_layout_edit.cc
@@ -281,7 +281,7 @@ void Window_PrintLayout_Edit::init_menu()
   //Menubar:
   auto menubar = std::make_unique<Gtk::MenuBar>(gmenu);
   menubar->show();
-  m_box_menu->pack_start(*(Gtk::manage(menubar.release())), Gtk::PackOptions::PACK_SHRINK);
+  m_box_menu->pack_start(*(Gtk::manage(menubar.release())), Gtk::PackOptions::SHRINK);
 
 
   //TODO: Create a generic checking method to test that
diff --git a/glom/mode_design/relationships_overview/window_relationships_overview.cc 
b/glom/mode_design/relationships_overview/window_relationships_overview.cc
index 08194a3..84910c7 100644
--- a/glom/mode_design/relationships_overview/window_relationships_overview.cc
+++ b/glom/mode_design/relationships_overview/window_relationships_overview.cc
@@ -84,7 +84,7 @@ Window_RelationshipsOverview::Window_RelationshipsOverview(BaseObjectType* cobje
 
   auto menu = std::make_unique<Gtk::MenuBar>(gmenu);
   menu->show();
-  vbox->pack_start(*(Gtk::manage(menu.release())), Gtk::PackOptions::PACK_SHRINK);
+  vbox->pack_start(*(Gtk::manage(menu.release())), Gtk::PackOptions::SHRINK);
 
 
   //Get the scolled window and add the canvas to it:
diff --git a/glom/mode_find/box_data_details_find.cc b/glom/mode_find/box_data_details_find.cc
index 504958d..1575d6c 100644
--- a/glom/mode_find/box_data_details_find.cc
+++ b/glom/mode_find/box_data_details_find.cc
@@ -30,7 +30,7 @@ Box_Data_Details_Find::Box_Data_Details_Find()
 : Box_Data_Details(false)
 {
   //Instead of nav buttons:
-  m_hbox_buttons.pack_end(m_Button_Find, Gtk::PackOptions::PACK_SHRINK);
+  m_hbox_buttons.pack_end(m_Button_Find, Gtk::PackOptions::SHRINK);
 
   //A signal handler is connected in the Box_Data base class.
   m_Button_Find.set_can_default();
diff --git a/glom/mode_find/box_data_list_find.cc b/glom/mode_find/box_data_list_find.cc
index 5727643..ba4ddc3 100644
--- a/glom/mode_find/box_data_list_find.cc
+++ b/glom/mode_find/box_data_list_find.cc
@@ -31,8 +31,8 @@ Box_Data_List_Find::Box_Data_List_Find()
 {
   //m_strHint = _("Enter the search criteria and click [Find]\n Glom will then change to Data mode to 
display the results.");
 
-  m_HBox.pack_end(m_Button_Find, Gtk::PackOptions::PACK_SHRINK);
-  pack_start(m_HBox, Gtk::PackOptions::PACK_SHRINK);
+  m_HBox.pack_end(m_Button_Find, Gtk::PackOptions::SHRINK);
+  pack_start(m_HBox, Gtk::PackOptions::SHRINK);
 
   //A signal handler is connected in the Box_Data base class.
   m_Button_Find.set_can_default();
diff --git a/glom/print_layout/canvas_layout_item.cc b/glom/print_layout/canvas_layout_item.cc
index 63d7197..b492c2f 100644
--- a/glom/print_layout/canvas_layout_item.cc
+++ b/glom/print_layout/canvas_layout_item.cc
@@ -374,7 +374,7 @@ void CanvasLayoutItem::add_portal_rows_if_necessary(const Glib::RefPtr<CanvasTab
             canvas_table->attach(cell_as_item,
               col /* left_attach */, col + 1 /* right_attach */,
               row /* top_attach */, row + 1 /* right_attach */,
-              Gtk::PackOptions::PACK_EXPAND_WIDGET, Gtk::PackOptions::PACK_EXPAND_WIDGET);
+              Gtk::PackOptions::EXPAND_WIDGET, Gtk::PackOptions::EXPAND_WIDGET);
 
             something_expanded = true;
         }
@@ -388,7 +388,7 @@ void CanvasLayoutItem::add_portal_rows_if_necessary(const Glib::RefPtr<CanvasTab
             canvas_table->attach(cell_as_item,
               col /* left_attach */, col + 1 /* right_attach */,
               row /* top_attach */, row + 1 /* right_attach */,
-              Gtk::PackOptions::PACK_EXPAND_PADDING, Gtk::PackOptions::PACK_EXPAND_WIDGET);
+              Gtk::PackOptions::EXPAND_PADDING, Gtk::PackOptions::EXPAND_WIDGET);
 
             //Add a second item (an invisible rect) to make sure that the size is really used:
             auto rect =
@@ -399,7 +399,7 @@ void CanvasLayoutItem::add_portal_rows_if_necessary(const Glib::RefPtr<CanvasTab
             canvas_table->attach(rect,
               col /* left_attach */, col + 1 /* right_attach */,
               row /* top_attach */, row + 1 /* right_attach */,
-              Gtk::PackOptions::PACK_SHRINK, Gtk::PackOptions::PACK_SHRINK);
+              Gtk::PackOptions::SHRINK, Gtk::PackOptions::SHRINK);
         }
       }
 
diff --git a/glom/utility_widgets/adddel/adddel_withbuttons.cc 
b/glom/utility_widgets/adddel/adddel_withbuttons.cc
index a7b2458..154b280 100644
--- a/glom/utility_widgets/adddel/adddel_withbuttons.cc
+++ b/glom/utility_widgets/adddel/adddel_withbuttons.cc
@@ -57,7 +57,7 @@ void AddDel_WithButtons::init()
   //m_Button_Edit.set_margin(Utils::to_utype(UiUtils::DefaultSpacings::SMALL));
 
   setup_buttons();
-  pack_start(m_ButtonBox, Gtk::PackOptions::PACK_SHRINK);
+  pack_start(m_ButtonBox, Gtk::PackOptions::SHRINK);
 
   //Link buttons to handlers:
   m_Button_Add.signal_clicked().connect(sigc::mem_fun(*this, &AddDel_WithButtons::on_button_add));
@@ -155,16 +155,16 @@ void AddDel_WithButtons::setup_buttons()
   if(!get_allow_user_actions())
     return;
 
-  m_ButtonBox.pack_end(m_Button_Add, Gtk::PackOptions::PACK_SHRINK);
+  m_ButtonBox.pack_end(m_Button_Add, Gtk::PackOptions::SHRINK);
   m_Button_Add.show();
 
-  m_ButtonBox.pack_end(m_Button_Del, Gtk::PackOptions::PACK_SHRINK);
+  m_ButtonBox.pack_end(m_Button_Del, Gtk::PackOptions::SHRINK);
   m_Button_Del.show();
 
-  m_ButtonBox.pack_end(m_Button_Edit, Gtk::PackOptions::PACK_SHRINK);
+  m_ButtonBox.pack_end(m_Button_Edit, Gtk::PackOptions::SHRINK);
   m_Button_Edit.show();
 
-  m_ButtonBox.pack_end(m_Button_Extra, Gtk::PackOptions::PACK_SHRINK);
+  m_ButtonBox.pack_end(m_Button_Extra, Gtk::PackOptions::SHRINK);
   if(!m_label_extra.empty())
     m_Button_Extra.show();
   else
diff --git a/glom/utility_widgets/filechooserdialog_saveextras.cc 
b/glom/utility_widgets/filechooserdialog_saveextras.cc
index f1ed46b..9a115d9 100644
--- a/glom/utility_widgets/filechooserdialog_saveextras.cc
+++ b/glom/utility_widgets/filechooserdialog_saveextras.cc
@@ -82,7 +82,7 @@ void FileChooserDialog_SaveExtras::create_child_widgets()
 
   auto box_label = Gtk::manage(new Gtk::Box(Gtk::Orientation::HORIZONTAL, 
Utils::to_utype(UiUtils::DefaultSpacings::LARGE)));
   auto label_title = Gtk::manage(new Gtk::Label(_("_Title:"), true));
-  box_label->pack_start(*label_title, Gtk::PackOptions::PACK_SHRINK);
+  box_label->pack_start(*label_title, Gtk::PackOptions::SHRINK);
   label_title->show();
   box_label->pack_start(m_entry_title);
   m_entry_title.get_accessible()->set_name(_("Title"));
diff --git a/glom/utility_widgets/flowtable.cc b/glom/utility_widgets/flowtable.cc
index 9c36782..396e2e9 100644
--- a/glom/utility_widgets/flowtable.cc
+++ b/glom/utility_widgets/flowtable.cc
@@ -138,8 +138,8 @@ void FlowTable::insert(Gtk::Widget* first, Gtk::Widget* second, int index, bool
     auto hbox = new Gtk::Box(Gtk::Orientation::HORIZONTAL, get_horizontal_spacing());
     m_list_hboxes.emplace_back(hbox); //So we can delete it whenever necessary.
 
-    hbox->pack_start(*first, Gtk::PackOptions::PACK_SHRINK);
-    hbox->pack_start(*second, expand ? Gtk::PackOptions::PACK_EXPAND_WIDGET : Gtk::PackOptions::PACK_SHRINK);
+    hbox->pack_start(*first, Gtk::PackOptions::SHRINK);
+    hbox->pack_start(*second, expand ? Gtk::PackOptions::EXPAND_WIDGET : Gtk::PackOptions::SHRINK);
     hbox->show();
 
     hbox->set_halign(Gtk::Align::FILL);
diff --git a/glom/utility_widgets/notebook_noframe.cc b/glom/utility_widgets/notebook_noframe.cc
index 18e64da..0e206ad 100644
--- a/glom/utility_widgets/notebook_noframe.cc
+++ b/glom/utility_widgets/notebook_noframe.cc
@@ -35,10 +35,10 @@ NotebookNoFrame::NotebookNoFrame()
 
   m_box_top.set_orientation(Gtk::Orientation::HORIZONTAL);
   m_box_top.set_spacing(Utils::to_utype(UiUtils::DefaultSpacings::SMALL));
-  m_box_top.pack_start(m_box_action_left, Gtk::PackOptions::PACK_SHRINK);
+  m_box_top.pack_start(m_box_action_left, Gtk::PackOptions::SHRINK);
   m_box_top.pack_start(m_box_tabs);
-  m_box_top.pack_end(m_box_action_right, Gtk::PackOptions::PACK_SHRINK);
-  pack_start(m_box_top, Gtk::PackOptions::PACK_SHRINK);
+  m_box_top.pack_end(m_box_action_right, Gtk::PackOptions::SHRINK);
+  pack_start(m_box_top, Gtk::PackOptions::SHRINK);
 
   m_box_top.show();
 
@@ -109,12 +109,12 @@ void NotebookNoFrame::set_action_widget(Gtk::Widget* widget, Gtk::PackType pack_
 {
   if(pack_type == Gtk::PackType::START)
   {
-    m_box_action_left.pack_start(*widget, Gtk::PackOptions::PACK_SHRINK);
+    m_box_action_left.pack_start(*widget, Gtk::PackOptions::SHRINK);
     m_box_action_left.show();
   }
   else
   {
-    m_box_action_right.pack_end(*widget, Gtk::PackOptions::PACK_SHRINK);
+    m_box_action_right.pack_end(*widget, Gtk::PackOptions::SHRINK);
     m_box_action_right.show();
   }
 }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]