GNOME.org
 

[gtkmm-documentation] Adapt to pack_start/end() without padding parameter.

commit add86f89b3703aaebce0e04d40d049e7e9aa62c2
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed May 3 10:34:47 2017 +0200

    Adapt to pack_start/end() without padding parameter.
    
    We need to check the actual behaviour at runtime for all these examples,
    and maybe then simplify the code.

 examples/book/buttonbox/examplewindow.cc   |   20 ++++++++++++--------
 examples/book/progressbar/examplewindow.cc |    3 ++-
 examples/book/revealer/examplewindow.cc    |    8 +++++---
 examples/book/searchbar/examplewindow.cc   |   16 +++++++++++-----
 examples/book/spinbutton/examplewindow.cc  |   24 ++++++++++++++----------
 examples/others/calendar/calendar.cc       |   20 +++++++++++++-------
 6 files changed, 57 insertions(+), 34 deletions(-)
---
diff --git a/examples/book/buttonbox/examplewindow.cc b/examples/book/buttonbox/examplewindow.cc
index 027d903..824de91 100644
--- a/examples/book/buttonbox/examplewindow.cc
+++ b/examples/book/buttonbox/examplewindow.cc
@@ -25,14 +25,17 @@ ExampleWindow::ExampleWindow()
 {
   set_title("Gtk::ButtonBox");
   m_VBox_Main.set_margin(10);
+  m_VBox_Main.set_spacing(10);
   add(m_VBox_Main);
 
-  m_VBox_Main.pack_start(m_Frame_Horizontal, Gtk::PackOptions::EXPAND_WIDGET, 10);
+  m_VBox_Main.pack_start(m_Frame_Horizontal, Gtk::PackOptions::EXPAND_WIDGET);
+  m_VBox_Main.set_margin_start(10);
 
   //The horizontal ButtonBoxes:
   m_VBox.set_margin(10);
   m_Frame_Horizontal.add(m_VBox);
 
+  m_VBox.set_spacing(5);
   m_VBox.pack_start(*Gtk::manage(
               new ExampleButtonBox(true, "Spread (spacing 40)", 40,
                   Gtk::ButtonBoxStyle::SPREAD)),
@@ -41,25 +44,26 @@ ExampleWindow::ExampleWindow()
   m_VBox.pack_start(*Gtk::manage(
               new ExampleButtonBox(true, "Edge (spacing 30)", 30,
                   Gtk::ButtonBoxStyle::EDGE)),
-          Gtk::PackOptions::EXPAND_WIDGET, 5);
+          Gtk::PackOptions::EXPAND_WIDGET);
 
   m_VBox.pack_start(*Gtk::manage(
               new ExampleButtonBox(true, "Start (spacing 20)", 20,
                   Gtk::ButtonBoxStyle::START)),
-          Gtk::PackOptions::EXPAND_WIDGET, 5);
+          Gtk::PackOptions::EXPAND_WIDGET);
 
   m_VBox.pack_start(*Gtk::manage(
               new ExampleButtonBox(true, "End (spacing 10)", 10,
                   Gtk::ButtonBoxStyle::END)),
-          Gtk::PackOptions::EXPAND_WIDGET, 5);
+          Gtk::PackOptions::EXPAND_WIDGET);
 
 
   //The vertical ButtonBoxes:
-  m_VBox_Main.pack_start(m_Frame_Vertical, Gtk::PackOptions::EXPAND_WIDGET, 10);
+  m_VBox_Main.pack_start(m_Frame_Vertical, Gtk::PackOptions::EXPAND_WIDGET);
 
   m_HBox.set_margin(10);
   m_Frame_Vertical.add(m_HBox);
 
+  m_HBox.set_spacing(5);
   m_HBox.pack_start(*Gtk::manage(
               new ExampleButtonBox(false, "Spread (spacing 5)", 5,
                   Gtk::ButtonBoxStyle::SPREAD)),
@@ -68,16 +72,16 @@ ExampleWindow::ExampleWindow()
   m_HBox.pack_start(*Gtk::manage(
               new ExampleButtonBox(false, "Edge (spacing 30)", 30,
                   Gtk::ButtonBoxStyle::EDGE)),
-          Gtk::PackOptions::EXPAND_WIDGET, 5);
+          Gtk::PackOptions::EXPAND_WIDGET);
 
   m_HBox.pack_start(*Gtk::manage(
               new ExampleButtonBox(false, "Start (spacing 20)", 20,
                   Gtk::ButtonBoxStyle::START)),
-          Gtk::PackOptions::EXPAND_WIDGET, 5);
+          Gtk::PackOptions::EXPAND_WIDGET);
 
   m_HBox.pack_start(*Gtk::manage(new ExampleButtonBox(false, "End (spacing 10)",
                   10, Gtk::ButtonBoxStyle::END)),
-          Gtk::PackOptions::EXPAND_WIDGET, 5);
+          Gtk::PackOptions::EXPAND_WIDGET);
 }
 
 ExampleWindow::~ExampleWindow()
