diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2013-03-07 22:41:53 +0000 |
|---|---|---|
| committer | Alex Valavanis <valavanisalex@gmail.com> | 2013-03-07 22:41:53 +0000 |
| commit | 909c15499d8bebfb484d05063ee3c3813b9bfe73 (patch) | |
| tree | 4d659ae1a0d4d8aa19d12ba7a657f8ea728aade3 /src/ui/dialog/inkscape-preferences.cpp | |
| parent | Disable "faux" or "synthesized" font faces. (diff) | |
| download | inkscape-909c15499d8bebfb484d05063ee3c3813b9bfe73.tar.gz inkscape-909c15499d8bebfb484d05063ee3c3813b9bfe73.zip | |
Fix deprecated Gtkmm symbols in preferences widget
(bzr r12178)
Diffstat (limited to 'src/ui/dialog/inkscape-preferences.cpp')
| -rw-r--r-- | src/ui/dialog/inkscape-preferences.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp index c162681e7..c63b78c70 100644 --- a/src/ui/dialog/inkscape-preferences.cpp +++ b/src/ui/dialog/inkscape-preferences.cpp @@ -1477,7 +1477,15 @@ void InkscapePreferences::initKeyboardShortcuts(Gtk::TreeModel::iterator iter_ui scroller->add(_kb_tree); int row = 3; + +#if WITH_GTKMM_3_0 + scroller->set_hexpand(); + scroller->set_vexpand(); + _page_keyshortcuts.attach(*scroller, 0, row, 2, 1); +#else _page_keyshortcuts.attach(*scroller, 0, 2, row, row+1, Gtk::EXPAND | Gtk::FILL, Gtk::EXPAND | Gtk::FILL); +#endif + row++; #if WITH_GTKMM_3_0 @@ -1488,7 +1496,13 @@ void InkscapePreferences::initKeyboardShortcuts(Gtk::TreeModel::iterator iter_ui box_buttons->set_layout(Gtk::BUTTONBOX_END); box_buttons->set_spacing(4); + +#if WITH_GTKMM_3_0 + box_buttons->set_hexpand(); + _page_keyshortcuts.attach(*box_buttons, 0, row, 3, 1); +#else _page_keyshortcuts.attach(*box_buttons, 0, 3, row, row+1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK); +#endif UI::Widget::Button *kb_reset = manage(new UI::Widget::Button(_("Reset"), _("Remove all your customized keyboard shortcuts, and revert to the shortcuts in the shortcut file listed above"))); box_buttons->pack_start(*kb_reset, true, true, 6); |