smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-05 21:25:46 +01:00
Code Issues Projects Releases Wiki Activity

fix segv

Browse source 
git-svn-id: svn://localhost/trunk/ardour2@221 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2006-01-01 17:06:15 +00:00
parent 8073c4da5e
commit ed1684dce5
6 changed files with 715 additions and 700 deletions
Download patch file Download diff file Expand all files Collapse all files

15
gtk2_ardour/editor.cc
View file

@ -595,10 +595,10 @@ Editor::Editor (AudioEngine& eng)
region_list_display.set_name ("RegionListDisplay");
region_list_model = TreeStore::create (region_list_columns);
region_list_sort_model = TreeModelSort::create (region_list_model);
region_list_model->set_sort_func (0, mem_fun (*this, &Editor::region_list_sorter));
region_list_display.set_model (region_list_model);
region_list_display.set_model (region_list_sort_model);
CellRendererText* renderer = Gtk::manage( new Gtk::CellRendererText() );
region_list_display.append_column (_("Regions"), *renderer);
@ -658,7 +658,8 @@ Editor::Editor (AudioEngine& eng)
the_notebook.set_scrollable (true);
the_notebook.popup_enable ();
TearOff *notebook_tearoff = manage (new TearOff (the_notebook));
TearOff *notebook_tearoff = manage (new TearOff (the_notebook, true));
notebook_tearoff->tearoff_window().set_size_request (200, 400);
edit_pane.pack1 (edit_frame, true, true);
edit_pane.pack2 (*notebook_tearoff, true, true);
@ -2475,9 +2476,9 @@ Editor::setup_toolbar ()
mouse_mode_tearoff->set_name ("MouseModeBase");
mouse_mode_tearoff->Detach.connect (bind (mem_fun(*this, &Editor::detach_tearoff), static_cast<Gtk::Box*>(&toolbar_hbox),
mouse_mode_tearoff->tearoff_window()));
&mouse_mode_tearoff->tearoff_window()));
mouse_mode_tearoff->Attach.connect (bind (mem_fun(*this, &Editor::reattach_tearoff), static_cast<Gtk::Box*> (&toolbar_hbox),
mouse_mode_tearoff->tearoff_window(), 1));
&mouse_mode_tearoff->tearoff_window(), 1));
mouse_move_button.set_name ("MouseModeButton");
mouse_select_button.set_name ("MouseModeButton");
@ -2663,9 +2664,9 @@ Editor::setup_toolbar ()
tools_tearoff->set_name ("MouseModeBase");
tools_tearoff->Detach.connect (bind (mem_fun(*this, &Editor::detach_tearoff), static_cast<Gtk::Box*>(&toolbar_hbox),
tools_tearoff->tearoff_window()));
&tools_tearoff->tearoff_window()));
tools_tearoff->Attach.connect (bind (mem_fun(*this, &Editor::reattach_tearoff), static_cast<Gtk::Box*> (&toolbar_hbox),
tools_tearoff->tearoff_window(), 0));
&tools_tearoff->tearoff_window(), 0));
toolbar_hbox.set_spacing (8);