summaryrefslogtreecommitdiffstats
path: root/src/ui/dialog/input.cpp
diff options
context:
space:
mode:
authorAlex Valavanis <valavanisalex@gmail.com>2012-12-16 13:20:25 +0000
committerAlex Valavanis <valavanisalex@gmail.com>2012-12-16 13:20:25 +0000
commita788114b417fec4eb9fe7645dd66f128db7ef9fc (patch)
tree4fe1c3426c8523e6623a731aaa9c949ff37b7949 /src/ui/dialog/input.cpp
parentGTK+ 3: Use orientable widgets (diff)
downloadinkscape-a788114b417fec4eb9fe7645dd66f128db7ef9fc.tar.gz
inkscape-a788114b417fec4eb9fe7645dd66f128db7ef9fc.zip
GTK+ 3: Switch to more orientable widgets
(bzr r11960)
Diffstat (limited to 'src/ui/dialog/input.cpp')
-rw-r--r--src/ui/dialog/input.cpp21
1 files changed, 21 insertions, 0 deletions
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);