diff --git a/examples/book/progressbar/examplewindow.cc b/examples/book/progressbar/examplewindow.cc
index 99d87c8..748af53 100644
--- a/examples/book/progressbar/examplewindow.cc
+++ b/examples/book/progressbar/examplewindow.cc
@@ -31,7 +31,8 @@ ExampleWindow::ExampleWindow()
   m_VBox.set_margin(10);
   add(m_VBox);
 
-  m_VBox.pack_start(m_ProgressBar, Gtk::PackOptions::SHRINK, 5);
+  m_VBox.pack_start(m_ProgressBar, Gtk::PackOptions::SHRINK);
+  m_ProgressBar.set_margin_end(5);
   m_ProgressBar.set_halign(Gtk::Align::CENTER);
   m_ProgressBar.set_valign(Gtk::Align::CENTER);
   m_ProgressBar.set_size_request(100, -1);
diff --git a/examples/book/revealer/examplewindow.cc b/examples/book/revealer/examplewindow.cc
index bb089f2..068b8aa 100644
--- a/examples/book/revealer/examplewindow.cc
+++ b/examples/book/revealer/examplewindow.cc
@@ -52,9 +52,11 @@ ExampleWindow::ExampleWindow()
   // Layout
   m_controls.set_row_spacing(6);
   m_controls.set_column_spacing(12);
-  m_vbox.pack_start(m_controls, Gtk::PackOptions::SHRINK, 0);
-  m_vbox.pack_start(m_separator, Gtk::PackOptions::SHRINK, 12);
-  m_vbox.pack_start(m_revealer, Gtk::PackOptions::EXPAND_WIDGET, 6);
+  m_vbox.pack_start(m_controls, Gtk::PackOptions::SHRINK);
+  m_vbox.pack_start(m_separator, Gtk::PackOptions::SHRINK);
+  m_separator.set_margin_start(12);
+  m_separator.set_margin_end(18);
+  m_vbox.pack_start(m_revealer, Gtk::PackOptions::EXPAND_WIDGET);
   m_vbox.set_margin(12);
   add(m_vbox);
 }
diff --git a/examples/book/searchbar/examplewindow.cc b/examples/book/searchbar/examplewindow.cc
index 13330dd..c49ecc6 100644
--- a/examples/book/searchbar/examplewindow.cc
+++ b/examples/book/searchbar/examplewindow.cc
@@ -59,7 +59,8 @@ ExampleWindow::ExampleWindow()
   m_up_down_box.pack_start(m_go_down_button, Gtk::PackOptions::SHRINK);
   m_up_down_box.pack_start(m_go_up_button, Gtk::PackOptions::SHRINK);
   m_search_box.pack_end(m_up_down_box, Gtk::PackOptions::SHRINK);
-  m_search_box.pack_start(m_entry, Gtk::PackOptions::EXPAND_WIDGET, 6);
+  m_search_box.pack_start(m_entry, Gtk::PackOptions::EXPAND_WIDGET);
+  m_search_box.set_spacing(6);
   m_search_bar.add(m_search_box);
 
   // Match style of epiphany's search bar
@@ -70,10 +71,15 @@ ExampleWindow::ExampleWindow()
   m_go_up_button.set_image_from_icon_name("go-up-symbolic", Gtk::BuiltinIconSize::BUTTON, true);
   m_go_down_button.set_image_from_icon_name("go-down-symbolic", Gtk::BuiltinIconSize::BUTTON, true);
 
-  m_vbox.pack_start(m_search_bar, Gtk::PackOptions::SHRINK, 6);
-  m_vbox.pack_start(m_label, Gtk::PackOptions::SHRINK, 6);
-  m_vbox.pack_start(m_separator, Gtk::PackOptions::SHRINK, 12);
-  m_vbox.pack_start(m_options_grid, Gtk::PackOptions::SHRINK, 12);
+  m_vbox.set_spacing(6);
+  m_vbox.pack_start(m_search_bar, Gtk::PackOptions::SHRINK);
+  m_vbox.pack_start(m_label, Gtk::PackOptions::SHRINK);
+  m_vbox.pack_start(m_separator, Gtk::PackOptions::SHRINK);
+  m_separator.set_margin_start(6);
+  m_separator.set_margin_end(6);
+  m_vbox.pack_start(m_options_grid, Gtk::PackOptions::SHRINK);
+  m_options_grid.set_margin_start(6);
+  m_options_grid.set_margin_end(6);
   m_vbox.set_margin(12);
   add(m_vbox);
 }
