GNOME.org
 

[gtkmm] Avoid use of deprecated H/V* classes.

commit 245e4d18ed6a5eb32f445b5a56c2b1ec9895fefd
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Jun 10 22:11:31 2011 +0200

    Avoid use of deprecated H/V* classes.
    
    	* demos/gtk-demo/demowindow.[h|cc]:
    	* demos/gtk-demo/example_buttonbox.cc:
    	* demos/gtk-demo/example_change_display.cc:
    	* demos/gtk-demo/example_colorsel.cc:
    	* demos/gtk-demo/example_dialog.cc:
    	* demos/gtk-demo/example_drawingarea.cc:
    	* demos/gtk-demo/example_iconview.cc:
    	* demos/gtk-demo/example_images.cc:
    	* demos/gtk-demo/example_menus.cc:
    	* demos/gtk-demo/example_panes.cc:
    	* demos/gtk-demo/example_sizegroup.cc:
    	* demos/gtk-demo/example_stockbrowser.cc:
    	* demos/gtk-demo/example_textview.cc:
    	* demos/gtk-demo/example_treeview_editable_cells.cc:
    	* demos/gtk-demo/example_treeview_liststore.cc:
    	* demos/gtk-demo/example_treeview_treestore.cc:
    	* demos/gtk-demo/example_uimanager.cc:
    	* gtk/src/bin.ccg:
    	* tests/delete_cpp_child/main.cc:
    	* tests/dialog/main.cc: Change all uses of HBox, VBox, and
    	the equivalents for ButtonBox, Scale, Separator, etc to
    	the non-deprecated Box, etc, equivalents.

 ChangeLog                                         |   42 +++++++++++++++++++++
 demos/gtk-demo/demowindow.cc                      |   10 +++--
 demos/gtk-demo/demowindow.h                       |    2 +-
 demos/gtk-demo/example_buttonbox.cc               |   13 ++++--
 demos/gtk-demo/example_change_display.cc          |   10 ++--
 demos/gtk-demo/example_colorsel.cc                |    4 +-
 demos/gtk-demo/example_dialog.cc                  |   14 +++---
 demos/gtk-demo/example_drawingarea.cc             |    4 +-
 demos/gtk-demo/example_iconview.cc                |    5 +-
 demos/gtk-demo/example_images.cc                  |    4 +-
 demos/gtk-demo/example_menus.cc                   |   10 +++--
 demos/gtk-demo/example_panes.cc                   |    6 +-
 demos/gtk-demo/example_sizegroup.cc               |    7 ++-
 demos/gtk-demo/example_stockbrowser.cc            |    8 ++--
 demos/gtk-demo/example_textview.cc                |    5 +-
 demos/gtk-demo/example_treeview_editable_cells.cc |    8 ++--
 demos/gtk-demo/example_treeview_liststore.cc      |    4 +-
 demos/gtk-demo/example_treeview_treestore.cc      |    4 +-
 demos/gtk-demo/example_uimanager.cc               |   10 +++--
 gtk/src/bin.ccg                                   |    2 +-
 tests/child_widget2/main.cc                       |    4 +-
 tests/delete_cpp_child/main.cc                    |    2 +-
 tests/dialog/main.cc                              |    2 +-
 tests/refcount_dialog/main.cc                     |    5 +-
 24 files changed, 120 insertions(+), 65 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 4a254d8..21529e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,45 @@
