From dc757ab7c10dbc1cd82f877d0e7d23cec801c3de Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sun, 17 Aug 2014 17:40:48 -0400 Subject: [PATCH] fix conflicts caused by XML-ization of old 2-canvas design --- gtk2_ardour/editor.cc | 4 ---- gtk2_ardour/editor.h | 6 +++--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 37d15bf089..ed7dbb7933 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -266,11 +266,7 @@ Editor::Editor () , horizontal_adjustment (get_adjustment ("horizontal_adjustment")) , unused_adjustment (get_adjustment ("unused_adjustment")) , edit_packer (get_table ("edit_packer")) - , time_canvas_event_box (get_event_box ("time_canvas_event_box")) , time_bars_event_box (get_event_box ("time_bars_event_box")) - , ruler_label_event_box (get_event_box ("ruler_label_event_box")) - , ruler_label_vbox (get_v_box ("ruler_label_vbox")) - , time_canvas_vbox (get_v_box ("time_canvas_vbox")) , edit_controls_vbox (get_v_box ("edit_controls_vbox")) , controls_layout (get_layout ("controls_layout")) , time_bars_vbox (get_v_box ("time_bars_vbox")) diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 68a6e8bb57..8bb4eba9c2 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -732,8 +732,8 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD bool track_canvas_motion (GdkEvent*); - Gtk::EventBox time_bars_event_box; - Gtk::VBox time_bars_vbox; + Gtk::EventBox& time_bars_event_box; + Gtk::VBox& time_bars_vbox; ArdourCanvas::Pixbuf *logo_item; #if 0 @@ -999,7 +999,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD Gtk::Menu *edit_controls_right_menu; Gtk::VBox track_canvas_vbox; - Gtk::VBox edit_controls_vbox; + Gtk::VBox& edit_controls_vbox; Gtk::HBox edit_controls_hbox; void control_vertical_zoom_in_all ();