X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_dialog.cc;h=c0e17087818cf9d98498a85f4390d66792a2641c;hb=159b8face74f8ba8da5e1e4225aed0c384ac9dc2;hp=cd95666b16f120b3fd85fa2c5b12cc12b4ce68cc;hpb=f6fdd8dcbf41f864e9f0cc32dabe81fe3533ddfe;p=ardour.git

diff --git a/gtk2_ardour/ardour_dialog.cc b/gtk2_ardour/ardour_dialog.cc
index cd95666b16..c0e1708781 100644
--- a/gtk2_ardour/ardour_dialog.cc
+++ b/gtk2_ardour/ardour_dialog.cc
@@ -24,10 +24,7 @@
 
 #include "ardour_dialog.h"
 #include "keyboard.h"
-#include "ardour_ui.h"
 #include "splash.h"
-#include "public_editor.h"
-#include "utils.h"
 
 using namespace std;
 using namespace Gtk;
@@ -56,14 +53,14 @@ bool
 ArdourDialog::on_enter_notify_event (GdkEventCrossing *ev)
 {
 	Keyboard::the_keyboard().enter_window (ev, this);
-	return false;
+	return Dialog::on_enter_notify_event (ev);
 }
 
 bool
 ArdourDialog::on_leave_notify_event (GdkEventCrossing *ev)
 {
 	Keyboard::the_keyboard().leave_window (ev, this);
-	return false;
+	return Dialog::on_leave_notify_event (ev);
 }
 
 void
@@ -81,7 +78,7 @@ ArdourDialog::on_show ()
 	Splash* spl = Splash::instance();
 
 	if (spl) {
-		spl->pop_back ();
+		spl->pop_back_for (*this);
 	}
 
 	Dialog::on_show ();
@@ -92,11 +89,7 @@ ArdourDialog::init ()
 {
 	set_type_hint(Gdk::WINDOW_TYPE_HINT_DIALOG);
 	set_border_width (10);
-	CloseAllDialogs.connect (sigc::bind (sigc::mem_fun (*this, &ArdourDialog::response), RESPONSE_CANCEL));
-}
-
-bool
-ArdourDialog::on_key_press_event (GdkEventKey* key)
-{
-	return Gtk::Dialog::on_key_press_event (key);
+	CloseAllDialogs.connect (
+		sigc::bind (sigc::mem_fun (*this, &ArdourDialog::response),
+		            RESPONSE_CANCEL));
 }