[gtkmm-documentation] Fix the build with --enable-warnings=fatal.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm-documentation] Fix the build with --enable-warnings=fatal.
- Date: Tue, 19 Jul 2011 11:33:39 +0000 (UTC)
commit 8ec40228c6c551f3f55526fc0e1a60639c2eeb02
Author: Murray Cumming <murrayc murrayc com>
Date: Tue Jul 19 13:31:51 2011 +0200
Fix the build with --enable-warnings=fatal.
* examples/: Replace all H/V classes with the base classes, specifying
the orientation. This is tedious.
ChangeLog | 7 ++
examples/book/assistant/exampleassistant.cc | 2 +-
examples/book/assistant/exampleassistant.h | 2 +-
examples/book/box/examplewindow.cc | 11 ++-
examples/book/box/examplewindow.h | 6 +-
examples/book/box/packbox.cc | 6 +-
examples/book/box/packbox.h | 2 +-
examples/book/buttonbox/examplebuttonbox.cc | 4 +-
examples/book/buttonbox/examplewindow.cc | 4 +-
examples/book/buttonbox/examplewindow.h | 4 +-
examples/book/buttons/radiobutton/radiobuttons.cc | 5 +-
examples/book/buttons/radiobutton/radiobuttons.h | 4 +-
examples/book/clipboard/ideal/examplewindow.cc | 3 +-
examples/book/clipboard/ideal/examplewindow.h | 4 +-
examples/book/clipboard/simple/examplewindow.cc | 3 +-
examples/book/clipboard/simple/examplewindow.h | 4 +-
.../book/custom/custom_container/examplewindow.cc | 3 +-
.../book/custom/custom_container/examplewindow.h | 4 +-
.../book/custom/custom_widget/examplewindow.cc | 3 +-
examples/book/custom/custom_widget/examplewindow.h | 4 +-
examples/book/dialogs/aboutdialog/examplewindow.cc | 3 +-
examples/book/dialogs/aboutdialog/examplewindow.h | 2 +-
.../dialogs/colorselectiondialog/examplewindow.cc | 1 +
.../dialogs/colorselectiondialog/examplewindow.h | 2 +-
.../dialogs/filechooserdialog/examplewindow.cc | 3 +-
.../book/dialogs/filechooserdialog/examplewindow.h | 2 +-
.../book/dialogs/messagedialog/examplewindow.cc | 3 +-
.../book/dialogs/messagedialog/examplewindow.h | 2 +-
examples/book/drag_and_drop/dndwindow.h | 2 +-
examples/book/entry/completion/examplewindow.cc | 7 +-
examples/book/entry/completion/examplewindow.h | 4 +-
examples/book/entry/icon/examplewindow.cc | 3 +-
examples/book/entry/icon/examplewindow.h | 2 +-
examples/book/entry/progress/examplewindow.cc | 3 +-
examples/book/entry/progress/examplewindow.h | 2 +-
examples/book/entry/simple/examplewindow.cc | 3 +-
examples/book/entry/simple/examplewindow.h | 4 +-
examples/book/helloworld2/helloworld.h | 2 +-
examples/book/iconview/examplewindow.cc | 3 +-
examples/book/iconview/examplewindow.h | 4 +-
examples/book/idle/idleexample.cc | 4 +-
examples/book/idle/idleexample.h | 2 +-
examples/book/infobar/examplewindow.cc | 2 +-
examples/book/infobar/examplewindow.h | 4 +-
examples/book/label/examplewindow.cc | 4 +-
examples/book/label/examplewindow.h | 4 +-
examples/book/menus/main_menu/examplewindow.cc | 1 +
examples/book/menus/main_menu/examplewindow.h | 2 +-
examples/book/menus/popup/examplewindow.cc | 3 +-
examples/book/menus/popup/examplewindow.h | 2 +-
examples/book/menus_and_toolbars/examplewindow.cc | 1 +
examples/book/menus_and_toolbars/examplewindow.h | 2 +-
examples/book/notebook/examplewindow.cc | 3 +-
examples/book/notebook/examplewindow.h | 4 +-
examples/book/paned/examplewindow.cc | 1 +
examples/book/paned/examplewindow.h | 2 +-
examples/book/printing/advanced/examplewindow.cc | 2 +-
examples/book/printing/advanced/examplewindow.h | 2 +-
examples/book/printing/advanced/previewdialog.cc | 4 +-
examples/book/printing/advanced/previewdialog.h | 4 +-
.../book/printing/advanced/printformoperation.cc | 4 +-
examples/book/printing/simple/examplewindow.cc | 2 +-
examples/book/printing/simple/examplewindow.h | 2 +-
examples/book/progressbar/examplewindow.cc | 2 +-
examples/book/progressbar/examplewindow.h | 4 +-
examples/book/range_widgets/examplewindow.cc | 14 ++--
examples/book/range_widgets/examplewindow.h | 12 ++--
examples/book/recent_files/examplewindow.cc | 3 +-
examples/book/recent_files/examplewindow.h | 2 +-
examples/book/scrolledwindow/examplewindow.cc | 2 +-
examples/book/spinbutton/examplewindow.cc | 2 +-
examples/book/spinbutton/examplewindow.h | 4 +-
examples/book/textview/examplewindow.cc | 3 +-
examples/book/textview/examplewindow.h | 4 +-
examples/book/timeout/timerexample.cc | 2 +-
examples/book/timeout/timerexample.h | 2 +-
examples/book/toolbar/examplewindow.cc | 3 +-
examples/book/toolbar/examplewindow.h | 4 +-
examples/book/toolpalette/examplewindow.cc | 4 +-
examples/book/toolpalette/examplewindow.h | 4 +-
examples/book/tooltips/examplewindow.cc | 2 +-
examples/book/tooltips/examplewindow.h | 2 +-
.../book/treeview/combo_renderer/examplewindow.cc | 3 +-
.../book/treeview/combo_renderer/examplewindow.h | 4 +-
.../book/treeview/drag_and_drop/examplewindow.cc | 3 +-
.../book/treeview/drag_and_drop/examplewindow.h | 4 +-
.../book/treeview/editable_cells/examplewindow.cc | 3 +-
.../book/treeview/editable_cells/examplewindow.h | 4 +-
examples/book/treeview/filter/examplewindow.cc | 3 +-
examples/book/treeview/filter/examplewindow.h | 4 +-
.../book/treeview/filter_modify/examplewindow.cc | 3 +-
.../book/treeview/filter_modify/examplewindow.h | 4 +-
examples/book/treeview/list/examplewindow.cc | 3 +-
examples/book/treeview/list/examplewindow.h | 4 +-
.../book/treeview/listviewtext/examplewindow.cc | 7 +-
.../book/treeview/listviewtext/examplewindow.h | 4 +-
examples/book/treeview/modelsort/examplewindow.cc | 3 +-
examples/book/treeview/modelsort/examplewindow.h | 4 +-
examples/book/treeview/popup/examplewindow.cc | 3 +-
examples/book/treeview/popup/examplewindow.h | 4 +-
examples/book/treeview/tree/examplewindow.cc | 3 +-
examples/book/treeview/tree/examplewindow.h | 4 +-
examples/book/update_ui/examplewindow.cc | 3 +-
examples/book/update_ui/examplewindow.h | 4 +-
examples/others/arrow/arrow.cc | 4 +-
examples/others/calendar/calendar.cc | 22 +++---
examples/others/cellrenderercustom/popupentry.cc | 2 +-
examples/others/exception/exceptiontest.cc | 2 +-
examples/others/idle/idle.cc | 4 +-
examples/others/statusbar/statusbar.cc | 4 +-
examples/others/stock/stock.cc | 2 +-
examples/others/tictactoe/tictactoe.cc | 90 ++++++++++----------
examples/others/tictactoe/tictactoe.h | 24 +++---
examples/others/treemodelcustom/examplewindow.cc | 3 +-
examples/others/treemodelcustom/examplewindow.h | 4 +-
115 files changed, 283 insertions(+), 237 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index d156cba..00c0145 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-07-19 Murray Cumming <murrayc murrayc com>
+
+ Fix the build with --enable-warnings=fatal.
+
+ * examples/: Replace all H/V classes with the base classes, specifying
+ the orientation. This is tedious.
+
2011-06-13 Josà Alburquerque <jaalburqu svn gnome org>
Wrapping Section: Initializations: Add comment about type substitution.
diff --git a/examples/book/assistant/exampleassistant.cc b/examples/book/assistant/exampleassistant.cc
index 557ba58..a3e22a1 100644
--- a/examples/book/assistant/exampleassistant.cc
+++ b/examples/book/assistant/exampleassistant.cc
@@ -18,7 +18,7 @@
#include "exampleassistant.h"
ExampleAssistant::ExampleAssistant()
-: m_box(false, 12),
+: m_box(Gtk::ORIENTATION_HORIZONTAL, 12),
m_label1("Type text to allow the assistant to continue:"),
m_label2("Confirmation page"),
m_check("Optional extra information")
diff --git a/examples/book/assistant/exampleassistant.h b/examples/book/assistant/exampleassistant.h
index 83e95a0..7b0e628 100644
--- a/examples/book/assistant/exampleassistant.h
+++ b/examples/book/assistant/exampleassistant.h
@@ -39,7 +39,7 @@ private:
void print_status();
// Child widgets:
- Gtk::HBox m_box;
+ Gtk::Box m_box;
Gtk::Label m_label1, m_label2;
Gtk::CheckButton m_check;
Gtk::Entry m_entry;
diff --git a/examples/book/box/examplewindow.cc b/examples/book/box/examplewindow.cc
index f37b411..79a497c 100644
--- a/examples/book/box/examplewindow.cc
+++ b/examples/book/box/examplewindow.cc
@@ -20,7 +20,8 @@
#include "examplewindow.h"
ExampleWindow::ExampleWindow(int which)
-: m_buttonQuit("Quit")
+: m_box1(Gtk::ORIENTATION_VERTICAL),
+ m_buttonQuit("Quit")
{
set_title("Gtk::Box example");
@@ -30,7 +31,7 @@ ExampleWindow::ExampleWindow(int which)
{
case 1:
{
- m_Label1.set_text("Gtk::HBox(false, 0);");
+ m_Label1.set_text("Gtk::Box(Gtk::ORIENTATION_HORIZONTAL, 0);");
// Align the label to the left side. We'll discuss this function and
// others in the section on Widget Attributes.
@@ -62,7 +63,7 @@ ExampleWindow::ExampleWindow(int which)
m_box1.pack_start(m_seperator1, Gtk::PACK_SHRINK, 5);
// create another new label, and show it.
- m_Label2.set_text("Gtk::HBox(true, 0);");
+ m_Label2.set_text("Gtk::Box(Gtk::ORIENTATION_HORIZONTAL, 0);");
m_Label2.set_alignment(Gtk::ALIGN_START, Gtk::ALIGN_START);
m_box1.pack_start(m_Label2, Gtk::PACK_SHRINK);
@@ -82,7 +83,7 @@ ExampleWindow::ExampleWindow(int which)
case 2:
{
- m_Label1.set_text("Gtk::HBox(false, 10);");
+ m_Label1.set_text("Gtk::Box(Gtk::ORIENTATION_HORIZONTAL, 10);");
m_Label1.set_alignment(Gtk::ALIGN_START, Gtk::ALIGN_START);
m_box1.pack_start(m_Label1, Gtk::PACK_SHRINK);
@@ -95,7 +96,7 @@ ExampleWindow::ExampleWindow(int which)
m_box1.pack_start(m_seperator1, Gtk::PACK_SHRINK, 5);
- m_Label2.set_text("Gtk::HBox(false, 0);");
+ m_Label2.set_text("Gtk::Box(Gtk::ORIENTATION_HORIZONTAL, 0);");
m_Label2.set_alignment(Gtk::ALIGN_START, Gtk::ALIGN_START);
m_box1.pack_start(m_Label2, Gtk::PACK_SHRINK);
diff --git a/examples/book/box/examplewindow.h b/examples/book/box/examplewindow.h
index 0debed2..75b13ed 100644
--- a/examples/book/box/examplewindow.h
+++ b/examples/book/box/examplewindow.h
@@ -34,13 +34,13 @@ protected:
//Child widgets:
Gtk::Button m_button;
- Gtk::VBox m_box1;
- Gtk::HBox m_boxQuit;
+ Gtk::Box m_box1;
+ Gtk::Box m_boxQuit;
Gtk::Button m_buttonQuit;
Gtk::Label m_Label1, m_Label2;
- Gtk::HSeparator m_seperator1, m_seperator2, m_seperator3, m_seperator4, m_seperator5;
+ Gtk::Separator m_seperator1, m_seperator2, m_seperator3, m_seperator4, m_seperator5;
};
#endif //GTKMM_EXAMPLEWINDOW_H
diff --git a/examples/book/box/packbox.cc b/examples/book/box/packbox.cc
index e32aaab..755cc9c 100644
--- a/examples/book/box/packbox.cc
+++ b/examples/book/box/packbox.cc
@@ -20,14 +20,16 @@
#include <cstdio> //For sprintf().
PackBox::PackBox(bool homogeneous, int spacing, Gtk::PackOptions options,
- int padding) :
- Gtk::HBox(homogeneous, spacing),
+ int padding)
+: 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"))
{
+ set_homogeneous(homogeneous);
+
pack_start(m_button1, options, padding);
pack_start(m_button2, options, padding);
pack_start(m_button3, options, padding);
diff --git a/examples/book/box/packbox.h b/examples/book/box/packbox.h
index 00294ab..aad3136 100644
--- a/examples/book/box/packbox.h
+++ b/examples/book/box/packbox.h
@@ -21,7 +21,7 @@
#include <gtkmm.h>
-class PackBox : public Gtk::HBox
+class PackBox : public Gtk::Box
{
public:
PackBox(bool homogeneous, int spacing, Gtk::PackOptions, int padding = 0);
diff --git a/examples/book/buttonbox/examplebuttonbox.cc b/examples/book/buttonbox/examplebuttonbox.cc
index ffcd598..b69e55e 100644
--- a/examples/book/buttonbox/examplebuttonbox.cc
+++ b/examples/book/buttonbox/examplebuttonbox.cc
@@ -30,9 +30,9 @@ ExampleButtonBox::ExampleButtonBox(bool horizontal,
Gtk::ButtonBox* bbox = 0;
if(horizontal)
- bbox = Gtk::manage( new Gtk::HButtonBox() );
+ bbox = Gtk::manage( new Gtk::ButtonBox(Gtk::ORIENTATION_HORIZONTAL) );
else
- bbox = Gtk::manage( new Gtk::VButtonBox() );
+ bbox = Gtk::manage( new Gtk::ButtonBox(Gtk::ORIENTATION_VERTICAL) );
bbox->set_border_width(5);
diff --git a/examples/book/buttonbox/examplewindow.cc b/examples/book/buttonbox/examplewindow.cc
index 0248852..2ca737f 100644
--- a/examples/book/buttonbox/examplewindow.cc
+++ b/examples/book/buttonbox/examplewindow.cc
@@ -20,7 +20,9 @@
#include "examplebuttonbox.h"
ExampleWindow::ExampleWindow()
-: m_Frame_Horizontal("Horizontal Button Boxes"),
+: m_VBox_Main(Gtk::ORIENTATION_VERTICAL),
+ m_VBox(Gtk::ORIENTATION_VERTICAL),
+ m_Frame_Horizontal("Horizontal Button Boxes"),
m_Frame_Vertical("Vertical Button Boxes")
{
set_title("Gtk::ButtonBox");
diff --git a/examples/book/buttonbox/examplewindow.h b/examples/book/buttonbox/examplewindow.h
index 903d050..c4ed4f5 100644
--- a/examples/book/buttonbox/examplewindow.h
+++ b/examples/book/buttonbox/examplewindow.h
@@ -32,8 +32,8 @@ protected:
void on_button_clicked();
//Child widgets:
- Gtk::VBox m_VBox_Main, m_VBox;
- Gtk::HBox m_HBox;
+ Gtk::Box m_VBox_Main, m_VBox;
+ Gtk::Box m_HBox;
Gtk::Frame m_Frame_Horizontal, m_Frame_Vertical;
};
diff --git a/examples/book/buttons/radiobutton/radiobuttons.cc b/examples/book/buttons/radiobutton/radiobuttons.cc
index 3bf77a4..ed4b14b 100644
--- a/examples/book/buttons/radiobutton/radiobuttons.cc
+++ b/examples/book/buttons/radiobutton/radiobuttons.cc
@@ -20,8 +20,9 @@
RadioButtons::RadioButtons() :
- m_Box1(false, 10),
- m_Box2(false, 10),
+ m_Box_Top(Gtk::ORIENTATION_VERTICAL),
+ m_Box1(Gtk::ORIENTATION_VERTICAL, 10),
+ m_Box2(Gtk::ORIENTATION_VERTICAL, 10),
m_RadioButton1("button1"),
m_RadioButton2("button2"),
m_RadioButton3("button3"),
diff --git a/examples/book/buttons/radiobutton/radiobuttons.h b/examples/book/buttons/radiobutton/radiobuttons.h
index 119eb20..143a63f 100644
--- a/examples/book/buttons/radiobutton/radiobuttons.h
+++ b/examples/book/buttons/radiobutton/radiobuttons.h
@@ -35,9 +35,9 @@ protected:
void on_button_clicked();
//Child widgets:
- Gtk::VBox m_Box_Top, m_Box1, m_Box2;
+ Gtk::Box m_Box_Top, m_Box1, m_Box2;
Gtk::RadioButton m_RadioButton1, m_RadioButton2, m_RadioButton3;
- Gtk::HSeparator m_Separator;
+ Gtk::Separator m_Separator;
Gtk::Button m_Button_Close;
};
diff --git a/examples/book/clipboard/ideal/examplewindow.cc b/examples/book/clipboard/ideal/examplewindow.cc
index d0b13e8..0df2c6a 100644
--- a/examples/book/clipboard/ideal/examplewindow.cc
+++ b/examples/book/clipboard/ideal/examplewindow.cc
@@ -30,7 +30,8 @@ const char example_target_text[] = "UTF8_STRING";
ExampleWindow::ExampleWindow()
-: m_Label("Select cells in the table, click Copy, then open a second instance "
+: m_VBox(Gtk::ORIENTATION_VERTICAL),
+ m_Label("Select cells in the table, click Copy, then open a second instance "
"of this example to try pasting the copied data.\nOr try pasting the "
"text representation into gedit."),
m_Table(2, 2, true),
diff --git a/examples/book/clipboard/ideal/examplewindow.h b/examples/book/clipboard/ideal/examplewindow.h
index 5fe3dd3..9575711 100644
--- a/examples/book/clipboard/ideal/examplewindow.h
+++ b/examples/book/clipboard/ideal/examplewindow.h
@@ -42,14 +42,14 @@ protected:
virtual void update_paste_status(); //Disable the paste button if there is nothing to paste.
//Child widgets:
- Gtk::VBox m_VBox;
+ Gtk::Box m_VBox;
Gtk::Label m_Label;
Gtk::Table m_Table;
Gtk::ToggleButton m_ButtonA1, m_ButtonA2, m_ButtonB1, m_ButtonB2;
- Gtk::HButtonBox m_ButtonBox;
+ Gtk::ButtonBox m_ButtonBox;
Gtk::Button m_Button_Copy, m_Button_Paste;
Glib::ustring m_ClipboardStore; //Keep copied stuff here, until it is pasted. This could be a big complex data structure.
diff --git a/examples/book/clipboard/simple/examplewindow.cc b/examples/book/clipboard/simple/examplewindow.cc
index d4ec628..431d61d 100644
--- a/examples/book/clipboard/simple/examplewindow.cc
+++ b/examples/book/clipboard/simple/examplewindow.cc
@@ -19,7 +19,8 @@
#include "examplewindow.h"
ExampleWindow::ExampleWindow()
-: m_Label("Select cells in the table, click Copy, then open a second "
+: m_VBox(Gtk::ORIENTATION_VERTICAL),
+ m_Label("Select cells in the table, click Copy, then open a second "
"instance of this example to try pasting the copied data."),
m_Table(2, 2, true),
m_ButtonA1("A1"), m_ButtonA2("A2"), m_ButtonB1("B1"), m_ButtonB2("B2"),
diff --git a/examples/book/clipboard/simple/examplewindow.h b/examples/book/clipboard/simple/examplewindow.h
index 75f6feb..8a31ed8 100644
--- a/examples/book/clipboard/simple/examplewindow.h
+++ b/examples/book/clipboard/simple/examplewindow.h
@@ -34,14 +34,14 @@ protected:
void on_clipboard_text_received(const Glib::ustring& text);
//Child widgets:
- Gtk::VBox m_VBox;
+ Gtk::Box m_VBox;
Gtk::Label m_Label;
Gtk::Table m_Table;
Gtk::ToggleButton m_ButtonA1, m_ButtonA2, m_ButtonB1, m_ButtonB2;
- Gtk::HButtonBox m_ButtonBox;
+ Gtk::ButtonBox m_ButtonBox;
Gtk::Button m_Button_Copy, m_Button_Paste;
};
diff --git a/examples/book/custom/custom_container/examplewindow.cc b/examples/book/custom/custom_container/examplewindow.cc
index 6b57680..5e10fc0 100644
--- a/examples/book/custom/custom_container/examplewindow.cc
+++ b/examples/book/custom/custom_container/examplewindow.cc
@@ -20,7 +20,8 @@
#include "examplewindow.h"
ExampleWindow::ExampleWindow()
-: m_Button_One("Child One"),
+: m_VBox(Gtk::ORIENTATION_VERTICAL),
+ m_Button_One("Child One"),
m_Label_Two("Child 2"),
m_Button_Quit("Quit")
{
diff --git a/examples/book/custom/custom_container/examplewindow.h b/examples/book/custom/custom_container/examplewindow.h
index 373b5c2..cc0873e 100644
--- a/examples/book/custom/custom_container/examplewindow.h
+++ b/examples/book/custom/custom_container/examplewindow.h
@@ -33,11 +33,11 @@ protected:
void on_button_quit();
//Child widgets:
- Gtk::VBox m_VBox;
+ Gtk::Box m_VBox;
MyContainer m_MyContainer;
Gtk::Button m_Button_One;
Gtk::Label m_Label_Two;
- Gtk::HButtonBox m_ButtonBox;
+ Gtk::ButtonBox m_ButtonBox;
Gtk::Button m_Button_Quit;
};
diff --git a/examples/book/custom/custom_widget/examplewindow.cc b/examples/book/custom/custom_widget/examplewindow.cc
index 127d6db..e7bba83 100644
--- a/examples/book/custom/custom_widget/examplewindow.cc
+++ b/examples/book/custom/custom_widget/examplewindow.cc
@@ -19,7 +19,8 @@
#include "examplewindow.h"
ExampleWindow::ExampleWindow()
-: m_Button_Quit("Quit")
+: m_VBox(Gtk::ORIENTATION_VERTICAL),
+ m_Button_Quit("Quit")
{
set_title("Custom Widget example");
set_border_width(6);
diff --git a/examples/book/custom/custom_widget/examplewindow.h b/examples/book/custom/custom_widget/examplewindow.h
index 5e231a2..fd4fe07 100644
--- a/examples/book/custom/custom_widget/examplewindow.h
+++ b/examples/book/custom/custom_widget/examplewindow.h
@@ -33,9 +33,9 @@ protected:
void on_button_quit();
//Child widgets:
- Gtk::VBox m_VBox;
+ Gtk::Box m_VBox;
MyWidget m_MyWidget;
- Gtk::HButtonBox m_ButtonBox;
+ Gtk::ButtonBox m_ButtonBox;
Gtk::Button m_Button_Quit;
};
diff --git a/examples/book/dialogs/aboutdialog/examplewindow.cc b/examples/book/dialogs/aboutdialog/examplewindow.cc
index a2ca340..1ac80b0 100644
--- a/examples/book/dialogs/aboutdialog/examplewindow.cc
+++ b/examples/book/dialogs/aboutdialog/examplewindow.cc
@@ -22,7 +22,8 @@
ExampleWindow::ExampleWindow()
-: m_Button("Show AboutDialog")
+: m_ButtonBox(Gtk::ORIENTATION_VERTICAL),
+ m_Button("Show AboutDialog")
{
set_title("Gtk::AboutDialog example");
diff --git a/examples/book/dialogs/aboutdialog/examplewindow.h b/examples/book/dialogs/aboutdialog/examplewindow.h
index 4c7b8ea..41d5ca3 100644
--- a/examples/book/dialogs/aboutdialog/examplewindow.h
+++ b/examples/book/dialogs/aboutdialog/examplewindow.h
@@ -33,7 +33,7 @@ protected:
void on_about_dialog_response(int response_id);
//Child widgets:
- Gtk::VButtonBox m_ButtonBox;
+ Gtk::ButtonBox m_ButtonBox;
Gtk::Button m_Button;
Gtk::AboutDialog m_Dialog;
};
diff --git a/examples/book/dialogs/colorselectiondialog/examplewindow.cc b/examples/book/dialogs/colorselectiondialog/examplewindow.cc
index 48c0c30..ab632e6 100644
--- a/examples/book/dialogs/colorselectiondialog/examplewindow.cc
+++ b/examples/book/dialogs/colorselectiondialog/examplewindow.cc
@@ -21,6 +21,7 @@
ExampleWindow::ExampleWindow()
+: m_VBox(Gtk::ORIENTATION_VERTICAL)
{
set_title("Gtk::ColorButton example");
set_default_size(200, 200);
diff --git a/examples/book/dialogs/colorselectiondialog/examplewindow.h b/examples/book/dialogs/colorselectiondialog/examplewindow.h
index 39f59a3..1dff35d 100644
--- a/examples/book/dialogs/colorselectiondialog/examplewindow.h
+++ b/examples/book/dialogs/colorselectiondialog/examplewindow.h
@@ -32,7 +32,7 @@ protected:
void on_button_color_set();
//Child widgets:
- Gtk::VBox m_VBox;
+ Gtk::Box m_VBox;
Gtk::ColorButton m_Button;
Gtk::DrawingArea m_DrawingArea; //To show the color.
diff --git a/examples/book/dialogs/filechooserdialog/examplewindow.cc b/examples/book/dialogs/filechooserdialog/examplewindow.cc
index 6eafa6d..90b7303 100644
--- a/examples/book/dialogs/filechooserdialog/examplewindow.cc
+++ b/examples/book/dialogs/filechooserdialog/examplewindow.cc
@@ -21,7 +21,8 @@
ExampleWindow::ExampleWindow()
-: m_Button_File("Choose File"),
+: m_ButtonBox(Gtk::ORIENTATION_VERTICAL),
+ m_Button_File("Choose File"),
m_Button_Folder("Choose Folder")
{
set_title("Gtk::FileSelection example");
diff --git a/examples/book/dialogs/filechooserdialog/examplewindow.h b/examples/book/dialogs/filechooserdialog/examplewindow.h
index b136587..e7712ae 100644
--- a/examples/book/dialogs/filechooserdialog/examplewindow.h
+++ b/examples/book/dialogs/filechooserdialog/examplewindow.h
@@ -33,7 +33,7 @@ protected:
void on_button_folder_clicked();
//Child widgets:
- Gtk::VButtonBox m_ButtonBox;
+ Gtk::ButtonBox m_ButtonBox;
Gtk::Button m_Button_File, m_Button_Folder;
};
diff --git a/examples/book/dialogs/messagedialog/examplewindow.cc b/examples/book/dialogs/messagedialog/examplewindow.cc
index 7cc7640..758174d 100644
--- a/examples/book/dialogs/messagedialog/examplewindow.cc
+++ b/examples/book/dialogs/messagedialog/examplewindow.cc
@@ -22,7 +22,8 @@
ExampleWindow::ExampleWindow()
-: m_Button_Info("Show Info MessageDialog"),
+: m_ButtonBox(Gtk::ORIENTATION_VERTICAL),
+ m_Button_Info("Show Info MessageDialog"),
m_Button_Question("Show Question MessageDialog")
{
set_title("Gtk::MessageDialog example");
diff --git a/examples/book/dialogs/messagedialog/examplewindow.h b/examples/book/dialogs/messagedialog/examplewindow.h
index 66416c8..14a7676 100644
--- a/examples/book/dialogs/messagedialog/examplewindow.h
+++ b/examples/book/dialogs/messagedialog/examplewindow.h
@@ -33,7 +33,7 @@ protected:
void on_button_question_clicked();
//Child widgets:
- Gtk::VButtonBox m_ButtonBox;
+ Gtk::ButtonBox m_ButtonBox;
Gtk::Button m_Button_Info, m_Button_Question;
};
diff --git a/examples/book/drag_and_drop/dndwindow.h b/examples/book/drag_and_drop/dndwindow.h
index 692ed65..2d33799 100644
--- a/examples/book/drag_and_drop/dndwindow.h
+++ b/examples/book/drag_and_drop/dndwindow.h
@@ -41,7 +41,7 @@ protected:
const Gtk::SelectionData& selection_data, guint info, guint time);
//Member widgets:
- Gtk::HBox m_HBox;
+ Gtk::Box m_HBox;
Gtk::Button m_Button_Drag;
Gtk::Label m_Label_Drop;
};
diff --git a/examples/book/entry/completion/examplewindow.cc b/examples/book/entry/completion/examplewindow.cc
index b906544..4bb4ba1 100644
--- a/examples/book/entry/completion/examplewindow.cc
+++ b/examples/book/entry/completion/examplewindow.cc
@@ -19,9 +19,10 @@
#include "examplewindow.h"
#include <iostream>
-ExampleWindow::ExampleWindow() :
- m_Label("Press a or b to see a list of possible completions and actions."),
- m_Button_Close("Close")
+ExampleWindow::ExampleWindow()
+: m_VBox(Gtk::ORIENTATION_VERTICAL),
+ m_Label("Press a or b to see a list of possible completions and actions."),
+ m_Button_Close("Close")
{
//set_size_request(200, 100);
set_title("Gtk::EntryCompletion");
diff --git a/examples/book/entry/completion/examplewindow.h b/examples/book/entry/completion/examplewindow.h
index 4d39722..ce09e2f 100644
--- a/examples/book/entry/completion/examplewindow.h
+++ b/examples/book/entry/completion/examplewindow.h
@@ -55,8 +55,8 @@ protected:
type_actions_map m_CompletionActions;
//Child widgets:
- Gtk::HBox m_HBox;
- Gtk::VBox m_VBox;
+ Gtk::Box m_HBox;
+ Gtk::Box m_VBox;
Gtk::Entry m_Entry;
Gtk::Label m_Label;
Gtk::Button m_Button_Close;
diff --git a/examples/book/entry/icon/examplewindow.cc b/examples/book/entry/icon/examplewindow.cc
index 4a8c5f1..69e20d9 100644
--- a/examples/book/entry/icon/examplewindow.cc
+++ b/examples/book/entry/icon/examplewindow.cc
@@ -20,7 +20,8 @@
#include <iostream>
ExampleWindow::ExampleWindow()
-: m_Button_Close("Close")
+: m_VBox(Gtk::ORIENTATION_VERTICAL),
+ m_Button_Close("Close")
{
set_title("Gtk::Entry");
diff --git a/examples/book/entry/icon/examplewindow.h b/examples/book/entry/icon/examplewindow.h
index 54edeb9..a90d2f2 100644
--- a/examples/book/entry/icon/examplewindow.h
+++ b/examples/book/entry/icon/examplewindow.h
@@ -33,7 +33,7 @@ protected:
void on_button_close();
//Child widgets:
- Gtk::VBox m_VBox;
+ Gtk::Box m_VBox;
Gtk::Entry m_Entry;
Gtk::Button m_Button_Close;
};
diff --git a/examples/book/entry/progress/examplewindow.cc b/examples/book/entry/progress/examplewindow.cc
index a3eae19..168d836 100644
--- a/examples/book/entry/progress/examplewindow.cc
+++ b/examples/book/entry/progress/examplewindow.cc
@@ -20,7 +20,8 @@
#include <iostream>
ExampleWindow::ExampleWindow()
-: m_Button_Close("Close")
+: m_VBox(Gtk::ORIENTATION_VERTICAL),
+ m_Button_Close("Close")
{
set_title("Gtk::Entry");
diff --git a/examples/book/entry/progress/examplewindow.h b/examples/book/entry/progress/examplewindow.h
index ecc09c7..ac97388 100644
--- a/examples/book/entry/progress/examplewindow.h
+++ b/examples/book/entry/progress/examplewindow.h
@@ -33,7 +33,7 @@ protected:
void on_button_close();
//Child widgets:
- Gtk::VBox m_VBox;
+ Gtk::Box m_VBox;
Gtk::Entry m_Entry;
Gtk::Button m_Button_Close;
};
diff --git a/examples/book/entry/simple/examplewindow.cc b/examples/book/entry/simple/examplewindow.cc
index ecd683d..280828f 100644
--- a/examples/book/entry/simple/examplewindow.cc
+++ b/examples/book/entry/simple/examplewindow.cc
@@ -20,7 +20,8 @@
#include <iostream>
ExampleWindow::ExampleWindow()
-: m_Button_Close("Close"),
+: m_VBox(Gtk::ORIENTATION_VERTICAL),
+ m_Button_Close("Close"),
m_CheckButton_Editable("Editable"),
m_CheckButton_Visible("Visible")
{
diff --git a/examples/book/entry/simple/examplewindow.h b/examples/book/entry/simple/examplewindow.h
index 015e903..38f48b0 100644
--- a/examples/book/entry/simple/examplewindow.h
+++ b/examples/book/entry/simple/examplewindow.h
@@ -34,8 +34,8 @@ protected:
void on_button_close();
//Child widgets:
- Gtk::HBox m_HBox;
- Gtk::VBox m_VBox;
+ Gtk::Box m_HBox;
+ Gtk::Box m_VBox;
Gtk::Entry m_Entry;
Gtk::Button m_Button_Close;
Gtk::CheckButton m_CheckButton_Editable, m_CheckButton_Visible;
diff --git a/examples/book/helloworld2/helloworld.h b/examples/book/helloworld2/helloworld.h
index ebf1a94..4532198 100644
--- a/examples/book/helloworld2/helloworld.h
+++ b/examples/book/helloworld2/helloworld.h
@@ -36,7 +36,7 @@ protected:
void on_button_clicked(Glib::ustring data);
// Child widgets:
- Gtk::HBox m_box1;
+ Gtk::Box m_box1;
Gtk::Button m_button1, m_button2;
};
diff --git a/examples/book/iconview/examplewindow.cc b/examples/book/iconview/examplewindow.cc
index cef9a06..a8f54f4 100644
--- a/examples/book/iconview/examplewindow.cc
+++ b/examples/book/iconview/examplewindow.cc
@@ -39,7 +39,8 @@ namespace
}
ExampleWindow::ExampleWindow()
- : m_Button_Quit("Quit")
+: m_VBox(Gtk::ORIENTATION_VERTICAL),
+ m_Button_Quit("Quit")
{
set_title("Gtk::IconView (ListStore + TreeModelSort) example");
set_border_width(5);
diff --git a/examples/book/iconview/examplewindow.h b/examples/book/iconview/examplewindow.h
index 19eef1e..ff15c80 100644
--- a/examples/book/iconview/examplewindow.h
+++ b/examples/book/iconview/examplewindow.h
@@ -58,13 +58,13 @@ protected:
ModelColumns m_Columns;
// Child widgets:
- Gtk::VBox m_VBox;
+ Gtk::Box m_VBox;
Gtk::ScrolledWindow m_ScrolledWindow;
Gtk::IconView m_IconView;
Glib::RefPtr<Gtk::ListStore> m_refListModel;
- Gtk::HButtonBox m_ButtonBox;
+ Gtk::ButtonBox m_ButtonBox;
Gtk::Button m_Button_Quit;
};
diff --git a/examples/book/idle/idleexample.cc b/examples/book/idle/idleexample.cc
index 6c0bc88..b2ad691 100644
--- a/examples/book/idle/idleexample.cc
+++ b/examples/book/idle/idleexample.cc
@@ -19,7 +19,7 @@
#include "idleexample.h"
IdleExample::IdleExample() :
- m_Box(false, 5),
+ m_Box(Gtk::ORIENTATION_VERTICAL, 5),
m_ButtonQuit(Gtk::Stock::QUIT)
{
set_border_width(5);
@@ -38,7 +38,7 @@ IdleExample::IdleExample() :
m_Box.pack_start( *Gtk::manage(new Gtk::Label("5000 MB")) );
m_Box.pack_start(m_ProgressBar_d);
- Gtk::HBox* hbox = Gtk::manage( new Gtk::HBox(false,10));
+ Gtk::Box* hbox = Gtk::manage( new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL,10));
m_Box.pack_start(*hbox);
hbox->pack_start(m_ButtonQuit, Gtk::PACK_EXPAND_PADDING);
diff --git a/examples/book/idle/idleexample.h b/examples/book/idle/idleexample.h
index 1dbd90a..f944565 100644
--- a/examples/book/idle/idleexample.h
+++ b/examples/book/idle/idleexample.h
@@ -34,7 +34,7 @@ protected:
void on_button_clicked();
// Member data:
- Gtk::VBox m_Box;
+ Gtk::Box m_Box;
Gtk::Button m_ButtonQuit;
Gtk::ProgressBar m_ProgressBar_c;
Gtk::ProgressBar m_ProgressBar_d;
diff --git a/examples/book/infobar/examplewindow.cc b/examples/book/infobar/examplewindow.cc
index 31688aa..bcc6ba2 100644
--- a/examples/book/infobar/examplewindow.cc
+++ b/examples/book/infobar/examplewindow.cc
@@ -17,7 +17,7 @@
#include "examplewindow.h"
ExampleWindow::ExampleWindow()
-: m_VBox(false, 6),
+: m_VBox(Gtk::ORIENTATION_VERTICAL, 6),
m_Button_Quit(Gtk::Stock::QUIT),
m_Button_Clear("Clear")
{
diff --git a/examples/book/infobar/examplewindow.h b/examples/book/infobar/examplewindow.h
index f0c53c5..ca4e680 100644
--- a/examples/book/infobar/examplewindow.h
+++ b/examples/book/infobar/examplewindow.h
@@ -33,7 +33,7 @@ protected:
void on_textbuffer_changed();
//Child widgets:
- Gtk::VBox m_VBox;
+ Gtk::Box m_VBox;
Gtk::ScrolledWindow m_ScrolledWindow;
Gtk::TextView m_TextView;
@@ -43,7 +43,7 @@ protected:
Gtk::InfoBar m_InfoBar;
Gtk::Label m_Message_Label;
- Gtk::HButtonBox m_ButtonBox;
+ Gtk::ButtonBox m_ButtonBox;
Gtk::Button m_Button_Quit, m_Button_Clear;
};
diff --git a/examples/book/label/examplewindow.cc b/examples/book/label/examplewindow.cc
index 3484f38..44d62f3 100644
--- a/examples/book/label/examplewindow.cc
+++ b/examples/book/label/examplewindow.cc
@@ -21,8 +21,8 @@
ExampleWindow::ExampleWindow()
:
- m_HBox(false, 5),
- m_VBox(false, 5),
+ m_HBox(Gtk::ORIENTATION_HORIZONTAL, 5),
+ m_VBox(Gtk::ORIENTATION_VERTICAL, 5),
m_Frame_Normal("Normal Label"),
m_Frame_Multi("Multi-line Label"),
m_Frame_Left("Left Justified Label"),
diff --git a/examples/book/label/examplewindow.h b/examples/book/label/examplewindow.h
index 548aecc..3ef4621 100644
--- a/examples/book/label/examplewindow.h
+++ b/examples/book/label/examplewindow.h
@@ -30,8 +30,8 @@ public:
protected:
//Child widgets:
- Gtk::HBox m_HBox;
- Gtk::VBox m_VBox, m_VBox2;
+ Gtk::Box m_HBox;
+ Gtk::Box m_VBox, m_VBox2;
Gtk::Frame m_Frame_Normal, m_Frame_Multi, m_Frame_Left, m_Frame_Right,
m_Frame_LineWrapped, m_Frame_FilledWrapped, m_Frame_Underlined;
Gtk::Label m_Label_Normal, m_Label_Multi, m_Label_Left, m_Label_Right,
diff --git a/examples/book/menus/main_menu/examplewindow.cc b/examples/book/menus/main_menu/examplewindow.cc
index d7b385c..1e0ff39 100644
--- a/examples/book/menus/main_menu/examplewindow.cc
+++ b/examples/book/menus/main_menu/examplewindow.cc
@@ -21,6 +21,7 @@
#include <iostream>
ExampleWindow::ExampleWindow()
+: m_Box(Gtk::ORIENTATION_VERTICAL)
{
set_title("main menu example");
set_default_size(200, 200);
diff --git a/examples/book/menus/main_menu/examplewindow.h b/examples/book/menus/main_menu/examplewindow.h
index b1569d5..361e277 100644
--- a/examples/book/menus/main_menu/examplewindow.h
+++ b/examples/book/menus/main_menu/examplewindow.h
@@ -37,7 +37,7 @@ protected:
void on_menu_choices_two();
//Child widgets:
- Gtk::VBox m_Box;
+ Gtk::Box m_Box;
Glib::RefPtr<Gtk::UIManager> m_refUIManager;
Glib::RefPtr<Gtk::ActionGroup> m_refActionGroup;
diff --git a/examples/book/menus/popup/examplewindow.cc b/examples/book/menus/popup/examplewindow.cc
index 6856599..8be6760 100644
--- a/examples/book/menus/popup/examplewindow.cc
+++ b/examples/book/menus/popup/examplewindow.cc
@@ -21,7 +21,8 @@
#include <iostream>
ExampleWindow::ExampleWindow()
-: m_Label("Right-click to see the popup menu."),
+: m_Box(Gtk::ORIENTATION_VERTICAL),
+ m_Label("Right-click to see the popup menu."),
m_pMenuPopup(0)
/* m_Image(Gtk::Stock::DIALOG_QUESTION, Gtk::ICON_SIZE_MENU) */
{
diff --git a/examples/book/menus/popup/examplewindow.h b/examples/book/menus/popup/examplewindow.h
index 7683061..13a2450 100644
--- a/examples/book/menus/popup/examplewindow.h
+++ b/examples/book/menus/popup/examplewindow.h
@@ -33,7 +33,7 @@ protected:
void on_menu_file_popup_generic();
//Child widgets:
- Gtk::VBox m_Box;
+ Gtk::Box m_Box;
Gtk::EventBox m_EventBox;
Gtk::Label m_Label;
diff --git a/examples/book/menus_and_toolbars/examplewindow.cc b/examples/book/menus_and_toolbars/examplewindow.cc
index 9d29849..6b389de 100644
--- a/examples/book/menus_and_toolbars/examplewindow.cc
+++ b/examples/book/menus_and_toolbars/examplewindow.cc
@@ -21,6 +21,7 @@
#include <iostream>
ExampleWindow::ExampleWindow()
+: m_Box(Gtk::ORIENTATION_VERTICAL)
{
set_title("main_menu example");
set_default_size(200, 200);
diff --git a/examples/book/menus_and_toolbars/examplewindow.h b/examples/book/menus_and_toolbars/examplewindow.h
index fd1fc67..68a3dfa 100644
--- a/examples/book/menus_and_toolbars/examplewindow.h
+++ b/examples/book/menus_and_toolbars/examplewindow.h
@@ -39,7 +39,7 @@ protected:
void on_action_others();
//Child widgets:
- Gtk::VBox m_Box;
+ Gtk::Box m_Box;
Glib::RefPtr<Gtk::UIManager> m_refUIManager;
Glib::RefPtr<Gtk::ActionGroup> m_refActionGroup;
diff --git a/examples/book/notebook/examplewindow.cc b/examples/book/notebook/examplewindow.cc
index aa42fcc..7fe8a36 100644
--- a/examples/book/notebook/examplewindow.cc
+++ b/examples/book/notebook/examplewindow.cc
@@ -20,7 +20,8 @@
#include "examplewindow.h"
ExampleWindow::ExampleWindow()
-: m_Label1("Contents of tab 1"),
+: m_VBox(Gtk::ORIENTATION_VERTICAL),
+ m_Label1("Contents of tab 1"),
m_Label2("Contents of tab 2"),
m_Button_Quit("Quit")
{
diff --git a/examples/book/notebook/examplewindow.h b/examples/book/notebook/examplewindow.h
index 282ad90..dc3b4a2 100644
--- a/examples/book/notebook/examplewindow.h
+++ b/examples/book/notebook/examplewindow.h
@@ -33,11 +33,11 @@ protected:
void on_notebook_switch_page(Gtk::Widget* page, guint page_num);
//Child widgets:
- Gtk::VBox m_VBox;
+ Gtk::Box m_VBox;
Gtk::Notebook m_Notebook;
Gtk::Label m_Label1, m_Label2;
- Gtk::HButtonBox m_ButtonBox;
+ Gtk::ButtonBox m_ButtonBox;
Gtk::Button m_Button_Quit;
};
diff --git a/examples/book/paned/examplewindow.cc b/examples/book/paned/examplewindow.cc
index 368d68f..4fb3fdf 100644
--- a/examples/book/paned/examplewindow.cc
+++ b/examples/book/paned/examplewindow.cc
@@ -19,6 +19,7 @@
#include "examplewindow.h"
ExampleWindow::ExampleWindow()
+: m_VPaned(Gtk::ORIENTATION_VERTICAL)
{
set_title ("Paned Windows");
set_border_width(10);
diff --git a/examples/book/paned/examplewindow.h b/examples/book/paned/examplewindow.h
index 67877a5..d180b96 100644
--- a/examples/book/paned/examplewindow.h
+++ b/examples/book/paned/examplewindow.h
@@ -32,7 +32,7 @@ public:
protected:
//Child widgets:
- Gtk::VPaned m_VPaned;
+ Gtk::Paned m_VPaned;
MessagesList m_MessagesList;
MessageText m_MessageText;
};
diff --git a/examples/book/printing/advanced/examplewindow.cc b/examples/book/printing/advanced/examplewindow.cc
index 6a88696..af1f2fa 100644
--- a/examples/book/printing/advanced/examplewindow.cc
+++ b/examples/book/printing/advanced/examplewindow.cc
@@ -26,7 +26,7 @@
const Glib::ustring app_title = "gtkmm Printing Example";
ExampleWindow::ExampleWindow()
- :
+: m_VBox(Gtk::ORIENTATION_VERTICAL),
m_Table(3, 2),
m_NameLabel("Name"),
m_SurnameLabel("Surname"),
diff --git a/examples/book/printing/advanced/examplewindow.h b/examples/book/printing/advanced/examplewindow.h
index af81514..9d7f7b7 100644
--- a/examples/book/printing/advanced/examplewindow.h
+++ b/examples/book/printing/advanced/examplewindow.h
@@ -56,7 +56,7 @@ protected:
Glib::RefPtr<Gtk::PrintSettings> m_refSettings;
//Child widgets:
- Gtk::VBox m_VBox;
+ Gtk::Box m_VBox;
Gtk::Table m_Table;
Gtk::Label m_NameLabel;
diff --git a/examples/book/printing/advanced/previewdialog.cc b/examples/book/printing/advanced/previewdialog.cc
index f1feb35..09b081a 100644
--- a/examples/book/printing/advanced/previewdialog.cc
+++ b/examples/book/printing/advanced/previewdialog.cc
@@ -24,10 +24,10 @@ PreviewDialog::PreviewDialog(
const Glib::RefPtr<Gtk::PrintOperationPreview>& preview,
const Glib::RefPtr<Gtk::PrintContext>& print_ctx,
Gtk::Window& parent)
- :
- m_pOperation(pfo),
+: m_pOperation(pfo),
m_refPreview(preview),
m_refPrintContext(print_ctx),
+ m_VBox(Gtk::ORIENTATION_VERTICAL),
m_SpinAdjustment( Gtk::Adjustment::create(1, 100, 1) ), //Used to construct m_PageSpin
m_PageSpin(m_SpinAdjustment, 1, 0),
m_CloseButton(Gtk::Stock::CLOSE),
diff --git a/examples/book/printing/advanced/previewdialog.h b/examples/book/printing/advanced/previewdialog.h
index cb93b58..31da719 100644
--- a/examples/book/printing/advanced/previewdialog.h
+++ b/examples/book/printing/advanced/previewdialog.h
@@ -47,8 +47,8 @@ protected:
Glib::RefPtr<Gtk::PrintContext> m_refPrintContext;
Glib::RefPtr<Pango::Layout> m_refLayout;
- Gtk::VBox m_VBox;
- Gtk::HBox m_HBox;
+ Gtk::Box m_VBox;
+ Gtk::Box m_HBox;
Glib::RefPtr<Gtk::Adjustment> m_SpinAdjustment;
Gtk::SpinButton m_PageSpin;
Gtk::Button m_CloseButton;
diff --git a/examples/book/printing/advanced/printformoperation.cc b/examples/book/printing/advanced/printformoperation.cc
index e497c1e..90c1b61 100644
--- a/examples/book/printing/advanced/printformoperation.cc
+++ b/examples/book/printing/advanced/printformoperation.cc
@@ -154,10 +154,10 @@ Gtk::Widget* PrintFormOperation::on_create_custom_widget()
//Create a custom tab in the print dialog titled "Other"
set_custom_tab_label("Other");
- Gtk::VBox* vbox = Gtk::manage(new Gtk::VBox());
+ Gtk::Box* vbox = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
vbox->set_border_width(12);
- Gtk::HBox* hbox = Gtk::manage(new Gtk::HBox(false, 8));
+ Gtk::Box* hbox = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL, 8));
vbox->pack_start(*hbox, false, false);
hbox->set_border_width(6);
hbox->show();
diff --git a/examples/book/printing/simple/examplewindow.cc b/examples/book/printing/simple/examplewindow.cc
index 9d3707b..2dcd09f 100644
--- a/examples/book/printing/simple/examplewindow.cc
+++ b/examples/book/printing/simple/examplewindow.cc
@@ -24,7 +24,7 @@
const Glib::ustring app_title = "gtkmm Printing Example";
ExampleWindow::ExampleWindow()
- :
+: m_VBox(Gtk::ORIENTATION_VERTICAL),
m_Table(3, 2),
m_NameLabel("Name"),
m_SurnameLabel("Surname"),
diff --git a/examples/book/printing/simple/examplewindow.h b/examples/book/printing/simple/examplewindow.h
index 83626b3..a320e16 100644
--- a/examples/book/printing/simple/examplewindow.h
+++ b/examples/book/printing/simple/examplewindow.h
@@ -57,7 +57,7 @@ protected:
//Child widgets:
- Gtk::VBox m_VBox;
+ Gtk::Box m_VBox;
Gtk::Table m_Table;
Gtk::Label m_NameLabel;
diff --git a/examples/book/progressbar/examplewindow.cc b/examples/book/progressbar/examplewindow.cc
index e8e1025..fd4fb1f 100644
--- a/examples/book/progressbar/examplewindow.cc
+++ b/examples/book/progressbar/examplewindow.cc
@@ -20,7 +20,7 @@
#include <iostream>
ExampleWindow::ExampleWindow()
-: m_VBox(false, 5),
+: m_VBox(Gtk::ORIENTATION_VERTICAL, 5),
m_Alignment(0.5, 0.5, 0, 0),
m_Table(2, 2, true),
m_CheckButton_Text("Show text"),
diff --git a/examples/book/progressbar/examplewindow.h b/examples/book/progressbar/examplewindow.h
index e4330a1..6145eae 100644
--- a/examples/book/progressbar/examplewindow.h
+++ b/examples/book/progressbar/examplewindow.h
@@ -36,11 +36,11 @@ protected:
void on_button_close();
//Child widgets:
- Gtk::VBox m_VBox;
+ Gtk::Box m_VBox;
Gtk::Alignment m_Alignment;
Gtk::Table m_Table;
Gtk::ProgressBar m_ProgressBar;
- Gtk::HSeparator m_Separator;
+ Gtk::Separator m_Separator;
Gtk::CheckButton m_CheckButton_Text, m_CheckButton_Activity, m_CheckButton_Inverted;
Gtk::Button m_Button_Close;
diff --git a/examples/book/range_widgets/examplewindow.cc b/examples/book/range_widgets/examplewindow.cc
index abc64ed..a1f7b55 100644
--- a/examples/book/range_widgets/examplewindow.cc
+++ b/examples/book/range_widgets/examplewindow.cc
@@ -21,11 +21,11 @@
ExampleWindow::ExampleWindow()
:
- m_VBox2(false, 20),
- m_VBox_HScale(false, 10),
- m_HBox_Scales(false, 10),
- m_HBox_Digits(false, 10),
- m_HBox_PageSize(false, 10),
+ m_VBox2(Gtk::ORIENTATION_VERTICAL, 20),
+ m_VBox_HScale(Gtk::ORIENTATION_HORIZONTAL, 10),
+ m_HBox_Scales(Gtk::ORIENTATION_HORIZONTAL, 10),
+ m_HBox_Digits(Gtk::ORIENTATION_HORIZONTAL, 10),
+ m_HBox_PageSize(Gtk::ORIENTATION_HORIZONTAL, 10),
// Value, lower, upper, step_increment, page_increment, page_size:
// Note that the page_size value only makes a difference for
@@ -35,8 +35,8 @@ ExampleWindow::ExampleWindow()
m_adjustment_digits( Gtk::Adjustment::create(1.0, 0.0, 5.0) ),
m_adjustment_pagesize( Gtk::Adjustment::create(1.0, 1.0, 101.0) ),
- m_VScale(m_adjustment),
- m_HScale(m_adjustment),
+ m_VScale(m_adjustment, Gtk::ORIENTATION_VERTICAL),
+ m_HScale(m_adjustment, Gtk::ORIENTATION_HORIZONTAL),
m_Scale_Digits(m_adjustment_digits),
m_Scale_PageSize(m_adjustment_pagesize),
diff --git a/examples/book/range_widgets/examplewindow.h b/examples/book/range_widgets/examplewindow.h
index 25eec56..55b254b 100644
--- a/examples/book/range_widgets/examplewindow.h
+++ b/examples/book/range_widgets/examplewindow.h
@@ -36,19 +36,19 @@ protected:
void on_button_quit();
//Child widgets:
- Gtk::VBox m_VBox_Top, m_VBox2, m_VBox_HScale;
- Gtk::HBox m_HBox_Scales, m_HBox_Digits, m_HBox_PageSize;
+ Gtk::Box m_VBox_Top, m_VBox2, m_VBox_HScale;
+ Gtk::Box m_HBox_Scales, m_HBox_Digits, m_HBox_PageSize;
Glib::RefPtr<Gtk::Adjustment> m_adjustment, m_adjustment_digits, m_adjustment_pagesize;
- Gtk::VScale m_VScale;
- Gtk::HScale m_HScale, m_Scale_Digits, m_Scale_PageSize;
+ Gtk::Scale m_VScale;
+ Gtk::Scale m_HScale, m_Scale_Digits, m_Scale_PageSize;
- Gtk::HSeparator m_Separator;
+ Gtk::Separator m_Separator;
Gtk::CheckButton m_CheckButton;
- Gtk::HScrollbar m_Scrollbar;
+ Gtk::Scrollbar m_Scrollbar;
Gtk::Menu m_Menu_Position;
diff --git a/examples/book/recent_files/examplewindow.cc b/examples/book/recent_files/examplewindow.cc
index 6622fcf..d86b8c7 100644
--- a/examples/book/recent_files/examplewindow.cc
+++ b/examples/book/recent_files/examplewindow.cc
@@ -21,7 +21,8 @@
#include <iostream>
ExampleWindow::ExampleWindow()
-: m_refRecentManager(Gtk::RecentManager::get_default())
+: m_Box(Gtk::ORIENTATION_VERTICAL),
+ m_refRecentManager(Gtk::RecentManager::get_default())
{
set_title("recent files example");
set_default_size(200, 200);
diff --git a/examples/book/recent_files/examplewindow.h b/examples/book/recent_files/examplewindow.h
index de852d2..634c8fb 100644
--- a/examples/book/recent_files/examplewindow.h
+++ b/examples/book/recent_files/examplewindow.h
@@ -34,7 +34,7 @@ protected:
void on_menu_file_new();
//Child widgets:
- Gtk::VBox m_Box;
+ Gtk::Box m_Box;
Glib::RefPtr<Gtk::UIManager> m_refUIManager;
Glib::RefPtr<Gtk::ActionGroup> m_refActionGroup;
diff --git a/examples/book/scrolledwindow/examplewindow.cc b/examples/book/scrolledwindow/examplewindow.cc
index 5cba282..ac1f047 100644
--- a/examples/book/scrolledwindow/examplewindow.cc
+++ b/examples/book/scrolledwindow/examplewindow.cc
@@ -36,7 +36,7 @@ ExampleWindow::ExampleWindow()
* the vertical. */
m_ScrolledWindow.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_ALWAYS);
- get_vbox()->pack_start(m_ScrolledWindow);
+ get_content_area()->pack_start(m_ScrolledWindow);
/* set the spacing to 10 on x and 10 on y */
m_Table.set_row_spacings(10);
diff --git a/examples/book/spinbutton/examplewindow.cc b/examples/book/spinbutton/examplewindow.cc
index ce20696..ddedf8b 100644
--- a/examples/book/spinbutton/examplewindow.cc
+++ b/examples/book/spinbutton/examplewindow.cc
@@ -24,7 +24,7 @@ ExampleWindow::ExampleWindow()
:
m_Frame_NotAccelerated("Not accelerated"),
m_Frame_Accelerated("Accelerated"),
- m_VBox_Main(false, 5),
+ m_VBox_Main(Gtk::ORIENTATION_VERTICAL, 5),
m_Label_Day("Day: "),
m_Label_Month("Month: "),
m_Label_Year("Year: "),
diff --git a/examples/book/spinbutton/examplewindow.h b/examples/book/spinbutton/examplewindow.h
index 9ba05a5..efa7719 100644
--- a/examples/book/spinbutton/examplewindow.h
+++ b/examples/book/spinbutton/examplewindow.h
@@ -43,9 +43,9 @@ protected:
//Child widgets:
Gtk::Frame m_Frame_NotAccelerated, m_Frame_Accelerated;
- Gtk::HBox m_HBox_NotAccelerated, m_HBox_Accelerated,
+ Gtk::Box m_HBox_NotAccelerated, m_HBox_Accelerated,
m_HBox_Buttons;
- Gtk::VBox m_VBox_Main, m_VBox, m_VBox_Day, m_VBox_Month, m_VBox_Year,
+ Gtk::Box m_VBox_Main, m_VBox, m_VBox_Day, m_VBox_Month, m_VBox_Year,
m_VBox_Accelerated, m_VBox_Value, m_VBox_Digits;
Gtk::Label m_Label_Day, m_Label_Month, m_Label_Year,
m_Label_Value, m_Label_Digits,
diff --git a/examples/book/textview/examplewindow.cc b/examples/book/textview/examplewindow.cc
index 1d0c604..2945a9a 100644
--- a/examples/book/textview/examplewindow.cc
+++ b/examples/book/textview/examplewindow.cc
@@ -19,7 +19,8 @@
#include "examplewindow.h"
ExampleWindow::ExampleWindow()
-: m_Button_Quit(Gtk::Stock::QUIT),
+: m_VBox(Gtk::ORIENTATION_VERTICAL),
+ m_Button_Quit(Gtk::Stock::QUIT),
m_Button_Buffer1("Use buffer 1"),
m_Button_Buffer2("Use buffer 2")
{
diff --git a/examples/book/textview/examplewindow.h b/examples/book/textview/examplewindow.h
index 19896af..9eafe00 100644
--- a/examples/book/textview/examplewindow.h
+++ b/examples/book/textview/examplewindow.h
@@ -37,14 +37,14 @@ protected:
void on_button_buffer2();
//Child widgets:
- Gtk::VBox m_VBox;
+ Gtk::Box m_VBox;
Gtk::ScrolledWindow m_ScrolledWindow;
Gtk::TextView m_TextView;
Glib::RefPtr<Gtk::TextBuffer> m_refTextBuffer1, m_refTextBuffer2;
- Gtk::HButtonBox m_ButtonBox;
+ Gtk::ButtonBox m_ButtonBox;
Gtk::Button m_Button_Quit, m_Button_Buffer1, m_Button_Buffer2;
};
diff --git a/examples/book/timeout/timerexample.cc b/examples/book/timeout/timerexample.cc
index d866c16..cc18555 100644
--- a/examples/book/timeout/timerexample.cc
+++ b/examples/book/timeout/timerexample.cc
@@ -19,7 +19,7 @@
#include "timerexample.h"
TimerExample::TimerExample() :
- m_Box(true, 10),
+ m_Box(Gtk::ORIENTATION_HORIZONTAL, 10),
// use Gtk::Stock wherever possible for buttons, etc.
m_ButtonAddTimer(Gtk::Stock::ADD),
m_ButtonDeleteTimer(Gtk::Stock::REMOVE),
diff --git a/examples/book/timeout/timerexample.h b/examples/book/timeout/timerexample.h
index 720ff0c..23a8585 100644
--- a/examples/book/timeout/timerexample.h
+++ b/examples/book/timeout/timerexample.h
@@ -39,7 +39,7 @@ protected:
// Member data:
- Gtk::HBox m_Box;
+ Gtk::Box m_Box;
Gtk::Button m_ButtonAddTimer, m_ButtonDeleteTimer, m_ButtonQuit;
// Keep track of the timers being added:
diff --git a/examples/book/toolbar/examplewindow.cc b/examples/book/toolbar/examplewindow.cc
index 641c89b..990553a 100644
--- a/examples/book/toolbar/examplewindow.cc
+++ b/examples/book/toolbar/examplewindow.cc
@@ -20,7 +20,8 @@
#include <iostream>
ExampleWindow::ExampleWindow()
-: m_Button_Close("Close")
+: m_VBox(Gtk::ORIENTATION_VERTICAL),
+ m_Button_Close("Close")
{
set_title("Gtk::Toolbar example");
//The toolbar will not demand any size, because it has an overflow menu.
diff --git a/examples/book/toolbar/examplewindow.h b/examples/book/toolbar/examplewindow.h
index 46df3f8..8a90727 100644
--- a/examples/book/toolbar/examplewindow.h
+++ b/examples/book/toolbar/examplewindow.h
@@ -33,8 +33,8 @@ protected:
void on_toolbar_item();
//Child widgets:
- Gtk::VBox m_VBox;
- Gtk::HButtonBox m_ButtonBox;
+ Gtk::Box m_VBox;
+ Gtk::ButtonBox m_ButtonBox;
Gtk::Toolbar m_Toolbar;
Gtk::Button m_Button_Close;
};
diff --git a/examples/book/toolpalette/examplewindow.cc b/examples/book/toolpalette/examplewindow.cc
index 67085cb..2cf1a88 100644
--- a/examples/book/toolpalette/examplewindow.cc
+++ b/examples/book/toolpalette/examplewindow.cc
@@ -180,8 +180,8 @@ void ExampleWindow::load_special_items()
}
ExampleWindow::ExampleWindow()
-: m_VBox(false, 6),
- m_HBox(false, 6)
+: m_VBox(Gtk::ORIENTATION_VERTICAL, 6),
+ m_HBox(Gtk::ORIENTATION_HORIZONTAL, 6)
{
set_title("Gtk::ToolPalette example");
set_size_request(600, 600);
diff --git a/examples/book/toolpalette/examplewindow.h b/examples/book/toolpalette/examplewindow.h
index eb86460..f0fb958 100644
--- a/examples/book/toolpalette/examplewindow.h
+++ b/examples/book/toolpalette/examplewindow.h
@@ -68,8 +68,8 @@ private:
//Child widgets:
- Gtk::VBox m_VBox;
- Gtk::HBox m_HBox;
+ Gtk::Box m_VBox;
+ Gtk::Box m_HBox;
Gtk::ComboBox m_ComboOrientation;
Glib::RefPtr<Gtk::ListStore> m_refTreeModelOrientation;
Gtk::ComboBox m_ComboStyle;
diff --git a/examples/book/tooltips/examplewindow.cc b/examples/book/tooltips/examplewindow.cc
index e10bf5f..923c0cb 100644
--- a/examples/book/tooltips/examplewindow.cc
+++ b/examples/book/tooltips/examplewindow.cc
@@ -26,7 +26,7 @@ const Glib::ustring markedup_tip = "<i>Markup</i> in a tooltip.";
ExampleWindow::ExampleWindow()
:
- m_vbox(false, 3),
+ m_vbox(Gtk::ORIENTATION_VERTICAL, 3),
m_checkbutton("Click to alternate markup in tooltip"),
m_label("A label"),
m_button("Custom widget in tooltip window"),
diff --git a/examples/book/tooltips/examplewindow.h b/examples/book/tooltips/examplewindow.h
index 30289b4..33bf3e2 100644
--- a/examples/book/tooltips/examplewindow.h
+++ b/examples/book/tooltips/examplewindow.h
@@ -40,7 +40,7 @@ protected:
bool on_button_query_tooltip(int x, int y, bool keyboard_tooltip, const Glib::RefPtr<Gtk::Tooltip>& tooltip);
//Child widgets:
- Gtk::VBox m_vbox;
+ Gtk::Box m_vbox;
Gtk::CheckButton m_checkbutton;
Gtk::Label m_label;
diff --git a/examples/book/treeview/combo_renderer/examplewindow.cc b/examples/book/treeview/combo_renderer/examplewindow.cc
index a0e9e92..fb28282 100644
--- a/examples/book/treeview/combo_renderer/examplewindow.cc
+++ b/examples/book/treeview/combo_renderer/examplewindow.cc
@@ -20,7 +20,8 @@
#include "examplewindow.h"
ExampleWindow::ExampleWindow()
-: m_Button_Quit("Quit")
+: m_VBox(Gtk::ORIENTATION_VERTICAL),
+ m_Button_Quit("Quit")
{
set_title("Gtk::TreeView (ListStore) example");
set_border_width(5);
diff --git a/examples/book/treeview/combo_renderer/examplewindow.h b/examples/book/treeview/combo_renderer/examplewindow.h
index c783535..50bce77 100644
--- a/examples/book/treeview/combo_renderer/examplewindow.h
+++ b/examples/book/treeview/combo_renderer/examplewindow.h
@@ -64,7 +64,7 @@ protected:
ModelColumnsCombo m_ColumnsCombo;
//Child widgets:
- Gtk::VBox m_VBox;
+ Gtk::Box m_VBox;
Gtk::ScrolledWindow m_ScrolledWindow;
Gtk::TreeView m_TreeView;
@@ -72,7 +72,7 @@ protected:
Glib::RefPtr<Gtk::ListStore> m_refTreeModelCombo1, m_refTreeModelCombo2;
- Gtk::HButtonBox m_ButtonBox;
+ Gtk::ButtonBox m_ButtonBox;
Gtk::Button m_Button_Quit;
};
diff --git a/examples/book/treeview/drag_and_drop/examplewindow.cc b/examples/book/treeview/drag_and_drop/examplewindow.cc
index e9a43c6..4a6a092 100644
--- a/examples/book/treeview/drag_and_drop/examplewindow.cc
+++ b/examples/book/treeview/drag_and_drop/examplewindow.cc
@@ -20,7 +20,8 @@
#include "examplewindow.h"
ExampleWindow::ExampleWindow()
-: m_Button_Quit(Gtk::Stock::QUIT)
+: m_VBox(Gtk::ORIENTATION_VERTICAL),
+ m_Button_Quit(Gtk::Stock::QUIT)
{
set_title("Gtk::TreeView (Drag and Drop) example");
set_border_width(5);
diff --git a/examples/book/treeview/drag_and_drop/examplewindow.h b/examples/book/treeview/drag_and_drop/examplewindow.h
index 0413121..2fea96a 100644
--- a/examples/book/treeview/drag_and_drop/examplewindow.h
+++ b/examples/book/treeview/drag_and_drop/examplewindow.h
@@ -35,13 +35,13 @@ protected:
//Child widgets:
- Gtk::VBox m_VBox;
+ Gtk::Box m_VBox;
Gtk::ScrolledWindow m_ScrolledWindow;
Gtk::TreeView m_TreeView;
Glib::RefPtr<TreeModel_Dnd> m_refTreeModel;
- Gtk::HButtonBox m_ButtonBox;
+ Gtk::ButtonBox m_ButtonBox;
Gtk::Button m_Button_Quit;
};
diff --git a/examples/book/treeview/editable_cells/examplewindow.cc b/examples/book/treeview/editable_cells/examplewindow.cc
index e7527c1..14a517a 100644
--- a/examples/book/treeview/editable_cells/examplewindow.cc
+++ b/examples/book/treeview/editable_cells/examplewindow.cc
@@ -25,7 +25,8 @@ using std::sprintf;
using std::strtol;
ExampleWindow::ExampleWindow()
-: m_Button_Quit("Quit"),
+: m_VBox(Gtk::ORIENTATION_VERTICAL),
+ m_Button_Quit("Quit"),
m_validate_retry(false)
{
set_title("Gtk::TreeView Editable Cells example");
diff --git a/examples/book/treeview/editable_cells/examplewindow.h b/examples/book/treeview/editable_cells/examplewindow.h
index 00452f3..bee353e 100644
--- a/examples/book/treeview/editable_cells/examplewindow.h
+++ b/examples/book/treeview/editable_cells/examplewindow.h
@@ -53,13 +53,13 @@ protected:
ModelColumns m_Columns;
//Child widgets:
- Gtk::VBox m_VBox;
+ Gtk::Box m_VBox;
Gtk::ScrolledWindow m_ScrolledWindow;
Gtk::TreeView m_TreeView;
Glib::RefPtr<Gtk::ListStore> m_refTreeModel;
- Gtk::HButtonBox m_ButtonBox;
+ Gtk::ButtonBox m_ButtonBox;
Gtk::Button m_Button_Quit;
//For the validated column:
diff --git a/examples/book/treeview/filter/examplewindow.cc b/examples/book/treeview/filter/examplewindow.cc
index 6e062c4..98d338b 100644
--- a/examples/book/treeview/filter/examplewindow.cc
+++ b/examples/book/treeview/filter/examplewindow.cc
@@ -20,7 +20,8 @@
#include "examplewindow.h"
ExampleWindow::ExampleWindow()
-: m_Button_Quit("Quit")
+: m_VBox(Gtk::ORIENTATION_VERTICAL),
+ m_Button_Quit("Quit")
{
set_title("Gtk::TreeView (TreeModelFilter) example");
set_border_width(5);
diff --git a/examples/book/treeview/filter/examplewindow.h b/examples/book/treeview/filter/examplewindow.h
index 35bef30..e272528 100644
--- a/examples/book/treeview/filter/examplewindow.h
+++ b/examples/book/treeview/filter/examplewindow.h
@@ -49,14 +49,14 @@ protected:
ModelColumns m_Columns;
//Child widgets:
- Gtk::VBox m_VBox;
+ Gtk::Box m_VBox;
Gtk::ScrolledWindow m_ScrolledWindow;
Gtk::TreeView m_TreeView;
Glib::RefPtr<Gtk::ListStore> m_refTreeModel;
Glib::RefPtr<Gtk::TreeModelFilter> m_refTreeModelFilter;
- Gtk::HButtonBox m_ButtonBox;
+ Gtk::ButtonBox m_ButtonBox;
Gtk::Button m_Button_Quit;
};
diff --git a/examples/book/treeview/filter_modify/examplewindow.cc b/examples/book/treeview/filter_modify/examplewindow.cc
index d50531e..bc52abb 100644
--- a/examples/book/treeview/filter_modify/examplewindow.cc
+++ b/examples/book/treeview/filter_modify/examplewindow.cc
@@ -20,7 +20,8 @@
#include "examplewindow.h"
ExampleWindow::ExampleWindow()
-: m_Button_Quit("Quit")
+: m_VBox(Gtk::ORIENTATION_VERTICAL),
+ m_Button_Quit("Quit")
{
set_title("Gtk::TreeView (TreeModelFilter) example");
set_border_width(5);
diff --git a/examples/book/treeview/filter_modify/examplewindow.h b/examples/book/treeview/filter_modify/examplewindow.h
index df9eb97..843df9e 100644
--- a/examples/book/treeview/filter_modify/examplewindow.h
+++ b/examples/book/treeview/filter_modify/examplewindow.h
@@ -68,14 +68,14 @@ protected:
ModelColumnsDisplay m_ColumnsDisplay;
//Child widgets:
- Gtk::VBox m_VBox;
+ Gtk::Box m_VBox;
Gtk::ScrolledWindow m_ScrolledWindow;
Gtk::TreeView m_TreeView;
Glib::RefPtr<Gtk::ListStore> m_refTreeModel;
Glib::RefPtr<Gtk::TreeModelFilter> m_refTreeModelFilter;
- Gtk::HButtonBox m_ButtonBox;
+ Gtk::ButtonBox m_ButtonBox;
Gtk::Button m_Button_Quit;
};
diff --git a/examples/book/treeview/list/examplewindow.cc b/examples/book/treeview/list/examplewindow.cc
index 4e152b3..627c82c 100644
--- a/examples/book/treeview/list/examplewindow.cc
+++ b/examples/book/treeview/list/examplewindow.cc
@@ -20,7 +20,8 @@
#include "examplewindow.h"
ExampleWindow::ExampleWindow()
-: m_Button_Quit("Quit")
+: m_VBox(Gtk::ORIENTATION_VERTICAL),
+ m_Button_Quit("Quit")
{
set_title("Gtk::TreeView (ListStore) example");
set_border_width(5);
diff --git a/examples/book/treeview/list/examplewindow.h b/examples/book/treeview/list/examplewindow.h
index 839cd85..f0aa710 100644
--- a/examples/book/treeview/list/examplewindow.h
+++ b/examples/book/treeview/list/examplewindow.h
@@ -48,13 +48,13 @@ protected:
ModelColumns m_Columns;
//Child widgets:
- Gtk::VBox m_VBox;
+ Gtk::Box m_VBox;
Gtk::ScrolledWindow m_ScrolledWindow;
Gtk::TreeView m_TreeView;
Glib::RefPtr<Gtk::ListStore> m_refTreeModel;
- Gtk::HButtonBox m_ButtonBox;
+ Gtk::ButtonBox m_ButtonBox;
Gtk::Button m_Button_Quit;
};
diff --git a/examples/book/treeview/listviewtext/examplewindow.cc b/examples/book/treeview/listviewtext/examplewindow.cc
index 8f72c70..0cca35f 100644
--- a/examples/book/treeview/listviewtext/examplewindow.cc
+++ b/examples/book/treeview/listviewtext/examplewindow.cc
@@ -19,9 +19,10 @@
#include <iostream>
#include "examplewindow.h"
-ExampleWindow::ExampleWindow() :
- m_ListViewText(3),
- m_Button_Quit("Quit")
+ExampleWindow::ExampleWindow()
+: m_VBox(Gtk::ORIENTATION_VERTICAL),
+ m_ListViewText(3),
+ m_Button_Quit("Quit")
{
set_title("Gtk::ListViewText example");
set_border_width(6);
diff --git a/examples/book/treeview/listviewtext/examplewindow.h b/examples/book/treeview/listviewtext/examplewindow.h
index 0ea0ff5..8504ed0 100644
--- a/examples/book/treeview/listviewtext/examplewindow.h
+++ b/examples/book/treeview/listviewtext/examplewindow.h
@@ -37,12 +37,12 @@ protected:
void on_button_quit();
//Child widgets:
- Gtk::VBox m_VBox;
+ Gtk::Box m_VBox;
Gtk::ScrolledWindow m_ScrolledWindow;
Gtk::ListViewText m_ListViewText;
- Gtk::HButtonBox m_ButtonBox;
+ Gtk::ButtonBox m_ButtonBox;
Gtk::Button m_Button_Quit;
};
diff --git a/examples/book/treeview/modelsort/examplewindow.cc b/examples/book/treeview/modelsort/examplewindow.cc
index 954f8ac..de602ee 100644
--- a/examples/book/treeview/modelsort/examplewindow.cc
+++ b/examples/book/treeview/modelsort/examplewindow.cc
@@ -20,7 +20,8 @@
#include "examplewindow.h"
ExampleWindow::ExampleWindow()
-: m_Button_Quit("Quit")
+: m_VBox(Gtk::ORIENTATION_VERTICAL),
+ m_Button_Quit("Quit")
{
set_title("Gtk::TreeView (TreeModelSort) example");
set_border_width(6);
diff --git a/examples/book/treeview/modelsort/examplewindow.h b/examples/book/treeview/modelsort/examplewindow.h
index d622228..fcb5655 100644
--- a/examples/book/treeview/modelsort/examplewindow.h
+++ b/examples/book/treeview/modelsort/examplewindow.h
@@ -47,14 +47,14 @@ protected:
ModelColumns m_Columns;
//Child widgets:
- Gtk::VBox m_VBox;
+ Gtk::Box m_VBox;
Gtk::ScrolledWindow m_ScrolledWindow1, m_ScrolledWindow2;
Gtk::TreeView m_TreeView1, m_TreeView2;
Glib::RefPtr<Gtk::ListStore> m_refTreeModel;
Glib::RefPtr<Gtk::TreeModelSort> m_refTreeModelSort1, m_refTreeModelSort2;
- Gtk::HButtonBox m_ButtonBox;
+ Gtk::ButtonBox m_ButtonBox;
Gtk::Button m_Button_Quit;
};
diff --git a/examples/book/treeview/popup/examplewindow.cc b/examples/book/treeview/popup/examplewindow.cc
index 5f51cbd..e0293e0 100644
--- a/examples/book/treeview/popup/examplewindow.cc
+++ b/examples/book/treeview/popup/examplewindow.cc
@@ -20,7 +20,8 @@
#include "examplewindow.h"
ExampleWindow::ExampleWindow()
-: m_Button_Quit("Quit")
+: m_VBox(Gtk::ORIENTATION_VERTICAL),
+ m_Button_Quit("Quit")
{
set_title("Gtk::TreeView (ListStore) example");
set_border_width(5);
diff --git a/examples/book/treeview/popup/examplewindow.h b/examples/book/treeview/popup/examplewindow.h
index 346cc8f..15c4d2a 100644
--- a/examples/book/treeview/popup/examplewindow.h
+++ b/examples/book/treeview/popup/examplewindow.h
@@ -35,12 +35,12 @@ protected:
//Child widgets:
- Gtk::VBox m_VBox;
+ Gtk::Box m_VBox;
Gtk::ScrolledWindow m_ScrolledWindow;
TreeView_WithPopup m_TreeView;
- Gtk::HButtonBox m_ButtonBox;
+ Gtk::ButtonBox m_ButtonBox;
Gtk::Button m_Button_Quit;
};
diff --git a/examples/book/treeview/tree/examplewindow.cc b/examples/book/treeview/tree/examplewindow.cc
index 7e6a01c..24baefe 100644
--- a/examples/book/treeview/tree/examplewindow.cc
+++ b/examples/book/treeview/tree/examplewindow.cc
@@ -20,7 +20,8 @@
#include "examplewindow.h"
ExampleWindow::ExampleWindow()
-: m_Button_Quit("Quit")
+: m_VBox(Gtk::ORIENTATION_VERTICAL),
+ m_Button_Quit("Quit")
{
set_title("Gtk::TreeView (TreeStore) example");
set_border_width(5);
diff --git a/examples/book/treeview/tree/examplewindow.h b/examples/book/treeview/tree/examplewindow.h
index 11aaded..54770aa 100644
--- a/examples/book/treeview/tree/examplewindow.h
+++ b/examples/book/treeview/tree/examplewindow.h
@@ -47,13 +47,13 @@ protected:
ModelColumns m_Columns;
//Child widgets:
- Gtk::VBox m_VBox;
+ Gtk::Box m_VBox;
Gtk::ScrolledWindow m_ScrolledWindow;
Gtk::TreeView m_TreeView;
Glib::RefPtr<Gtk::TreeStore> m_refTreeModel;
- Gtk::HButtonBox m_ButtonBox;
+ Gtk::ButtonBox m_ButtonBox;
Gtk::Button m_Button_Quit;
};
diff --git a/examples/book/update_ui/examplewindow.cc b/examples/book/update_ui/examplewindow.cc
index 0657044..84fede2 100644
--- a/examples/book/update_ui/examplewindow.cc
+++ b/examples/book/update_ui/examplewindow.cc
@@ -20,7 +20,8 @@
#include "examplewindow.h"
ExampleWindow::ExampleWindow()
-: m_Button_Start("Start"),
+: m_VBox(Gtk::ORIENTATION_VERTICAL),
+ m_Button_Start("Start"),
m_Button_Quit(Gtk::Stock::QUIT)
{
set_title("update-ui example");
diff --git a/examples/book/update_ui/examplewindow.h b/examples/book/update_ui/examplewindow.h
index ef7d877..6ae7db0 100644
--- a/examples/book/update_ui/examplewindow.h
+++ b/examples/book/update_ui/examplewindow.h
@@ -34,11 +34,11 @@ protected:
//Child widgets:
- Gtk::VBox m_VBox;
+ Gtk::Box m_VBox;
Gtk::ProgressBar m_ProgressBar;
- Gtk::HButtonBox m_ButtonBox;
+ Gtk::ButtonBox m_ButtonBox;
Gtk::Button m_Button_Start;
Gtk::Button m_Button_Quit;
};
diff --git a/examples/others/arrow/arrow.cc b/examples/others/arrow/arrow.cc
index 0f075e3..71eff9d 100644
--- a/examples/others/arrow/arrow.cc
+++ b/examples/others/arrow/arrow.cc
@@ -34,7 +34,7 @@ public:
AppWindow::AppWindow()
{
ArrowButton *button;
- Gtk::HBox *box;
+ Gtk::Box *box;
set_title ("Arrow Buttons");
@@ -42,7 +42,7 @@ AppWindow::AppWindow()
set_border_width (10);
/* Create a box to hold the arrows/buttons */
- box=Gtk::manage (new Gtk::HBox (false, 0));
+ box = Gtk::manage (new Gtk::Box (Gtk::ORIENTATION_HORIZONTAL));
box->set_border_width (2);
/* Pack and show all our widgets */
diff --git a/examples/others/calendar/calendar.cc b/examples/others/calendar/calendar.cc
index c8b8974..5bfff04 100644
--- a/examples/others/calendar/calendar.cc
+++ b/examples/others/calendar/calendar.cc
@@ -157,16 +157,16 @@ CalendarExample::CalendarExample()
set_resizable(false);
- Gtk::VBox* vbox = Gtk::manage(new Gtk::VBox(false, DEF_PAD));
+ Gtk::Box* vbox = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL, DEF_PAD));
add(*vbox);
/*
* The top part of the CalendarExample, flags and fontsel.
*/
- Gtk::HBox* hbox = Gtk::manage(new Gtk::HBox(false, DEF_PAD));
+ Gtk::Box* hbox = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL, DEF_PAD));
vbox->pack_start(*hbox, Gtk::PACK_EXPAND_WIDGET, DEF_PAD);
- Gtk::HButtonBox* hbbox = Gtk::manage(new Gtk::HButtonBox());
+ Gtk::ButtonBox* hbbox = Gtk::manage(new Gtk::ButtonBox());
hbox->pack_start(*hbbox, Gtk::PACK_SHRINK, DEF_PAD);
hbbox->set_layout(Gtk::BUTTONBOX_SPREAD);
hbbox->set_spacing(5);
@@ -182,17 +182,17 @@ CalendarExample::CalendarExample()
calendar_->signal_day_selected().connect(sigc::mem_fun(*this, &CalendarExample::day_selected));
calendar_->signal_day_selected_double_click().connect(sigc::mem_fun(*this, &CalendarExample::day_selected_double_click));
- Gtk::VSeparator* separator = Gtk::manage(new Gtk::VSeparator());
+ Gtk::Separator* separator = Gtk::manage(new Gtk::Separator(Gtk::ORIENTATION_VERTICAL));
hbox->pack_start (*separator, Gtk::PACK_SHRINK);
- Gtk::VBox* vbox2 = Gtk::manage(new Gtk::VBox(false, DEF_PAD));
+ Gtk::Box* vbox2 = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL, DEF_PAD));
hbox->pack_start(*vbox2, Gtk::PACK_SHRINK, DEF_PAD);
/* Build the Right frame with the flags in */
Gtk::Frame* frameFlags = Gtk::manage(new Gtk::Frame("Flags"));
vbox2->pack_start(*frameFlags, Gtk::PACK_EXPAND_WIDGET, DEF_PAD);
- Gtk::VBox* vbox3 = Gtk::manage(new Gtk::VBox(true, DEF_PAD_SMALL));
+ Gtk::Box* vbox3 = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL, DEF_PAD_SMALL));
frameFlags->add(*vbox3);
struct {
@@ -225,31 +225,31 @@ CalendarExample::CalendarExample()
frame = Gtk::manage(new Gtk::Frame("Signal events"));
vbox->pack_start(*frame, Gtk::PACK_EXPAND_WIDGET, DEF_PAD);
- vbox2 = Gtk::manage(new Gtk::VBox(true, DEF_PAD_SMALL));
+ vbox2 = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL, DEF_PAD_SMALL));
frame->add(*vbox2);
- hbox = Gtk::manage(new Gtk::HBox(false, 5));
+ hbox = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL, 5));
vbox2->pack_start (*hbox, Gtk::PACK_SHRINK);
Gtk::Label* label = Gtk::manage(new Gtk::Label("Day selected:"));
hbox->pack_start (*label, Gtk::PACK_SHRINK);
label_selected_ = new Gtk::Label("");
hbox->pack_start (*label_selected_, Gtk::PACK_SHRINK);
- hbox = Gtk::manage(new Gtk::HBox(false, 5));
+ hbox = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL, 5));
vbox2->pack_start (*hbox, Gtk::PACK_SHRINK);
label = Gtk::manage(new Gtk::Label("Day selected double click:"));
hbox->pack_start (*label, Gtk::PACK_SHRINK);
label_selected_double_click_ = new Gtk::Label("");
hbox->pack_start (*label_selected_double_click_, Gtk::PACK_SHRINK);
- hbox = Gtk::manage(new Gtk::HBox(false, 5));
+ hbox = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL, 5));
vbox2->pack_start (*hbox, Gtk::PACK_SHRINK);
label = Gtk::manage(new Gtk::Label("Month change:"));
hbox->pack_start (*label, Gtk::PACK_SHRINK);
label_month_ = new Gtk::Label("");
hbox->pack_start(*label_month_, Gtk::PACK_SHRINK);
- Gtk::HButtonBox* bbox = Gtk::manage(new Gtk::HButtonBox());
+ Gtk::ButtonBox* bbox = Gtk::manage(new Gtk::ButtonBox());
vbox->pack_start(*bbox, Gtk::PACK_SHRINK);
bbox->set_layout(Gtk::BUTTONBOX_END);
diff --git a/examples/others/cellrenderercustom/popupentry.cc b/examples/others/cellrenderercustom/popupentry.cc
index c02634f..9a12cca 100644
--- a/examples/others/cellrenderercustom/popupentry.cc
+++ b/examples/others/cellrenderercustom/popupentry.cc
@@ -32,7 +32,7 @@ PopupEntry::PopupEntry(const Glib::ustring& path)
entry_ (0),
editing_canceled_ (false)
{
- Gtk::HBox *const hbox = new Gtk::HBox(false, 0);
+ Gtk::Box *const hbox = new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL, 0);
add(*Gtk::manage(hbox));
entry_ = new Gtk::Entry();
diff --git a/examples/others/exception/exceptiontest.cc b/examples/others/exception/exceptiontest.cc
index 9d54a8f..317ec17 100644
--- a/examples/others/exception/exceptiontest.cc
+++ b/examples/others/exception/exceptiontest.cc
@@ -98,7 +98,7 @@ int main(int argc, char** argv)
window.set_title("Exception Handlers");
window.set_border_width(10);
- Gtk::Box *const box = new Gtk::VBox(true, 5);
+ Gtk::Box *const box = new Gtk::Box(Gtk::ORIENTATION_VERTICAL, 5);
window.add(*Gtk::manage(box));
// New exception handlers are inserted at the front of the per-thread
diff --git a/examples/others/idle/idle.cc b/examples/others/idle/idle.cc
index 40cfdc9..e19250e 100644
--- a/examples/others/idle/idle.cc
+++ b/examples/others/idle/idle.cc
@@ -39,7 +39,7 @@ IdleExample::IdleExample() :
m_quit.signal_pressed().connect(sigc::mem_fun(*this, &Gtk::Widget::hide));
// put buttons into container
- Gtk::VBox *vbox = manage( new Gtk::VBox(false,5));
+ Gtk::Box *vbox = manage( new Gtk::Box(Gtk::ORIENTATION_VERTICAL,5));
// adding a few widgets
vbox->pack_start(* manage(new Gtk::Label("Formatting windows drive C:")));
@@ -52,7 +52,7 @@ IdleExample::IdleExample() :
vbox->pack_start(* manage(new Gtk::Label("5000 MB")));
vbox->pack_start(m_progressbar_d);
- Gtk::HBox *hbox = manage( new Gtk::HBox(false,10));
+ Gtk::Box *hbox = manage( new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL,10));
hbox->pack_start(m_quit, Gtk::PACK_EXPAND_PADDING);
vbox->pack_start(*hbox);
diff --git a/examples/others/statusbar/statusbar.cc b/examples/others/statusbar/statusbar.cc
index 1f7ffbc..eddc71e 100644
--- a/examples/others/statusbar/statusbar.cc
+++ b/examples/others/statusbar/statusbar.cc
@@ -17,7 +17,7 @@ protected:
void pop_item(unsigned int context_id) { m_status_bar.pop(context_id); }
unsigned int m_context_id, m_count;
- Gtk::VBox m_vbox;
+ Gtk::Box m_vbox;
Gtk::Button m_bPush, m_bPop;
Gtk::Statusbar m_status_bar;
};
@@ -26,7 +26,7 @@ protected:
StatusBarExample::StatusBarExample()
:
m_count(1),
- m_vbox(false, 1),
+ m_vbox(Gtk::ORIENTATION_VERTICAL, 1),
m_bPush("push item"),
m_bPop("pop last item")
{
diff --git a/examples/others/stock/stock.cc b/examples/others/stock/stock.cc
index da38b5b..f94f82e 100644
--- a/examples/others/stock/stock.cc
+++ b/examples/others/stock/stock.cc
@@ -48,7 +48,7 @@ MainWindowClass::MainWindowClass()
set_size_request(350, -1);
- Gtk::VBox* vbox = Gtk::manage(new Gtk::VBox(false, 0));
+ Gtk::Box* vbox = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL, 0));
add(*vbox);
Gtk::MenuBar* menubar = Gtk::manage(new Gtk::MenuBar());
diff --git a/examples/others/tictactoe/tictactoe.cc b/examples/others/tictactoe/tictactoe.cc
index 28c93d7..40a1419 100644
--- a/examples/others/tictactoe/tictactoe.cc
+++ b/examples/others/tictactoe/tictactoe.cc
@@ -1,12 +1,12 @@
/* example-start tictactoe tictactoe.c */
/* GTK - The GIMP Toolkit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+ * Copyright(C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2 of the License, or(at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -23,75 +23,75 @@
#include <gtkmm/togglebutton.h>
#include "tictactoe.h"
-TicTacToe::TicTacToe ()
+TicTacToe::TicTacToe()
+: Gtk::Box(Gtk::ORIENTATION_VERTICAL)
{
- Gtk::Table *table;
- Gtk::ToggleButton *button;
- int i,j;
-
- table = Gtk::manage( new Gtk::Table (3, 3, true) );
- add ( *table);
+ Gtk::Table* table = Gtk::manage( new Gtk::Table(3, 3, true) );
+ add( *table);
- for (i=0;i<3; i++)
- for (j=0;j<3; j++)
- {
- buttons[i][j] = button = Gtk::manage( new Gtk::ToggleButton ());
- table-> attach (*button, i, i+1, j, j+1);
- button-> signal_toggled().connect ( sigc::bind(
+ for(int i=0;i<3; i++)
+ {
+ for(int j=0;j<3; j++)
+ {
+ Gtk::ToggleButton* button = 0;
+ buttons[i][j] = button = Gtk::manage( new Gtk::ToggleButton());
+ table->attach(*button, i, i+1, j, j+1);
+ button->signal_toggled().connect( sigc::bind(
sigc::mem_fun(*this, &TicTacToe::toggle),
button));
- button-> set_size_request (20, 20);
- }
+ button->set_size_request(20, 20);
+ }
+ }
- table-> show_all();
+ table->show_all();
}
-TicTacToe::~TicTacToe() {}
+TicTacToe::~TicTacToe()
+{}
void
-TicTacToe::clear ()
+TicTacToe::clear()
{
freeze();
- for (int i=0;i<3;i++)
- for (int j=0;j<3;j++)
- buttons[i][j]-> set_active (false);
+ for(int i=0; i<3; i++)
+ for(int j=0; j<3; j++)
+ buttons[i][j]->set_active(false);
thaw();
}
void
-TicTacToe::toggle (Gtk::ToggleButton *button)
+TicTacToe::toggle(Gtk::ToggleButton *button)
{
- int i,k;
- if (frozen) return;
+ if(frozen)
+ return;
static int rwins[8][3] = { { 0, 0, 0 }, { 1, 1, 1 }, { 2, 2, 2 },
- { 0, 1, 2 }, { 0, 1, 2 }, { 0, 1, 2 },
- { 0, 1, 2 }, { 0, 1, 2 } };
+ { 0, 1, 2 }, { 0, 1, 2 }, { 0, 1, 2 },
+ { 0, 1, 2 }, { 0, 1, 2 } };
static int cwins[8][3] = { { 0, 1, 2 }, { 0, 1, 2 }, { 0, 1, 2 },
- { 0, 0, 0 }, { 1, 1, 1 }, { 2, 2, 2 },
- { 0, 1, 2 }, { 2, 1, 0 } };
+ { 0, 0, 0 }, { 1, 1, 1 }, { 2, 2, 2 },
+ { 0, 1, 2 }, { 2, 1, 0 } };
bool success, found;
- for (k=0; k<8; k++)
- {
- success = true;
- found = false;
+ for(int k=0; k<8; k++)
+ {
+ success = true;
+ found = false;
- for (i=0;i<3;i++)
- {
- success &= buttons[rwins[k][i]][cwins[k][i]]-> get_active();
- found |= buttons[rwins[k][i]][cwins[k][i]] == button;
- }
+ for(int i=0; i<3; i++)
+ {
+ success &= buttons[rwins[k][i]][cwins[k][i]]->get_active();
+ found |= buttons[rwins[k][i]][cwins[k][i]] == button;
+ }
- if (success && found)
- {
- tictactoe();
- break;
- }
+ if(success && found)
+ {
+ tictactoe();
+ break;
}
+ }
}
-/* example-end */
diff --git a/examples/others/tictactoe/tictactoe.h b/examples/others/tictactoe/tictactoe.h
index bafde35..9921e4f 100644
--- a/examples/others/tictactoe/tictactoe.h
+++ b/examples/others/tictactoe/tictactoe.h
@@ -23,23 +23,23 @@
#include <gtkmm/togglebutton.h>
#include <gdkmm.h>
-class TicTacToe: public Gtk::VBox
+class TicTacToe: public Gtk::Box
{
- private:
- Gtk::ToggleButton *buttons[3][3];
- bool frozen;
- void toggle(Gtk::ToggleButton*);
+private:
+ Gtk::ToggleButton* buttons[3][3];
+ bool frozen;
+ void toggle(Gtk::ToggleButton*);
- public:
- void freeze() {frozen=true;}
- void thaw() {frozen=false;}
+public:
+ void freeze() {frozen=true;}
+ void thaw() {frozen=false;}
- void clear();
+ void clear();
- sigc::signal<void> tictactoe;
+ sigc::signal<void> tictactoe;
- TicTacToe();
- ~TicTacToe();
+ TicTacToe();
+ ~TicTacToe();
};
#endif /* __TICTACTOE_H__ */
diff --git a/examples/others/treemodelcustom/examplewindow.cc b/examples/others/treemodelcustom/examplewindow.cc
index 578c0a5..4b9fbb6 100644
--- a/examples/others/treemodelcustom/examplewindow.cc
+++ b/examples/others/treemodelcustom/examplewindow.cc
@@ -20,7 +20,8 @@
#include "examplewindow.h"
ExampleWindow::ExampleWindow()
-: m_Button_Quit("Quit")
+: m_VBox(Gtk::ORIENTATION_VERTICAL),
+ m_Button_Quit("Quit")
{
set_title("Gtk::TreeView (custom TreeModel) example");
set_border_width(5);
diff --git a/examples/others/treemodelcustom/examplewindow.h b/examples/others/treemodelcustom/examplewindow.h
index 0853617..0ccdfa3 100644
--- a/examples/others/treemodelcustom/examplewindow.h
+++ b/examples/others/treemodelcustom/examplewindow.h
@@ -32,7 +32,7 @@ protected:
void on_button_quit();
//Child widgets:
- Gtk::VBox m_VBox;
+ Gtk::Box m_VBox;
Gtk::ScrolledWindow m_ScrolledWindow;
Gtk::TreeView m_TreeView;
@@ -40,7 +40,7 @@ protected:
//Our custom tree model:
Glib::RefPtr<ExampleTreeModel> m_refTreeModel;
- Gtk::HButtonBox m_ButtonBox;
+ Gtk::ButtonBox m_ButtonBox;
Gtk::Button m_Button_Quit;
};
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
