some C++-ification of GnomeCanvasBlah

git-svn-id: svn://localhost/trunk/ardour2@82 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 19 insertions, 20 deletions

diff --git a/gtk2_ardour/ghostregion.cc b/gtk2_ardour/ghostregion.cc
index 32c25b74cc..f6a081ca35 100644
--- a/gtk2_ardour/ghostregion.cc
+++ b/gtk2_ardour/ghostregion.cc
@@ -8,23 +8,23 @@ using namespace Editing;
 GhostRegion::GhostRegion (AutomationTimeAxisView& atv, double initial_pos)
 	: trackview (atv)
 {
-	group = gnome_canvas_item_new (GNOME_CANVAS_GROUP(trackview.canvas_display),
-				     gnome_canvas_group_get_type(),
-				     "x", initial_pos,
-				     "y", 0.0,
-				     NULL);
+  //group = gnome_canvas_item_new (GNOME_CANVAS_GROUP(trackview.canvas_display),
+  //			     gnome_canvas_group_get_type(),
+  //			     "x", initial_pos,
+  //			     "y", 0.0,
+  //			     NULL);
+	group = new Gnome::Canvas::Group (*trackview.canvas_display);
+	group->set_property ("x", initial_pos);
+	group->set_property ("y", 0.0);
 
-	base_rect = gnome_canvas_item_new (GNOME_CANVAS_GROUP(group),
-					 gnome_canvas_simplerect_get_type(),
-					 "x1", (double) 0.0,
-					 "y1", (double) 0.0,
-					 "y2", (double) trackview.height,
-					 "outline_what", (guint32) 0,
-					 "outline_color_rgba", color_map[cGhostTrackBaseOutline],
-					 "fill_color_rgba", color_map[cGhostTrackBaseFill],
-					 NULL);
-
-	gnome_canvas_item_lower_to_bottom (group);
+	base_rect = new Gnome::Canvas::SimpleRect (*group);
+	base_rect->set_property ("x1", (double) 0.0);
+	base_rect->set_property ("y1", (double) 0.0);
+	base_rect->set_property ("y2", (double) trackview.height);
+	base_rect->set_property ("outline_what", (guint32) 0);
+	base_rect->set_property ("outline_color_rgba", color_map[cGhostTrackBaseOutline]);
+	base_rect->set_property ("fill_color_rgba", color_map[cGhostTrackBaseFill]);
+	group->lower_to_bottom ();
 
 	atv.add_ghost (this);
 }
@@ -39,14 +39,14 @@ void
 GhostRegion::set_samples_per_unit (double spu)
 {
 	for (vector<GnomeCanvasItem*>::iterator i = waves.begin(); i != waves.end(); ++i) {
-		gnome_canvas_item_set ((*i), "samples_per_unit", spu, NULL);
+	        gnome_canvas_item_set ((*i), "samples_per_unit", spu, NULL);
 	}		
 }
 
 void
 GhostRegion::set_duration (double units)
 {
-	gnome_canvas_item_set (base_rect, "x2", units, NULL);
+        base_rect->set_property ("x2", units);
 }
 
 void
@@ -56,8 +56,7 @@ GhostRegion::set_height ()
 	vector<GnomeCanvasItem*>::iterator i;
 	uint32_t n;
 
-	gnome_canvas_item_set (base_rect, "y2", (double) trackview.height, NULL);
-
+	base_rect->set_property ("y2", (double) trackview.height);
 	ht = ((trackview.height) / (double) waves.size());
 	
 	for (n = 0, i = waves.begin(); i != waves.end(); ++i, ++n) {