diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-01-11 21:36:44 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-02-22 15:31:25 -0500 |
| commit | c932c562330f4611c14dd6846d6cd617507695db (patch) | |
| tree | 37bba7f71c534dc343341869f7b6ad1399d670d1 /libs | |
| parent | e268a9d2aae5012d494680d851abe1415c2063c6 (diff) | |
cleanup post-rebase-against-master messes
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/surfaces/faderport/gui.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libs/surfaces/faderport/gui.cc b/libs/surfaces/faderport/gui.cc index f56512e526..dffd340e29 100644 --- a/libs/surfaces/faderport/gui.cc +++ b/libs/surfaces/faderport/gui.cc @@ -25,7 +25,7 @@ #include "pbd/strsplit.h" #include "pbd/file_utils.h" -#include "gtkmm2ext/actions.h" +#include "gtkmm2ext/bindings.h" #include "gtkmm2ext/gtk_ui.h" #include "gtkmm2ext/gui_thread.h" #include "gtkmm2ext/utils.h" @@ -357,12 +357,14 @@ FPGUI::build_available_action_menu () vector<string> labels; vector<string> tooltips; vector<string> keys; - vector<AccelKey> bindings; + vector<Glib::RefPtr<Gtk::Action> > actions; + + Gtkmm2ext::ActionMap::get_all_actions (paths, labels, tooltips, keys, actions); + typedef std::map<string,TreeIter> NodeMap; NodeMap nodes; NodeMap::iterator r; - ActionManager::get_all_actions (labels, paths, tooltips, keys, bindings); vector<string>::iterator k; vector<string>::iterator p; |