Gnome::Canvas -> ArdourCanvas and some other small fixes

[ardour.git] / gtk2_ardour / marker_view.h

diff --git a/gtk2_ardour/marker_view.h b/gtk2_ardour/marker_view.h
index 1c69bdb334752cacdd5ada95d8f23866c854e877..a3e7dc3feac2d81cffa63276dfc80fd1a9113312 100644 (file)
--- a/gtk2_ardour/marker_view.h
+++ b/gtk2_ardour/marker_view.h
@@ -23,9 +23,10 @@
 
 #include <string>
 #include <gtkmm.h>
-#include <gtk-canvas.h>
 #include "time_axis_view_item.h"
 
+#include "canvas.h"
+
 class MarkerTimeAxisView ;
 class ImageFrameView ;
 
@@ -54,11 +55,11 @@ class MarkerView : public TimeAxisViewItem
                 * @param start the start time of this item
                 * @param duration the duration of this item
                 */
-               MarkerView(GtkCanvasGroup *parent,
+                 MarkerView(ArdourCanvas::Group *parent,
                        TimeAxisView *tv,
                        ImageFrameView* marked,
                        double spu,
-                       GdkColor& base_color,
+                       Gdk::Color& base_color,
                        std::string mark_type,
                        std::string mark_id,
                        jack_nframes_t start,