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

1 files changed, 11 insertions, 21 deletions

diff --git a/gtk2_ardour/canvas-flag.h b/gtk2_ardour/canvas-flag.h
index 781430f8e4..5892358491 100644
--- a/gtk2_ardour/canvas-flag.h
+++ b/gtk2_ardour/canvas-flag.h
@@ -4,38 +4,28 @@
 #include <string>
 #include <libgnomecanvasmm/group.h>
 #include <libgnomecanvasmm/widget.h>
+#include <libgnomecanvasmm/text.h>
 
 #include "ardour/midi_model.h"
 
 #include "simplerect.h"
 #include "simpleline.h"
-#include "interactive-item.h"
 
 class MidiRegionView;
 
 namespace Gnome {
 namespace Canvas {
 
-class CanvasFlag : public Group, public InteractiveItem
+class CanvasFlag : public Group
 {
 public:
-	CanvasFlag(
-			MidiRegionView& region,
-			Group&          parent,
-			double          height,
-			guint           outline_color_rgba = 0xc0c0c0ff,
-			guint           fill_color_rgba = 0x07070707,
-			double          x = 0.0,
-			double          y = 0.0)
-		: Group(parent, x, y)
-		, _text(0)
-		, _height(height)
-		, _outline_color_rgba(outline_color_rgba)
-		, _fill_color_rgba(fill_color_rgba)
-		, _region(region)
-		, _line(0)
-		, _rect(0)
-	{}
+	CanvasFlag(MidiRegionView& region,
+                   Group&          parent,
+                   double          height,
+                   guint           outline_color_rgba = 0xc0c0c0ff,
+                   guint           fill_color_rgba = 0x07070707,
+                   double          x = 0.0,
+                   double          y = 0.0);
 
 	virtual ~CanvasFlag();
 
@@ -44,7 +34,7 @@ public:
 	void set_text(const std::string& a_text);
 
 protected:
-	InteractiveText* _text;
+	Text*            _text;
 	double           _height;
 	guint            _outline_color_rgba;
 	guint            _fill_color_rgba;
@@ -54,7 +44,7 @@ private:
 	void delete_allocated_objects();
 
 	SimpleLine*      _line;
-	InteractiveRect* _rect;
+	SimpleRect*      _rect;
 };