diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2012-02-07 11:11:57 +0000 |
|---|---|---|
| committer | Alex Valavanis <valavanisalex@gmail.com> | 2012-02-07 11:11:57 +0000 |
| commit | f97d10f1b5fd32fe58e77d496d60fb82fa1adbf1 (patch) | |
| tree | 7b0936d5e888b3b196105a86a8d2611dcac04a59 /src/extension/param | |
| parent | (cppcheck and janitorial tasks:) C-style casting to C++-style casting (diff) | |
| download | inkscape-f97d10f1b5fd32fe58e77d496d60fb82fa1adbf1.tar.gz inkscape-f97d10f1b5fd32fe58e77d496d60fb82fa1adbf1.zip | |
Cleaning up my mess... backward compatibility and fix Windows build (hopefully)
Fixed bugs:
- https://launchpad.net/bugs/927992
(bzr r10947)
Diffstat (limited to 'src/extension/param')
| -rw-r--r-- | src/extension/param/enum.cpp | 5 | ||||
| -rw-r--r-- | src/extension/param/radiobutton.cpp | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/extension/param/enum.cpp b/src/extension/param/enum.cpp index 3e4462b8a..d58586992 100644 --- a/src/extension/param/enum.cpp +++ b/src/extension/param/enum.cpp @@ -242,7 +242,12 @@ Gtk::Widget *ParamComboBox::get_widget(SPDocument * doc, Inkscape::XML::Node * n for (GSList * list = choices; list != NULL; list = g_slist_next(list)) { enumentry * entr = reinterpret_cast<enumentry *>(list->data); Glib::ustring text = entr->guitext; +#if WITH_GTKMM_2_24 combo->append(text); +#else + combo->append(text); +#endif + if ( _value && !entr->value.compare(_value) ) { settext = entr->guitext; } diff --git a/src/extension/param/radiobutton.cpp b/src/extension/param/radiobutton.cpp index 7df89de90..d6cac6541 100644 --- a/src/extension/param/radiobutton.cpp +++ b/src/extension/param/radiobutton.cpp @@ -296,7 +296,11 @@ Gtk::Widget * ParamRadioButton::get_widget(SPDocument * doc, Inkscape::XML::Node switch ( _mode ) { case MINIMAL: { +#if WITH_GTKMM_2_24 cbt->append(*text); +#else + cbt->append_text(*text); +#endif if (!entr->value->compare(_value)) { cbt->set_active_text(*text); comboSet = true; |