diff options
| author | David Robillard <d@drobilla.net> | 2011-07-04 19:15:50 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2011-07-04 19:15:50 +0000 |
| commit | 86560309aa26b8cbb08bcfab85c7bc50a87794ab (patch) | |
| tree | 6732b1b5ac06e0cfdaeefad56250fba92f5b8561 /src/gui/ObjectMenu.cpp | |
| parent | 6201df44e0187cb0606aaf1b9858c099db2a93c6 (diff) | |
| download | ingen-86560309aa26b8cbb08bcfab85c7bc50a87794ab.tar.gz ingen-86560309aa26b8cbb08bcfab85c7bc50a87794ab.tar.bz2 ingen-86560309aa26b8cbb08bcfab85c7bc50a87794ab.zip | |
Simplify FlowCanvas menu API, and fix crashing Ingen menus (ticket #721).
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3411 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/gui/ObjectMenu.cpp')
| -rw-r--r-- | src/gui/ObjectMenu.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/gui/ObjectMenu.cpp b/src/gui/ObjectMenu.cpp index 2fa14778..b97aa412 100644 --- a/src/gui/ObjectMenu.cpp +++ b/src/gui/ObjectMenu.cpp @@ -16,12 +16,16 @@ */ #include <utility> + #include <gtkmm.h> + #include "ingen/ServerInterface.hpp" -#include "shared/LV2URIMap.hpp" #include "ingen/client/ObjectModel.hpp" +#include "shared/LV2URIMap.hpp" + #include "App.hpp" #include "ObjectMenu.hpp" +#include "WidgetFactory.hpp" #include "WindowFactory.hpp" using namespace Raul; @@ -30,7 +34,7 @@ namespace Ingen { namespace GUI { ObjectMenu::ObjectMenu(BaseObjectType* cobject, - const Glib::RefPtr<Gtk::Builder>& xml) + const Glib::RefPtr<Gtk::Builder>& deriv_xml) : Gtk::Menu(cobject) , _polyphonic_menuitem(NULL) , _disconnect_menuitem(NULL) @@ -39,6 +43,7 @@ ObjectMenu::ObjectMenu(BaseObjectType* cobject, , _properties_menuitem(NULL) , _enable_signal(false) { + Glib::RefPtr<Gtk::Builder> xml = WidgetFactory::create("object_menu"); xml->get_widget("object_learn_menuitem", _learn_menuitem); xml->get_widget("object_unlearn_menuitem", _unlearn_menuitem); xml->get_widget("object_polyphonic_menuitem", _polyphonic_menuitem); |