mark the step entry dialog as a dialog even though it is an ArdourWindow, to help...

[ardour.git] / gtk2_ardour / canvas-note.h

diff --git a/gtk2_ardour/canvas-note.h b/gtk2_ardour/canvas-note.h
index cd3c1669515dcee1e59476f555b746678f61dbfe..46b0f1d600bb34f1d5c2497cdcd509bd0af4e32a 100644 (file)
--- a/gtk2_ardour/canvas-note.h
+++ b/gtk2_ardour/canvas-note.h
@@ -1,6 +1,6 @@
 /*
     Copyright (C) 2007 Paul Davis
-    Author: Dave Robillard
+    Author: David Robillard
     Author: Hans Baier
 
     This program is free software; you can redistribute it and/or modify
@@ -29,14 +29,20 @@
 namespace Gnome {
 namespace Canvas {
 
-class CanvasNote : public SimpleRect, public CanvasNoteEvent {
-public:
+class CanvasNote : public SimpleRect, public CanvasNoteEvent
+{
+ public:
        typedef Evoral::Note<Evoral::MusicalTime> NoteType;
 
-       double x1() { return property_x1(); }
-       double y1() { return property_y1(); }
-       double x2() { return property_x2(); }
-       double y2() { return property_y2(); }
+       CanvasNote (MidiRegionView&                   region,
+                   Group&                            group,
+                   const boost::shared_ptr<NoteType> note = boost::shared_ptr<NoteType>(),
+                    bool with_events = true);
+
+       double x1() const { return property_x1(); }
+       double y1() const { return property_y1(); }
+       double x2() const { return property_x2(); }
+       double y2() const { return property_y2(); }
 
        void set_outline_color(uint32_t c) { property_outline_color_rgba() = c; hide(); show(); }
        void set_fill_color(uint32_t c)    { property_fill_color_rgba()    = c; hide(); show(); }
@@ -45,12 +51,20 @@ public:
        void hide() { SimpleRect::hide(); }
 
        bool on_event(GdkEvent* ev);
+       void move_event(double dx, double dy);
+};
 
-       CanvasNote (MidiRegionView&                   region,
-                   Group&                            group,
-                   const boost::shared_ptr<NoteType> note = boost::shared_ptr<NoteType>())
-               : SimpleRect(group), CanvasNoteEvent(region, this, note)
-       {
+class NoEventCanvasNote : public CanvasNote
+{
+  public:
+       NoEventCanvasNote (MidiRegionView& region,
+                           Group& group,
+                           const boost::shared_ptr<NoteType> note = boost::shared_ptr<NoteType>())
+               : CanvasNote (region, group, note, false) {}
+
+       double point_vfunc(double, double, int, int, GnomeCanvasItem**) {
+               /* return a huge value to tell the canvas that we're never the item for an event */
+               return 9999999999999.0;
        }
 };