Create and make default the new rc file ardour2_ui.rc, with new font definitions

[ardour.git] / gtk2_ardour / marker_time_axis_view.h

diff --git a/gtk2_ardour/marker_time_axis_view.h b/gtk2_ardour/marker_time_axis_view.h
index 5d3f76ad8ec3bc06a2efdc665a5bce5c8fccf02b..1dd742a4591060f8e63a43b755b57014afab5924 100644 (file)
--- a/gtk2_ardour/marker_time_axis_view.h
+++ b/gtk2_ardour/marker_time_axis_view.h
@@ -22,13 +22,12 @@
 #define __ardour_marker_time_axis_view_h__
 
 #include <list>
-
-#include <gtkmm.h>
+#include <gdkmm/color.h>
 #include <libgnomecanvasmm/group.h>
-#include <libgnomecanvasmm/canvas.h>
 
 #include <ardour/location.h>
 #include "simplerect.h"
+#include "canvas.h"
 
 class PublicEditor;
 class MarkerTimeAxis;
@@ -75,7 +74,7 @@ class MarkerTimeAxisView : public sigc::trackable
                /**
                 *
                 */
-               Gnome::Canvas::Item *canvas_item() { return canvas_group; }
+               ArdourCanvas::Item *canvas_item() { return canvas_group; }
                
                
                //---------------------------------------------------------------------------------------//
@@ -226,8 +225,8 @@ class MarkerTimeAxisView : public sigc::trackable
                /* the TimeAxisView that this object is acting as the view helper for */
                MarkerTimeAxis& _trackview ;
                
-               Gnome::Canvas::Group *canvas_group ;
-               Gnome::Canvas::SimpleRect *canvas_rect ; /* frame around the whole thing */
+               ArdourCanvas::Group *canvas_group ;
+               ArdourCanvas::SimpleRect *canvas_rect ; /* frame around the whole thing */
 
                /** the current samples per unit */
                double _samples_per_unit;