diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2005-11-27 17:59:03 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2005-11-27 17:59:03 +0000 |
| commit | c74f6577e2466d24a74da3ba6a48e2a1957769c8 (patch) | |
| tree | c17ca202a457170c1055954372de6514f65d7e59 /gtk2_ardour/ardour_ui2.cc | |
| parent | 8f54e410585907cbecd7047cb0c4e1d79d9b9d5f (diff) | |
ripping, tearing, shredding
git-svn-id: svn://localhost/trunk/ardour2@130 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/ardour_ui2.cc')
| -rw-r--r-- | gtk2_ardour/ardour_ui2.cc | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc index 64f85c0192..90eee48557 100644 --- a/gtk2_ardour/ardour_ui2.cc +++ b/gtk2_ardour/ardour_ui2.cc @@ -66,11 +66,6 @@ ARDOUR_UI::setup_windows () return -1; } - if (create_meter_bridge ()) { - error << _("UI: cannot setup meter_bridge") << endmsg; - return -1; - } - /* all other dialogs are created conditionally */ we_have_dependents (); @@ -425,16 +420,24 @@ ARDOUR_UI::setup_clock () { ARDOUR_UI::Clock.connect (bind (mem_fun (big_clock, &AudioClock::set), false)); - big_clock_window = new ArdourDialog ("big clock window"); + big_clock_window = new Gtk::Window (WINDOW_TOPLEVEL); big_clock_window->set_border_width (0); big_clock_window->add (big_clock); big_clock_window->set_title (_("ardour: clock")); big_clock_window->set_type_hint (Gdk::WINDOW_TYPE_HINT_MENU); + big_clock_window->signal_realize().connect (bind (sigc::ptr_fun (set_decoration), big_clock_window, (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH))); + big_clock_window->signal_unmap().connect (mem_fun(*this, &ARDOUR_UI::big_clock_hiding)); - big_clock_window->signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it), static_cast<Gtk::Window*>(big_clock_window))); + manage_window (*big_clock_window); +} - big_clock_window->signal_unmap().connect (mem_fun(*this, &ARDOUR_UI::big_clock_hiding)); +void +ARDOUR_UI::manage_window (Window& win) +{ + win.signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it), &win)); + win.signal_enter_notify_event().connect (bind (mem_fun (Keyboard::the_keyboard(), &Keyboard::enter_window), &win)); + win.signal_leave_notify_event().connect (bind (mem_fun (Keyboard::the_keyboard(), &Keyboard::leave_window), &win)); } void |