smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-08 22:55:44 +01:00
Code Issues Projects Releases Wiki Activity

fix conflicts caused by XML-ization of old 2-canvas design

Browse source
This commit is contained in:
Paul Davis 2014-08-17 17:40:48 -04:00
parent af3143ba4a
commit dc757ab7c1
2 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gtk2_ardour/editor.cc
View file

@ -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"))

6
gtk2_ardour/editor.h
View file

@ -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 ();