From 5391c2f4a814facccf4612e4b73a8d948387fae7 Mon Sep 17 00:00:00 2001
From: Nikolay <MPolianovskyi@wavesglobal.com>
Date: Thu, 23 Oct 2014 11:46:40 +0300
Subject: [PATCH] [Summary] Reworked implementation on Esc and on Enter pressed
 according to new possibilities in parent class WavesDialog [Reviewed] Nobody

---
 gtk2_ardour/add_tracks_dialog.cc | 28 +++++++++++-----------------
 gtk2_ardour/add_tracks_dialog.h  |  6 ++++--
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/gtk2_ardour/add_tracks_dialog.cc b/gtk2_ardour/add_tracks_dialog.cc
index c90f220cf8..bb0f793ac6 100644
--- a/gtk2_ardour/add_tracks_dialog.cc
+++ b/gtk2_ardour/add_tracks_dialog.cc
@@ -140,22 +140,16 @@ AddTracksDialog::setup ()
     _tracks_format_dropdown.set_text(TrackFormat::FormatMono);
 }
 
-bool
-AddTracksDialog::on_key_press_event (GdkEventKey* ev)
+void
+AddTracksDialog::on_enter_pressed ()
 {
-    switch (ev->keyval)
-    {
-        case GDK_Return:
-            hide();
-            response (Gtk::RESPONSE_YES);
-            return true;
-        case GDK_Escape:
-            hide();
-            response (Gtk::RESPONSE_CANCEL);
-            return true;
-    }
-    
-    Gtk::Widget::on_key_press_event(ev);
-    
-    return true; // do not propagate event
+    hide();
+    response (Gtk::RESPONSE_YES);
+}
+
+void
+AddTracksDialog::on_esc_pressed ()
+{
+    hide();
+    response (Gtk::RESPONSE_CANCEL);
 }
diff --git a/gtk2_ardour/add_tracks_dialog.h b/gtk2_ardour/add_tracks_dialog.h
index bf2b986caf..cd139f9440 100644
--- a/gtk2_ardour/add_tracks_dialog.h
+++ b/gtk2_ardour/add_tracks_dialog.h
@@ -26,8 +26,10 @@ public:
     int count();
     ARDOUR::ChanCount input_channels ();
     
-    bool on_key_press_event (GdkEventKey* ev);
-        
+protected:
+    void on_enter_pressed ();
+    void on_esc_pressed ();
+    
 private:
 	WavesButton& _decrement_button;
     WavesButton& _increment_button;