diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2005-11-23 04:13:32 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2005-11-23 04:13:32 +0000 |
| commit | fb45ffea71d345ced0cfbb12b9dcd89ecb1e8dbf (patch) | |
| tree | b82e8a70ce8e88212d63e4a5a4827c5363d3d299 /gtk2_ardour/ardour_dialog.cc | |
| parent | bac3c6bc0f36623e200fe30fc8cc4137ab96fba7 (diff) | |
strip keyboard.cc of noxious focus handling stuff, and cleanup
git-svn-id: svn://localhost/trunk/ardour2@106 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/ardour_dialog.cc')
| -rw-r--r-- | gtk2_ardour/ardour_dialog.cc | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/gtk2_ardour/ardour_dialog.cc b/gtk2_ardour/ardour_dialog.cc index 3af944d85c..030be0486e 100644 --- a/gtk2_ardour/ardour_dialog.cc +++ b/gtk2_ardour/ardour_dialog.cc @@ -27,8 +27,7 @@ ArdourDialog::ArdourDialog (string name) - : Dialog (name), - KeyboardTarget (*this, name) + : Dialog (name) { session = 0; kbd_input = false; @@ -46,25 +45,26 @@ bool ArdourDialog::on_enter_notify_event (GdkEventCrossing *ev) { if (ev->detail != GDK_NOTIFY_INFERIOR) { - Keyboard::the_keyboard().set_current_dialog (this); + // GTK2FIX + //Keyboard::the_keyboard().set_current_dialog (this); } - return FALSE; + return false; } bool ArdourDialog::on_leave_notify_event (GdkEventCrossing *ev) { if (ev->detail != GDK_NOTIFY_INFERIOR) { - Keyboard::the_keyboard().set_current_dialog (0); + // GTK2FIX + //Keyboard::the_keyboard().set_current_dialog (0); } - return FALSE; + return false; } void ArdourDialog::on_unmap () { _within_hiding = true; - Hiding (); /* EMIT_SIGNAL */ _within_hiding = false; Dialog::on_unmap (); } @@ -79,12 +79,7 @@ void ArdourDialog::stop (int rr) { if (hide_on_stop) { - Hiding (); /* EMIT_SIGNAL */ hide_all (); - - if (kbd_input) { - ARDOUR_UI::instance()->allow_focus (false); - } } if (running) { @@ -102,10 +97,6 @@ ArdourDialog::run () { show_all (); - if (kbd_input) { - ARDOUR_UI::instance()->allow_focus (true); - } - running = true; switch (Dialog::run ()) { case GTK_RESPONSE_ACCEPT: @@ -121,10 +112,6 @@ ArdourDialog::run () } hide_all (); - - if (kbd_input) { - ARDOUR_UI::instance()->allow_focus (false); - } } void |