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/option_editor.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/option_editor.cc')
| -rw-r--r-- | gtk2_ardour/option_editor.cc | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc index 1e98dda2d4..803e17d79b 100644 --- a/gtk2_ardour/option_editor.cc +++ b/gtk2_ardour/option_editor.cc @@ -412,9 +412,6 @@ OptionEditor::setup_path_options() session_raid_entry.signal_activate().connect (mem_fun(*this, &OptionEditor::raid_path_changed)); - session_raid_entry.signal_focus_in_event().connect (mem_fun (Keyboard::the_keyboard(), &Keyboard::focus_in_handler)); - session_raid_entry.signal_focus_out_event().connect (bind (mem_fun(*this, &OptionEditor::focus_out_event_handler), &OptionEditor::raid_path_changed)); - label = manage(new Label(_("session RAID path"))); label->set_name ("OptionsLabel"); path_table.attach (*label, 0, 1, 0, 1, FILL|EXPAND, FILL); @@ -1402,7 +1399,6 @@ void OptionEditor::just_close_win() { hide_all(); - ARDOUR_UI::instance()->allow_focus(false); } void @@ -1523,9 +1519,7 @@ OptionEditor::setup_click_editor () click_path_entry.signal_activate().connect (mem_fun(*this, &OptionEditor::click_sound_changed)); click_emphasis_path_entry.signal_activate().connect (mem_fun(*this, &OptionEditor::click_emphasis_sound_changed)); - click_path_entry.signal_focus_in_event().connect (mem_fun (Keyboard::the_keyboard(), &Keyboard::focus_in_handler)); click_path_entry.signal_focus_out_event().connect (bind (mem_fun(*this, &OptionEditor::focus_out_event_handler), &OptionEditor::click_sound_changed)); - click_emphasis_path_entry.signal_focus_in_event().connect (mem_fun (Keyboard::the_keyboard(), &Keyboard::focus_in_handler)); click_emphasis_path_entry.signal_focus_out_event().connect (bind (mem_fun(*this, &OptionEditor::focus_out_event_handler), &OptionEditor::click_emphasis_sound_changed)); click_browse_button.set_name ("EditorGTKButton"); @@ -1606,11 +1600,11 @@ OptionEditor::connect_audition_editor () auditioner_gpm->show_all (); } -gint +bool OptionEditor::focus_out_event_handler (GdkEventFocus* ev, void (OptionEditor::*pmf)()) { (this->*pmf)(); - return Keyboard::the_keyboard().focus_out_handler (ev); + return false; } void |