+2011-06-10  Murray Cumming  <murrayc murrayc com>
+
+	Several classes: Derive from Box instead of HBox or VBox.
+
+	* gtk/src/colorselection.hg:
+	* gtk/src/filechooserbutton.hg:
+	* gtk/src/filechooserwidget.hg:
+	* gtk/src/fontselection.hg:
+	* gtk/src/hvbox.ccg:
+	* gtk/src/hvbox.hg:
+	* gtk/src/infobar.hg:
+	* gtk/src/recentchooserwidget.hg:
+	* gtk/src/statusbar.hg: The base class was changed in GTK+ in 
+	GTK+ 3.1.x. And HBox and VBox are deprecated now.
+
+2011-06-10  Murray Cumming  <murrayc murrayc com>
+
+	Avoid use of deprecated H/V* classes.
+
+	* demos/gtk-demo/demowindow.[h|cc]:
+	* demos/gtk-demo/example_buttonbox.cc:
+	* demos/gtk-demo/example_change_display.cc:
+	* demos/gtk-demo/example_colorsel.cc:
+	* demos/gtk-demo/example_dialog.cc:
+	* demos/gtk-demo/example_drawingarea.cc:
+	* demos/gtk-demo/example_iconview.cc:
+	* demos/gtk-demo/example_images.cc:
+	* demos/gtk-demo/example_menus.cc:
+	* demos/gtk-demo/example_panes.cc:
+	* demos/gtk-demo/example_sizegroup.cc:
+	* demos/gtk-demo/example_stockbrowser.cc:
+	* demos/gtk-demo/example_textview.cc:
+	* demos/gtk-demo/example_treeview_editable_cells.cc:
+	* demos/gtk-demo/example_treeview_liststore.cc:
+	* demos/gtk-demo/example_treeview_treestore.cc:
+	* demos/gtk-demo/example_uimanager.cc:
+	* gtk/src/bin.ccg:
+	* tests/delete_cpp_child/main.cc:
+	* tests/dialog/main.cc: Change all uses of HBox, VBox, and 
+	the equivalents for ButtonBox, Scale, Separator, etc to 
+	the non-deprecated Box, etc, equivalents.
+
 2011-06-09  Murray Cumming  <murrayc murrayc com>
 
 	Deprecate all H* an V* classes in favour of the base classes.
diff --git a/demos/gtk-demo/demowindow.cc b/demos/gtk-demo/demowindow.cc
index b4b718b..fe0f0e3 100644
--- a/demos/gtk-demo/demowindow.cc
+++ b/demos/gtk-demo/demowindow.cc
@@ -21,9 +21,10 @@
 #include "config.h"
 #endif
 
-#include "gtkmm/main.h"
-#include "gtkmm/cellrenderertext.h"
-#include "gtkmm/treeviewcolumn.h"
+#include <gtkmm/main.h>
+#include <gtkmm/cellrenderertext.h>
+#include <gtkmm/treeviewcolumn.h>
+#include <gtkmm/box.h>
 #include "demowindow.h"
 #include "textwidget.h"
 #include "demos.h"
@@ -73,7 +74,8 @@ const DemoColumns& demo_columns()
 
 
 DemoWindow::DemoWindow()
-: m_TextWidget_Info(false),
+: m_HBox(Gtk::ORIENTATION_HORIZONTAL),
+  m_TextWidget_Info(false),
   m_TextWidget_Source(true)
 {
   m_pWindow_Example = 0;
diff --git a/demos/gtk-demo/demowindow.h b/demos/gtk-demo/demowindow.h
index 16a51a0..08142b6 100644
--- a/demos/gtk-demo/demowindow.h
+++ b/demos/gtk-demo/demowindow.h
@@ -49,7 +49,7 @@ protected:
 
   //Member widgets:
   Gtk::Notebook m_Notebook;
-  Gtk::HBox m_HBox;
+  Gtk::Box m_HBox;
 
   Glib::RefPtr<Gtk::TreeStore> m_refTreeStore;
   Gtk::TreeView m_TreeView;
diff --git a/demos/gtk-demo/example_buttonbox.cc b/demos/gtk-demo/example_buttonbox.cc
index bafd441..60aede7 100644
--- a/demos/gtk-demo/example_buttonbox.cc
+++ b/demos/gtk-demo/example_buttonbox.cc
@@ -18,8 +18,8 @@ protected:
 
   //Member widgets:
   Gtk::Frame m_Frame_Horizontal, m_Frame_Vertical;
-  Gtk::VBox m_VBox_Main, m_VBox;
-  Gtk::HBox m_HBox;
+  Gtk::Box m_VBox_Main, m_VBox;
+  Gtk::Box m_HBox;
 };
 
 //Called by DemoWindow;
@@ -30,7 +30,10 @@ Gtk::Window* do_buttonbox()
 
 Example_ButtonBox::Example_ButtonBox()
 : m_Frame_Horizontal("Horizontal Button Boxes"),
