GTK+ 3: Switch to more orientable widgets

(bzr r11960)

7 files changed, 72 insertions, 1 deletions

diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp
index ddafcd481..6769a25ef 100644
--- a/src/ui/dialog/filter-effects-dialog.cpp
+++ b/src/ui/dialog/filter-effects-dialog.cpp
@@ -2380,7 +2380,12 @@ FilterEffectsDialog::FilterEffectsDialog()
     _add_primitive_type.remove_row(NR_FILTER_COMPONENTTRANSFER);
 
     // Initialize widget hierarchy
+#if WITH_GTKMM_3_0
+    Gtk::Paned* hpaned = Gtk::manage(new Gtk::Paned);
+#else
     Gtk::HPaned* hpaned = Gtk::manage(new Gtk::HPaned);
+#endif
+
     Gtk::ScrolledWindow* sw_prims = Gtk::manage(new Gtk::ScrolledWindow);
     Gtk::HBox* infobox = Gtk::manage(new Gtk::HBox(/*homogeneous:*/false, /*spacing:*/4));
     Gtk::HBox* hb_prims = Gtk::manage(new Gtk::HBox);
diff --git a/src/ui/dialog/find.h b/src/ui/dialog/find.h
index 64fb4cc3d..77a6c9d02 100644
--- a/src/ui/dialog/find.h
+++ b/src/ui/dialog/find.h
@@ -12,6 +12,10 @@
 #ifndef INKSCAPE_UI_DIALOG_FIND_H
 #define INKSCAPE_UI_DIALOG_FIND_H
 
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include "ui/widget/panel.h"
 #include "ui/widget/button.h"
 #include "ui/widget/entry.h" 
@@ -280,7 +284,13 @@ private:
     Gtk::Label status;
     UI::Widget::Button button_find;
     UI::Widget::Button button_replace;
+
+#if WITH_GTKMM_3_0
+    Gtk::ButtonBox box_buttons;
+#else
     Gtk::HButtonBox box_buttons;
