diff options
| author | John Smith <john.smith7545@yahoo.com> | 2012-03-23 13:30:43 +0000 |
|---|---|---|
| committer | John Smith <removethis.john.q.public@bigmail.com> | 2012-03-23 13:30:43 +0000 |
| commit | 64d4659e32867f30f2dfa71c21778a834894ffca (patch) | |
| tree | 03ef61a1e8a7bf64bde2eecf8aaa3c07b3a6e080 /src/ui/widget | |
| parent | Fix for 903676 : Replace GtkCList with GtkTreeView in XML Tree, selection bug... (diff) | |
| download | inkscape-64d4659e32867f30f2dfa71c21778a834894ffca.tar.gz inkscape-64d4659e32867f30f2dfa71c21778a834894ffca.zip | |
Fix for 909328 : Dockable Find & Replace dialog, replace ComboBoxText with Entry to fix build error with gtkmm2.4
(bzr r11119)
Diffstat (limited to 'src/ui/widget')
| -rw-r--r-- | src/ui/widget/entry.cpp | 8 | ||||
| -rw-r--r-- | src/ui/widget/entry.h | 44 |
2 files changed, 0 insertions, 52 deletions
diff --git a/src/ui/widget/entry.cpp b/src/ui/widget/entry.cpp index 08617433c..173e014d9 100644 --- a/src/ui/widget/entry.cpp +++ b/src/ui/widget/entry.cpp @@ -25,14 +25,6 @@ Entry::Entry( Glib::ustring const &label, Glib::ustring const &tooltip, { } -ComboBoxText::ComboBoxText( Glib::ustring const &label, Glib::ustring const &tooltip, - Glib::ustring const &suffix, - Glib::ustring const &icon, - bool mnemonic) - : Labelled(label, tooltip, new Gtk::ComboBoxText(true), suffix, icon, mnemonic) -{ -} - } // namespace Widget } // namespace UI } // namespace Inkscape diff --git a/src/ui/widget/entry.h b/src/ui/widget/entry.h index be7c8b450..53b848fc9 100644 --- a/src/ui/widget/entry.h +++ b/src/ui/widget/entry.h @@ -37,50 +37,6 @@ public: Gtk::Entry* getEntry() {return (Gtk::Entry*)(_widget);}; }; -class ComboBoxText : public Labelled -{ -public: - ComboBoxText( Glib::ustring const &label, - Glib::ustring const &tooltip, - Glib::ustring const &suffix = "", - Glib::ustring const &icon = "", - bool mnemonic = true); - - Gtk::ComboBoxText* getWidget() { return (Gtk::ComboBoxText *)_widget; }; - Gtk::Entry* getEntry() { return (Gtk::Entry *)getWidget()->get_child(); }; - Glib::ustring get_text() { return getEntry()->get_text(); }; - void prepend_text(const Glib::ustring& text) { -#if WITH_GTKMM_2_24 - getWidget()->prepend(text); -#else - getWidget()->prepend_text(text); -#endif - }; - void append_text(const Glib::ustring& text) { -#if WITH_GTKMM_2_24 - getWidget()->append(text); -#else - getWidget()->append_text(text); -#endif - }; - void insert_text(gint position, const Glib::ustring& text) { -#if WITH_GTKMM_2_24 - getWidget()->insert(position, text); -#else - getWidget()->insert_text(position, text); -#endif - }; - void remove_text(const Glib::ustring& text) { getWidget()->remove_text(text); }; - void remove_all() { -#if WITH_GTKMM_2_24 - getWidget()->remove_all(); -#else - getWidget()->clear_items(); -#endif - }; - -}; - } // namespace Widget } // namespace UI } // namespace Inkscape |