-  m_Frame_Vertical("Vertical Button Boxes")
+  m_Frame_Vertical("Vertical Button Boxes"),
+  m_VBox_Main(Gtk::ORIENTATION_VERTICAL),
+  m_VBox(Gtk::ORIENTATION_VERTICAL),
+  m_HBox(Gtk::ORIENTATION_HORIZONTAL)
 {
   set_title("Button Boxes");
   set_border_width(10);
@@ -70,9 +73,9 @@ Gtk::Frame* Example_ButtonBox::create_button_box(bool horizontal, const Glib::us
 
   Gtk::ButtonBox* pButtonBox = 0;
   if (horizontal)
-    pButtonBox = Gtk::manage(new Gtk::HButtonBox());
+    pButtonBox = Gtk::manage(new Gtk::ButtonBox(Gtk::ORIENTATION_HORIZONTAL));
   else
-    pButtonBox = Gtk::manage(new Gtk::VButtonBox());
+    pButtonBox = Gtk::manage(new Gtk::ButtonBox(Gtk::ORIENTATION_VERTICAL));
 
   pButtonBox->set_border_width(5);
   pFrame->add(*pButtonBox);
diff --git a/demos/gtk-demo/example_change_display.cc b/demos/gtk-demo/example_change_display.cc
index b212e02..a37cd55 100644
--- a/demos/gtk-demo/example_change_display.cc
+++ b/demos/gtk-demo/example_change_display.cc
@@ -90,11 +90,11 @@ protected:
   };
   ModelColumns_Screen m_columns_screen;
 
-  Gtk::VBox m_VBox;
+  Gtk::Box m_VBox;
   Gtk::Frame m_Frame_Display, m_Frame_Screen;
   Gtk::TreeView m_TreeView_Display, m_TreeView_Screen;
   Glib::RefPtr<Gtk::ListStore> m_refListStore_Display,  m_refListStore_Screen;
-  Gtk::VBox m_ButtonBox_Display, m_ButtonBox_Screen;
+  Gtk::Box m_ButtonBox_Display, m_ButtonBox_Screen;
 
   Gtk::Button m_Button_Display_Open, m_Button_Display_Close;
 
@@ -114,10 +114,10 @@ protected:
 
 Example_ChangeDisplay::Example_ChangeDisplay()
 : Gtk::Dialog("Change Screen or display"),
-  m_VBox(false, 5),
+  m_VBox(Gtk::ORIENTATION_VERTICAL, 5),
   m_Frame_Display("Display"),
   m_Frame_Screen("Screen"),
-  m_ButtonBox_Display(false, 5), m_ButtonBox_Screen(false, 5),
+  m_ButtonBox_Display(Gtk::ORIENTATION_VERTICAL, 5), m_ButtonBox_Screen(Gtk::ORIENTATION_VERTICAL, 5),
   m_Button_Display_Open("_Open...", true), m_Button_Display_Close("_Close...", true),
   m_pPopup(0),
   m_popup_clicked(false)
@@ -189,7 +189,7 @@ Example_ChangeDisplay::~Example_ChangeDisplay()
 
 void Example_ChangeDisplay::setup_frame(Gtk::Frame& frame, Gtk::TreeView& treeview, Gtk::Box& buttonbox)
 {
-  Gtk::HBox* pHBox = Gtk::manage( new Gtk::HBox(false, 8) );
+  Gtk::Box* pHBox = Gtk::manage( new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL, 8) );
   pHBox->set_border_width(8);
   frame.add(*pHBox);
 
diff --git a/demos/gtk-demo/example_colorsel.cc b/demos/gtk-demo/example_colorsel.cc
index de9bb99..cdba328 100644
--- a/demos/gtk-demo/example_colorsel.cc
+++ b/demos/gtk-demo/example_colorsel.cc
@@ -18,7 +18,7 @@ protected:
   virtual void on_button_clicked();
 
   //Member widgets:
-  Gtk::VBox m_VBox;
+  Gtk::Box m_VBox;
   Gtk::Frame m_Frame;
   Gtk::DrawingArea m_DrawingArea;
   Gtk::Button m_Button;
@@ -33,7 +33,7 @@ Gtk::Window* do_colorsel()
 }
 
 Example_ColorSel::Example_ColorSel()
