From b8205253aa82aa05097118ffcdcc4bebaf48e128 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 16 Sep 2018 15:39:13 +0200 Subject: Remove checks for ancient Gtkmm --- src/gui/LoadPluginWindow.cpp | 4 ---- src/gui/LoadPluginWindow.hpp | 2 -- src/gui/wscript | 2 -- 3 files changed, 8 deletions(-) diff --git a/src/gui/LoadPluginWindow.cpp b/src/gui/LoadPluginWindow.cpp index c96634cc..bd08f457 100644 --- a/src/gui/LoadPluginWindow.cpp +++ b/src/gui/LoadPluginWindow.cpp @@ -116,10 +116,8 @@ LoadPluginWindow::LoadPluginWindow(BaseObjectType* cobject, _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); @@ -158,13 +156,11 @@ 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 graph controller for this window and initializes everything. * diff --git a/src/gui/LoadPluginWindow.hpp b/src/gui/LoadPluginWindow.hpp index 3874b8dd..29314c7a 100644 --- a/src/gui/LoadPluginWindow.hpp +++ b/src/gui/LoadPluginWindow.hpp @@ -107,9 +107,7 @@ 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 set_row(Gtk::TreeModel::Row& row, SPtr plugin); diff --git a/src/gui/wscript b/src/gui/wscript index 160afc03..e4d777ad 100644 --- a/src/gui/wscript +++ b/src/gui/wscript @@ -14,8 +14,6 @@ def configure(conf): autowaf.check_pkg(conf, 'gthread-2.0', uselib_store='GTHREAD', atleast_version='2.14.0', mandatory=False) autowaf.check_pkg(conf, 'gtkmm-2.4', uselib_store='GTKMM', - atleast_version='2.12.0', mandatory=False) - autowaf.check_pkg(conf, 'gtkmm-2.4', uselib_store='NEW_GTKMM', atleast_version='2.14.0', mandatory=False) autowaf.check_pkg(conf, 'ganv-1', uselib_store='GANV', atleast_version='1.5.4', mandatory=False) -- cgit v1.2.1