diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2013-04-11 20:19:22 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-04-11 20:19:22 -0400 |
commit | ee1f0520a820fb829ef3c1dbfcbb57e37242c2c8 (patch) | |
tree | 66ce908eff7680bd3b1e28732d598ecab5a6875a /gtk2_ardour/editor.cc | |
parent | 1fda7b293ac3435526e3992a37b19f9ada19a3bd (diff) |
many changes to get the cairo-canvas version much, much more functional. still problems with a lot of subtle and not-so-subtle issues
Diffstat (limited to 'gtk2_ardour/editor.cc')
-rw-r--r-- | gtk2_ardour/editor.cc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 7f49c56d7b..6bae2674df 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -517,12 +517,6 @@ Editor::Editor () time_bars_event_box.set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); time_bars_event_box.signal_button_release_event().connect (sigc::mem_fun(*this, &Editor::ruler_label_button_release)); - /* these enable us to have a dedicated window (for cursor setting, etc.) - for the canvas areas. - */ - - track_canvas_event_box.add (*_track_canvas_viewport); - time_canvas_event_box.add (time_canvas_vbox); time_canvas_event_box.set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::POINTER_MOTION_MASK); @@ -543,7 +537,7 @@ Editor::Editor () /* time bars canvas */ edit_packer.attach (*_time_bars_canvas_viewport, 2, 3, 1, 2, FILL, FILL, 0, 0); /* track canvas */ - edit_packer.attach (track_canvas_event_box, 2, 3, 2, 3, FILL|EXPAND, FILL|EXPAND, 0, 0); + edit_packer.attach (*_track_canvas_viewport, 2, 3, 2, 3, FILL|EXPAND, FILL|EXPAND, 0, 0); bottom_hbox.set_border_width (2); bottom_hbox.set_spacing (3); @@ -788,6 +782,7 @@ Editor::~Editor() delete button_bindings; delete _routes; delete _route_groups; + delete _time_bars_canvas_viewport; delete _track_canvas_viewport; delete _drags; } |