convert property_foo().set_value(bar) to property_foo() = bar

[ardour.git] / gtk2_ardour / marker_time_axis_view.cc

diff --git a/gtk2_ardour/marker_time_axis_view.cc b/gtk2_ardour/marker_time_axis_view.cc
index 60216290f451a0226b2ea62afb4e4f9afebf70f5..c1374c4f962f5c0cfe4cf66bd360d46edf9b84e7 100644 (file)
--- a/gtk2_ardour/marker_time_axis_view.cc
+++ b/gtk2_ardour/marker_time_axis_view.cc
@@ -52,19 +52,19 @@ MarkerTimeAxisView::MarkerTimeAxisView(MarkerTimeAxis& tv)
        region_color = _trackview.color();
        stream_base_color = color_map[cMarkerTrackBase];
 
-       canvas_group = gnome_canvas_item_new (GNOME_CANVAS_GROUP(_trackview.canvas_display), gnome_canvas_group_get_type (), 0);
-
-       canvas_rect = gnome_canvas_item_new (GNOME_CANVAS_GROUP(canvas_group),
-               gnome_canvas_simplerect_get_type(),
-               "x1", 0.0,
-               "y1", 0.0,
-               "x2", 1000000.0,
-               "y2", (double)20,
-               "outline_color_rgba", color_map[cMarkerTrackOutline],
-               "fill_color_rgba", stream_base_color,
-               0) ;
-                                          
-       gtk_signal_connect(GTK_OBJECT(canvas_rect), "event", (GtkSignalFunc)PublicEditor::canvas_marker_time_axis_view_event, &_trackview) ;
+       //GTK2FIX -- how to get the group? is the canvas display really a group?
+       //canvas_group = gnome_canvas_item_new (GNOME_CANVAS_GROUP(_trackview.canvas_display), gnome_canvas_group_get_type (), 0);
+       canvas_group = new ArdourCanvas::Group (*_trackview.canvas_display);
+
+       canvas_rect =  new ArdourCanvas::SimpleRect (*canvas_group);
+       canvas_rect->set_property ("x1", 0.0);
+       canvas_rect->set_property ("y1", 0.0);
+       canvas_rect->set_property ("x2", 1000000.0);
+       canvas_rect->set_property ("y2", (double)20);
+       canvas_rect->set_property ("outline_color_rgba", color_map[cMarkerTrackOutline]);
+       canvas_rect->set_property ("fill_color_rgba", stream_base_color);
+                  
+       canvas_rect->signal_event().connect (bind (mem_fun (_trackview.editor, &PublicEditor::canvas_marker_time_axis_view_event), canvas_rect, &_trackview));
 
        _samples_per_unit = _trackview.editor.get_current_zoom() ;
 
@@ -142,7 +142,8 @@ MarkerTimeAxisView::set_height(gdouble h)
 int
 MarkerTimeAxisView::set_position(gdouble x, gdouble y)
 {
-       gnome_canvas_item_set (canvas_group, "x", x, "y", y, NULL);
+       canvas_group->set_property ("x", x);
+       canvas_group->set_property ("y", y);
        return 0;
 }
 
@@ -174,7 +175,7 @@ MarkerTimeAxisView::set_samples_per_unit(gdouble spp)
  * @param color the new base color
  */
 void
-MarkerTimeAxisView::apply_color(GdkColor& color)
+MarkerTimeAxisView::apply_color(Gdk::Color& color)
 {
        region_color = color;
 
@@ -207,7 +208,7 @@ MarkerTimeAxisView::add_marker_view(ImageFrameView* ifv, std::string mark_type,
                return(0) ;
        }
        
-       MarkerView* mv = new MarkerView(GNOME_CANVAS_GROUP(canvas_group),
+       MarkerView* mv = new MarkerView(canvas_group,
                 &_trackview,
                 ifv,
                 _trackview.editor.get_current_zoom(),