diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2005-11-16 03:09:36 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2005-11-16 03:09:36 +0000 |
commit | 077b5779b9392ed8dae243700e03ac79c12a7180 (patch) | |
tree | e983ceecdb1f7eb8ccad0ffc3b34cce81d993bb5 /gtk2_ardour | |
parent | f16caf535c3e7a697c7464ecc153bce1b341d0ef (diff) |
more editor*.cc fixes
git-svn-id: svn://localhost/trunk/ardour2@100 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
-rw-r--r-- | gtk2_ardour/editor.h | 6 | ||||
-rw-r--r-- | gtk2_ardour/editor_cursors.cc | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 43205fb31a..7b46e7624f 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -610,7 +610,7 @@ class Editor : public PublicEditor jack_nframes_t current_frame; double length; - Cursor (Editor&, const string& color, bool (Editor::*)(GdkEvent*)); + Cursor (Editor&, const string& color, bool (Editor::*)(GdkEvent*,ArdourCanvas::Item*)); ~Cursor (); void set_position (jack_nframes_t); @@ -1184,8 +1184,8 @@ class Editor : public PublicEditor /* non-public event handlers */ - bool canvas_playhead_cursor_event (GdkEvent* event); - bool canvas_edit_cursor_event (GdkEvent* event); + bool canvas_playhead_cursor_event (GdkEvent* event, ArdourCanvas::Item*); + bool canvas_edit_cursor_event (GdkEvent* event, ArdourCanvas::Item*); bool track_canvas_event (GdkEvent* event, ArdourCanvas::Item*); bool track_canvas_button_press_event (GdkEventButton *); diff --git a/gtk2_ardour/editor_cursors.cc b/gtk2_ardour/editor_cursors.cc index 7eae566f1c..78552d6451 100644 --- a/gtk2_ardour/editor_cursors.cc +++ b/gtk2_ardour/editor_cursors.cc @@ -30,7 +30,7 @@ using namespace sigc; using namespace ARDOUR; using namespace Gtk; -Editor::Cursor::Cursor (Editor& ed, const string& color, bool (Editor::*callbck)(GdkEvent*)) +Editor::Cursor::Cursor (Editor& ed, const string& color, bool (Editor::*callbck)(GdkEvent*,ArdourCanvas::Item*)) : editor (ed), length(1.0) { @@ -54,7 +54,7 @@ Editor::Cursor::Cursor (Editor& ed, const string& color, bool (Editor::*callbck) // cerr << "cursor line @ " << canvas_item << endl; canvas_item->set_data ("cursor", this); - canvas_item->signal_event().connect (mem_fun (ed, callbck)); + canvas_item->signal_event().connect (bind (mem_fun (ed, callbck), canvas_item)); current_frame = 1; /* force redraw at 0 */ } |