[goocanvasmm] Replace deprecated Gtk::VBox and Gtk::HBox.



commit 8011ef5e436a4c938282f7ed04390c87c873c13b
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Dec 16 11:57:45 2016 +0100

    Replace deprecated Gtk::VBox and Gtk::HBox.

 examples/coordinates/window.cc           |    4 ++--
 examples/coordinates/window.h            |    4 ++--
 examples/demo/primitives.cc              |    2 +-
 examples/demo/primitives.h               |    2 +-
 examples/drag_to_canvas/examplewindow.cc |    4 ++--
 examples/drag_to_canvas/examplewindow.h  |    4 ++--
 examples/tablemodel/examplewindow.cc     |    2 +-
 examples/text/window.cc                  |    6 +++---
 examples/text/window.h                   |    4 ++--
 9 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/examples/coordinates/window.cc b/examples/coordinates/window.cc
index e42e442..a276e41 100644
--- a/examples/coordinates/window.cc
+++ b/examples/coordinates/window.cc
@@ -19,8 +19,8 @@
 #include <sstream>
 
 ExampleWindow::ExampleWindow()
-: m_box(false, 6),
-  m_button_box(false, 6),
+: m_box(Gtk::ORIENTATION_VERTICAL, 6),
+  m_button_box(Gtk::ORIENTATION_HORIZONTAL, 6),
   m_label_origin("origin (0, 0)"),
   m_button_translate("translate(20, 20)"),
   m_button_scale("scale(1.2, 1.2)"),
diff --git a/examples/coordinates/window.h b/examples/coordinates/window.h
index 682ab26..8052bb2 100644
--- a/examples/coordinates/window.h
+++ b/examples/coordinates/window.h
@@ -35,8 +35,8 @@ private:
   Goocanvas::Canvas m_canvas;
   Glib::RefPtr<Goocanvas::Rect> m_rect;
 
-  Gtk::VBox m_box;
-  Gtk::HBox m_button_box;
+  Gtk::Box m_box;
+  Gtk::Box m_button_box;
   Gtk::Label m_label_origin, m_label_status;
   Gtk::Button m_button_translate, m_button_scale, m_button_setxy;
 };
diff --git a/examples/demo/primitives.cc b/examples/demo/primitives.cc
index 30bc793..92c8099 100644
--- a/examples/demo/primitives.cc
+++ b/examples/demo/primitives.cc
@@ -24,7 +24,7 @@
 Primitives::Primitives()
   : _name("Primitives")
 {
-  _vbox = Gtk::manage(new Gtk::VBox());
+  _vbox = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
 
   auto lbl = Gtk::manage(new Gtk::Label("Drag an item with button 1. Click button 2 on an item to lower it, 
or button 3 to raise it."));
   _vbox->pack_start(*lbl, Gtk::PACK_SHRINK);
diff --git a/examples/demo/primitives.h b/examples/demo/primitives.h
index bc7ff8c..9270a01 100644
--- a/examples/demo/primitives.h
+++ b/examples/demo/primitives.h
@@ -64,7 +64,7 @@ private:
   void      _create_hilbert();
 
   Glib::ustring    _name ;
-  Gtk::VBox*    _vbox ;
+  Gtk::Box*    _vbox ;
   Gtk::RadioButtonGroup  _rbg ;
   Goocanvas::Canvas*  _canvas ;
   Gtk::ScrolledWindow*  _scrolled_window ;
diff --git a/examples/drag_to_canvas/examplewindow.cc b/examples/drag_to_canvas/examplewindow.cc
index 7e380d3..f79c7db 100644
--- a/examples/drag_to_canvas/examplewindow.cc
+++ b/examples/drag_to_canvas/examplewindow.cc
@@ -21,8 +21,8 @@
 const int DRAG_DATA_FORMAT = 8; // 8 bits format
 
 ExampleWindow::ExampleWindow()
-: m_vbox(false, 6),
-  m_hbox(false, 6),
+: m_vbox(Gtk::ORIENTATION_VERTICAL, 6),
+  m_hbox(Gtk::ORIENTATION_HORIZONTAL, 6),
   m_button_rect("Rectangle"),
   m_button_ellipse("Ellipse"),
   m_drag_preview_requested(false)
diff --git a/examples/drag_to_canvas/examplewindow.h b/examples/drag_to_canvas/examplewindow.h
index ec6605e..cc2b196 100644
--- a/examples/drag_to_canvas/examplewindow.h
+++ b/examples/drag_to_canvas/examplewindow.h
@@ -48,8 +48,8 @@ protected:
   
   Goocanvas::Canvas m_canvas;
 
-  Gtk::VBox m_vbox;
-  Gtk::HBox m_hbox;
+  Gtk::Box m_vbox;
+  Gtk::Box m_hbox;
   Gtk::Button m_button_rect, m_button_ellipse;
 
   std::vector<Gtk::TargetEntry> m_drag_targets;
diff --git a/examples/tablemodel/examplewindow.cc b/examples/tablemodel/examplewindow.cc
index 9e51735..159a264 100644
--- a/examples/tablemodel/examplewindow.cc
+++ b/examples/tablemodel/examplewindow.cc
@@ -63,7 +63,7 @@ ExampleWindow::ExampleWindow()
   auto sw2 = Gtk::manage(new Gtk::ScrolledWindow());
   sw2->add(m_second_canvas);
 
-  auto box = Gtk::manage(new Gtk::VBox(false, 6));
+  auto box = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL, 6));
   box->pack_start(*sw1, Gtk::PACK_EXPAND_WIDGET);
   box->pack_start(*sw2, Gtk::PACK_EXPAND_WIDGET);
   add(*box);
diff --git a/examples/text/window.cc b/examples/text/window.cc
index effbc6e..d54d56f 100644
--- a/examples/text/window.cc
+++ b/examples/text/window.cc
@@ -19,9 +19,9 @@
 #include <sstream>
 
 ExampleWindow::ExampleWindow()
-: m_box(false, 6),
-  m_button_box1(false, 6),
-  m_button_box2(false, 6),
+: m_box(Gtk::ORIENTATION_VERTICAL, 6),
+  m_button_box1(Gtk::ORIENTATION_HORIZONTAL, 6),
+  m_button_box2(Gtk::ORIENTATION_HORIZONTAL, 6),
   m_label_origin("origin (0, 0)"),
   m_button_translate("translate(20, 20)"),
   m_button_scale("scale(1.2, 1.2)"),
diff --git a/examples/text/window.h b/examples/text/window.h
index 263c121..0c92765 100644
--- a/examples/text/window.h
+++ b/examples/text/window.h
@@ -39,8 +39,8 @@ private:
   Goocanvas::Canvas m_canvas;
   Glib::RefPtr<Goocanvas::Text> m_text;
 
-  Gtk::VBox m_box;
-  Gtk::HBox m_button_box1, m_button_box2;
+  Gtk::Box m_box;
+  Gtk::Box m_button_box1, m_button_box2;
   Gtk::Label m_label_origin, m_label_status;
   Gtk::Button m_button_translate, m_button_scale, m_button_setxy, m_button_zoom;
   Gtk::Button m_button_set_width, m_button_set_width_unlimited;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]