diff options
| author | John Emmas <johne53@tiscali.co.uk> | 2013-10-14 19:31:22 +0100 |
|---|---|---|
| committer | John Emmas <johne53@tiscali.co.uk> | 2013-10-14 19:31:22 +0100 |
| commit | e466ce40ad1ba591543020cb7c0aa15dbebef81e (patch) | |
| tree | f8e43560917a0a70c48d32ac171e828472cfd794 /gtk2_ardour/window_manager.h | |
| parent | 4fac237fdcf025c5fd5aafe207113abd6abb469b (diff) | |
| parent | a901f28c6287ff99444d6a8afe67b71531a5f7d0 (diff) | |
Merge branch 'master' into windows+cc
Conflicts (hopefully resolved):
gtk2_ardour/ardour_ui.cc
Diffstat (limited to 'gtk2_ardour/window_manager.h')
| -rw-r--r-- | gtk2_ardour/window_manager.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gtk2_ardour/window_manager.h b/gtk2_ardour/window_manager.h index 135f72c3ee..2dd6a2262e 100644 --- a/gtk2_ardour/window_manager.h +++ b/gtk2_ardour/window_manager.h @@ -122,7 +122,7 @@ class ProxyBase : public ARDOUR::SessionHandlePtr, public sigc::trackable { Gtkmm2ext::VisibilityTracker* vistracker; void save_pos_and_size (); - bool handle_win_event (GdkEventAny *ev); + bool delete_event_handler (GdkEventAny *ev); void setup (); }; |