diff --git a/examples/book/spinbutton/examplewindow.cc b/examples/book/spinbutton/examplewindow.cc
index 0fdbd00..d800ec3 100644
--- a/examples/book/spinbutton/examplewindow.cc
+++ b/examples/book/spinbutton/examplewindow.cc
@@ -63,7 +63,8 @@ ExampleWindow::ExampleWindow()
 
   /* Day, month, year spinners */
 
-  m_VBox.pack_start(m_HBox_NotAccelerated, Gtk::PackOptions::EXPAND_WIDGET, 5);
+  m_VBox.set_spacing(5);
+  m_VBox.pack_start(m_HBox_NotAccelerated, Gtk::PackOptions::EXPAND_WIDGET);
 
   m_VBox_Day.pack_start(m_Label_Day);
 
@@ -71,14 +72,15 @@ ExampleWindow::ExampleWindow()
 
   m_VBox_Day.pack_start(m_SpinButton_Day);
 
-  m_HBox_NotAccelerated.pack_start(m_VBox_Day, Gtk::PackOptions::EXPAND_WIDGET, 5);
+  m_HBox_NotAccelerated.set_spacing(5);
+  m_HBox_NotAccelerated.pack_start(m_VBox_Day, Gtk::PackOptions::EXPAND_WIDGET);
 
   m_VBox_Month.pack_start(m_Label_Month);
 
   m_SpinButton_Month.set_wrap();
   m_VBox_Month.pack_start(m_SpinButton_Month);
 
-  m_HBox_NotAccelerated.pack_start(m_VBox_Month, Gtk::PackOptions::EXPAND_WIDGET, 5);
+  m_HBox_NotAccelerated.pack_start(m_VBox_Month, Gtk::PackOptions::EXPAND_WIDGET);
 
   m_VBox_Year.pack_start(m_Label_Year);
 
@@ -86,7 +88,7 @@ ExampleWindow::ExampleWindow()
   m_SpinButton_Year.set_size_request(55, -1);
   m_VBox_Year.pack_start(m_SpinButton_Year);
 
-  m_HBox_NotAccelerated.pack_start(m_VBox_Year, Gtk::PackOptions::EXPAND_WIDGET, 5);
+  m_HBox_NotAccelerated.pack_start(m_VBox_Year, Gtk::PackOptions::EXPAND_WIDGET);
 
   //Accelerated:
   m_VBox_Main.pack_start(m_Frame_Accelerated);
@@ -94,9 +96,10 @@ ExampleWindow::ExampleWindow()
   m_VBox_Accelerated.set_margin(5);
   m_Frame_Accelerated.add(m_VBox_Accelerated);
 
-  m_VBox_Accelerated.pack_start(m_HBox_Accelerated, Gtk::PackOptions::EXPAND_WIDGET, 5);
+  m_VBox_Accelerated.set_spacing(5);
+  m_VBox_Accelerated.pack_start(m_HBox_Accelerated, Gtk::PackOptions::EXPAND_WIDGET);
 
-  m_HBox_Accelerated.pack_start(m_VBox_Value, Gtk::PackOptions::EXPAND_WIDGET, 5);
+  m_HBox_Accelerated.pack_start(m_VBox_Value, Gtk::PackOptions::EXPAND_WIDGET);
 
   m_VBox_Value.pack_start(m_Label_Value);
 
@@ -104,7 +107,7 @@ ExampleWindow::ExampleWindow()
   m_SpinButton_Value.set_size_request(100, -1);
   m_VBox_Value.pack_start(m_SpinButton_Value);
 
-  m_HBox_Accelerated.pack_start(m_VBox_Digits, Gtk::PackOptions::EXPAND_WIDGET, 5);
+  m_HBox_Accelerated.pack_start(m_VBox_Digits, Gtk::PackOptions::EXPAND_WIDGET);
 
   m_VBox_Digits.pack_start(m_Label_Digits);
 
@@ -128,15 +131,16 @@ ExampleWindow::ExampleWindow()
 
 
   //Buttons:
-  m_VBox_Accelerated.pack_start (m_HBox_Buttons, Gtk::PackOptions::SHRINK, 5);
+  m_VBox_Accelerated.pack_start (m_HBox_Buttons, Gtk::PackOptions::SHRINK);
 
   m_Button_Int.signal_clicked().connect( sigc::bind( sigc::mem_fun(*this,
                   &ExampleWindow::on_button_getvalue), VALUE_FORMAT_INT) );
