GNOME.org
 

[gtkmm] demos/tests: pack_start/pack_end() calls: Specify EXPAND_WIDGET.

commit 214be98c94d85aa5ac79031faa5f995e4b797c26
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Apr 27 12:02:37 2017 +0200

    demos/tests: pack_start/pack_end() calls: Specify EXPAND_WIDGET.
    
    Because this was the default value before we had to remove the
    default value.

 demos/gtk-demo/demowindow.cc                      |    2 +-
 demos/gtk-demo/example_change_display.cc          |    6 +++---
 demos/gtk-demo/example_colorsel.cc                |    2 +-
 demos/gtk-demo/example_dialog.cc                  |    2 +-
 demos/gtk-demo/example_drawingarea.cc             |    4 ++--
 demos/gtk-demo/example_iconbrowser.cc             |   10 +++++-----
 demos/gtk-demo/example_menus.cc                   |    4 ++--
 demos/gtk-demo/example_panes.cc                   |    2 +-
 demos/gtk-demo/example_sizegroup.cc               |    4 ++--
 demos/gtk-demo/example_treeview_editable_cells.cc |    6 +++---
 demos/gtk-demo/example_treeview_liststore.cc      |    2 +-
 demos/gtk-demo/example_treeview_treestore.cc      |    2 +-
 tests/child_widget2/main.cc                       |    2 +-
 tests/dialog_deletethis/main.cc                   |    2 +-
 tests/refcount_dialog/main.cc                     |    2 +-
 15 files changed, 26 insertions(+), 26 deletions(-)
---
diff --git a/demos/gtk-demo/demowindow.cc b/demos/gtk-demo/demowindow.cc
index fee21fe..542fde5 100644
--- a/demos/gtk-demo/demowindow.cc
+++ b/demos/gtk-demo/demowindow.cc
@@ -93,7 +93,7 @@ DemoWindow::DemoWindow()
   m_Notebook.append_page(m_TextWidget_Source, "_Source", true);  //true = use mnemonic.
   m_Notebook.child_property_tab_expand(m_TextWidget_Info) = true;
   m_Notebook.child_property_tab_expand(m_TextWidget_Source) = true;
-  m_HBox.pack_start(m_Notebook);
+  m_HBox.pack_start(m_Notebook, Gtk::PackOptions::EXPAND_WIDGET);
 
   set_default_size (800, 600);
 
diff --git a/demos/gtk-demo/example_change_display.cc b/demos/gtk-demo/example_change_display.cc
index 88e0f15..03b8d92 100644
--- a/demos/gtk-demo/example_change_display.cc
+++ b/demos/gtk-demo/example_change_display.cc
@@ -113,7 +113,7 @@ Example_ChangeDisplay::Example_ChangeDisplay()
   set_default_size(300, 400);
 
   m_VBox.property_margin() = 8;
-  get_content_area()->pack_start(m_VBox);
+  get_content_area()->pack_start(m_VBox, Gtk::PackOptions::EXPAND_WIDGET);
 
 
   //Display:
@@ -133,7 +133,7 @@ Example_ChangeDisplay::Example_ChangeDisplay()
     auto refSelection = m_TreeView_Display.get_selection();
     refSelection->signal_changed().connect( sigc::mem_fun(*this, 
&Example_ChangeDisplay::on_treeview_display_selection_changed) );
 
-    m_VBox.pack_start(m_Frame_Display);
+    m_VBox.pack_start(m_Frame_Display, Gtk::PackOptions::EXPAND_WIDGET);
 
     m_refSizeGroup_Display = Gtk::SizeGroup::create(Gtk::SizeGroup::Mode::HORIZONTAL);
     m_refSizeGroup_Display->add_widget(m_ButtonBox_Display);
