X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fcanvas-flag.cc;h=1a85cc9644dd2a266f4baaf6b845b17caf11aa45;hb=74385f96428536c4d71f0b9fb88ffdda691ebc89;hp=186790ff1fb3d8d7ce24e11cea983a29241ce34e;hpb=5182f0770cca50cbb7c8fe419b2e64af02525553;p=ardour.git

diff --git a/gtk2_ardour/canvas-flag.cc b/gtk2_ardour/canvas-flag.cc
index 186790ff1f..1a85cc9644 100644
--- a/gtk2_ardour/canvas-flag.cc
+++ b/gtk2_ardour/canvas-flag.cc
@@ -12,17 +12,17 @@ CanvasFlag::CanvasFlag (MidiRegionView& region,
                         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)
+	: 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));
+	/* 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
@@ -43,7 +43,7 @@ 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, std::string(a_text));
 	_text->property_justification() = Gtk::JUSTIFY_CENTER;
 	_text->property_fill_color_rgba() = _outline_color_rgba;
 	double flagwidth  = _text->property_text_width()  + 10.0;
@@ -58,9 +58,9 @@ CanvasFlag::set_text(const string& a_text)
 	_rect->property_fill_color_rgba() = _fill_color_rgba;
 	_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));
+	/* 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()
@@ -71,18 +71,18 @@ CanvasFlag::~CanvasFlag()
 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.
-        */
+	/* XXX if you change this function to actually do anything, be sure
+	   to fix the connections commented out elsewhere in this file.
+	*/
 	return false;
 }
 
 void
 CanvasFlag::set_height (double h)
 {
-        _height = h;
+	_height = h;
 
-        if (_line) {
-                _line->property_y2() = _height;
-        }
+	if (_line) {
+		_line->property_y2() = _height;
+	}
 }