projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more hot wine.
[ardour.git]
/
gtk2_ardour
/
ardour_dialog.cc
diff --git
a/gtk2_ardour/ardour_dialog.cc
b/gtk2_ardour/ardour_dialog.cc
index 34027ca0c3600f3f207e2b460034234a15662389..f8071c2e622d960481789c42cbbaea1857726ed1 100644
(file)
--- a/
gtk2_ardour/ardour_dialog.cc
+++ b/
gtk2_ardour/ardour_dialog.cc
@@
-55,7
+55,7
@@
ArdourDialog::~ArdourDialog ()
{
if (_splash_pushed) {
Splash* spl = Splash::instance();
{
if (_splash_pushed) {
Splash* spl = Splash::instance();
-
+
if (spl) {
spl->pop_front();
}
if (spl) {
spl->pop_front();
}
@@
-64,26
+64,19
@@
ArdourDialog::~ArdourDialog ()
}
bool
}
bool
-ArdourDialog::on_key_press_event (GdkEventKey* ev)
-{
- if (!relay_key_press (ev, this)) {
- return Gtk::Window::on_key_press_event(ev);
- }
- return true;
-}
-
-bool
-ArdourDialog::on_enter_notify_event (GdkEventCrossing *ev)
+ArdourDialog::on_focus_in_event (GdkEventFocus *ev)
{
{
- Keyboard::the_keyboard().
enter
_window (ev, this);
- return Dialog::on_
enter_notify
_event (ev);
+ Keyboard::the_keyboard().
focus_in
_window (ev, this);
+ return Dialog::on_
focus_in
_event (ev);
}
bool
}
bool
-ArdourDialog::on_
leave_notify_event (GdkEventCrossing
*ev)
+ArdourDialog::on_
focus_out_event (GdkEventFocus
*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
}
void
@@
-119,7
+112,7
@@
void
ArdourDialog::init ()
{
set_border_width (10);
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();
set_type_hint (Gdk::WINDOW_TYPE_HINT_DIALOG);
Gtk::Window* parent = WM::Manager::instance().transient_parent();