diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2012-02-11 13:19:28 +0000 |
|---|---|---|
| committer | Alex Valavanis <valavanisalex@gmail.com> | 2012-02-11 13:19:28 +0000 |
| commit | d78865613d0001b7323a9cfbecb75e356e022275 (patch) | |
| tree | 80b63042238d1a198c0412d822b97d3e853d63f6 /src/ui/dialog/align-and-distribute.cpp | |
| parent | Backward compat fix for Gtkmm 2.20 (diff) | |
| download | inkscape-d78865613d0001b7323a9cfbecb75e356e022275.tar.gz inkscape-d78865613d0001b7323a9cfbecb75e356e022275.zip | |
Lots of gtkmm deprecation fixes
(bzr r10957)
Diffstat (limited to 'src/ui/dialog/align-and-distribute.cpp')
| -rw-r--r-- | src/ui/dialog/align-and-distribute.cpp | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/src/ui/dialog/align-and-distribute.cpp b/src/ui/dialog/align-and-distribute.cpp index 2647cd569..714a0d9d5 100644 --- a/src/ui/dialog/align-and-distribute.cpp +++ b/src/ui/dialog/align-and-distribute.cpp @@ -1025,6 +1025,15 @@ AlignAndDistribute::AlignAndDistribute() //Rest of the widgetry +#if WITH_GTKMM_2_24 + _combo.append(_("Last selected")); + _combo.append(_("First selected")); + _combo.append(_("Biggest object")); + _combo.append(_("Smallest object")); + _combo.append(_("Page")); + _combo.append(_("Drawing")); + _combo.append(_("Selection")); +#else _combo.append_text(_("Last selected")); _combo.append_text(_("First selected")); _combo.append_text(_("Biggest object")); @@ -1032,7 +1041,7 @@ AlignAndDistribute::AlignAndDistribute() _combo.append_text(_("Page")); _combo.append_text(_("Drawing")); _combo.append_text(_("Selection")); - +#endif _combo.set_active(prefs->getInt("/dialogs/align/align-to", 6)); _combo.signal_changed().connect(sigc::mem_fun(*this, &AlignAndDistribute::on_ref_change)); @@ -1108,13 +1117,21 @@ void AlignAndDistribute::on_selgrp_toggled(){ void AlignAndDistribute::setMode(bool nodeEdit) { //Act on widgets used in node mode +#if WITH_GTKMM_2_24 + void ( Gtk::Widget::*mNode) () = nodeEdit ? + &Gtk::Widget::show_all : &Gtk::Widget::hide; + + //Act on widgets used in selection mode + void ( Gtk::Widget::*mSel) () = nodeEdit ? + &Gtk::Widget::hide : &Gtk::Widget::show_all; +#else void ( Gtk::Widget::*mNode) () = nodeEdit ? &Gtk::Widget::show_all : &Gtk::Widget::hide_all; //Act on widgets used in selection mode void ( Gtk::Widget::*mSel) () = nodeEdit ? &Gtk::Widget::hide_all : &Gtk::Widget::show_all; - +#endif ((_alignFrame).*(mSel))(); ((_distributeFrame).*(mSel))(); |