X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fwindow_manager.cc;h=01baf3e1fde9486e349c487209396cf3fb3784a5;hb=61c199b97c3eb4bbd84d2d033594be682944a416;hp=629e24419b470716e51ae078e9c3609eb5ac5bfa;hpb=07be5beee7941a193fd55b584e72dbd9c8bea6fb;p=ardour.git

diff --git a/gtk2_ardour/window_manager.cc b/gtk2_ardour/window_manager.cc
index 629e24419b..01baf3e1fd 100644
--- a/gtk2_ardour/window_manager.cc
+++ b/gtk2_ardour/window_manager.cc
@@ -194,6 +194,7 @@ ProxyBase::ProxyBase (const string& name, const std::string& menu_name, const XM
 ProxyBase::~ProxyBase ()
 {
 	delete vistracker;
+	delete _window;
 }
 
 void
@@ -348,7 +349,7 @@ ProxyBase::setup ()
 	assert (_window);
 
 	vistracker = new Gtkmm2ext::VisibilityTracker (*_window);
-	_window->signal_delete_event().connect (sigc::mem_fun (*this, &ProxyBase::handle_win_event));
+	_window->signal_delete_event().connect (sigc::mem_fun (*this, &ProxyBase::delete_event_handler));
 
 	if (_width != -1 || _height != -1 || _x_off != -1 || _y_off != -1) {
 		/* cancel any mouse-based positioning */
@@ -368,8 +369,9 @@ ProxyBase::setup ()
 void
 ProxyBase::show ()
 {
-	Gtk::Window* win = get (true);
-	win->show ();
+	get (true);
+	assert (_window);
+	_window->show ();
 }
 
 void
@@ -383,17 +385,19 @@ ProxyBase::maybe_show ()
 void
 ProxyBase::show_all ()
 {
-	Gtk::Window* win = get (true);
-	win->show_all ();
+	get (true);
+	assert (_window);
+	_window->show_all ();
 }
 
-
 void
 ProxyBase::present ()
 {
-	Gtk::Window* win = get (true);
-	win->show_all ();
-	win->present ();
+	get (true);
+	assert (_window);
+
+	_window->show_all ();
+	_window->present ();
 
 	/* turn off any mouse-based positioning */
 	_window->set_position (Gtk::WIN_POS_NONE);
@@ -402,15 +406,14 @@ ProxyBase::present ()
 void
 ProxyBase::hide ()
 {
-	Gtk::Window* win = get (false);
-	if (win) {
+	if (_window) {
 		save_pos_and_size();
-		win->hide ();
+		_window->hide ();
 	}
 }
 
 bool
-ProxyBase::handle_win_event (GdkEventAny *ev)
+ProxyBase::delete_event_handler (GdkEventAny* /*ev*/)
 {
 	hide();
 	return true;
@@ -419,9 +422,10 @@ ProxyBase::handle_win_event (GdkEventAny *ev)
 void
 ProxyBase::save_pos_and_size ()
 {
-	Gtk::Window* win = get (false);
-	win->get_position (_x_off, _y_off);
-	win->get_size (_width, _height);
+	if (_window) {
+		_window->get_position (_x_off, _y_off);
+		_window->get_size (_width, _height);
+	}
 }
 /*-----------------------*/