@@ -160,7 +160,7 @@ void Example_ChangeDisplay::setup_frame(Gtk::Frame& frame, Gtk::TreeView& treevi
   auto pScrolledWindow = Gtk::manage( new Gtk::ScrolledWindow() );
   pScrolledWindow->set_policy(Gtk::PolicyType::NEVER, Gtk::PolicyType::AUTOMATIC);
   pScrolledWindow->set_shadow_type(Gtk::ShadowType::IN);
-  pHBox->pack_start(*pScrolledWindow);
+  pHBox->pack_start(*pScrolledWindow, Gtk::PackOptions::EXPAND_WIDGET);
 
   treeview.set_headers_visible(false);
   pScrolledWindow->add(treeview);
diff --git a/demos/gtk-demo/example_colorsel.cc b/demos/gtk-demo/example_colorsel.cc
index 20aa481..3d685c3 100644
--- a/demos/gtk-demo/example_colorsel.cc
+++ b/demos/gtk-demo/example_colorsel.cc
@@ -44,7 +44,7 @@ Example_ColorSel::Example_ColorSel()
 
   // Create the color swatch area
   m_Frame.set_shadow_type(Gtk::ShadowType::IN);
-  m_VBox.pack_start(m_Frame);
+  m_VBox.pack_start(m_Frame, Gtk::PackOptions::EXPAND_WIDGET);
 
   // set a fixed size
   m_DrawingArea.set_content_width(200);
diff --git a/demos/gtk-demo/example_dialog.cc b/demos/gtk-demo/example_dialog.cc
index ddf77ff..d63fa7d 100644
--- a/demos/gtk-demo/example_dialog.cc
+++ b/demos/gtk-demo/example_dialog.cc
@@ -147,7 +147,7 @@ Dialog_Interactive::Dialog_Interactive(Gtk::Window& parent, const Glib::ustring&
 
   m_Grid.set_row_spacing(4);
   m_Grid.set_column_spacing(4);
-  m_HBox.pack_start(m_Grid);
+  m_HBox.pack_start(m_Grid, Gtk::PackOptions::EXPAND_WIDGET);
 
   m_Grid.attach(m_Label1, 0, 0, 1, 1);
   m_Entry1.set_text(entry1);
diff --git a/demos/gtk-demo/example_drawingarea.cc b/demos/gtk-demo/example_drawingarea.cc
index b07856c..f8a63c7 100644
--- a/demos/gtk-demo/example_drawingarea.cc
+++ b/demos/gtk-demo/example_drawingarea.cc
@@ -64,7 +64,7 @@ Example_DrawingArea::Example_DrawingArea()
   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);
+  m_VBox.pack_start(m_Frame_Checkerboard, Gtk::PackOptions::EXPAND_WIDGET);
 
   /* set a minimum size */
   m_DrawingArea_Checkerboard.set_content_width(100);
@@ -81,7 +81,7 @@ Example_DrawingArea::Example_DrawingArea()
   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);
+  m_VBox.pack_start(m_Frame_Scribble, Gtk::PackOptions::EXPAND_WIDGET);
 
   /* set a minimum size */
   m_DrawingArea_Scribble.set_content_width(100);
diff --git a/demos/gtk-demo/example_iconbrowser.cc b/demos/gtk-demo/example_iconbrowser.cc
index 38a419e..94c60b4 100644
--- a/demos/gtk-demo/example_iconbrowser.cc
+++ b/demos/gtk-demo/example_iconbrowser.cc
@@ -198,8 +198,8 @@ Example_IconBrowser::Example_IconBrowser()
   m_header.pack_end(m_search_button);
   m_search_button.set_image_from_icon_name("edit-find-symbolic", Gtk::BuiltinIconSize::MENU);
   m_header.pack_end(m_header_radio_button_box);
-  m_header_radio_button_box.pack_start(m_normal_radio);
-  m_header_radio_button_box.pack_start(m_symbolic_radio);
+  m_header_radio_button_box.pack_start(m_normal_radio, Gtk::PackOptions::EXPAND_WIDGET);
+  m_header_radio_button_box.pack_start(m_symbolic_radio, Gtk::PackOptions::EXPAND_WIDGET);
   m_normal_radio.set_draw_indicator(false); // Make it look as a normal button
   m_symbolic_radio.set_draw_indicator(false);
   m_symbolic_radio.join_group(m_normal_radio);
@@ -214,7 +214,7 @@ Example_IconBrowser::Example_IconBrowser()
   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::PackOptions::SHRINK);
-  m_hbox.pack_start(m_vcontent_box);
+  m_hbox.pack_start(m_vcontent_box, Gtk::PackOptions::EXPAND_WIDGET);
   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.
@@ -222,7 +222,7 @@ Example_IconBrowser::Example_IconBrowser()
     m_search_button.property_active(),
     m_search_bar.property_search_mode_enabled(),
     Glib::Binding::Flags::BIDIRECTIONAL);
-  m_vcontent_box.pack_start(m_scrolled_window);
+  m_vcontent_box.pack_start(m_scrolled_window, Gtk::PackOptions::EXPAND_WIDGET);
   m_scrolled_window.set_policy(Gtk::PolicyType::NEVER, Gtk::PolicyType::AUTOMATIC);
   m_scrolled_window.add(m_icon_view);
   m_icon_view.set_model(m_filter_model);
