Fix some more Gtk::Menu memory leaks

[ardour.git] / gtk2_ardour / visibility_group.cc

diff --git a/gtk2_ardour/visibility_group.cc b/gtk2_ardour/visibility_group.cc
index d0ef1dd63510a0c36b9253a4421ab724410b2d06..0090e39019918c11d471184217e18083a9b72966 100644 (file)
--- a/gtk2_ardour/visibility_group.cc
+++ b/gtk2_ardour/visibility_group.cc
@@ -25,6 +25,7 @@
 #include "pbd/strsplit.h"
 #include "pbd/xml++.h"
 
+#include "ardour_ui.h"
 #include "visibility_group.h"
 
 #include "pbd/i18n.h"
@@ -69,16 +70,9 @@ VisibilityGroup::button_press_event (GdkEventButton* ev)
                return false;
        }
 
-       menu()->popup (1, ev->time);
-       return true;
-}
-
-Gtk::Menu*
-VisibilityGroup::menu ()
-{
        using namespace Gtk::Menu_Helpers;
 
-       Gtk::Menu* m = Gtk::manage (new Gtk::Menu);
+       Gtk::Menu* m = ARDOUR_UI::instance()->shared_popup_menu ();
        MenuList& items = m->items ();
 
        for (vector<Member>::iterator i = _members.begin(); i != _members.end(); ++i) {
@@ -88,9 +82,11 @@ VisibilityGroup::menu ()
                j->signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &VisibilityGroup::toggle), i));
        }
 
-       return m;
+       m->popup (1, ev->time);
+       return true;
 }
 
+
 /** @return true if the member should be visible, even taking into account any override functor */
 bool
 VisibilityGroup::should_actually_be_visible (Member const & m) const