-  m_HBox_Buttons.pack_start(m_Button_Int, Gtk::PackOptions::EXPAND_WIDGET, 5);
+  m_HBox_Buttons.set_spacing(5);
+  m_HBox_Buttons.pack_start(m_Button_Int, Gtk::PackOptions::EXPAND_WIDGET);
 
   m_Button_Float.signal_clicked().connect( sigc::bind( sigc::mem_fun(*this,
                   &ExampleWindow::on_button_getvalue), VALUE_FORMAT_FLOAT) );
-  m_HBox_Buttons.pack_start(m_Button_Float, Gtk::PackOptions::EXPAND_WIDGET, 5);
+  m_HBox_Buttons.pack_start(m_Button_Float, Gtk::PackOptions::EXPAND_WIDGET);
 
   m_VBox_Accelerated.pack_start(m_Label_ShowValue);
   m_Label_ShowValue.set_text("0");
diff --git a/examples/others/calendar/calendar.cc b/examples/others/calendar/calendar.cc
index f5aeab2..3148e41 100644
--- a/examples/others/calendar/calendar.cc
+++ b/examples/others/calendar/calendar.cc
@@ -175,7 +175,7 @@ CalendarExample::CalendarExample()
 
   set_resizable(false);
 
-  auto vbox = Gtk::manage(new Gtk::Box(Gtk::Orientation::VERTICAL, DEF_PAD));
+  auto vbox = Gtk::manage(new Gtk::Box(Gtk::Orientation::VERTICAL, DEF_PAD * 2));
   vbox->set_margin(5);
   add(*vbox);
 
@@ -184,15 +184,18 @@ CalendarExample::CalendarExample()
    */
 
   auto hbox = Gtk::manage(new Gtk::Box(Gtk::Orientation::HORIZONTAL, DEF_PAD));
-  vbox->pack_start(*hbox, Gtk::PackOptions::EXPAND_WIDGET, DEF_PAD);
+  vbox->pack_start(*hbox, Gtk::PackOptions::EXPAND_WIDGET);
   auto hbbox = Gtk::manage(new Gtk::ButtonBox());
-  hbox->pack_start(*hbbox, Gtk::PackOptions::SHRINK, DEF_PAD);
+  hbox->pack_start(*hbbox, Gtk::PackOptions::SHRINK);
+  hbbox->set_margin_end(DEF_PAD);
   hbbox->set_layout(Gtk::ButtonBoxStyle::SPREAD);
   hbbox->set_spacing(5);
 
   /* Calendar widget */
   auto frame = Gtk::manage(new Gtk::Frame("Calendar"));
-  hbbox->pack_start(*frame, Gtk::PackOptions::EXPAND_WIDGET, DEF_PAD);
+  hbbox->pack_start(*frame, Gtk::PackOptions::EXPAND_WIDGET);
+  frame->set_margin_start(DEF_PAD);
+  frame->set_margin_end(DEF_PAD);
   calendar_ = new Gtk::Calendar();
   set_flags();
   calendar_->mark_day(19);
@@ -205,12 +208,15 @@ CalendarExample::CalendarExample()
   hbox->pack_start (*separator, Gtk::PackOptions::SHRINK);
 
   auto vbox2 = Gtk::manage(new Gtk::Box(Gtk::Orientation::VERTICAL, DEF_PAD));
-  hbox->pack_start(*vbox2, Gtk::PackOptions::SHRINK, DEF_PAD);
+  hbox->pack_start(*vbox2, Gtk::PackOptions::SHRINK);
+  vbox2->set_margin_start(DEF_PAD);
+  vbox2->set_margin_end(DEF_PAD);
 
   /* Build the Right frame with the flags in */
 
   auto frameFlags = Gtk::manage(new Gtk::Frame("Flags"));
-  vbox2->pack_start(*frameFlags, Gtk::PackOptions::EXPAND_WIDGET, DEF_PAD);
+  vbox2->pack_start(*frameFlags, Gtk::PackOptions::EXPAND_WIDGET);
+  frameFlags->set_margin_end(DEF_PAD);
   auto vbox3 = Gtk::manage(new Gtk::Box(Gtk::Orientation::VERTICAL, DEF_PAD_SMALL));
   frameFlags->add(*vbox3);
 
@@ -253,7 +259,7 @@ CalendarExample::CalendarExample()
    *  Build the Signal-event part.
    */
   frame = Gtk::manage(new Gtk::Frame("Signal events"));
-  vbox->pack_start(*frame, Gtk::PackOptions::EXPAND_WIDGET, DEF_PAD);
+  vbox->pack_start(*frame, Gtk::PackOptions::EXPAND_WIDGET);
   vbox2 = Gtk::manage(new Gtk::Box(Gtk::Orientation::VERTICAL, DEF_PAD_SMALL));
   frame->add(*vbox2);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]