+#endif
+
     Gtk::HBox hboxbutton_row;
 
     /**
diff --git a/src/ui/dialog/input.cpp b/src/ui/dialog/input.cpp
index 4c567a6e3..6aff67f69 100644
--- a/src/ui/dialog/input.cpp
+++ b/src/ui/dialog/input.cpp
@@ -424,7 +424,12 @@ private:
         Gtk::CheckButton useExt;
         Gtk::Button save;
 
+#if WITH_GTKMM_3_0
+        Gtk::Paned pane;
+#else
         Gtk::HPaned pane;
+#endif
+
         Gtk::VBox detailsBox;
         Gtk::HBox titleFrame;
         Gtk::Label titleLabel;
@@ -485,8 +490,15 @@ private:
     Inkscape::UI::Widget::Frame axisFrame;
     Gtk::ScrolledWindow treeScroller;
     Gtk::ScrolledWindow detailScroller;
+
+#if WITH_GTKMM_3_0
+    Gtk::Paned splitter;
+    Gtk::Paned split2;
+#else
     Gtk::HPaned splitter;
     Gtk::VPaned split2;
+#endif
+
     Gtk::Label devName;
     Gtk::Label devKeyCount;
     Gtk::Label devAxesCount;
@@ -589,7 +601,11 @@ InputDialogImpl::InputDialogImpl() :
     treeScroller(),
     detailScroller(),
     splitter(),
+#if WITH_GTKMM_3_0
+    split2(Gtk::ORIENTATION_VERTICAL),
+#else
     split2(),
+#endif
     axisTable(11, 2),
     linkCombo(),
     topHolder(),
@@ -1048,7 +1064,12 @@ InputDialogImpl::ConfPanel::ConfPanel() :
     useExt.set_active(Preferences::get()->getBool("/options/useextinput/value"));
     useExt.signal_toggled().connect(sigc::mem_fun(*this, &InputDialogImpl::ConfPanel::useExtToggled));
 
+#if WITH_GTKMM_3_0
+    Gtk::ButtonBox *buttonBox = manage(new Gtk::ButtonBox);
+#else
     Gtk::HButtonBox *buttonBox = manage (new Gtk::HButtonBox);
+#endif
+
     buttonBox->set_layout (Gtk::BUTTONBOX_END);
     //Gtk::Alignment *align = new Gtk::Alignment(Gtk::ALIGN_END, Gtk::ALIGN_START, 0, 0);
     buttonBox->add(save);
diff --git a/src/ui/dialog/ocaldialogs.cpp b/src/ui/dialog/ocaldialogs.cpp
index c7bff185c..8f5f2ed22 100644
--- a/src/ui/dialog/ocaldialogs.cpp
+++ b/src/ui/dialog/ocaldialogs.cpp
@@ -1196,7 +1196,13 @@ ImportDialog::ImportDialog(Gtk::Window& parent_window, FileDialogType file_types
 
     // Creation
     Gtk::VBox *vbox = new Gtk::VBox(false, 0);
+
+#if WITH_GTKMM_3_0
+    Gtk::ButtonBox *hbuttonbox_bottom = new Gtk::ButtonBox();
+#else
     Gtk::HButtonBox *hbuttonbox_bottom = new Gtk::HButtonBox();
+#endif
+
     Gtk::HBox *hbox_bottom = new Gtk::HBox(false, 12);
     BaseBox *basebox_logo = new BaseBox();
     BaseBox *basebox_no_search_results = new BaseBox();
@@ -1204,7 +1210,13 @@ ImportDialog::ImportDialog(Gtk::Window& parent_window, FileDialogType file_types
     label_description = new Gtk::Label();
     entry_search = new SearchEntry();
     button_search = new Gtk::Button(_("Search"));
+
+#if WITH_GTKMM_3_0
+    Gtk::ButtonBox* hbuttonbox_search = new Gtk::ButtonBox();
+#else
     Gtk::HButtonBox* hbuttonbox_search = new Gtk::HButtonBox();
+#endif
+
     Gtk::ScrolledWindow* scrolledwindow_preview = new Gtk::ScrolledWindow();
     preview_files = new PreviewWidget();
     /// Add the buttons in the bottom of the dialog
diff --git a/src/ui/dialog/xml-tree.cpp b/src/ui/dialog/xml-tree.cpp
index b21932f99..29dbc4b93 100644
--- a/src/ui/dialog/xml-tree.cpp
+++ b/src/ui/dialog/xml-tree.cpp
@@ -79,7 +79,11 @@ XmlTree::XmlTree (void) :
     xml_attribute_delete_button (_("Delete attribute")),
     text_container (),
     attr_container (),
-    attr_subpaned_container (),
+#if WITH_GTKMM_3_0
+    attr_subpaned_container(Gtk::ORIENTATION_VERTICAL),
+#else
+    attr_subpaned_container(),
+#endif
     set_attr (_("Set")),
     new_window(NULL)
 {
diff --git a/src/ui/dialog/xml-tree.h b/src/ui/dialog/xml-tree.h
index ee1dadc14..9d2fac71f 100644
--- a/src/ui/dialog/xml-tree.h
+++ b/src/ui/dialog/xml-tree.h
@@ -13,6 +13,10 @@
 #ifndef SEEN_DIALOGS_XML_TREE_H
 #define SEEN_DIALOGS_XML_TREE_H
 
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include "ui/widget/panel.h"
 #include <gtkmm/entry.h>
 #include <gtkmm/textview.h>
@@ -215,7 +219,12 @@ private:
     Gtk::Button *create_button;
     Gtk::Entry *name_entry;
 
+#if WITH_GTKMM_3_0
+    Gtk::Paned paned;
+#else
     Gtk::HPaned paned;
+#endif
+
     Gtk::VBox left_box;
     Gtk::VBox right_box;
     Gtk::HBox status_box;
@@ -239,7 +248,13 @@ private:
     Gtk::ScrolledWindow text_container;
     Gtk::HBox attr_hbox;
     Gtk::VBox attr_container;
+
+#if WITH_GTKMM_3_0
+    Gtk::Paned attr_subpaned_container;
+#else
     Gtk::VPaned attr_subpaned_container;
+#endif
+
     Gtk::Button set_attr;
 
     GtkWidget *new_window;
diff --git a/src/ui/widget/panel.h b/src/ui/widget/panel.h
index 91a2a3c74..5bb054577 100644
--- a/src/ui/widget/panel.h
+++ b/src/ui/widget/panel.h
@@ -13,6 +13,10 @@
 #ifndef SEEN_INKSCAPE_UI_WIDGET_PANEL_H
 #define SEEN_INKSCAPE_UI_WIDGET_PANEL_H
 
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include <gtkmm/box.h>
 #include <gtkmm/arrow.h>
 #include <gtkmm/button.h>