Fix some more Gtk::Menu memory leaks

This commit is contained in:
Robin Gareus 2019-03-08 01:44:30 +01:00
parent 15cd1163fc
commit d42c0f2d60
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
3 changed files with 6 additions and 12 deletions

View File

@ -146,6 +146,7 @@ RouteParams_UI::RouteParams_UI ()
RouteParams_UI::~RouteParams_UI ()
{
delete track_menu;
}
void

View File

@ -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,17 +70,9 @@ VisibilityGroup::button_press_event (GdkEventButton* ev)
return false;
}
/* memory leak: Gtk::Menu* */
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) {
@ -89,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

View File

@ -86,8 +86,6 @@ private:
void update_list_view ();
bool should_actually_be_visible (Member const &) const;
Gtk::Menu* menu ();
std::vector<Member> _members;
std::string _xml_property_name;
ModelColumns _model_columns;