diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2013-01-01 18:24:47 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2013-01-01 18:24:47 +0000 |
| commit | 0b3b386881da011ac7ee60dd20bd610fd9670677 (patch) | |
| tree | 59d08dfb788ebbe333fa21140fcd8203faadc356 /src/ui/dialog/input.cpp | |
| parent | merge from trunk (r11952) (diff) | |
| parent | clip path visual bbox refresh, second try (Bug 1005085) (diff) | |
| download | inkscape-0b3b386881da011ac7ee60dd20bd610fd9670677.tar.gz inkscape-0b3b386881da011ac7ee60dd20bd610fd9670677.zip | |
merge from trunk (r12005)
(bzr r11668.1.47)
Diffstat (limited to 'src/ui/dialog/input.cpp')
| -rw-r--r-- | src/ui/dialog/input.cpp | 21 |
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); |