run bundle fixup code for all platforms

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

diff --git a/gtk2_ardour/canvas-flag.h b/gtk2_ardour/canvas-flag.h
index 781430f8e4b1257b29a3dc38a6255645f9baa02e..ef78221803a5eb120122441d64fb802320184533 100644 (file)
--- a/gtk2_ardour/canvas-flag.h
+++ b/gtk2_ardour/canvas-flag.h
@@ -4,47 +4,38 @@
 #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();
 
        virtual bool on_event(GdkEvent* ev);
 
-       void set_text(const std::string& a_text);
+       virtual void set_text(const std::string& a_text);
+        virtual void set_height (double);
 
 protected:
-       InteractiveText* _text;
+       Text*            _text;
        double           _height;
        guint            _outline_color_rgba;
        guint            _fill_color_rgba;
@@ -54,7 +45,7 @@ private:
        void delete_allocated_objects();
 
        SimpleLine*      _line;
-       InteractiveRect* _rect;
+       SimpleRect*      _rect;
 };