From 64d4659e32867f30f2dfa71c21778a834894ffca Mon Sep 17 00:00:00 2001
From: John Smith <john.smith7545@yahoo.com>
Date: Fri, 23 Mar 2012 22:30:43 +0900
Subject: Fix for 909328 : Dockable Find & Replace dialog, replace ComboBoxText
 with Entry to fix build error with gtkmm2.4

(bzr r11119)
---
 src/ui/widget/entry.cpp |  8 --------
 src/ui/widget/entry.h   | 44 --------------------------------------------
 2 files changed, 52 deletions(-)

(limited to 'src/ui/widget')

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
-- 
cgit v1.2.3