X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmarker_time_axis_view.h;h=5d3f76ad8ec3bc06a2efdc665a5bce5c8fccf02b;hb=f0416627d63d94cac80e7fc2e0e585b79a8147f0;hp=f611a38f2e6261cac8408fc8592d1eea2fcb9694;hpb=14d43ca9fe28a8309b4a52fa85e2b0c64a92248b;p=ardour.git

diff --git a/gtk2_ardour/marker_time_axis_view.h b/gtk2_ardour/marker_time_axis_view.h
index f611a38f2e..5d3f76ad8e 100644
--- a/gtk2_ardour/marker_time_axis_view.h
+++ b/gtk2_ardour/marker_time_axis_view.h
@@ -24,9 +24,11 @@
 #include <list>
 
 #include <gtkmm.h>
-#include <libgnomecanvas/libgnomecanvas.h>
+#include <libgnomecanvasmm/group.h>
+#include <libgnomecanvasmm/canvas.h>
 
 #include <ardour/location.h>
+#include "simplerect.h"
 
 class PublicEditor;
 class MarkerTimeAxis;
@@ -73,7 +75,7 @@ class MarkerTimeAxisView : public sigc::trackable
 		/**
 		 *
 		 */
-		GnomeCanvasItem *canvas_item() { return canvas_group; }
+		Gnome::Canvas::Item *canvas_item() { return canvas_group; }
 		
 		
 		//---------------------------------------------------------------------------------------//
@@ -114,7 +116,7 @@ class MarkerTimeAxisView : public sigc::trackable
 		 *
 		 * @param color the new base color
 		 */
-		void apply_color(GdkColor& color) ;
+		void apply_color(Gdk::Color& color) ;
 
 		//---------------------------------------------------------------------------------------//
 		// Child MarkerView Accessors/Mutators
@@ -224,14 +226,14 @@ class MarkerTimeAxisView : public sigc::trackable
 		/* the TimeAxisView that this object is acting as the view helper for */
 		MarkerTimeAxis& _trackview ;
 		
-		GnomeCanvasItem *canvas_group ;
-		GnomeCanvasItem *canvas_rect ; /* frame around the whole thing */
+		Gnome::Canvas::Group *canvas_group ;
+		Gnome::Canvas::SimpleRect *canvas_rect ; /* frame around the whole thing */
 
 		/** the current samples per unit */
 		double _samples_per_unit;
 
 		/* XXX why are these different? */
-		GdkColor region_color;
+		Gdk::Color region_color;
 		uint32_t stream_base_color;
 		
 }; /* class MarkerTimeAxisView */