@@ -895,7 +895,7 @@ DetailDialog::DetailDialog(Gtk::Window& parent)
 {
   set_resizable(false);
   auto content_area = get_content_area();
-  content_area->pack_start(m_grid);
+  content_area->pack_start(m_grid, Gtk::PackOptions::EXPAND_WIDGET);
   m_grid.property_margin() = 10;
   m_grid.set_row_spacing(10);
   m_grid.set_column_spacing(10);
diff --git a/demos/gtk-demo/example_menus.cc b/demos/gtk-demo/example_menus.cc
index f3ac374..475efcf 100644
--- a/demos/gtk-demo/example_menus.cc
+++ b/demos/gtk-demo/example_menus.cc
@@ -85,7 +85,7 @@ Example_Menus::Example_Menus()
 
 
   m_VBox_Sub1.property_margin() = 10;
-  m_VBox1.pack_start(m_VBox_Sub1);
+  m_VBox1.pack_start(m_VBox_Sub1, Gtk::PackOptions::EXPAND_WIDGET);
 
   {
     auto pMenu = create_menu(1);
@@ -119,7 +119,7 @@ Example_Menus::Example_Menus()
 
   m_Button.signal_clicked().connect(sigc::mem_fun(*this, &Example_Menus::on_button_clicked));
 
-  m_VBox_Sub2.pack_start(m_Button);
+  m_VBox_Sub2.pack_start(m_Button, Gtk::PackOptions::EXPAND_WIDGET);
   m_Button.property_can_default() = true;
   m_Button.grab_default();
 }
diff --git a/demos/gtk-demo/example_panes.cc b/demos/gtk-demo/example_panes.cc
index 2366636..c38c41c 100644
--- a/demos/gtk-demo/example_panes.cc
+++ b/demos/gtk-demo/example_panes.cc
@@ -52,7 +52,7 @@ Example_Panes::Example_Panes()
   add(*Gtk::manage(pVBox));
 
   Gtk::Paned *const pVPaned = new Gtk::Paned(Gtk::Orientation::VERTICAL);
-  pVBox->pack_start(*Gtk::manage(pVPaned));
+  pVBox->pack_start(*Gtk::manage(pVPaned), Gtk::PackOptions::EXPAND_WIDGET);
   pVPaned->property_margin() = 5;
 
   Gtk::Paned *const pHPaned = new Gtk::Paned(Gtk::Orientation::HORIZONTAL);
diff --git a/demos/gtk-demo/example_sizegroup.cc b/demos/gtk-demo/example_sizegroup.cc
index 526904d..6254304 100644
--- a/demos/gtk-demo/example_sizegroup.cc
+++ b/demos/gtk-demo/example_sizegroup.cc
@@ -58,14 +58,14 @@ Example_SizeGroup::Example_SizeGroup()
   set_resizable(false);
   add_button("_Close", Gtk::ResponseType::CLOSE);
 
-  get_content_area()->pack_start(m_VBox);
+  get_content_area()->pack_start(m_VBox, Gtk::PackOptions::EXPAND_WIDGET);
   m_VBox.property_margin() = 5;
 
   m_refSizeGroup = Gtk::SizeGroup::create(Gtk::SizeGroup::Mode::HORIZONTAL),
 
   /* Create one frame holding color options
    */
-  m_VBox.pack_start(m_Frame_Color);
+  m_VBox.pack_start(m_Frame_Color, Gtk::PackOptions::EXPAND_WIDGET);
 
   m_Grid_Color.property_margin() = 5;
   m_Grid_Color.set_row_spacing(5);
diff --git a/demos/gtk-demo/example_treeview_editable_cells.cc 
b/demos/gtk-demo/example_treeview_editable_cells.cc
index d0c81f9..4cdc3ba 100644
--- a/demos/gtk-demo/example_treeview_editable_cells.cc
+++ b/demos/gtk-demo/example_treeview_editable_cells.cc
@@ -112,7 +112,7 @@ Example_TreeView_EditableCells::Example_TreeView_EditableCells()
 
   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);
+  m_VBox.pack_start(m_ScrolledWindow, Gtk::PackOptions::EXPAND_WIDGET);
 
   /* create model */
   create_model();