-: m_VBox(false, 8),
+: m_VBox(Gtk::ORIENTATION_VERTICAL, 8),
   m_Button("_Change the above color", true),
   m_Alignment(Gtk::ALIGN_END, Gtk::ALIGN_END, 0.0, 0.0)
 {
diff --git a/demos/gtk-demo/example_dialog.cc b/demos/gtk-demo/example_dialog.cc
index e41aada..f7a89ce 100644
--- a/demos/gtk-demo/example_dialog.cc
+++ b/demos/gtk-demo/example_dialog.cc
@@ -20,8 +20,8 @@ protected:
 
   //Member widgets:
   Gtk::Frame m_Frame;
-  Gtk::VBox m_VBox, m_VBox2;
-  Gtk::HBox m_HBox, m_HBox2;
+  Gtk::Box m_VBox, m_VBox2;
+  Gtk::Box m_HBox, m_HBox2;
   Gtk::Button m_Button_Message, m_Button_Interactive;
   Gtk::Table m_Table;
   Gtk::Label m_Label1, m_Label2;
@@ -41,7 +41,7 @@ public:
 
 protected:
   //Member widgets:
-  Gtk::HBox m_HBox;
+  Gtk::Box m_HBox;
   Gtk::Table m_Table;
   Gtk::Label m_Label1, m_Label2;
   Gtk::Entry m_Entry1, m_Entry2;
@@ -58,8 +58,8 @@ Gtk::Window* do_dialog()
 
 Example_Dialog::Example_Dialog()
 : m_Frame("Dialogs"),
-  m_VBox(false, 8),
-  m_HBox(false, 8), m_HBox2(false, 8),
+  m_VBox(Gtk::ORIENTATION_VERTICAL, 8),
+  m_HBox(Gtk::ORIENTATION_HORIZONTAL, 8), m_HBox2(Gtk::ORIENTATION_HORIZONTAL, 8),
   m_Button_Message("_Message Dialog", true), m_Button_Interactive("_Interactive Dialog", true),
   m_Table(2, 2, false),
   m_Label1("_Entry 1", true), m_Label2("E_ntry 2")
@@ -79,7 +79,7 @@ Example_Dialog::Example_Dialog()
   m_VBox.pack_start(m_HBox, Gtk::PACK_SHRINK);
   m_Button_Message.signal_clicked().connect(sigc::mem_fun(*this, &Example_Dialog::on_button_message));
   m_HBox.pack_start(m_Button_Message, Gtk::PACK_SHRINK);
-  m_VBox.pack_start(*(Gtk::manage(new Gtk::HSeparator())), Gtk::PACK_SHRINK);
+  m_VBox.pack_start(*(Gtk::manage(new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL))), Gtk::PACK_SHRINK);
 
 
   /* Interactive dialog*/
@@ -134,7 +134,7 @@ void Example_Dialog::on_button_interactive()
 
 Dialog_Interactive::Dialog_Interactive(Gtk::Window& parent, const Glib::ustring& entry1, const Glib::ustring& entry2)
 : Gtk::Dialog("Interactive Dialog", parent, true),
-  m_HBox(false, 8),
+  m_HBox(Gtk::ORIENTATION_HORIZONTAL, 8),
   m_Table(2, 2, false),
   m_Label1("_Entry 1", true), m_Label2("E_ntry 2", true),
   m_Image(Gtk::Stock::DIALOG_QUESTION, Gtk::ICON_SIZE_DIALOG)
diff --git a/demos/gtk-demo/example_drawingarea.cc b/demos/gtk-demo/example_drawingarea.cc
index 4c83e6f..663619c 100644
--- a/demos/gtk-demo/example_drawingarea.cc
+++ b/demos/gtk-demo/example_drawingarea.cc
@@ -33,7 +33,7 @@ protected:
 
   //Member widgets:
   Gtk::Frame m_Frame_Checkerboard, m_Frame_Scribble;
-  Gtk::VBox m_VBox;
+  Gtk::Box m_VBox;
   Gtk::Label m_Label_Checkerboard, m_Label_Scribble;
   Gtk::DrawingArea m_DrawingArea_Checkerboard, m_DrawingArea_Scribble;
 
@@ -48,7 +48,7 @@ Gtk::Window* do_drawingarea()
 
 Example_DrawingArea::Example_DrawingArea()
 :
