X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fcanvas-flag.cc;h=ad75c28fdf77afb6e1e766713016f8a3ed79620e;hb=5b520324ceab2559723b4ef5127301fa61ff4846;hp=c40bf456483d5d65e0235fa513ef9c88b6aac1e2;hpb=30daaebaa2d90d6b0e8673143ccc3cacd7bd1753;p=ardour.git

diff --git a/gtk2_ardour/canvas-flag.cc b/gtk2_ardour/canvas-flag.cc
index c40bf45648..ad75c28fdf 100644
--- a/gtk2_ardour/canvas-flag.cc
+++ b/gtk2_ardour/canvas-flag.cc
@@ -5,32 +5,45 @@
 using namespace Gnome::Canvas;
 using namespace std;
 
+CanvasFlag::CanvasFlag (MidiRegionView& region,
+                        Group&          parent,
+                        double          height,
+                        guint           outline_color_rgba,
+                        guint           fill_color_rgba,
+                        double          x,
+                        double          y)
+        : 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)
+{
+        /* XXX this connection is needed if ::on_event() is changed to actually do anything */
+        signal_event().connect (sigc::mem_fun (*this, &CanvasFlag::on_event));
+}
 
-void 
+void
 CanvasFlag::delete_allocated_objects()
 {
-	if (_text) {
-		delete _text;
-		_text = 0;
-	}
-	
-	if (_line) {
-		delete _line;
-		_line = 0;
-	}
-	
-	if (_rect) {
-		delete _rect;
-		_rect = 0;
-	}
+	delete _text;
+	_text = 0;
+
+	delete _line;
+	_line = 0;
+
+	delete _rect;
+	_rect = 0;
 }
 
-void 
-CanvasFlag::set_text(string& a_text)
+void
+CanvasFlag::set_text(const string& a_text)
 {
 	delete_allocated_objects();
-	
-	_text = new Text(*this, 0.0, 0.0, Glib::ustring(a_text));
+
+	_text = new Text (*this, 0.0, 0.0, Glib::ustring(a_text));
 	_text->property_justification() = Gtk::JUSTIFY_CENTER;
 	_text->property_fill_color_rgba() = _outline_color_rgba;
 	double flagwidth  = _text->property_text_width()  + 10.0;
@@ -43,8 +56,11 @@ CanvasFlag::set_text(string& a_text)
 	_rect = new SimpleRect(*this, 0.0, 0.0, flagwidth, flagheight);
 	_rect->property_outline_color_rgba() = _outline_color_rgba;
 	_rect->property_fill_color_rgba() = _fill_color_rgba;
-	_text->lower_to_bottom();
-	_text->raise(2);	
+	_text->raise_to_top();
+
+        /* XXX these two connections are needed if ::on_event() is changed to actually do anything */
+        //_rect->signal_event().connect (sigc::mem_fun (*this, &CanvasFlag::on_event));
+        //_text->signal_event().connect (sigc::mem_fun (*this, &CanvasFlag::on_event));
 }
 
 CanvasFlag::~CanvasFlag()
@@ -52,3 +68,11 @@ CanvasFlag::~CanvasFlag()
 	delete_allocated_objects();
 }
 
+bool
+CanvasFlag::on_event(GdkEvent* /*ev*/)
+{
+        /* XXX if you change this function to actually do anything, be sure
+           to fix the connections commented out elsewhere in this file.
+        */
+	return false;
+}