@@ -128,11 +128,11 @@ Example_TreeView_EditableCells::Example_TreeView_EditableCells()
   /* some buttons */
   m_VBox.pack_start(m_HBox, Gtk::PackOptions::SHRINK);
 
-  m_HBox.pack_start(m_Button_Add);
+  m_HBox.pack_start(m_Button_Add, Gtk::PackOptions::EXPAND_WIDGET);
   m_Button_Add.signal_clicked().connect(
     sigc::mem_fun(*this, &Example_TreeView_EditableCells::on_button_add_clicked));
 
-  m_HBox.pack_start(m_Button_Remove);
+  m_HBox.pack_start(m_Button_Remove, Gtk::PackOptions::EXPAND_WIDGET);
   m_Button_Remove.signal_clicked().connect(
     sigc::mem_fun(*this, &Example_TreeView_EditableCells::on_button_remove_clicked));
 }
diff --git a/demos/gtk-demo/example_treeview_liststore.cc b/demos/gtk-demo/example_treeview_liststore.cc
index cfe758f..817a445 100644
--- a/demos/gtk-demo/example_treeview_liststore.cc
+++ b/demos/gtk-demo/example_treeview_liststore.cc
@@ -111,7 +111,7 @@ Example_TreeView_ListStore::Example_TreeView_ListStore()
 
   m_ScrolledWindow.set_shadow_type(Gtk::ShadowType::ETCHED_IN);
   m_ScrolledWindow.set_policy(Gtk::PolicyType::NEVER, Gtk::PolicyType::AUTOMATIC);
-  m_VBox.pack_start(m_ScrolledWindow);
+  m_VBox.pack_start(m_ScrolledWindow, Gtk::PackOptions::EXPAND_WIDGET);
 
   /* create model */
   create_model();
diff --git a/demos/gtk-demo/example_treeview_treestore.cc b/demos/gtk-demo/example_treeview_treestore.cc
index e1553c4..f2dd404 100644
--- a/demos/gtk-demo/example_treeview_treestore.cc
+++ b/demos/gtk-demo/example_treeview_treestore.cc
@@ -157,7 +157,7 @@ Example_TreeView_TreeStore::Example_TreeView_TreeStore()
 
   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);
+  m_VBox.pack_start(m_ScrolledWindow, Gtk::PackOptions::EXPAND_WIDGET);
 
   /* create model */
   create_model();
diff --git a/tests/child_widget2/main.cc b/tests/child_widget2/main.cc
index 5a45834..6275a77 100644
--- a/tests/child_widget2/main.cc
+++ b/tests/child_widget2/main.cc
@@ -14,7 +14,7 @@ MyWindow::MyWindow() :
   vbox(Gtk::Orientation::VERTICAL)
 {
   add(vbox);
-  vbox.pack_start(b);
+  vbox.pack_start(b, Gtk::PackOptions::EXPAND_WIDGET);
 }
 
 int main (int argc, char *argv[])
diff --git a/tests/dialog_deletethis/main.cc b/tests/dialog_deletethis/main.cc
index c7109d5..7e542b7 100644
--- a/tests/dialog_deletethis/main.cc
+++ b/tests/dialog_deletethis/main.cc
@@ -12,7 +12,7 @@ class Dlg : public sigc::trackable
       dlg_ = new Gtk::Dialog("Test Dialog");
       Gtk::Button *btn = manage(new Gtk::Button("ClickMe"));
       btn->signal_clicked().connect(sigc::mem_fun(*this, &Dlg::on_button_clicked));
-      dlg_->get_content_area()->pack_start(*btn);
+      dlg_->get_content_area()->pack_start(*btn, Gtk::PackOptions::EXPAND_WIDGET);
       dlg_->add_button("_OK", Gtk::ResponseType::OK);
       dlg_->signal_response().connect(sigc::mem_fun(*this, &Dlg::on_response));
       dlg_->show();
diff --git a/tests/refcount_dialog/main.cc b/tests/refcount_dialog/main.cc
index b9b00cf..ce96dc6 100644
--- a/tests/refcount_dialog/main.cc
+++ b/tests/refcount_dialog/main.cc
@@ -31,7 +31,7 @@ MyWindow::MyWindow()
   set_size_request(200, 200);
 
   m_Button.signal_clicked().connect( sigc::mem_fun(*this, &MyWindow::on_button_clicked) );
-  m_Box.pack_start(m_Button);
+  m_Box.pack_start(m_Button, Gtk::PackOptions::EXPAND_WIDGET);
   add(m_Box);
 }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]