mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-15 19:16:40 +01:00
remove <gtkmm/gtkmm.h> from all files, plus a small fix related to map/realize handling
git-svn-id: svn://localhost/trunk/ardour2@145 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
50bf5a0c06
commit
b1a99f89da
37 changed files with 187 additions and 45 deletions
|
|
@ -333,7 +333,7 @@ Editor::Editor (AudioEngine& eng)
|
|||
track_canvas_scroller.get_hadjustment()->set_upper (1200.0);
|
||||
track_canvas_scroller.get_hadjustment()->set_step_increment (20.0);
|
||||
track_canvas_scroller.get_hadjustment()->signal_value_changed().connect (mem_fun(*this, &Editor::canvas_horizontally_scrolled));
|
||||
|
||||
|
||||
edit_vscrollbar.set_adjustment(*track_canvas_scroller.get_vadjustment());
|
||||
edit_hscrollbar.set_adjustment(*track_canvas_scroller.get_hadjustment());
|
||||
|
||||
|
|
@ -346,6 +346,9 @@ Editor::Editor (AudioEngine& eng)
|
|||
time_canvas_scroller.set_hadjustment (*track_canvas_scroller.get_hadjustment());
|
||||
time_canvas_scroller.set_name ("TimeCanvasScroller");
|
||||
|
||||
track_canvas_scroller.signal_map_event().connect (mem_fun (*this, &Editor::track_canvas_map_handler));
|
||||
time_canvas_scroller.signal_map_event().connect (mem_fun (*this, &Editor::time_canvas_map_handler));
|
||||
|
||||
edit_controls_vbox.set_spacing (track_spacing);
|
||||
edit_controls_hbox.pack_start (edit_controls_vbox, true, true);
|
||||
edit_controls_scroller.add (edit_controls_hbox);
|
||||
|
|
@ -1002,15 +1005,6 @@ Editor::on_realize ()
|
|||
null_cursor = new Gdk::Cursor(empty_pixmap, empty_bitmap, white, white, 0, 0);
|
||||
}
|
||||
|
||||
void
|
||||
Editor::on_map ()
|
||||
{
|
||||
Window::on_map ();
|
||||
|
||||
track_canvas_scroller.get_window()->set_cursor (*current_canvas_cursor);
|
||||
time_canvas_scroller.get_window()->set_cursor (*timebar_cursor);
|
||||
}
|
||||
|
||||
void
|
||||
Editor::track_canvas_allocate (Gtk::Allocation alloc)
|
||||
{
|
||||
|
|
@ -4103,3 +4097,9 @@ Editor::transport_punch_location()
|
|||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
Editor::on_map ()
|
||||
{
|
||||
// XXX remove me
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue