diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-05-28 16:37:04 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-05-28 16:37:04 +0000 |
| commit | 3e966771d042455a50a01e786af2af7b6f407395 (patch) | |
| tree | b93b553d12b4c903087f26efa5ff06284add0cab /gtk2_ardour/editor_canvas_events.cc | |
| parent | 3d6493abc9d332132aef250a551d60fe45f7b3eb (diff) | |
clean up item event handling in MidiRegionViews by removing unnecessary InteractiveItem inheritance, and keep child->parent event handling order consistent as much as possible
git-svn-id: svn://localhost/ardour2/branches/3.0@7186 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_canvas_events.cc')
| -rw-r--r-- | gtk2_ardour/editor_canvas_events.cc | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc index 28074c23e8..3fa29437ca 100644 --- a/gtk2_ardour/editor_canvas_events.cc +++ b/gtk2_ardour/editor_canvas_events.cc @@ -44,7 +44,6 @@ #include "control_point.h" #include "canvas_impl.h" #include "simplerect.h" -#include "interactive-item.h" #include "editor_drag.h" #include "midi_time_axis.h" #include "editor_regions.h" @@ -65,12 +64,6 @@ Editor::track_canvas_scroll (GdkEventScroll* ev) nframes64_t xdelta; int direction = ev->direction; - Gnome::Canvas::Item* item = track_canvas->get_item_at(ev->x, ev->y); - InteractiveItem* interactive_item = dynamic_cast<InteractiveItem*>(item); - if (interactive_item) { - return interactive_item->on_event(reinterpret_cast<GdkEvent*>(ev)); - } - retry: switch (direction) { case GDK_SCROLL_UP: @@ -153,8 +146,7 @@ bool Editor::track_canvas_scroll_event (GdkEventScroll *event) { track_canvas->grab_focus(); - track_canvas_scroll (event); - return false; + return track_canvas_scroll (event); } bool @@ -961,6 +953,7 @@ Editor::canvas_note_event (GdkEvent *event, ArdourCanvas::Item* item) return false; } + cerr << "Forward note event item on to editor\n"; return typed_event (item, event, NoteItem); } |