-  m_VBox(false, 8)
+  m_VBox(Gtk::ORIENTATION_VERTICAL, 8)
 {
   set_title("Drawing Area");
   set_border_width(8);
diff --git a/demos/gtk-demo/example_iconview.cc b/demos/gtk-demo/example_iconview.cc
index 53b6b4c..f04fcac 100644
--- a/demos/gtk-demo/example_iconview.cc
+++ b/demos/gtk-demo/example_iconview.cc
@@ -47,7 +47,7 @@ protected:
   std::string m_parent;
 
   //Member widgets:
-  Gtk::VBox m_VBox;
+  Gtk::Box m_VBox;
   Gtk::Toolbar m_Toolbar;
   Gtk::ToolButton m_ButtonUp, m_ButtonHome;
   Gtk::ScrolledWindow m_ScrolledWindow;
@@ -61,7 +61,8 @@ Gtk::Window* do_iconview()
 }
 
 Example_IconView::Example_IconView()
-: m_ButtonUp(Gtk::Stock::GO_UP),
+: m_VBox(Gtk::ORIENTATION_VERTICAL),
+  m_ButtonUp(Gtk::Stock::GO_UP),
   m_ButtonHome(Gtk::Stock::HOME)
 {
   set_title("Icon View");
diff --git a/demos/gtk-demo/example_images.cc b/demos/gtk-demo/example_images.cc
index de60371..1901a10 100644
--- a/demos/gtk-demo/example_images.cc
+++ b/demos/gtk-demo/example_images.cc
@@ -30,7 +30,7 @@ protected:
   virtual void on_loader_area_updated(int x, int y, int width, int height);
 
   //Member widgets:
-  Gtk::VBox m_VBox;
+  Gtk::Box m_VBox;
   Gtk::Label m_Label_Image, m_Label_Animation, m_Label_Progressive;
   Gtk::Frame m_Frame_Image, m_Frame_Animation, m_Frame_Progressive;
   Gtk::Alignment m_Alignment_Image, m_Alignment_Animation, m_Alignment_Progressive;
@@ -48,7 +48,7 @@ Gtk::Window* do_images()
 
 Example_Images::Example_Images()
 :
-  m_VBox                (false, 8),
+  m_VBox                (Gtk::ORIENTATION_VERTICAL, 8),
   m_Alignment_Image     (0.5, 0.5, 0, 0),
   m_Alignment_Animation (0.5, 0.5, 0, 0),
   m_image_stream        (0)
diff --git a/demos/gtk-demo/example_menus.cc b/demos/gtk-demo/example_menus.cc
index 770de86..59fe48b 100644
--- a/demos/gtk-demo/example_menus.cc
+++ b/demos/gtk-demo/example_menus.cc
@@ -42,9 +42,9 @@ protected:
 
   //Member widgets:
   Gtk::Frame m_Frame_Horizontal, m_Frame_Vertical;
-  Gtk::VBox m_VBox1, m_VBox_Sub1, m_VBox_Sub2;
+  Gtk::Box m_VBox1, m_VBox_Sub1, m_VBox_Sub2;
   Gtk::MenuBar m_MenuBar;
-  Gtk::HSeparator m_Separator;
+  Gtk::Separator m_Separator;
   Gtk::Button m_Button;
 };
 
@@ -55,8 +55,10 @@ Gtk::Window* do_menus()
 }
 
 Example_Menus::Example_Menus()
