add plural forms for pt to gtk2_ardour/po/pt.po

[ardour.git] / gtk2_ardour / ardour_dialog.cc

diff --git a/gtk2_ardour/ardour_dialog.cc b/gtk2_ardour/ardour_dialog.cc
index 3690ee023bbe545fa7cb59016f478f0507ad5adc..89b9914120147b4586ca137ad0d73df5ad17c3b7 100644 (file)
--- a/gtk2_ardour/ardour_dialog.cc
+++ b/gtk2_ardour/ardour_dialog.cc
@@ -32,6 +32,7 @@
 using namespace std;
 using namespace Gtk;
 using namespace Gtkmm2ext;
+using namespace ARDOUR_UI_UTILS;
 
 ArdourDialog::ArdourDialog (string title, bool modal, bool use_seperator)
        : Dialog (title, modal, use_seperator)
@@ -54,32 +55,29 @@ ArdourDialog::~ArdourDialog ()
 {
         if (_splash_pushed) {
                 Splash* spl = Splash::instance();
-                
+
                 if (spl) {
                         spl->pop_front();
                 }
         }
-       WM::Manager::instance().remove (proxy);
+        Keyboard::the_keyboard().focus_out_window (0, this);
+        WM::Manager::instance().remove (proxy);
 }
 
 bool
-ArdourDialog::on_key_press_event (GdkEventKey* ev)
+ArdourDialog::on_focus_in_event (GdkEventFocus *ev)
 {
-       return relay_key_press (ev, this);
+       Keyboard::the_keyboard().focus_in_window (ev, this);
+       return Dialog::on_focus_in_event (ev);
 }
 
 bool
-ArdourDialog::on_enter_notify_event (GdkEventCrossing *ev)
+ArdourDialog::on_focus_out_event (GdkEventFocus *ev)
 {
-       Keyboard::the_keyboard().enter_window (ev, this);
-       return Dialog::on_enter_notify_event (ev);
-}
-
-bool
-ArdourDialog::on_leave_notify_event (GdkEventCrossing *ev)
-{
-       Keyboard::the_keyboard().leave_window (ev, this);
-       return Dialog::on_leave_notify_event (ev);
+       if (!get_modal()) {
+               Keyboard::the_keyboard().focus_out_window (ev, this);
+       }
+       return Dialog::on_focus_out_event (ev);
 }
 
 void
@@ -115,7 +113,7 @@ void
 ArdourDialog::init ()
 {
        set_border_width (10);
-
+       add_events (Gdk::FOCUS_CHANGE_MASK);
        set_type_hint (Gdk::WINDOW_TYPE_HINT_DIALOG);
 
        Gtk::Window* parent = WM::Manager::instance().transient_parent();