[gtkmm-documentation] Adapt for Gtk::PackOptions as an enum class.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm-documentation] Adapt for Gtk::PackOptions as an enum class.
- Date: Wed, 3 May 2017 08:35:47 +0000 (UTC)
commit 279ec24109aafc28cda6a4d2ec6f1d3e3513f8f9
Author: Murray Cumming <murrayc murrayc com>
Date: Wed May 3 09:30:13 2017 +0200
Adapt for Gtk::PackOptions as an enum class.
The behaviour has also changed subtly, so we will also need to check
that the resizing is correct for all these examples at runtime.
Most problems should be fixable by calling set_hexpand(true/false) on
a parent widget.
We might want to stop using the PackOptions altogether.
examples/book/actionbar/examplewindow.cc | 10 ++--
examples/book/box/examplewindow.cc | 70 ++++++++++----------
examples/book/box/packbox.cc | 6 +-
examples/book/buttonbox/examplewindow.cc | 20 +++---
examples/book/clipboard/ideal/examplewindow.cc | 8 +-
examples/book/clipboard/simple/examplewindow.cc | 8 +-
.../book/custom/custom_container/examplewindow.cc | 6 +-
.../book/custom/custom_widget/examplewindow.cc | 2 +-
.../dialogs/colorchooserdialog/examplewindow.cc | 4 +-
examples/book/entry/completion/examplewindow.cc | 6 +-
examples/book/entry/icon/examplewindow.cc | 4 +-
examples/book/entry/progress/examplewindow.cc | 4 +-
examples/book/iconview/examplewindow.cc | 4 +-
examples/book/idle/idleexample.cc | 2 +-
examples/book/infobar/examplewindow.cc | 8 +-
examples/book/label/examplewindow.cc | 18 +++---
examples/book/listbox/examplewindow.cc | 42 ++++++------
examples/book/menus/main_menu/examplewindow.cc | 2 +-
examples/book/menus_and_toolbars/examplewindow.cc | 4 +-
examples/book/multithread/examplewindow.cc | 10 ++--
examples/book/notebook/examplewindow.cc | 4 +-
examples/book/placessidebar/examplewindow.cc | 4 +-
examples/book/popover/examplewindow.cc | 6 +-
examples/book/printing/advanced/examplewindow.cc | 4 +-
examples/book/printing/advanced/previewdialog.cc | 6 +-
examples/book/printing/simple/examplewindow.cc | 4 +-
examples/book/progressbar/examplewindow.cc | 6 +-
examples/book/range_widgets/examplewindow.cc | 18 +++---
examples/book/recent_files/examplewindow.cc | 4 +-
examples/book/revealer/examplewindow.cc | 6 +-
examples/book/searchbar/examplewindow.cc | 16 ++--
examples/book/spinbutton/examplewindow.cc | 22 +++---
examples/book/textview/examplewindow.cc | 8 +-
examples/book/toolbar/examplewindow.cc | 6 +-
examples/book/toolpalette/examplewindow.cc | 6 +-
examples/book/tooltips/examplewindow.cc | 6 +-
.../book/treeview/combo_renderer/examplewindow.cc | 4 +-
.../book/treeview/drag_and_drop/examplewindow.cc | 4 +-
.../book/treeview/editable_cells/examplewindow.cc | 4 +-
examples/book/treeview/filter/examplewindow.cc | 4 +-
.../book/treeview/filter_modify/examplewindow.cc | 4 +-
examples/book/treeview/list/examplewindow.cc | 4 +-
.../book/treeview/listviewtext/examplewindow.cc | 4 +-
examples/book/treeview/modelsort/examplewindow.cc | 4 +-
examples/book/treeview/popup/examplewindow.cc | 4 +-
examples/book/treeview/tree/examplewindow.cc | 4 +-
examples/book/update_ui/examplewindow.cc | 8 +-
examples/others/calendar/calendar.cc | 36 +++++-----
examples/others/cellrenderercustom/popupentry.cc | 4 +-
examples/others/idle/idle.cc | 2 +-
examples/others/treemodelcustom/examplewindow.cc | 4 +-
51 files changed, 229 insertions(+), 229 deletions(-)
---
diff --git a/examples/book/actionbar/examplewindow.cc b/examples/book/actionbar/examplewindow.cc
index 2b89965..0978150 100644
--- a/examples/book/actionbar/examplewindow.cc
+++ b/examples/book/actionbar/examplewindow.cc
@@ -37,9 +37,9 @@ ExampleWindow::ExampleWindow()
m_prev_button.set_image_from_icon_name("go-previous-symbolic", Gtk::BuiltinIconSize::BUTTON, true);
m_next_button.set_image_from_icon_name("go-next-symbolic", Gtk::BuiltinIconSize::BUTTON, true);
m_photo_button.set_image_from_icon_name("media-record-symbolic", Gtk::BuiltinIconSize::BUTTON, true);
- m_photo_box.pack_start(m_prev_button, Gtk::PACK_SHRINK);
- m_photo_box.pack_start(m_photo_button, Gtk::PACK_SHRINK);
- m_photo_box.pack_start(m_next_button, Gtk::PACK_SHRINK);
+ m_photo_box.pack_start(m_prev_button, Gtk::PackOptions::SHRINK);
+ m_photo_box.pack_start(m_photo_button, Gtk::PackOptions::SHRINK);
+ m_photo_box.pack_start(m_next_button, Gtk::PackOptions::SHRINK);
auto style_context = m_photo_box.get_style_context();
style_context->add_class("raised");
style_context->add_class("linked");
@@ -51,8 +51,8 @@ ExampleWindow::ExampleWindow()
// Layout
m_box.set_homogeneous(false);
- m_box.pack_start(m_face_image, Gtk::PACK_EXPAND_WIDGET);
- m_box.pack_end(m_action_bar, Gtk::PACK_SHRINK);
+ m_box.pack_start(m_face_image, Gtk::PackOptions::EXPAND_WIDGET);
+ m_box.pack_end(m_action_bar, Gtk::PackOptions::SHRINK);
add(m_box);
}
diff --git a/examples/book/box/examplewindow.cc b/examples/book/box/examplewindow.cc
index 6e75222..4492bc9 100644
--- a/examples/book/box/examplewindow.cc
+++ b/examples/book/box/examplewindow.cc
@@ -44,43 +44,43 @@ ExampleWindow::ExampleWindow(int which)
// Pack the label into the vertical box (vbox box1). Remember that
// widgets added to a vbox will be packed one on top of the other in
// order.
- m_box1.pack_start(m_Label1, Gtk::PACK_SHRINK);
+ m_box1.pack_start(m_Label1, Gtk::PackOptions::SHRINK);
// Create a PackBox - homogeneous = false, spacing = 0,
- // options = Gtk::PACK_SHRINK, margin = 0
- pPackBox1 = Gtk::manage(new PackBox(false, 0, Gtk::PACK_SHRINK));
- m_box1.pack_start(*pPackBox1, Gtk::PACK_SHRINK);
+ // options = Gtk::PackOptions::SHRINK, margin = 0
+ pPackBox1 = Gtk::manage(new PackBox(false, 0, Gtk::PackOptions::SHRINK));
+ m_box1.pack_start(*pPackBox1, Gtk::PackOptions::SHRINK);
// Create a PackBox - homogeneous = false, spacing = 0,
- // options = Gtk::PACK_EXPAND_PADDING, margin = 0
- pPackBox2 = Gtk::manage(new PackBox(false, 0, Gtk::PACK_EXPAND_PADDING));
- m_box1.pack_start(*pPackBox2, Gtk::PACK_SHRINK);
+ // options = Gtk::PackOptions::EXPAND_PADDING, margin = 0
+ pPackBox2 = Gtk::manage(new PackBox(false, 0, Gtk::PackOptions::EXPAND_PADDING));
+ m_box1.pack_start(*pPackBox2, Gtk::PackOptions::SHRINK);
// Create a PackBox - homogeneous = false, spacing = 0,
- // options = Gtk::PACK_EXPAND_WIDGET, margin = 0
- pPackBox3 = Gtk::manage(new PackBox(false, 0, Gtk::PACK_EXPAND_WIDGET));
- m_box1.pack_start(*pPackBox3, Gtk::PACK_SHRINK);
+ // options = Gtk::PackOptions::EXPAND_WIDGET, margin = 0
+ pPackBox3 = Gtk::manage(new PackBox(false, 0, Gtk::PackOptions::EXPAND_WIDGET));
+ m_box1.pack_start(*pPackBox3, Gtk::PackOptions::SHRINK);
// pack the separator into the vbox. Remember each of these
// widgets are being packed into a vbox, so they'll be stacked
// vertically.
- m_box1.pack_start(m_separator1, Gtk::PACK_SHRINK);
+ m_box1.pack_start(m_separator1, Gtk::PackOptions::SHRINK);
// create another new label, and show it.
m_Label2.set_text("Gtk::Box(Gtk::Orientation::HORIZONTAL, 0); set_homogeneous(true);");
m_Label2.set_halign(Gtk::Align::START);
m_Label2.set_valign(Gtk::Align::START);
- m_box1.pack_start(m_Label2, Gtk::PACK_SHRINK);
+ m_box1.pack_start(m_Label2, Gtk::PackOptions::SHRINK);
// Args are: homogeneous, spacing, options, margin
- pPackBox4 = Gtk::manage(new PackBox(true, 0, Gtk::PACK_EXPAND_PADDING));
- m_box1.pack_start(*pPackBox4, Gtk::PACK_SHRINK);
+ pPackBox4 = Gtk::manage(new PackBox(true, 0, Gtk::PackOptions::EXPAND_PADDING));
+ m_box1.pack_start(*pPackBox4, Gtk::PackOptions::SHRINK);
// Args are: homogeneous, spacing, options, margin
- pPackBox5 = Gtk::manage(new PackBox(true, 0, Gtk::PACK_EXPAND_WIDGET));
- m_box1.pack_start(*pPackBox5, Gtk::PACK_SHRINK);
+ pPackBox5 = Gtk::manage(new PackBox(true, 0, Gtk::PackOptions::EXPAND_WIDGET));
+ m_box1.pack_start(*pPackBox5, Gtk::PackOptions::SHRINK);
- m_box1.pack_start(m_separator2, Gtk::PACK_SHRINK);
+ m_box1.pack_start(m_separator2, Gtk::PackOptions::SHRINK);
break;
}
@@ -90,28 +90,28 @@ ExampleWindow::ExampleWindow(int which)
m_Label1.set_text("Gtk::Box(Gtk::Orientation::HORIZONTAL, 10); set_homogeneous(false);");
m_Label1.set_halign(Gtk::Align::START);
m_Label1.set_valign(Gtk::Align::START);
- m_box1.pack_start(m_Label1, Gtk::PACK_SHRINK);
+ m_box1.pack_start(m_Label1, Gtk::PackOptions::SHRINK);
- pPackBox1 = Gtk::manage(new PackBox(false, 10, Gtk::PACK_EXPAND_PADDING));
- m_box1.pack_start(*pPackBox1, Gtk::PACK_SHRINK);
+ pPackBox1 = Gtk::manage(new PackBox(false, 10, Gtk::PackOptions::EXPAND_PADDING));
+ m_box1.pack_start(*pPackBox1, Gtk::PackOptions::SHRINK);
- pPackBox2 = Gtk::manage(new PackBox(false, 10, Gtk::PACK_EXPAND_WIDGET));
- m_box1.pack_start(*pPackBox2, Gtk::PACK_SHRINK);
+ pPackBox2 = Gtk::manage(new PackBox(false, 10, Gtk::PackOptions::EXPAND_WIDGET));
+ m_box1.pack_start(*pPackBox2, Gtk::PackOptions::SHRINK);
- m_box1.pack_start(m_separator1, Gtk::PACK_SHRINK);
+ m_box1.pack_start(m_separator1, Gtk::PackOptions::SHRINK);
m_Label2.set_text("Gtk::Box(Gtk::Orientation::HORIZONTAL, 0); set_homogeneous(false);");
m_Label2.set_halign(Gtk::Align::START);
m_Label2.set_valign(Gtk::Align::START);
- m_box1.pack_start(m_Label2, Gtk::PACK_SHRINK);
+ m_box1.pack_start(m_Label2, Gtk::PackOptions::SHRINK);
- pPackBox3 = Gtk::manage(new PackBox(false, 0, Gtk::PACK_SHRINK, 10));
- m_box1.pack_start(*pPackBox3, Gtk::PACK_SHRINK);
+ pPackBox3 = Gtk::manage(new PackBox(false, 0, Gtk::PackOptions::SHRINK, 10));
+ m_box1.pack_start(*pPackBox3, Gtk::PackOptions::SHRINK);
- pPackBox4 = Gtk::manage(new PackBox(false, 0, Gtk::PACK_EXPAND_WIDGET, 10));
- m_box1.pack_start(*pPackBox4, Gtk::PACK_SHRINK);
+ pPackBox4 = Gtk::manage(new PackBox(false, 0, Gtk::PackOptions::EXPAND_WIDGET, 10));
+ m_box1.pack_start(*pPackBox4, Gtk::PackOptions::SHRINK);
- m_box1.pack_start(m_separator2, Gtk::PACK_SHRINK);
+ m_box1.pack_start(m_separator2, Gtk::PackOptions::SHRINK);
break;
}
@@ -120,16 +120,16 @@ ExampleWindow::ExampleWindow(int which)
{
// This demonstrates the ability to use Gtk::Box::pack_end() to
// right justify widgets. First, we create a new box as before.
- pPackBox1 = Gtk::manage(new PackBox(false, 0, Gtk::PACK_SHRINK));
+ pPackBox1 = Gtk::manage(new PackBox(false, 0, Gtk::PackOptions::SHRINK));
// create the label that will be put at the end.
m_Label1.set_text("end");
// pack it using pack_end(), so it is put on the right side
// of the PackBox.
- pPackBox1->pack_end(m_Label1, Gtk::PACK_SHRINK);
+ pPackBox1->pack_end(m_Label1, Gtk::PackOptions::SHRINK);
- m_box1.pack_start(*pPackBox1, Gtk::PACK_SHRINK);
+ m_box1.pack_start(*pPackBox1, Gtk::PackOptions::SHRINK);
// This explicitly sets the separator to 700 pixels wide by 5 pixels
// high. This is so the hbox we created will also be 700 pixels wide,
@@ -139,7 +139,7 @@ ExampleWindow::ExampleWindow(int which)
m_separator1.set_size_request(700, 5);
// pack the separator into the vbox.
- m_box1.pack_start(m_separator1, Gtk::PACK_SHRINK);
+ m_box1.pack_start(m_separator1, Gtk::PackOptions::SHRINK);
break;
}
@@ -156,8 +156,8 @@ ExampleWindow::ExampleWindow(int which)
&ExampleWindow::on_button_quit_clicked) );
// pack the button into the quitbox.
- m_boxQuit.pack_start(m_buttonQuit, Gtk::PACK_EXPAND_PADDING);
- m_box1.pack_start(m_boxQuit, Gtk::PACK_SHRINK);
+ m_boxQuit.pack_start(m_buttonQuit, Gtk::PackOptions::EXPAND_PADDING);
+ m_box1.pack_start(m_boxQuit, Gtk::PackOptions::SHRINK);
// pack the vbox (box1) which now contains all our widgets, into the
// main window.
diff --git a/examples/book/box/packbox.cc b/examples/book/box/packbox.cc
index f1c9790..e403ac3 100644
--- a/examples/book/box/packbox.cc
+++ b/examples/book/box/packbox.cc
@@ -21,9 +21,9 @@ PackBox::PackBox(bool homogeneous, int spacing, Gtk::PackOptions options,
: Gtk::Box(Gtk::Orientation::HORIZONTAL, spacing),
m_button1("box.pack_start("),
m_button2("button,"),
- m_button3((options == Gtk::PACK_SHRINK) ? "Gtk::PACK_SHRINK);" :
- ((options == Gtk::PACK_EXPAND_PADDING) ?
- "Gtk::PACK_EXPAND_PADDING);" : "Gtk::PACK_EXPAND_WIDGET);"))
+ m_button3((options == Gtk::PackOptions::SHRINK) ? "Gtk::PackOptions::SHRINK);" :
+ ((options == Gtk::PackOptions::EXPAND_PADDING) ?
+ "Gtk::PackOptions::EXPAND_PADDING);" : "Gtk::PackOptions::EXPAND_WIDGET);"))
{
set_homogeneous(homogeneous);
diff --git a/examples/book/buttonbox/examplewindow.cc b/examples/book/buttonbox/examplewindow.cc
index 2af9a2f..027d903 100644
--- a/examples/book/buttonbox/examplewindow.cc
+++ b/examples/book/buttonbox/examplewindow.cc
@@ -27,7 +27,7 @@ ExampleWindow::ExampleWindow()
m_VBox_Main.set_margin(10);
add(m_VBox_Main);
- m_VBox_Main.pack_start(m_Frame_Horizontal, Gtk::PACK_EXPAND_WIDGET, 10);
+ m_VBox_Main.pack_start(m_Frame_Horizontal, Gtk::PackOptions::EXPAND_WIDGET, 10);
//The horizontal ButtonBoxes:
m_VBox.set_margin(10);
@@ -36,26 +36,26 @@ ExampleWindow::ExampleWindow()
m_VBox.pack_start(*Gtk::manage(
new ExampleButtonBox(true, "Spread (spacing 40)", 40,
Gtk::ButtonBoxStyle::SPREAD)),
- Gtk::PACK_EXPAND_WIDGET);
+ Gtk::PackOptions::EXPAND_WIDGET);
m_VBox.pack_start(*Gtk::manage(
new ExampleButtonBox(true, "Edge (spacing 30)", 30,
Gtk::ButtonBoxStyle::EDGE)),
- Gtk::PACK_EXPAND_WIDGET, 5);
+ Gtk::PackOptions::EXPAND_WIDGET, 5);
m_VBox.pack_start(*Gtk::manage(
new ExampleButtonBox(true, "Start (spacing 20)", 20,
Gtk::ButtonBoxStyle::START)),
- Gtk::PACK_EXPAND_WIDGET, 5);
+ Gtk::PackOptions::EXPAND_WIDGET, 5);
m_VBox.pack_start(*Gtk::manage(
new ExampleButtonBox(true, "End (spacing 10)", 10,
Gtk::ButtonBoxStyle::END)),
- Gtk::PACK_EXPAND_WIDGET, 5);
+ Gtk::PackOptions::EXPAND_WIDGET, 5);
//The vertical ButtonBoxes:
- m_VBox_Main.pack_start(m_Frame_Vertical, Gtk::PACK_EXPAND_WIDGET, 10);
+ m_VBox_Main.pack_start(m_Frame_Vertical, Gtk::PackOptions::EXPAND_WIDGET, 10);
m_HBox.set_margin(10);
m_Frame_Vertical.add(m_HBox);
@@ -63,21 +63,21 @@ ExampleWindow::ExampleWindow()
m_HBox.pack_start(*Gtk::manage(
new ExampleButtonBox(false, "Spread (spacing 5)", 5,
Gtk::ButtonBoxStyle::SPREAD)),
- Gtk::PACK_EXPAND_WIDGET);
+ Gtk::PackOptions::EXPAND_WIDGET);
m_HBox.pack_start(*Gtk::manage(
new ExampleButtonBox(false, "Edge (spacing 30)", 30,
Gtk::ButtonBoxStyle::EDGE)),
- Gtk::PACK_EXPAND_WIDGET, 5);
+ Gtk::PackOptions::EXPAND_WIDGET, 5);
m_HBox.pack_start(*Gtk::manage(
new ExampleButtonBox(false, "Start (spacing 20)", 20,
Gtk::ButtonBoxStyle::START)),
- Gtk::PACK_EXPAND_WIDGET, 5);
+ Gtk::PackOptions::EXPAND_WIDGET, 5);
m_HBox.pack_start(*Gtk::manage(new ExampleButtonBox(false, "End (spacing 10)",
10, Gtk::ButtonBoxStyle::END)),
- Gtk::PACK_EXPAND_WIDGET, 5);
+ Gtk::PackOptions::EXPAND_WIDGET, 5);
}
ExampleWindow::~ExampleWindow()
diff --git a/examples/book/clipboard/ideal/examplewindow.cc b/examples/book/clipboard/ideal/examplewindow.cc
index 1aeb42a..2c1c11f 100644
--- a/examples/book/clipboard/ideal/examplewindow.cc
+++ b/examples/book/clipboard/ideal/examplewindow.cc
@@ -40,7 +40,7 @@ ExampleWindow::ExampleWindow()
m_VBox.set_margin(12);
add(m_VBox);
- m_VBox.pack_start(m_Label, Gtk::PACK_SHRINK);
+ m_VBox.pack_start(m_Label, Gtk::PackOptions::SHRINK);
//Fill Grid:
m_VBox.pack_start(m_Grid);
@@ -52,15 +52,15 @@ ExampleWindow::ExampleWindow()
m_Grid.attach(m_ButtonB2, 1, 1, 1, 1);
//Add ButtonBox to bottom:
- m_VBox.pack_start(m_ButtonBox, Gtk::PACK_SHRINK);
+ m_VBox.pack_start(m_ButtonBox, Gtk::PackOptions::SHRINK);
m_VBox.set_spacing(6);
//Fill ButtonBox:
m_ButtonBox.set_layout(Gtk::ButtonBoxStyle::END);
- m_ButtonBox.pack_start(m_Button_Copy, Gtk::PACK_SHRINK);
+ m_ButtonBox.pack_start(m_Button_Copy, Gtk::PackOptions::SHRINK);
m_Button_Copy.signal_clicked().connect(sigc::mem_fun(*this,
&ExampleWindow::on_button_copy) );
- m_ButtonBox.pack_start(m_Button_Paste, Gtk::PACK_SHRINK);
+ m_ButtonBox.pack_start(m_Button_Paste, Gtk::PackOptions::SHRINK);
m_Button_Paste.signal_clicked().connect(sigc::mem_fun(*this,
&ExampleWindow::on_button_paste) );
diff --git a/examples/book/clipboard/simple/examplewindow.cc b/examples/book/clipboard/simple/examplewindow.cc
index 4427bed..669f0c4 100644
--- a/examples/book/clipboard/simple/examplewindow.cc
+++ b/examples/book/clipboard/simple/examplewindow.cc
@@ -28,7 +28,7 @@ ExampleWindow::ExampleWindow()
m_VBox.set_margin(12);
add(m_VBox);
- m_VBox.pack_start(m_Label, Gtk::PACK_SHRINK);
+ m_VBox.pack_start(m_Label, Gtk::PackOptions::SHRINK);
//Fill Grid:
m_VBox.pack_start(m_Grid);
@@ -40,15 +40,15 @@ ExampleWindow::ExampleWindow()
m_Grid.attach(m_ButtonB2, 1, 1, 1, 1);
//Add ButtonBox to bottom:
- m_VBox.pack_start(m_ButtonBox, Gtk::PACK_SHRINK);
+ m_VBox.pack_start(m_ButtonBox, Gtk::PackOptions::SHRINK);
m_VBox.set_spacing(6);
//Fill ButtonBox:
m_ButtonBox.set_layout(Gtk::ButtonBoxStyle::END);
- m_ButtonBox.pack_start(m_Button_Copy, Gtk::PACK_SHRINK);
+ m_ButtonBox.pack_start(m_Button_Copy, Gtk::PackOptions::SHRINK);
m_Button_Copy.signal_clicked().connect(sigc::mem_fun(*this,
&ExampleWindow::on_button_copy) );
- m_ButtonBox.pack_start(m_Button_Paste, Gtk::PACK_SHRINK);
+ m_ButtonBox.pack_start(m_Button_Paste, Gtk::PackOptions::SHRINK);
m_Button_Paste.signal_clicked().connect(sigc::mem_fun(*this,
&ExampleWindow::on_button_paste) );
}
diff --git a/examples/book/custom/custom_container/examplewindow.cc
b/examples/book/custom/custom_container/examplewindow.cc
index 8db299b..289bf18 100644
--- a/examples/book/custom/custom_container/examplewindow.cc
+++ b/examples/book/custom/custom_container/examplewindow.cc
@@ -32,10 +32,10 @@ ExampleWindow::ExampleWindow()
//Add the child widgets to the custom container:
m_MyContainer.set_child_widgets(m_Button_One, m_Label_Two);
- m_VBox.pack_start(m_MyContainer, Gtk::PACK_EXPAND_WIDGET);
- m_VBox.pack_start(m_ButtonBox, Gtk::PACK_SHRINK);
+ m_VBox.pack_start(m_MyContainer, Gtk::PackOptions::EXPAND_WIDGET);
+ m_VBox.pack_start(m_ButtonBox, Gtk::PackOptions::SHRINK);
- m_ButtonBox.pack_start(m_Button_Quit, Gtk::PACK_SHRINK);
+ m_ButtonBox.pack_start(m_Button_Quit, Gtk::PackOptions::SHRINK);
m_ButtonBox.set_margin(6);
m_ButtonBox.set_layout(Gtk::ButtonBoxStyle::END);
m_Button_Quit.signal_clicked().connect( sigc::mem_fun(*this,
diff --git a/examples/book/custom/custom_widget/examplewindow.cc
b/examples/book/custom/custom_widget/examplewindow.cc
index 67866a3..c738a63 100644
--- a/examples/book/custom/custom_widget/examplewindow.cc
+++ b/examples/book/custom/custom_widget/examplewindow.cc
@@ -35,7 +35,7 @@ ExampleWindow::ExampleWindow()
m_Grid.attach(m_ButtonBox, 0, 2, 2, 1);
- m_ButtonBox.pack_start(m_Button_Quit, Gtk::PACK_SHRINK);
+ m_ButtonBox.pack_start(m_Button_Quit, Gtk::PackOptions::SHRINK);
m_ButtonBox.set_margin(6);
m_ButtonBox.set_layout(Gtk::ButtonBoxStyle::END);
m_Button_Quit.signal_clicked().connect( sigc::mem_fun(*this, &ExampleWindow::on_button_quit) );
diff --git a/examples/book/dialogs/colorchooserdialog/examplewindow.cc
b/examples/book/dialogs/colorchooserdialog/examplewindow.cc
index 130de1a..f4b7947 100644
--- a/examples/book/dialogs/colorchooserdialog/examplewindow.cc
+++ b/examples/book/dialogs/colorchooserdialog/examplewindow.cc
@@ -26,11 +26,11 @@ ExampleWindow::ExampleWindow()
add(m_VBox);
- m_VBox.pack_start(m_ColorButton, Gtk::PACK_SHRINK);
+ m_VBox.pack_start(m_ColorButton, Gtk::PackOptions::SHRINK);
m_ColorButton.signal_color_set().connect(sigc::mem_fun(*this,
&ExampleWindow::on_color_button_color_set) );
- m_VBox.pack_start(m_Button_Dialog, Gtk::PACK_SHRINK);
+ m_VBox.pack_start(m_Button_Dialog, Gtk::PackOptions::SHRINK);
m_Button_Dialog.signal_clicked().connect(sigc::mem_fun(*this,
&ExampleWindow::on_button_dialog_clicked) );
diff --git a/examples/book/entry/completion/examplewindow.cc b/examples/book/entry/completion/examplewindow.cc
index b3cfd66..ec3f281 100644
--- a/examples/book/entry/completion/examplewindow.cc
+++ b/examples/book/entry/completion/examplewindow.cc
@@ -26,13 +26,13 @@ ExampleWindow::ExampleWindow()
set_title("Gtk::EntryCompletion");
add(m_VBox);
- m_VBox.pack_start(m_Entry, Gtk::PACK_SHRINK);
+ m_VBox.pack_start(m_Entry, Gtk::PackOptions::SHRINK);
- m_VBox.pack_start(m_Label, Gtk::PACK_EXPAND_WIDGET);
+ m_VBox.pack_start(m_Label, Gtk::PackOptions::EXPAND_WIDGET);
m_Button_Close.signal_clicked().connect( sigc::mem_fun(*this,
&ExampleWindow::on_button_close) );
- m_VBox.pack_start(m_Button_Close, Gtk::PACK_SHRINK);
+ m_VBox.pack_start(m_Button_Close, Gtk::PackOptions::SHRINK);
m_Button_Close.set_can_default();
m_Button_Close.grab_default();
diff --git a/examples/book/entry/icon/examplewindow.cc b/examples/book/entry/icon/examplewindow.cc
index 3d5039b..d990705 100644
--- a/examples/book/entry/icon/examplewindow.cc
+++ b/examples/book/entry/icon/examplewindow.cc
@@ -27,7 +27,7 @@ ExampleWindow::ExampleWindow()
m_Entry.set_max_length(50);
m_Entry.set_text("Hello world");
- m_VBox.pack_start(m_Entry, Gtk::PACK_SHRINK);
+ m_VBox.pack_start(m_Entry, Gtk::PackOptions::SHRINK);
m_Entry.set_icon_from_icon_name("edit-find");
m_Entry.signal_icon_press().connect( sigc::mem_fun(*this, &ExampleWindow::on_icon_pressed) );
@@ -35,7 +35,7 @@ ExampleWindow::ExampleWindow()
m_Button_Close.signal_clicked().connect( sigc::mem_fun(*this,
&ExampleWindow::on_button_close) );
- m_VBox.pack_start(m_Button_Close, Gtk::PACK_SHRINK);
+ m_VBox.pack_start(m_Button_Close, Gtk::PackOptions::SHRINK);
m_Button_Close.set_can_default();
m_Button_Close.grab_default();
}
diff --git a/examples/book/entry/progress/examplewindow.cc b/examples/book/entry/progress/examplewindow.cc
index 0df997d..615cab8 100644
--- a/examples/book/entry/progress/examplewindow.cc
+++ b/examples/book/entry/progress/examplewindow.cc
@@ -27,7 +27,7 @@ ExampleWindow::ExampleWindow()
m_Entry.set_max_length(50);
m_Entry.set_text("Hello world");
- m_VBox.pack_start(m_Entry, Gtk::PACK_SHRINK);
+ m_VBox.pack_start(m_Entry, Gtk::PackOptions::SHRINK);
//Change the progress fraction every 0.1 second:
Glib::signal_timeout().connect(
@@ -37,7 +37,7 @@ ExampleWindow::ExampleWindow()
m_Button_Close.signal_clicked().connect( sigc::mem_fun(*this,
&ExampleWindow::on_button_close) );
- m_VBox.pack_start(m_Button_Close, Gtk::PACK_SHRINK);
+ m_VBox.pack_start(m_Button_Close, Gtk::PackOptions::SHRINK);
m_Button_Close.set_can_default();
m_Button_Close.grab_default();
}
diff --git a/examples/book/iconview/examplewindow.cc b/examples/book/iconview/examplewindow.cc
index b3d5992..e46ea3b 100644
--- a/examples/book/iconview/examplewindow.cc
+++ b/examples/book/iconview/examplewindow.cc
@@ -53,9 +53,9 @@ ExampleWindow::ExampleWindow()
m_ScrolledWindow.set_policy(Gtk::PolicyType::AUTOMATIC, Gtk::PolicyType::AUTOMATIC);
m_VBox.pack_start(m_ScrolledWindow);
- m_VBox.pack_start(m_ButtonBox, Gtk::PACK_SHRINK);
+ m_VBox.pack_start(m_ButtonBox, Gtk::PackOptions::SHRINK);
- m_ButtonBox.pack_start(m_Button_Quit, Gtk::PACK_SHRINK);
+ m_ButtonBox.pack_start(m_Button_Quit, Gtk::PackOptions::SHRINK);
m_ButtonBox.set_margin(6);
m_ButtonBox.set_layout(Gtk::ButtonBoxStyle::END);
m_Button_Quit.signal_clicked().connect(sigc::mem_fun(*this,
diff --git a/examples/book/idle/idleexample.cc b/examples/book/idle/idleexample.cc
index b9d3534..67a7c6b 100644
--- a/examples/book/idle/idleexample.cc
+++ b/examples/book/idle/idleexample.cc
@@ -38,7 +38,7 @@ IdleExample::IdleExample() :
auto hbox = Gtk::manage( new Gtk::Box(Gtk::Orientation::HORIZONTAL,10));
m_Box.pack_start(*hbox);
- hbox->pack_start(m_ButtonQuit, Gtk::PACK_EXPAND_PADDING);
+ hbox->pack_start(m_ButtonQuit, Gtk::PackOptions::EXPAND_PADDING);
// Connect the signal handlers:
m_ButtonQuit.signal_clicked().connect( sigc::mem_fun(*this,
diff --git a/examples/book/infobar/examplewindow.cc b/examples/book/infobar/examplewindow.cc
index a8c2420..4f53bdf 100644
--- a/examples/book/infobar/examplewindow.cc
+++ b/examples/book/infobar/examplewindow.cc
@@ -37,7 +37,7 @@ ExampleWindow::ExampleWindow()
m_InfoBar.add_button("_OK", 0);
// Add the InfoBar to the vbox:
- m_VBox.pack_start(m_InfoBar, Gtk::PACK_SHRINK);
+ m_VBox.pack_start(m_InfoBar, Gtk::PackOptions::SHRINK);
// Create the buffer and set it for the TextView:
m_refTextBuffer = Gtk::TextBuffer::create();
@@ -52,10 +52,10 @@ ExampleWindow::ExampleWindow()
m_VBox.pack_start(m_ScrolledWindow);
// Add button box:
- m_VBox.pack_start(m_ButtonBox, Gtk::PACK_SHRINK);
+ m_VBox.pack_start(m_ButtonBox, Gtk::PackOptions::SHRINK);
- m_ButtonBox.pack_start(m_Button_Clear, Gtk::PACK_SHRINK);
- m_ButtonBox.pack_start(m_Button_Quit, Gtk::PACK_SHRINK);
+ m_ButtonBox.pack_start(m_Button_Clear, Gtk::PackOptions::SHRINK);
+ m_ButtonBox.pack_start(m_Button_Quit, Gtk::PackOptions::SHRINK);
m_ButtonBox.set_spacing(6);
m_ButtonBox.set_layout(Gtk::ButtonBoxStyle::END);
diff --git a/examples/book/label/examplewindow.cc b/examples/book/label/examplewindow.cc
index ff22dec..f722cf4 100644
--- a/examples/book/label/examplewindow.cc
+++ b/examples/book/label/examplewindow.cc
@@ -41,23 +41,23 @@ ExampleWindow::ExampleWindow()
m_HBox.set_margin(5);
add(m_HBox);
- m_HBox.pack_start(m_VBox, Gtk::PACK_SHRINK);
+ m_HBox.pack_start(m_VBox, Gtk::PackOptions::SHRINK);
m_Frame_Normal.add(m_Label_Normal);
- m_VBox.pack_start(m_Frame_Normal, Gtk::PACK_SHRINK);
+ m_VBox.pack_start(m_Frame_Normal, Gtk::PackOptions::SHRINK);
m_Frame_Multi.add(m_Label_Multi);
- m_VBox.pack_start(m_Frame_Multi, Gtk::PACK_SHRINK);
+ m_VBox.pack_start(m_Frame_Multi, Gtk::PackOptions::SHRINK);
m_Label_Left.set_justify(Gtk::Justification::LEFT);
m_Frame_Left.add(m_Label_Left);
- m_VBox.pack_start(m_Frame_Left, Gtk::PACK_SHRINK);
+ m_VBox.pack_start(m_Frame_Left, Gtk::PackOptions::SHRINK);
m_Label_Right.set_justify(Gtk::Justification::RIGHT);
m_Frame_Right.add(m_Label_Right);
- m_VBox.pack_start(m_Frame_Right, Gtk::PACK_SHRINK);
+ m_VBox.pack_start(m_Frame_Right, Gtk::PackOptions::SHRINK);
- m_HBox.pack_start(m_VBox2, Gtk::PACK_SHRINK);
+ m_HBox.pack_start(m_VBox2, Gtk::PackOptions::SHRINK);
m_Label_LineWrapped.set_text(
"This is an example of a line-wrapped label. It "
@@ -73,7 +73,7 @@ ExampleWindow::ExampleWindow()
"many extra spaces. ");
m_Label_LineWrapped.set_line_wrap();
m_Frame_LineWrapped.add(m_Label_LineWrapped);
- m_VBox2.pack_start(m_Frame_LineWrapped, Gtk::PACK_SHRINK);
+ m_VBox2.pack_start(m_Frame_LineWrapped, Gtk::PackOptions::SHRINK);
m_Label_FilledWrapped.set_text(
"This is an example of a line-wrapped, filled label. "
@@ -89,14 +89,14 @@ ExampleWindow::ExampleWindow()
m_Label_FilledWrapped.set_justify(Gtk::Justification::FILL);
m_Label_FilledWrapped.set_line_wrap();
m_Frame_FilledWrapped.add(m_Label_FilledWrapped);
- m_VBox2.pack_start(m_Frame_FilledWrapped, Gtk::PACK_SHRINK);
+ m_VBox2.pack_start(m_Frame_FilledWrapped, Gtk::PackOptions::SHRINK);
m_Label_Underlined.set_justify(Gtk::Justification::LEFT);
m_Label_Underlined.set_pattern (
"_________________________ _ _________ _ ______"
" __ _______ ___");
m_Frame_Underlined.add(m_Label_Underlined);
- m_VBox2.pack_start(m_Frame_Underlined, Gtk::PACK_SHRINK);
+ m_VBox2.pack_start(m_Frame_Underlined, Gtk::PackOptions::SHRINK);
}
ExampleWindow::~ExampleWindow()
diff --git a/examples/book/listbox/examplewindow.cc b/examples/book/listbox/examplewindow.cc
index ff2232c..15f6d02 100644
--- a/examples/book/listbox/examplewindow.cc
+++ b/examples/book/listbox/examplewindow.cc
@@ -64,14 +64,14 @@ ExampleWindow::ExampleWindow() :
m_HBox.set_margin(5);
add(m_HBox);
- m_HBox.pack_start(m_VBox1, Gtk::PACK_SHRINK);
+ m_HBox.pack_start(m_VBox1, Gtk::PackOptions::SHRINK);
// ComboBox for selection mode.
for (std::size_t i = 0; i < G_N_ELEMENTS(selectionModes); ++i)
m_ComboBox.append(selectionModes[i].text);
m_ComboBox.signal_changed().connect(sigc::mem_fun(*this, &ExampleWindow::on_selection_mode_changed));
- m_VBox1.pack_start(m_ComboBox, Gtk::PACK_SHRINK);
+ m_VBox1.pack_start(m_ComboBox, Gtk::PackOptions::SHRINK);
const auto mode = m_ListBox.get_selection_mode();
int index = 0;
@@ -88,12 +88,12 @@ ExampleWindow::ExampleWindow() :
// Check button for single click.
m_CheckButton_SingleClick.set_active(m_ListBox.get_activate_on_single_click());
m_CheckButton_SingleClick.signal_toggled().connect(sigc::mem_fun(*this,
&ExampleWindow::on_single_click_toggled));
- m_VBox1.pack_start(m_CheckButton_SingleClick, Gtk::PACK_SHRINK);
+ m_VBox1.pack_start(m_CheckButton_SingleClick, Gtk::PackOptions::SHRINK);
// Put the ListBox in a ScrolledWindow.
m_ScrolledWindow.set_policy(Gtk::PolicyType::NEVER, Gtk::PolicyType::AUTOMATIC);
m_ScrolledWindow.add(m_ListBox);
- m_HBox.pack_start(m_ScrolledWindow, Gtk::PACK_SHRINK);
+ m_HBox.pack_start(m_ScrolledWindow, Gtk::PackOptions::SHRINK);
m_ListBox.signal_row_selected().connect(sigc::mem_fun(*this, &ExampleWindow::on_row_selected));
m_ListBox.signal_row_activated().connect(sigc::mem_fun(*this, &ExampleWindow::on_row_activated));
@@ -108,11 +108,11 @@ ExampleWindow::ExampleWindow() :
m_ListBox.append(*row);
row = Gtk::manage(new ExampleRow("", 0));
- m_HBox_Row.pack_start(m_Label_Row, Gtk::PACK_SHRINK);
- m_HBox_Row.pack_start(m_CheckButton_Row1, Gtk::PACK_SHRINK);
- m_HBox_Row.pack_start(m_Button_Row1, Gtk::PACK_SHRINK);
- m_VBox_Row.pack_start(m_HBox_Row, Gtk::PACK_SHRINK);
- m_VBox_Row.pack_start(m_CheckButton_Row2, Gtk::PACK_SHRINK);
+ m_HBox_Row.pack_start(m_Label_Row, Gtk::PackOptions::SHRINK);
+ m_HBox_Row.pack_start(m_CheckButton_Row1, Gtk::PackOptions::SHRINK);
+ m_HBox_Row.pack_start(m_Button_Row1, Gtk::PackOptions::SHRINK);
+ m_VBox_Row.pack_start(m_HBox_Row, Gtk::PackOptions::SHRINK);
+ m_VBox_Row.pack_start(m_CheckButton_Row2, Gtk::PackOptions::SHRINK);
row->add(m_VBox_Row);
m_ListBox.append(*row);
@@ -123,24 +123,24 @@ ExampleWindow::ExampleWindow() :
m_ListBox.append(*row);
// Put buttons in a vertical box, and connect signal handlers.
- m_HBox.pack_start(m_VBox2, Gtk::PACK_SHRINK);
- m_VBox2.pack_start(m_Button_Sort, Gtk::PACK_SHRINK);
+ m_HBox.pack_start(m_VBox2, Gtk::PackOptions::SHRINK);
+ m_VBox2.pack_start(m_Button_Sort, Gtk::PackOptions::SHRINK);
m_Button_Sort.signal_clicked().connect(sigc::mem_fun(*this, &ExampleWindow::on_sort_clicked));
- m_VBox2.pack_start(m_Button_ReverseSort, Gtk::PACK_SHRINK);
+ m_VBox2.pack_start(m_Button_ReverseSort, Gtk::PackOptions::SHRINK);
m_Button_ReverseSort.signal_clicked().connect(sigc::mem_fun(*this,
&ExampleWindow::on_reverse_sort_clicked));
- m_VBox2.pack_start(m_Button_Change, Gtk::PACK_SHRINK);
+ m_VBox2.pack_start(m_Button_Change, Gtk::PackOptions::SHRINK);
m_Button_Change.signal_clicked().connect(sigc::mem_fun(*this, &ExampleWindow::on_change_clicked));
- m_VBox2.pack_start(m_Button_Filter, Gtk::PACK_SHRINK);
+ m_VBox2.pack_start(m_Button_Filter, Gtk::PackOptions::SHRINK);
m_Button_Filter.signal_clicked().connect(sigc::mem_fun(*this, &ExampleWindow::on_filter_clicked));
- m_VBox2.pack_start(m_Button_Unfilter, Gtk::PACK_SHRINK);
+ m_VBox2.pack_start(m_Button_Unfilter, Gtk::PackOptions::SHRINK);
m_Button_Unfilter.signal_clicked().connect(sigc::mem_fun(*this, &ExampleWindow::on_unfilter_clicked));
- m_VBox2.pack_start(m_Button_Add, Gtk::PACK_SHRINK);
+ m_VBox2.pack_start(m_Button_Add, Gtk::PackOptions::SHRINK);
m_Button_Add.signal_clicked().connect(sigc::mem_fun(*this, &ExampleWindow::on_add_clicked));
- m_VBox2.pack_start(m_Button_Separate, Gtk::PACK_SHRINK);
+ m_VBox2.pack_start(m_Button_Separate, Gtk::PackOptions::SHRINK);
m_Button_Separate.signal_clicked().connect(sigc::mem_fun(*this, &ExampleWindow::on_separate_clicked));
- m_VBox2.pack_start(m_Button_Unseparate, Gtk::PACK_SHRINK);
+ m_VBox2.pack_start(m_Button_Unseparate, Gtk::PackOptions::SHRINK);
m_Button_Unseparate.signal_clicked().connect(sigc::mem_fun(*this, &ExampleWindow::on_unseparate_clicked));
- m_VBox2.pack_start(m_Button_Visibility, Gtk::PACK_SHRINK);
+ m_VBox2.pack_start(m_Button_Visibility, Gtk::PackOptions::SHRINK);
m_Button_Visibility.signal_clicked().connect(sigc::mem_fun(*this, &ExampleWindow::on_visibility_clicked));
}
@@ -250,9 +250,9 @@ void ExampleWindow::update_header_func(Gtk::ListBoxRow* row, Gtk::ListBoxRow* be
{
auto hbox = Gtk::manage(new Gtk::Box(Gtk::Orientation::HORIZONTAL));
auto label = Gtk::manage(new Gtk::Label("Header"));
- hbox->pack_start(*label, Gtk::PACK_SHRINK);
+ hbox->pack_start(*label, Gtk::PackOptions::SHRINK);
auto button = Gtk::manage(new Gtk::Button("button"));
- hbox->pack_start(*button, Gtk::PACK_SHRINK);
+ hbox->pack_start(*button, Gtk::PackOptions::SHRINK);
row->set_header(*hbox);
}
diff --git a/examples/book/menus/main_menu/examplewindow.cc b/examples/book/menus/main_menu/examplewindow.cc
index 212b363..7e6dbf9 100644
--- a/examples/book/menus/main_menu/examplewindow.cc
+++ b/examples/book/menus/main_menu/examplewindow.cc
@@ -107,7 +107,7 @@ ExampleWindow::ExampleWindow()
if (!toolbar)
g_warning("GtkToolbar not found");
else
- m_Box.pack_start(*toolbar, Gtk::PACK_SHRINK);
+ m_Box.pack_start(*toolbar, Gtk::PackOptions::SHRINK);
}
ExampleWindow::~ExampleWindow()
diff --git a/examples/book/menus_and_toolbars/examplewindow.cc
b/examples/book/menus_and_toolbars/examplewindow.cc
index 622b1e8..14672c6 100644
--- a/examples/book/menus_and_toolbars/examplewindow.cc
+++ b/examples/book/menus_and_toolbars/examplewindow.cc
@@ -139,7 +139,7 @@ ExampleWindow::ExampleWindow(const Glib::RefPtr<Gtk::Application>& app)
auto pMenuBar = Gtk::manage(new Gtk::MenuBar(gmenu));
//Add the MenuBar to the window:
- m_Box.pack_start(*pMenuBar, Gtk::PACK_SHRINK);
+ m_Box.pack_start(*pMenuBar, Gtk::PackOptions::SHRINK);
}
//Get the toolbar and add it to a container widget:
@@ -148,7 +148,7 @@ ExampleWindow::ExampleWindow(const Glib::RefPtr<Gtk::Application>& app)
if (!toolbar)
g_warning("GtkToolbar not found");
else
- m_Box.pack_start(*toolbar, Gtk::PACK_SHRINK);
+ m_Box.pack_start(*toolbar, Gtk::PackOptions::SHRINK);
}
ExampleWindow::~ExampleWindow()
diff --git a/examples/book/multithread/examplewindow.cc b/examples/book/multithread/examplewindow.cc
index 11e1fa5..d86eecb 100644
--- a/examples/book/multithread/examplewindow.cc
+++ b/examples/book/multithread/examplewindow.cc
@@ -36,7 +36,7 @@ ExampleWindow::ExampleWindow() :
add(m_VBox);
// Add the ProgressBar.
- m_VBox.pack_start(m_ProgressBar, Gtk::PACK_SHRINK);
+ m_VBox.pack_start(m_ProgressBar, Gtk::PackOptions::SHRINK);
m_ProgressBar.set_text("Fraction done");
m_ProgressBar.set_show_text();
@@ -52,11 +52,11 @@ ExampleWindow::ExampleWindow() :
m_TextView.set_editable(false);
// Add the buttons to the ButtonBox.
- m_VBox.pack_start(m_ButtonBox, Gtk::PACK_SHRINK);
+ m_VBox.pack_start(m_ButtonBox, Gtk::PackOptions::SHRINK);
- m_ButtonBox.pack_start(m_ButtonStart, Gtk::PACK_SHRINK);
- m_ButtonBox.pack_start(m_ButtonStop, Gtk::PACK_SHRINK);
- m_ButtonBox.pack_start(m_ButtonQuit, Gtk::PACK_SHRINK);
+ m_ButtonBox.pack_start(m_ButtonStart, Gtk::PackOptions::SHRINK);
+ m_ButtonBox.pack_start(m_ButtonStop, Gtk::PackOptions::SHRINK);
+ m_ButtonBox.pack_start(m_ButtonQuit, Gtk::PackOptions::SHRINK);
m_ButtonBox.set_margin(5);
m_ButtonBox.set_spacing(5);
m_ButtonBox.set_layout(Gtk::ButtonBoxStyle::END);
diff --git a/examples/book/notebook/examplewindow.cc b/examples/book/notebook/examplewindow.cc
index beb9fbd..9f5e72b 100644
--- a/examples/book/notebook/examplewindow.cc
+++ b/examples/book/notebook/examplewindow.cc
@@ -32,9 +32,9 @@ ExampleWindow::ExampleWindow()
//Add the Notebook, with the button underneath:
m_Notebook.set_margin(10);
m_VBox.pack_start(m_Notebook);
- m_VBox.pack_start(m_ButtonBox, Gtk::PACK_SHRINK);
+ m_VBox.pack_start(m_ButtonBox, Gtk::PackOptions::SHRINK);
- m_ButtonBox.pack_start(m_Button_Quit, Gtk::PACK_SHRINK);
+ m_ButtonBox.pack_start(m_Button_Quit, Gtk::PackOptions::SHRINK);
m_Button_Quit.signal_clicked().connect(sigc::mem_fun(*this,
&ExampleWindow::on_button_quit) );
diff --git a/examples/book/placessidebar/examplewindow.cc b/examples/book/placessidebar/examplewindow.cc
index 2e0ef1a..c216001 100644
--- a/examples/book/placessidebar/examplewindow.cc
+++ b/examples/book/placessidebar/examplewindow.cc
@@ -55,8 +55,8 @@ ExampleWindow::ExampleWindow()
// Layout
m_controls_frame.add(m_controls);
- m_hbox.pack_start(m_places_sidebar, Gtk::PACK_EXPAND_WIDGET);
- m_hbox.pack_start(m_controls_frame, Gtk::PACK_SHRINK);
+ m_hbox.pack_start(m_places_sidebar, Gtk::PackOptions::EXPAND_WIDGET);
+ m_hbox.pack_start(m_controls_frame, Gtk::PackOptions::SHRINK);
m_hbox.set_margin(12);
add(m_hbox);
}
diff --git a/examples/book/popover/examplewindow.cc b/examples/book/popover/examplewindow.cc
index ec8fab0..2b2acb2 100644
--- a/examples/book/popover/examplewindow.cc
+++ b/examples/book/popover/examplewindow.cc
@@ -91,9 +91,9 @@ void ExampleWindow::configure_form_buttons()
m_toggle_form_buttons[1].join_group(m_toggle_form_buttons[0]);
m_toggle_form_buttons[2].join_group(m_toggle_form_buttons[0]);
- m_format_buttons_box.pack_start(m_toggle_form_buttons[0], Gtk::PACK_EXPAND_WIDGET);
- m_format_buttons_box.pack_start(m_toggle_form_buttons[1], Gtk::PACK_EXPAND_WIDGET);
- m_format_buttons_box.pack_start(m_toggle_form_buttons[2], Gtk::PACK_EXPAND_WIDGET);
+ m_format_buttons_box.pack_start(m_toggle_form_buttons[0], Gtk::PackOptions::EXPAND_WIDGET);
+ m_format_buttons_box.pack_start(m_toggle_form_buttons[1], Gtk::PackOptions::EXPAND_WIDGET);
+ m_format_buttons_box.pack_start(m_toggle_form_buttons[2], Gtk::PackOptions::EXPAND_WIDGET);
m_format_buttons_box.set_hexpand();
diff --git a/examples/book/printing/advanced/examplewindow.cc
b/examples/book/printing/advanced/examplewindow.cc
index 504ce6e..9c135c8 100644
--- a/examples/book/printing/advanced/examplewindow.cc
+++ b/examples/book/printing/advanced/examplewindow.cc
@@ -229,7 +229,7 @@ void ExampleWindow::build_main_menu(const Glib::RefPtr<Gtk::Application>& app)
auto pMenuBar = Gtk::manage(new Gtk::MenuBar(gmenu));
// Add the MenuBar to the window:
- m_VBox.pack_start(*pMenuBar, Gtk::PACK_SHRINK);
+ m_VBox.pack_start(*pMenuBar, Gtk::PackOptions::SHRINK);
}
// Get the toolbar and add it to a container widget:
@@ -238,7 +238,7 @@ void ExampleWindow::build_main_menu(const Glib::RefPtr<Gtk::Application>& app)
if (!toolbar)
g_warning("GtkToolbar not found");
else
- m_VBox.pack_start(*toolbar, Gtk::PACK_SHRINK);
+ m_VBox.pack_start(*toolbar, Gtk::PackOptions::SHRINK);
}
void ExampleWindow::on_printoperation_status_changed()
diff --git a/examples/book/printing/advanced/previewdialog.cc
b/examples/book/printing/advanced/previewdialog.cc
index dc4bb5b..37775fc 100644
--- a/examples/book/printing/advanced/previewdialog.cc
+++ b/examples/book/printing/advanced/previewdialog.cc
@@ -42,12 +42,12 @@ PreviewDialog::PreviewDialog(
add(m_VBox);
m_HBox.pack_start(m_PageSpin);
- m_HBox.pack_start(m_CloseButton, Gtk::PACK_SHRINK);
- m_VBox.pack_start(m_HBox, Gtk::PACK_SHRINK);
+ m_HBox.pack_start(m_CloseButton, Gtk::PackOptions::SHRINK);
+ m_VBox.pack_start(m_HBox, Gtk::PackOptions::SHRINK);
m_DrawingArea.set_content_width(200);
m_DrawingArea.set_content_height(300);
- m_VBox.pack_start(m_DrawingArea, Gtk::PACK_EXPAND_WIDGET);
+ m_VBox.pack_start(m_DrawingArea, Gtk::PackOptions::EXPAND_WIDGET);
m_refPreview->signal_ready().connect(
sigc::mem_fun(*this, &PreviewDialog::on_popreview_ready));
diff --git a/examples/book/printing/simple/examplewindow.cc b/examples/book/printing/simple/examplewindow.cc
index 504ce6e..9c135c8 100644
--- a/examples/book/printing/simple/examplewindow.cc
+++ b/examples/book/printing/simple/examplewindow.cc
@@ -229,7 +229,7 @@ void ExampleWindow::build_main_menu(const Glib::RefPtr<Gtk::Application>& app)
auto pMenuBar = Gtk::manage(new Gtk::MenuBar(gmenu));
// Add the MenuBar to the window:
- m_VBox.pack_start(*pMenuBar, Gtk::PACK_SHRINK);
+ m_VBox.pack_start(*pMenuBar, Gtk::PackOptions::SHRINK);
}
// Get the toolbar and add it to a container widget:
@@ -238,7 +238,7 @@ void ExampleWindow::build_main_menu(const Glib::RefPtr<Gtk::Application>& app)
if (!toolbar)
g_warning("GtkToolbar not found");
else
- m_VBox.pack_start(*toolbar, Gtk::PACK_SHRINK);
+ m_VBox.pack_start(*toolbar, Gtk::PackOptions::SHRINK);
}
void ExampleWindow::on_printoperation_status_changed()
diff --git a/examples/book/progressbar/examplewindow.cc b/examples/book/progressbar/examplewindow.cc
index 044493f..99d87c8 100644
--- a/examples/book/progressbar/examplewindow.cc
+++ b/examples/book/progressbar/examplewindow.cc
@@ -31,7 +31,7 @@ ExampleWindow::ExampleWindow()
m_VBox.set_margin(10);
add(m_VBox);
- m_VBox.pack_start(m_ProgressBar, Gtk::PACK_SHRINK, 5);
+ m_VBox.pack_start(m_ProgressBar, Gtk::PackOptions::SHRINK, 5);
m_ProgressBar.set_halign(Gtk::Align::CENTER);
m_ProgressBar.set_valign(Gtk::Align::CENTER);
m_ProgressBar.set_size_request(100, -1);
@@ -42,7 +42,7 @@ ExampleWindow::ExampleWindow()
m_connection_timeout = Glib::signal_timeout().connect(sigc::mem_fun(*this,
&ExampleWindow::on_timeout), 50 );
- m_VBox.pack_start(m_Separator, Gtk::PACK_SHRINK);
+ m_VBox.pack_start(m_Separator, Gtk::PackOptions::SHRINK);
m_VBox.pack_start(m_Grid);
m_Grid.set_row_homogeneous(true);
@@ -65,7 +65,7 @@ ExampleWindow::ExampleWindow()
&ExampleWindow::on_checkbutton_inverted) );
//Add a button to exit the program.
- m_VBox.pack_start(m_Button_Close, Gtk::PACK_SHRINK);
+ m_VBox.pack_start(m_Button_Close, Gtk::PackOptions::SHRINK);
m_Button_Close.signal_clicked().connect(sigc::mem_fun(*this,
&ExampleWindow::on_button_close) );
m_Button_Close.set_can_default();
diff --git a/examples/book/range_widgets/examplewindow.cc b/examples/book/range_widgets/examplewindow.cc
index e0bc463..d585316 100644
--- a/examples/book/range_widgets/examplewindow.cc
+++ b/examples/book/range_widgets/examplewindow.cc
@@ -82,7 +82,7 @@ ExampleWindow::ExampleWindow()
m_CheckButton.set_active();
m_CheckButton.signal_toggled().connect( sigc::mem_fun(*this,
&ExampleWindow::on_checkbutton_toggled) );
- m_VBox2.pack_start(m_CheckButton, Gtk::PACK_SHRINK);
+ m_VBox2.pack_start(m_CheckButton, Gtk::PackOptions::SHRINK);
//Position ComboBox:
//Create the Tree model:
@@ -104,16 +104,16 @@ ExampleWindow::ExampleWindow()
row[m_Columns.m_col_position_type] = Gtk::PositionType::RIGHT;
row[m_Columns.m_col_title] = "Right";
- m_VBox2.pack_start(m_HBox_Combo, Gtk::PACK_SHRINK);
+ m_VBox2.pack_start(m_HBox_Combo, Gtk::PackOptions::SHRINK);
m_HBox_Combo.pack_start(
- *Gtk::manage(new Gtk::Label("Scale Value Position:", 0)), Gtk::PACK_SHRINK);
+ *Gtk::manage(new Gtk::Label("Scale Value Position:", 0)), Gtk::PackOptions::SHRINK);
m_HBox_Combo.pack_start(m_ComboBox_Position);
m_ComboBox_Position.signal_changed().connect( sigc::mem_fun(*this, &ExampleWindow::on_combo_position) );
m_ComboBox_Position.set_active(0); // Top
//Digits:
m_HBox_Digits.pack_start(
- *Gtk::manage(new Gtk::Label("Scale Digits:", 0)), Gtk::PACK_SHRINK);
+ *Gtk::manage(new Gtk::Label("Scale Digits:", 0)), Gtk::PackOptions::SHRINK);
m_Scale_Digits.set_digits(0);
m_adjustment_digits->signal_value_changed().connect(sigc::mem_fun(*this,
&ExampleWindow::on_adjustment1_value_changed));
@@ -122,16 +122,16 @@ ExampleWindow::ExampleWindow()
//Page Size:
m_HBox_PageSize.pack_start(
*Gtk::manage(new Gtk::Label("Scrollbar Page Size:", 0)),
- Gtk::PACK_SHRINK);
+ Gtk::PackOptions::SHRINK);
m_Scale_PageSize.set_digits(0);
m_adjustment_pagesize->signal_value_changed().connect(sigc::mem_fun(*this,
&ExampleWindow::on_adjustment2_value_changed));
m_HBox_PageSize.pack_start(m_Scale_PageSize);
- m_VBox2.pack_start(m_HBox_Digits, Gtk::PACK_SHRINK);
- m_VBox2.pack_start(m_HBox_PageSize, Gtk::PACK_SHRINK);
- m_VBox_Top.pack_start(m_Separator, Gtk::PACK_SHRINK);
- m_VBox_Top.pack_start(m_Button_Quit, Gtk::PACK_SHRINK);
+ m_VBox2.pack_start(m_HBox_Digits, Gtk::PackOptions::SHRINK);
+ m_VBox2.pack_start(m_HBox_PageSize, Gtk::PackOptions::SHRINK);
+ m_VBox_Top.pack_start(m_Separator, Gtk::PackOptions::SHRINK);
+ m_VBox_Top.pack_start(m_Button_Quit, Gtk::PackOptions::SHRINK);
m_Button_Quit.set_can_default();
m_Button_Quit.grab_default();
diff --git a/examples/book/recent_files/examplewindow.cc b/examples/book/recent_files/examplewindow.cc
index c70b856..6fa2178 100644
--- a/examples/book/recent_files/examplewindow.cc
+++ b/examples/book/recent_files/examplewindow.cc
@@ -125,7 +125,7 @@ ExampleWindow::ExampleWindow(const Glib::RefPtr<Gtk::Application>& app)
{
//Menubar:
auto pMenubar = Gtk::manage(new Gtk::MenuBar(gmenu));
- m_Box.pack_start(*pMenubar, Gtk::PACK_SHRINK);
+ m_Box.pack_start(*pMenubar, Gtk::PackOptions::SHRINK);
}
else
g_warning("GMenu not found");
@@ -134,7 +134,7 @@ ExampleWindow::ExampleWindow(const Glib::RefPtr<Gtk::Application>& app)
m_refBuilder->get_widget("toolbar", pToolbar);
if (pToolbar)
//Toolbar:
- m_Box.pack_start(*pToolbar, Gtk::PACK_SHRINK);
+ m_Box.pack_start(*pToolbar, Gtk::PackOptions::SHRINK);
else
g_warning("GtkToolbar not found");
}
diff --git a/examples/book/revealer/examplewindow.cc b/examples/book/revealer/examplewindow.cc
index bdc1d0a..bb089f2 100644
--- a/examples/book/revealer/examplewindow.cc
+++ b/examples/book/revealer/examplewindow.cc
@@ -52,9 +52,9 @@ ExampleWindow::ExampleWindow()
// Layout
m_controls.set_row_spacing(6);
m_controls.set_column_spacing(12);
- m_vbox.pack_start(m_controls, Gtk::PACK_SHRINK, 0);
- m_vbox.pack_start(m_separator, Gtk::PACK_SHRINK, 12);
- m_vbox.pack_start(m_revealer, Gtk::PACK_EXPAND_WIDGET, 6);
+ 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.set_margin(12);
add(m_vbox);
}
diff --git a/examples/book/searchbar/examplewindow.cc b/examples/book/searchbar/examplewindow.cc
index bb38dc1..13330dd 100644
--- a/examples/book/searchbar/examplewindow.cc
+++ b/examples/book/searchbar/examplewindow.cc
@@ -56,10 +56,10 @@ ExampleWindow::ExampleWindow()
m_options_grid.attach(m_close_button_switch, 1, 1);
// Searchbar Layout
- m_up_down_box.pack_start(m_go_down_button, Gtk::PACK_SHRINK);
- m_up_down_box.pack_start(m_go_up_button, Gtk::PACK_SHRINK);
- m_search_box.pack_end(m_up_down_box, Gtk::PACK_SHRINK);
- m_search_box.pack_start(m_entry, Gtk::PACK_EXPAND_WIDGET, 6);
+ 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_bar.add(m_search_box);
// Match style of epiphany's search bar
@@ -70,10 +70,10 @@ 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::PACK_SHRINK, 6);
- m_vbox.pack_start(m_label, Gtk::PACK_SHRINK, 6);
- m_vbox.pack_start(m_separator, Gtk::PACK_SHRINK, 12);
- m_vbox.pack_start(m_options_grid, Gtk::PACK_SHRINK, 12);
+ 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_margin(12);
add(m_vbox);
}
diff --git a/examples/book/spinbutton/examplewindow.cc b/examples/book/spinbutton/examplewindow.cc
index b3b8a42..0fdbd00 100644
--- a/examples/book/spinbutton/examplewindow.cc
+++ b/examples/book/spinbutton/examplewindow.cc
@@ -63,7 +63,7 @@ ExampleWindow::ExampleWindow()
/* Day, month, year spinners */
- m_VBox.pack_start(m_HBox_NotAccelerated, Gtk::PACK_EXPAND_WIDGET, 5);
+ m_VBox.pack_start(m_HBox_NotAccelerated, Gtk::PackOptions::EXPAND_WIDGET, 5);
m_VBox_Day.pack_start(m_Label_Day);
@@ -71,14 +71,14 @@ ExampleWindow::ExampleWindow()
m_VBox_Day.pack_start(m_SpinButton_Day);
- m_HBox_NotAccelerated.pack_start(m_VBox_Day, Gtk::PACK_EXPAND_WIDGET, 5);
+ m_HBox_NotAccelerated.pack_start(m_VBox_Day, Gtk::PackOptions::EXPAND_WIDGET, 5);
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::PACK_EXPAND_WIDGET, 5);
+ m_HBox_NotAccelerated.pack_start(m_VBox_Month, Gtk::PackOptions::EXPAND_WIDGET, 5);
m_VBox_Year.pack_start(m_Label_Year);
@@ -86,7 +86,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::PACK_EXPAND_WIDGET, 5);
+ m_HBox_NotAccelerated.pack_start(m_VBox_Year, Gtk::PackOptions::EXPAND_WIDGET, 5);
//Accelerated:
m_VBox_Main.pack_start(m_Frame_Accelerated);
@@ -94,9 +94,9 @@ ExampleWindow::ExampleWindow()
m_VBox_Accelerated.set_margin(5);
m_Frame_Accelerated.add(m_VBox_Accelerated);
- m_VBox_Accelerated.pack_start(m_HBox_Accelerated, Gtk::PACK_EXPAND_WIDGET, 5);
+ m_VBox_Accelerated.pack_start(m_HBox_Accelerated, Gtk::PackOptions::EXPAND_WIDGET, 5);
- m_HBox_Accelerated.pack_start(m_VBox_Value, Gtk::PACK_EXPAND_WIDGET, 5);
+ m_HBox_Accelerated.pack_start(m_VBox_Value, Gtk::PackOptions::EXPAND_WIDGET, 5);
m_VBox_Value.pack_start(m_Label_Value);
@@ -104,7 +104,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::PACK_EXPAND_WIDGET, 5);
+ m_HBox_Accelerated.pack_start(m_VBox_Digits, Gtk::PackOptions::EXPAND_WIDGET, 5);
m_VBox_Digits.pack_start(m_Label_Digits);
@@ -128,15 +128,15 @@ ExampleWindow::ExampleWindow()
//Buttons:
- m_VBox_Accelerated.pack_start (m_HBox_Buttons, Gtk::PACK_SHRINK, 5);
+ m_VBox_Accelerated.pack_start (m_HBox_Buttons, Gtk::PackOptions::SHRINK, 5);
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::PACK_EXPAND_WIDGET, 5);
+ m_HBox_Buttons.pack_start(m_Button_Int, Gtk::PackOptions::EXPAND_WIDGET, 5);
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::PACK_EXPAND_WIDGET, 5);
+ m_HBox_Buttons.pack_start(m_Button_Float, Gtk::PackOptions::EXPAND_WIDGET, 5);
m_VBox_Accelerated.pack_start(m_Label_ShowValue);
m_Label_ShowValue.set_text("0");
@@ -144,7 +144,7 @@ ExampleWindow::ExampleWindow()
//Close button:
m_Button_Close.signal_clicked().connect( sigc::mem_fun(*this,
&ExampleWindow::on_button_close) );
- m_VBox_Main.pack_start(m_Button_Close, Gtk::PACK_SHRINK);
+ m_VBox_Main.pack_start(m_Button_Close, Gtk::PackOptions::SHRINK);
}
ExampleWindow::~ExampleWindow()
diff --git a/examples/book/textview/examplewindow.cc b/examples/book/textview/examplewindow.cc
index 0a3654e..5fa5531 100644
--- a/examples/book/textview/examplewindow.cc
+++ b/examples/book/textview/examplewindow.cc
@@ -37,11 +37,11 @@ ExampleWindow::ExampleWindow()
m_VBox.pack_start(m_ScrolledWindow);
//Add buttons:
- m_VBox.pack_start(m_ButtonBox, Gtk::PACK_SHRINK);
+ m_VBox.pack_start(m_ButtonBox, Gtk::PackOptions::SHRINK);
- m_ButtonBox.pack_start(m_Button_Buffer1, Gtk::PACK_SHRINK);
- m_ButtonBox.pack_start(m_Button_Buffer2, Gtk::PACK_SHRINK);
- m_ButtonBox.pack_start(m_Button_Quit, Gtk::PACK_SHRINK);
+ m_ButtonBox.pack_start(m_Button_Buffer1, Gtk::PackOptions::SHRINK);
+ m_ButtonBox.pack_start(m_Button_Buffer2, Gtk::PackOptions::SHRINK);
+ m_ButtonBox.pack_start(m_Button_Quit, Gtk::PackOptions::SHRINK);
m_ButtonBox.set_margin(5);
m_ButtonBox.set_spacing(5);
m_ButtonBox.set_layout(Gtk::ButtonBoxStyle::END);
diff --git a/examples/book/toolbar/examplewindow.cc b/examples/book/toolbar/examplewindow.cc
index 36869d6..76911e4 100644
--- a/examples/book/toolbar/examplewindow.cc
+++ b/examples/book/toolbar/examplewindow.cc
@@ -28,12 +28,12 @@ ExampleWindow::ExampleWindow()
add(m_VBox);
//Put a toolbar at the top, and a button underneath:
- m_VBox.pack_start(m_Toolbar, Gtk::PACK_SHRINK);
+ m_VBox.pack_start(m_Toolbar, Gtk::PackOptions::SHRINK);
m_ButtonBox.set_margin(5);
m_ButtonBox.set_layout(Gtk::ButtonBoxStyle::END);
- m_VBox.pack_end(m_ButtonBox, Gtk::PACK_SHRINK);
+ m_VBox.pack_end(m_ButtonBox, Gtk::PackOptions::SHRINK);
- m_ButtonBox.pack_start(m_Button_Close, Gtk::PACK_SHRINK);
+ m_ButtonBox.pack_start(m_Button_Close, Gtk::PackOptions::SHRINK);
m_Button_Close.signal_clicked().connect( sigc::mem_fun(*this,
&ExampleWindow::on_button_close) );
diff --git a/examples/book/toolpalette/examplewindow.cc b/examples/book/toolpalette/examplewindow.cc
index 4c9d217..b974987 100644
--- a/examples/book/toolpalette/examplewindow.cc
+++ b/examples/book/toolpalette/examplewindow.cc
@@ -198,7 +198,7 @@ ExampleWindow::ExampleWindow()
row[m_ColumnsOrientation.m_col_value] = Gtk::Orientation::VERTICAL;
row[m_ColumnsOrientation.m_col_name] = "Vertical";
m_ComboOrientation.set_model(m_refTreeModelOrientation);
- m_VBox.pack_start(m_ComboOrientation, Gtk::PACK_SHRINK);
+ m_VBox.pack_start(m_ComboOrientation, Gtk::PackOptions::SHRINK);
m_ComboOrientation.pack_start(m_ColumnsOrientation.m_col_name);
m_ComboOrientation.signal_changed().connect(
sigc::mem_fun(*this, &ExampleWindow::on_combo_orientation_changed) );
@@ -223,7 +223,7 @@ ExampleWindow::ExampleWindow()
row[m_ColumnsStyle.m_col_value] = -1; // A custom meaning for this demo.
row[m_ColumnsStyle.m_col_name] = "Default";
m_ComboStyle.set_model(m_refTreeModelStyle);
- m_VBox.pack_start(m_ComboStyle, Gtk::PACK_SHRINK);
+ m_VBox.pack_start(m_ComboStyle, Gtk::PackOptions::SHRINK);
m_ComboStyle.pack_start(m_ColumnsStyle.m_col_name);
m_ComboStyle.signal_changed().connect(
sigc::mem_fun(*this, &ExampleWindow::on_combo_style_changed) );
@@ -234,7 +234,7 @@ ExampleWindow::ExampleWindow()
load_toggle_items();
load_special_items();
- m_VBox.pack_start(m_HBox, Gtk::PACK_EXPAND_WIDGET);
+ m_VBox.pack_start(m_HBox, Gtk::PackOptions::EXPAND_WIDGET);
m_ScrolledWindowPalette.set_policy(Gtk::PolicyType::NEVER, Gtk::PolicyType::AUTOMATIC);
m_ScrolledWindowPalette.set_margin(6);
diff --git a/examples/book/tooltips/examplewindow.cc b/examples/book/tooltips/examplewindow.cc
index baa5563..ab7eefd 100644
--- a/examples/book/tooltips/examplewindow.cc
+++ b/examples/book/tooltips/examplewindow.cc
@@ -38,11 +38,11 @@ ExampleWindow::ExampleWindow()
//Check button with markup in tooltip:
m_checkbutton.set_tooltip_text(non_markedup_tip);
- m_vbox.pack_start(m_checkbutton, Gtk::PACK_SHRINK);
+ m_vbox.pack_start(m_checkbutton, Gtk::PackOptions::SHRINK);
//Label:
m_label.set_tooltip_text("Another tooltip");
- m_vbox.pack_start(m_label, Gtk::PACK_SHRINK);
+ m_vbox.pack_start(m_label, Gtk::PackOptions::SHRINK);
//Textview:
prepare_textview();
@@ -51,7 +51,7 @@ ExampleWindow::ExampleWindow()
// set_tooltip_window(), like set_tooltip_text(),
// will call set_has_tooltip() for us.
m_button.set_tooltip_window(m_button_tooltip_window);
- m_vbox.pack_start(m_button, Gtk::PACK_SHRINK);
+ m_vbox.pack_start(m_button, Gtk::PackOptions::SHRINK);
//Button's custom tooltip window:
m_button_tooltip_window.set_default_size(250, 30);
diff --git a/examples/book/treeview/combo_renderer/examplewindow.cc
b/examples/book/treeview/combo_renderer/examplewindow.cc
index e629df9..ccb6e22 100644
--- a/examples/book/treeview/combo_renderer/examplewindow.cc
+++ b/examples/book/treeview/combo_renderer/examplewindow.cc
@@ -34,9 +34,9 @@ ExampleWindow::ExampleWindow()
m_ScrolledWindow.set_policy(Gtk::PolicyType::AUTOMATIC, Gtk::PolicyType::AUTOMATIC);
m_VBox.pack_start(m_ScrolledWindow);
- m_VBox.pack_start(m_ButtonBox, Gtk::PACK_SHRINK);
+ m_VBox.pack_start(m_ButtonBox, Gtk::PackOptions::SHRINK);
- m_ButtonBox.pack_start(m_Button_Quit, Gtk::PACK_SHRINK);
+ m_ButtonBox.pack_start(m_Button_Quit, Gtk::PackOptions::SHRINK);
m_ButtonBox.set_margin(5);
m_ButtonBox.set_layout(Gtk::ButtonBoxStyle::END);
m_Button_Quit.signal_clicked().connect( sigc::mem_fun(*this,
diff --git a/examples/book/treeview/drag_and_drop/examplewindow.cc
b/examples/book/treeview/drag_and_drop/examplewindow.cc
index 44c466b..30fb10f 100644
--- a/examples/book/treeview/drag_and_drop/examplewindow.cc
+++ b/examples/book/treeview/drag_and_drop/examplewindow.cc
@@ -34,9 +34,9 @@ ExampleWindow::ExampleWindow()
m_ScrolledWindow.set_policy(Gtk::PolicyType::AUTOMATIC, Gtk::PolicyType::AUTOMATIC);
m_VBox.pack_start(m_ScrolledWindow);
- m_VBox.pack_start(m_ButtonBox, Gtk::PACK_SHRINK);
+ m_VBox.pack_start(m_ButtonBox, Gtk::PackOptions::SHRINK);
- m_ButtonBox.pack_start(m_Button_Quit, Gtk::PACK_SHRINK);
+ m_ButtonBox.pack_start(m_Button_Quit, Gtk::PackOptions::SHRINK);
m_ButtonBox.set_margin(5);
m_ButtonBox.set_layout(Gtk::ButtonBoxStyle::END);
m_Button_Quit.signal_clicked().connect(sigc::mem_fun(*this,
diff --git a/examples/book/treeview/editable_cells/examplewindow.cc
b/examples/book/treeview/editable_cells/examplewindow.cc
index d07a856..6a1f7b6 100644
--- a/examples/book/treeview/editable_cells/examplewindow.cc
+++ b/examples/book/treeview/editable_cells/examplewindow.cc
@@ -40,9 +40,9 @@ ExampleWindow::ExampleWindow()
m_ScrolledWindow.set_policy(Gtk::PolicyType::AUTOMATIC, Gtk::PolicyType::AUTOMATIC);
m_VBox.pack_start(m_ScrolledWindow);
- m_VBox.pack_start(m_ButtonBox, Gtk::PACK_SHRINK);
+ m_VBox.pack_start(m_ButtonBox, Gtk::PackOptions::SHRINK);
- m_ButtonBox.pack_start(m_Button_Quit, Gtk::PACK_SHRINK);
+ m_ButtonBox.pack_start(m_Button_Quit, Gtk::PackOptions::SHRINK);
m_ButtonBox.set_margin(5);
m_ButtonBox.set_layout(Gtk::ButtonBoxStyle::END);
m_Button_Quit.signal_clicked().connect( sigc::mem_fun(*this,
diff --git a/examples/book/treeview/filter/examplewindow.cc b/examples/book/treeview/filter/examplewindow.cc
index 2c61976..cf6634a 100644
--- a/examples/book/treeview/filter/examplewindow.cc
+++ b/examples/book/treeview/filter/examplewindow.cc
@@ -34,9 +34,9 @@ ExampleWindow::ExampleWindow()
m_ScrolledWindow.set_policy(Gtk::PolicyType::AUTOMATIC, Gtk::PolicyType::AUTOMATIC);
m_VBox.pack_start(m_ScrolledWindow);
- m_VBox.pack_start(m_ButtonBox, Gtk::PACK_SHRINK);
+ m_VBox.pack_start(m_ButtonBox, Gtk::PackOptions::SHRINK);
- m_ButtonBox.pack_start(m_Button_Quit, Gtk::PACK_SHRINK);
+ m_ButtonBox.pack_start(m_Button_Quit, Gtk::PackOptions::SHRINK);
m_ButtonBox.set_margin(5);
m_ButtonBox.set_layout(Gtk::ButtonBoxStyle::END);
m_Button_Quit.signal_clicked().connect( sigc::mem_fun(*this,
diff --git a/examples/book/treeview/filter_modify/examplewindow.cc
b/examples/book/treeview/filter_modify/examplewindow.cc
index 470c386..6971336 100644
--- a/examples/book/treeview/filter_modify/examplewindow.cc
+++ b/examples/book/treeview/filter_modify/examplewindow.cc
@@ -34,9 +34,9 @@ ExampleWindow::ExampleWindow()
m_ScrolledWindow.set_policy(Gtk::PolicyType::AUTOMATIC, Gtk::PolicyType::AUTOMATIC);
m_VBox.pack_start(m_ScrolledWindow);
- m_VBox.pack_start(m_ButtonBox, Gtk::PACK_SHRINK);
+ m_VBox.pack_start(m_ButtonBox, Gtk::PackOptions::SHRINK);
- m_ButtonBox.pack_start(m_Button_Quit, Gtk::PACK_SHRINK);
+ m_ButtonBox.pack_start(m_Button_Quit, Gtk::PackOptions::SHRINK);
m_ButtonBox.set_margin(5);
m_ButtonBox.set_layout(Gtk::ButtonBoxStyle::END);
m_Button_Quit.signal_clicked().connect( sigc::mem_fun(*this,
diff --git a/examples/book/treeview/list/examplewindow.cc b/examples/book/treeview/list/examplewindow.cc
index a73ce47..6736ccd 100644
--- a/examples/book/treeview/list/examplewindow.cc
+++ b/examples/book/treeview/list/examplewindow.cc
@@ -34,9 +34,9 @@ ExampleWindow::ExampleWindow()
m_ScrolledWindow.set_policy(Gtk::PolicyType::AUTOMATIC, Gtk::PolicyType::AUTOMATIC);
m_VBox.pack_start(m_ScrolledWindow);
- m_VBox.pack_start(m_ButtonBox, Gtk::PACK_SHRINK);
+ m_VBox.pack_start(m_ButtonBox, Gtk::PackOptions::SHRINK);
- m_ButtonBox.pack_start(m_Button_Quit, Gtk::PACK_SHRINK);
+ m_ButtonBox.pack_start(m_Button_Quit, Gtk::PackOptions::SHRINK);
m_ButtonBox.set_margin(5);
m_ButtonBox.set_layout(Gtk::ButtonBoxStyle::END);
m_Button_Quit.signal_clicked().connect( sigc::mem_fun(*this,
diff --git a/examples/book/treeview/listviewtext/examplewindow.cc
b/examples/book/treeview/listviewtext/examplewindow.cc
index 5562459..72fd0b1 100644
--- a/examples/book/treeview/listviewtext/examplewindow.cc
+++ b/examples/book/treeview/listviewtext/examplewindow.cc
@@ -35,9 +35,9 @@ ExampleWindow::ExampleWindow()
m_ScrolledWindow.set_policy(Gtk::PolicyType::AUTOMATIC, Gtk::PolicyType::AUTOMATIC);
m_VBox.pack_start(m_ScrolledWindow);
- m_VBox.pack_start(m_ButtonBox, Gtk::PACK_SHRINK);
+ m_VBox.pack_start(m_ButtonBox, Gtk::PackOptions::SHRINK);
- m_ButtonBox.pack_start(m_Button_Quit, Gtk::PACK_SHRINK);
+ m_ButtonBox.pack_start(m_Button_Quit, Gtk::PackOptions::SHRINK);
m_ButtonBox.set_margin(5);
m_ButtonBox.set_layout(Gtk::ButtonBoxStyle::END);
m_Button_Quit.signal_clicked().connect( sigc::mem_fun(*this,
diff --git a/examples/book/treeview/modelsort/examplewindow.cc
b/examples/book/treeview/modelsort/examplewindow.cc
index f312da0..846bd26 100644
--- a/examples/book/treeview/modelsort/examplewindow.cc
+++ b/examples/book/treeview/modelsort/examplewindow.cc
@@ -38,9 +38,9 @@ ExampleWindow::ExampleWindow()
m_VBox.pack_start(m_ScrolledWindow1);
m_VBox.pack_start(m_ScrolledWindow2);
- m_VBox.pack_start(m_ButtonBox, Gtk::PACK_SHRINK);
+ m_VBox.pack_start(m_ButtonBox, Gtk::PackOptions::SHRINK);
- m_ButtonBox.pack_start(m_Button_Quit, Gtk::PACK_SHRINK);
+ m_ButtonBox.pack_start(m_Button_Quit, Gtk::PackOptions::SHRINK);
m_ButtonBox.set_margin(5);
m_ButtonBox.set_layout(Gtk::ButtonBoxStyle::END);
m_Button_Quit.signal_clicked().connect( sigc::mem_fun(*this,
diff --git a/examples/book/treeview/popup/examplewindow.cc b/examples/book/treeview/popup/examplewindow.cc
index 8a7fc91..a2ece8d 100644
--- a/examples/book/treeview/popup/examplewindow.cc
+++ b/examples/book/treeview/popup/examplewindow.cc
@@ -34,9 +34,9 @@ ExampleWindow::ExampleWindow()
m_ScrolledWindow.set_policy(Gtk::PolicyType::AUTOMATIC, Gtk::PolicyType::AUTOMATIC);
m_VBox.pack_start(m_ScrolledWindow);
- m_VBox.pack_start(m_ButtonBox, Gtk::PACK_SHRINK);
+ m_VBox.pack_start(m_ButtonBox, Gtk::PackOptions::SHRINK);
- m_ButtonBox.pack_start(m_Button_Quit, Gtk::PACK_SHRINK);
+ m_ButtonBox.pack_start(m_Button_Quit, Gtk::PackOptions::SHRINK);
m_ButtonBox.set_margin(5);
m_ButtonBox.set_layout(Gtk::ButtonBoxStyle::END);
m_Button_Quit.signal_clicked().connect( sigc::mem_fun(*this,
diff --git a/examples/book/treeview/tree/examplewindow.cc b/examples/book/treeview/tree/examplewindow.cc
index 00d8bcd..e9d0a88 100644
--- a/examples/book/treeview/tree/examplewindow.cc
+++ b/examples/book/treeview/tree/examplewindow.cc
@@ -34,9 +34,9 @@ ExampleWindow::ExampleWindow()
m_ScrolledWindow.set_policy(Gtk::PolicyType::AUTOMATIC, Gtk::PolicyType::AUTOMATIC);
m_VBox.pack_start(m_ScrolledWindow);
- m_VBox.pack_start(m_ButtonBox, Gtk::PACK_SHRINK);
+ m_VBox.pack_start(m_ButtonBox, Gtk::PackOptions::SHRINK);
- m_ButtonBox.pack_start(m_Button_Quit, Gtk::PACK_SHRINK);
+ m_ButtonBox.pack_start(m_Button_Quit, Gtk::PackOptions::SHRINK);
m_ButtonBox.set_margin(5);
m_ButtonBox.set_layout(Gtk::ButtonBoxStyle::END);
m_Button_Quit.signal_clicked().connect(sigc::mem_fun(*this,
diff --git a/examples/book/update_ui/examplewindow.cc b/examples/book/update_ui/examplewindow.cc
index 62e988f..09bc121 100644
--- a/examples/book/update_ui/examplewindow.cc
+++ b/examples/book/update_ui/examplewindow.cc
@@ -28,11 +28,11 @@ ExampleWindow::ExampleWindow()
m_VBox.set_margin(6);
add(m_VBox);
- m_VBox.pack_start(m_ProgressBar, Gtk::PACK_SHRINK);
- m_VBox.pack_start(m_ButtonBox, Gtk::PACK_SHRINK);
+ m_VBox.pack_start(m_ProgressBar, Gtk::PackOptions::SHRINK);
+ m_VBox.pack_start(m_ButtonBox, Gtk::PackOptions::SHRINK);
- m_ButtonBox.pack_start(m_Button_Quit, Gtk::PACK_SHRINK);
- m_ButtonBox.pack_start(m_Button_Start, Gtk::PACK_SHRINK);
+ m_ButtonBox.pack_start(m_Button_Quit, Gtk::PackOptions::SHRINK);
+ m_ButtonBox.pack_start(m_Button_Start, Gtk::PackOptions::SHRINK);
m_ButtonBox.set_margin(6);
m_ButtonBox.set_layout(Gtk::ButtonBoxStyle::END);
m_Button_Quit.signal_clicked().connect(sigc::mem_fun(*this,
diff --git a/examples/others/calendar/calendar.cc b/examples/others/calendar/calendar.cc
index 8160a8a..f5aeab2 100644
--- a/examples/others/calendar/calendar.cc
+++ b/examples/others/calendar/calendar.cc
@@ -184,15 +184,15 @@ CalendarExample::CalendarExample()
*/
auto hbox = Gtk::manage(new Gtk::Box(Gtk::Orientation::HORIZONTAL, DEF_PAD));
- vbox->pack_start(*hbox, Gtk::PACK_EXPAND_WIDGET, DEF_PAD);
+ vbox->pack_start(*hbox, Gtk::PackOptions::EXPAND_WIDGET, DEF_PAD);
auto hbbox = Gtk::manage(new Gtk::ButtonBox());
- hbox->pack_start(*hbbox, Gtk::PACK_SHRINK, DEF_PAD);
+ hbox->pack_start(*hbbox, Gtk::PackOptions::SHRINK, 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::PACK_EXPAND_WIDGET, DEF_PAD);
+ hbbox->pack_start(*frame, Gtk::PackOptions::EXPAND_WIDGET, DEF_PAD);
calendar_ = new Gtk::Calendar();
set_flags();
calendar_->mark_day(19);
@@ -202,15 +202,15 @@ CalendarExample::CalendarExample()
calendar_->signal_day_selected_double_click().connect(sigc::mem_fun(*this,
&CalendarExample::day_selected_double_click));
auto separator = Gtk::manage(new Gtk::Separator(Gtk::Orientation::VERTICAL));
- hbox->pack_start (*separator, Gtk::PACK_SHRINK);
+ hbox->pack_start (*separator, Gtk::PackOptions::SHRINK);
auto vbox2 = Gtk::manage(new Gtk::Box(Gtk::Orientation::VERTICAL, DEF_PAD));
- hbox->pack_start(*vbox2, Gtk::PACK_SHRINK, DEF_PAD);
+ hbox->pack_start(*vbox2, Gtk::PackOptions::SHRINK, DEF_PAD);
/* Build the Right frame with the flags in */
auto frameFlags = Gtk::manage(new Gtk::Frame("Flags"));
- vbox2->pack_start(*frameFlags, Gtk::PACK_EXPAND_WIDGET, DEF_PAD);
+ vbox2->pack_start(*frameFlags, Gtk::PackOptions::EXPAND_WIDGET, DEF_PAD);
auto vbox3 = Gtk::manage(new Gtk::Box(Gtk::Orientation::VERTICAL, DEF_PAD_SMALL));
frameFlags->add(*vbox3);
@@ -236,7 +236,7 @@ CalendarExample::CalendarExample()
/* Build the right font-button */
font_button_ = Gtk::manage(new Gtk::FontButton());
font_button_->signal_font_set().connect(sigc::mem_fun(*this, &CalendarExample::on_font_button_font_set));
- vbox2->pack_start(*font_button_, Gtk::PACK_SHRINK);
+ vbox2->pack_start(*font_button_, Gtk::PackOptions::SHRINK);
// Add a StyleProvider to the Gtk::Calendar, so we can change the font.
// This was easier before Gtk::Widget::override_font() was deprecated.
@@ -253,33 +253,33 @@ CalendarExample::CalendarExample()
* Build the Signal-event part.
*/
frame = Gtk::manage(new Gtk::Frame("Signal events"));
- vbox->pack_start(*frame, Gtk::PACK_EXPAND_WIDGET, DEF_PAD);
+ vbox->pack_start(*frame, Gtk::PackOptions::EXPAND_WIDGET, DEF_PAD);
vbox2 = Gtk::manage(new Gtk::Box(Gtk::Orientation::VERTICAL, DEF_PAD_SMALL));
frame->add(*vbox2);
hbox = Gtk::manage(new Gtk::Box(Gtk::Orientation::HORIZONTAL, 5));
- vbox2->pack_start (*hbox, Gtk::PACK_SHRINK);
+ vbox2->pack_start (*hbox, Gtk::PackOptions::SHRINK);
auto label = Gtk::manage(new Gtk::Label("Day selected:"));
- hbox->pack_start (*label, Gtk::PACK_SHRINK);
+ hbox->pack_start (*label, Gtk::PackOptions::SHRINK);
label_selected_ = new Gtk::Label("");
- hbox->pack_start (*label_selected_, Gtk::PACK_SHRINK);
+ hbox->pack_start (*label_selected_, Gtk::PackOptions::SHRINK);
hbox = Gtk::manage(new Gtk::Box(Gtk::Orientation::HORIZONTAL, 5));
- vbox2->pack_start (*hbox, Gtk::PACK_SHRINK);
+ vbox2->pack_start (*hbox, Gtk::PackOptions::SHRINK);
label = Gtk::manage(new Gtk::Label("Day selected double click:"));
- hbox->pack_start (*label, Gtk::PACK_SHRINK);
+ hbox->pack_start (*label, Gtk::PackOptions::SHRINK);
label_selected_double_click_ = new Gtk::Label("");
- hbox->pack_start (*label_selected_double_click_, Gtk::PACK_SHRINK);
+ hbox->pack_start (*label_selected_double_click_, Gtk::PackOptions::SHRINK);
hbox = Gtk::manage(new Gtk::Box(Gtk::Orientation::HORIZONTAL, 5));
- vbox2->pack_start (*hbox, Gtk::PACK_SHRINK);
+ vbox2->pack_start (*hbox, Gtk::PackOptions::SHRINK);
label = Gtk::manage(new Gtk::Label("Month change:"));
- hbox->pack_start (*label, Gtk::PACK_SHRINK);
+ hbox->pack_start (*label, Gtk::PackOptions::SHRINK);
label_month_ = new Gtk::Label("");
- hbox->pack_start(*label_month_, Gtk::PACK_SHRINK);
+ hbox->pack_start(*label_month_, Gtk::PackOptions::SHRINK);
auto bbox = Gtk::manage(new Gtk::ButtonBox());
- vbox->pack_start(*bbox, Gtk::PACK_SHRINK);
+ vbox->pack_start(*bbox, Gtk::PackOptions::SHRINK);
bbox->set_layout(Gtk::ButtonBoxStyle::END);
auto button = Gtk::manage(new Gtk::Button("Close"));
diff --git a/examples/others/cellrenderercustom/popupentry.cc
b/examples/others/cellrenderercustom/popupentry.cc
index b800a33..74a906b 100644
--- a/examples/others/cellrenderercustom/popupentry.cc
+++ b/examples/others/cellrenderercustom/popupentry.cc
@@ -38,11 +38,11 @@ PopupEntry::PopupEntry(const Glib::ustring& path)
add(*Gtk::manage(hbox));
entry_ = new Gtk::Entry();
- hbox->pack_start(*Gtk::manage(entry_), Gtk::PACK_EXPAND_WIDGET);
+ hbox->pack_start(*Gtk::manage(entry_), Gtk::PackOptions::EXPAND_WIDGET);
entry_->set_has_frame(false);
button_ = new Gtk::Button();
- hbox->pack_start(*Gtk::manage(button_), Gtk::PACK_SHRINK);
+ hbox->pack_start(*Gtk::manage(button_), Gtk::PackOptions::SHRINK);
button_->set_image_from_icon_name("pan-down-symbolic", Gtk::BuiltinIconSize::BUTTON, true);
set_can_focus();
diff --git a/examples/others/idle/idle.cc b/examples/others/idle/idle.cc
index 49e0b09..8457296 100644
--- a/examples/others/idle/idle.cc
+++ b/examples/others/idle/idle.cc
@@ -54,7 +54,7 @@ IdleExample::IdleExample() :
vbox->pack_start(m_progressbar_d);
Gtk::Box *hbox = manage( new Gtk::Box(Gtk::Orientation::HORIZONTAL,10));
- hbox->pack_start(m_quit, Gtk::PACK_EXPAND_PADDING);
+ hbox->pack_start(m_quit, Gtk::PackOptions::EXPAND_PADDING);
vbox->pack_start(*hbox);
// set margin and display all
diff --git a/examples/others/treemodelcustom/examplewindow.cc
b/examples/others/treemodelcustom/examplewindow.cc
index 4cead84..3b2006b 100644
--- a/examples/others/treemodelcustom/examplewindow.cc
+++ b/examples/others/treemodelcustom/examplewindow.cc
@@ -34,9 +34,9 @@ ExampleWindow::ExampleWindow()
m_ScrolledWindow.set_policy(Gtk::PolicyType::AUTOMATIC, Gtk::PolicyType::AUTOMATIC);
m_VBox.pack_start(m_ScrolledWindow);
- m_VBox.pack_start(m_ButtonBox, Gtk::PACK_SHRINK);
+ m_VBox.pack_start(m_ButtonBox, Gtk::PackOptions::SHRINK);
- m_ButtonBox.pack_start(m_Button_Quit, Gtk::PACK_SHRINK);
+ m_ButtonBox.pack_start(m_Button_Quit, Gtk::PackOptions::SHRINK);
m_ButtonBox.set_margin(5);
m_ButtonBox.set_layout(Gtk::ButtonBoxStyle::END);
m_Button_Quit.signal_clicked().connect( sigc::mem_fun(*this, &ExampleWindow::on_button_quit) );
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