-: m_VBox_Sub1(false, 10),
-  m_VBox_Sub2(false, 10),
+: m_VBox1(Gtk::ORIENTATION_VERTICAL),
+  m_VBox_Sub1(Gtk::ORIENTATION_VERTICAL, 10),
+  m_VBox_Sub2(Gtk::ORIENTATION_VERTICAL, 10),
+  m_Separator(Gtk::ORIENTATION_HORIZONTAL),
   m_Button("close")
 {
   set_title("menus");
diff --git a/demos/gtk-demo/example_panes.cc b/demos/gtk-demo/example_panes.cc
index 07d6379..6ae8de3 100644
--- a/demos/gtk-demo/example_panes.cc
+++ b/demos/gtk-demo/example_panes.cc
@@ -49,14 +49,14 @@ Example_Panes::Example_Panes()
   set_title("Panes");
   set_border_width(0);
 
-  Gtk::VBox *const pVBox = new Gtk::VBox();
+  Gtk::Box *const pVBox = new Gtk::Box(Gtk::ORIENTATION_VERTICAL);
   add(*Gtk::manage(pVBox));
 
-  Gtk::VPaned *const pVPaned = new Gtk::VPaned();
+  Gtk::Paned *const pVPaned = new Gtk::Paned(Gtk::ORIENTATION_VERTICAL);
   pVBox->pack_start(*Gtk::manage(pVPaned));
   pVPaned->set_border_width(5);
 
-  Gtk::HPaned *const pHPaned = new Gtk::HPaned();
+  Gtk::Paned *const pHPaned = new Gtk::Paned(Gtk::ORIENTATION_HORIZONTAL);
   pVPaned->add1(*Gtk::manage(pHPaned));
 
   Gtk::Frame *const pFrame1 = new Gtk::Frame();
diff --git a/demos/gtk-demo/example_sizegroup.cc b/demos/gtk-demo/example_sizegroup.cc
index 89f4e12..e2bad77 100644
--- a/demos/gtk-demo/example_sizegroup.cc
+++ b/demos/gtk-demo/example_sizegroup.cc
@@ -34,8 +34,8 @@ protected:
 
   //Member widgets:
   Gtk::Frame m_Frame_Color, m_Frame_Line;
-  Gtk::VBox m_VBox;
-  Gtk::HBox m_HBox;
+  Gtk::Box m_VBox;
+  Gtk::Box m_HBox;
   Glib::RefPtr<Gtk::SizeGroup> m_refSizeGroup;
   Gtk::Table m_Table_Color, m_Table_Line;
   Gtk::CheckButton m_CheckButton;
@@ -51,7 +51,8 @@ Example_SizeGroup::Example_SizeGroup()
 : Gtk::Dialog("Gtk::SizeGroup"),
   m_Frame_Color("Color Options"),
   m_Frame_Line("Line Options"),
-  m_VBox(false, 5),
+  m_VBox(Gtk::ORIENTATION_VERTICAL, 5),
+  m_HBox(Gtk::ORIENTATION_HORIZONTAL, 5),
   m_Table_Color(2, 2), m_Table_Line(2, 2),
   m_CheckButton("_Enable grouping", true)
 {
diff --git a/demos/gtk-demo/example_stockbrowser.cc b/demos/gtk-demo/example_stockbrowser.cc
index 1793a4a..bd59903 100644
--- a/demos/gtk-demo/example_stockbrowser.cc
+++ b/demos/gtk-demo/example_stockbrowser.cc
@@ -27,8 +27,8 @@ protected:
 
   //Child widgets:
   Gtk::Frame m_Frame;
-  Gtk::VBox m_VBox;
-  Gtk::HBox m_HBox;
+  Gtk::Box m_VBox;
+  Gtk::Box m_HBox;
   Gtk::ScrolledWindow m_ScrolledWindow;
   Glib::RefPtr<Gtk::TreeModel> m_refTreeModel;
   Gtk::TreeView m_TreeView;
@@ -64,8 +64,8 @@ Gtk::Window* do_stock_browser()
 Example_StockBrowser::Example_StockBrowser()
 :
   m_Frame("Selected Item"),
-  m_VBox(false, 8),
-  m_HBox(false, 8),
+  m_VBox(Gtk::ORIENTATION_VERTICAL, 8),
+  m_HBox(Gtk::ORIENTATION_HORIZONTAL, 8),
   m_Alignment(Gtk::ALIGN_CENTER, Gtk::ALIGN_START, 0.0, 0.0)
 {
   set_title("Stock Icons and Items");
diff --git a/demos/gtk-demo/example_textview.cc b/demos/gtk-demo/example_textview.cc
index 03ca5fe..feb72bf 100644
--- a/demos/gtk-demo/example_textview.cc
+++ b/demos/gtk-demo/example_textview.cc
@@ -46,7 +46,7 @@ protected:
 
 
   //Member widgets
-  Gtk::VPaned m_VPaned;
+  Gtk::Paned m_VPaned;
   Gtk::TextView m_View1;
   Gtk::TextView* m_pView2;
   Gtk::ScrolledWindow m_ScrolledWindow1, m_ScrolledWindow2;
@@ -64,6 +64,7 @@ Gtk::Window* do_textview()
 }
 
 Example_TextView::Example_TextView()
+: m_VPaned(Gtk::ORIENTATION_VERTICAL)
 {
   set_default_size(450, 450);
   set_title("Text View");
@@ -397,7 +398,7 @@ void Example_TextView::attach_widgets(Gtk::TextView& text_view)
     }
     else if (i == 2)
     {
-      Gtk::HScale* pHScale = Gtk::manage( new Gtk::HScale() );
+      Gtk::Scale* pHScale = Gtk::manage( new Gtk::Scale(Gtk::ORIENTATION_HORIZONTAL) );
       pHScale->set_range(0, 100);
       pHScale->set_size_request(70, -1);
 
diff --git a/demos/gtk-demo/example_treeview_editable_cells.cc b/demos/gtk-demo/example_treeview_editable_cells.cc
index f5141d2..931d7a6 100644
--- a/demos/gtk-demo/example_treeview_editable_cells.cc
+++ b/demos/gtk-demo/example_treeview_editable_cells.cc
@@ -45,12 +45,12 @@ protected:
   virtual void on_column_product_edited(const Glib::ustring& path_string, const Glib::ustring& new_text);
 
   //Member widgets:
-  Gtk::VBox m_VBox;
+  Gtk::Box m_VBox;
   Gtk::ScrolledWindow m_ScrolledWindow;
   Gtk::Label m_Label;
   Gtk::TreeView m_TreeView;
   Glib::RefPtr<Gtk::ListStore> m_refListStore;
-  Gtk::HBox m_HBox;
+  Gtk::Box m_HBox;
   Gtk::Button m_Button_Add, m_Button_Remove;
 
   typedef std::vector<CellItem_Product> type_vecItems;
@@ -99,9 +99,9 @@ Gtk::Window* do_treeview_editable_cells()
 
 
 Example_TreeView_EditableCells::Example_TreeView_EditableCells()
-: m_VBox(false, 5),
+: m_VBox(Gtk::ORIENTATION_VERTICAL, 5),
   m_Label("Shopping list (you can edit the cells!)"),
-  m_HBox(true, 4),
+  m_HBox(Gtk::ORIENTATION_HORIZONTAL, 4),
   m_Button_Add("Add item"),
   m_Button_Remove("Remove item")
 {
diff --git a/demos/gtk-demo/example_treeview_liststore.cc b/demos/gtk-demo/example_treeview_liststore.cc
index bb35c5f..14a423f 100644
--- a/demos/gtk-demo/example_treeview_liststore.cc
+++ b/demos/gtk-demo/example_treeview_liststore.cc
@@ -37,7 +37,7 @@ protected:
   virtual void liststore_add_item(const CellItem_Bug& foo);
 
   //Member widgets:
-  Gtk::VBox m_VBox;
+  Gtk::Box m_VBox;
   Gtk::ScrolledWindow m_ScrolledWindow;
   Gtk::Label m_Label;
   Gtk::TreeView m_TreeView;
@@ -102,7 +102,7 @@ Gtk::Window* do_treeview_liststore()
 
 
 Example_TreeView_ListStore::Example_TreeView_ListStore()
-: m_VBox(false, 8),
+: m_VBox(Gtk::ORIENTATION_VERTICAL, 8),
   m_Label("This is the bug list (note: not based on real data, it would be nice to have a nice ODBC interface to bugzilla or so, though).")
 {
   set_title("Gtk::ListStore demo");
diff --git a/demos/gtk-demo/example_treeview_treestore.cc b/demos/gtk-demo/example_treeview_treestore.cc
index 4bceeb9..88d2d2b 100644
--- a/demos/gtk-demo/example_treeview_treestore.cc
+++ b/demos/gtk-demo/example_treeview_treestore.cc
@@ -46,7 +46,7 @@ protected:
   virtual void treestore_add_item(const CellItem_Holiday& foo);
 
   //Member widgets:
-  Gtk::VBox m_VBox;
+  Gtk::Box m_VBox;
   Gtk::ScrolledWindow m_ScrolledWindow;
   Gtk::Label m_Label;
   Gtk::TreeView m_TreeView;
@@ -146,7 +146,7 @@ Gtk::Window* do_treeview_treestore()
 
 
 Example_TreeView_TreeStore::Example_TreeView_TreeStore()
-: m_VBox(false, 8),
+: m_VBox(Gtk::ORIENTATION_VERTICAL, 8),
   m_Label("Jonathan's Holiday Card Planning Sheet")
 {
   set_title("Card planning sheet");
diff --git a/demos/gtk-demo/example_uimanager.cc b/demos/gtk-demo/example_uimanager.cc
index 2cb51e9..fd5695e 100644
--- a/demos/gtk-demo/example_uimanager.cc
+++ b/demos/gtk-demo/example_uimanager.cc
@@ -37,9 +37,9 @@ protected:
  
    
   //Member widgets:
-  Gtk::VBox m_Box1;
-  Gtk::VBox m_Box2;
-  Gtk::HSeparator m_Separator;
+  Gtk::Box m_Box1;
+  Gtk::Box m_Box2;
+  Gtk::Separator m_Separator;
   Gtk::Label m_Label;
   Gtk::Button m_Button;
   Glib::RefPtr<Gtk::UIManager> m_refUIManager;
@@ -55,7 +55,9 @@ Gtk::Window* do_ui_manager()
 
 
 Example_UIManager::Example_UIManager()
-: m_Box2(false, 10),
+: m_Box1(Gtk::ORIENTATION_VERTICAL),
+  m_Box2(Gtk::ORIENTATION_VERTICAL, 10),
+  m_Separator(Gtk::ORIENTATION_HORIZONTAL),
   m_Label("Type\n<alt>\nto start"),
   m_Button("close")
 {
diff --git a/gtk/src/bin.ccg b/gtk/src/bin.ccg
index 428c0f2..2114926 100644
--- a/gtk/src/bin.ccg
+++ b/gtk/src/bin.ccg
@@ -85,7 +85,7 @@ Bin::add_pixlabel(const std::string& pixfile,
   label->set_alignment (x_align, y_align);
 
   //Put them in a Box:
-  Box* hbox = manage(new HBox(false, 5));
+  Box* hbox = manage(new Box(ORIENTATION_HORIZONTAL, 5));
   hbox->pack_start(*pmap, PACK_SHRINK);
   hbox->pack_start(*label);
   hbox->show_all();
diff --git a/tests/child_widget2/main.cc b/tests/child_widget2/main.cc
index 9d280c4..c1a49f7 100644
--- a/tests/child_widget2/main.cc
+++ b/tests/child_widget2/main.cc
@@ -6,12 +6,12 @@ public:
   MyWindow();
 private:
   Gtk::Button b;
-  Gtk::VBox vbox;
+  Gtk::Box vbox;
 };
 
 MyWindow::MyWindow() :
   b("hello"),
-  vbox()
+  vbox(Gtk::ORIENTATION_VERTICAL)
 {
   add(vbox);
   vbox.pack_start(b);
diff --git a/tests/delete_cpp_child/main.cc b/tests/delete_cpp_child/main.cc
index 211a533..30eb81a 100644
--- a/tests/delete_cpp_child/main.cc
+++ b/tests/delete_cpp_child/main.cc
@@ -19,7 +19,7 @@ private:
 AppWindow::AppWindow()
     : m_label (0)
 {
-    Gtk::Box* vbox = Gtk::manage(new Gtk::VBox (false, 5));
+    Gtk::Box* vbox = Gtk::manage(new Gtk::Box (Gtk::ORIENTATION_VERTICAL, 5));
     add(*vbox);
 
     Gtk::Button* button = Gtk::manage(new Gtk::Button("Delete Label"));
diff --git a/tests/dialog/main.cc b/tests/dialog/main.cc
index 27230e8..c6cebb0 100644
--- a/tests/dialog/main.cc
+++ b/tests/dialog/main.cc
@@ -19,7 +19,7 @@ private:
 AppWindow::AppWindow()
     : m_label (NULL)
 {
-    Gtk::Box* vbox = manage (new Gtk::VBox (false, 5));
+    Gtk::Box* vbox = manage (new Gtk::Box (Gtk::ORIENTATION_VERTICAL, 5));
     add(*vbox);
 
     Gtk::Button* button = Gtk::manage (new Gtk::Button ("Delete Label"));
diff --git a/tests/refcount_dialog/main.cc b/tests/refcount_dialog/main.cc
index 410f107..f64444b 100644
--- a/tests/refcount_dialog/main.cc
+++ b/tests/refcount_dialog/main.cc
@@ -20,12 +20,13 @@ public:
   void on_button_clicked();
 
 protected:
-  Gtk::HBox m_Box;
+  Gtk::Box m_Box;
   Gtk::Button m_Button;
 };
 
 MyWindow::MyWindow()
-: m_Button("Show Dialog")
+: m_Box(Gtk::ORIENTATION_HORIZONTAL),
+  m_Button("Show Dialog")
 {
   set_size_request(200, 200);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]