From fc56a92847ff6ae474f0aad3167ba2f55196c395 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Fri, 11 Dec 2009 15:59:21 +0000
Subject: Build against old Gtkmm (without clear icon in text entries).

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2309 a436a847-0d15-0410-975c-d299462d15a1
---
 src/gui/LoadPluginWindow.cpp | 5 +++++
 src/gui/LoadPluginWindow.hpp | 2 ++
 wscript                      | 1 +
 3 files changed, 8 insertions(+)

diff --git a/src/gui/LoadPluginWindow.cpp b/src/gui/LoadPluginWindow.cpp
index c5b895cc..be3a6e1a 100644
--- a/src/gui/LoadPluginWindow.cpp
+++ b/src/gui/LoadPluginWindow.cpp
@@ -93,8 +93,11 @@ LoadPluginWindow::LoadPluginWindow(BaseObjectType* cobject, const Glib::RefPtr<G
 			sigc::mem_fun(this, &LoadPluginWindow::filter_changed));
 	_node_name_entry->signal_changed().connect(
 			sigc::mem_fun(this, &LoadPluginWindow::name_changed));
+
+#ifdef HAVE_NEW_GTKMM
 	_search_entry->signal_icon_release().connect(
 			sigc::mem_fun(this, &LoadPluginWindow::name_cleared));
+#endif
 
 	_selection = _plugins_treeview->get_selection();
 	_selection->set_mode(Gtk::SELECTION_MULTIPLE);
@@ -140,11 +143,13 @@ LoadPluginWindow::name_changed()
 }
 
 
+#ifdef HAVE_NEW_GTKMM
 void
 LoadPluginWindow::name_cleared(Gtk::EntryIconPosition pos, const GdkEventButton* event)
 {
 	_search_entry->set_text("");
 }
+#endif // HAVE_NEW_GTKMM
 
 
 /** Sets the patch controller for this window and initializes everything.
diff --git a/src/gui/LoadPluginWindow.hpp b/src/gui/LoadPluginWindow.hpp
index 1ec5700c..b5a3bbd5 100644
--- a/src/gui/LoadPluginWindow.hpp
+++ b/src/gui/LoadPluginWindow.hpp
@@ -97,7 +97,9 @@ private:
 	void filter_changed();
 	void clear_clicked();
 	void name_changed();
+#ifdef HAVE_NEW_GTKMM
 	void name_cleared(Gtk::EntryIconPosition pos, const GdkEventButton* event);
+#endif
 
 	void new_plugin(SharedPtr<PluginModel> plugin);
 
diff --git a/wscript b/wscript
index d1581d00..9ab3592b 100644
--- a/wscript
+++ b/wscript
@@ -29,6 +29,7 @@ def configure(conf):
 	autowaf.check_pkg(conf, 'glibmm-2.4', uselib_store='GLIBMM', atleast_version='2.14.0', mandatory=True)
 	autowaf.check_pkg(conf, 'gthread-2.0', uselib_store='GTHREAD', atleast_version='2.14.0', mandatory=True)
 	autowaf.check_pkg(conf, 'gtkmm-2.4', uselib_store='GTKMM', atleast_version='2.11.12', mandatory=False)
+	autowaf.check_pkg(conf, 'gtkmm-2.4', uselib_store='NEW_GTKMM', atleast_version='2.14.0', mandatory=False)
 	autowaf.check_pkg(conf, 'jack', uselib_store='JACK', atleast_version='0.109.0', mandatory=True)
 	autowaf.check_pkg(conf, 'slv2', uselib_store='SLV2', atleast_version='0.6.0', mandatory=True)
 	autowaf.check_pkg(conf, 'raul', uselib_store='RAUL', atleast_version='0.5.1', mandatory=True)
-- 
cgit v1.2.1