X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmarker_time_axis.h;h=e321fe40031b51c5085758261568ae189307ac6a;hb=ca49f7cba731bd443c4a62184c8dec892b4ce5e7;hp=a46025cd19256f10ffcd5dc67ea36f9f0e4ccf82;hpb=209d967b1bb80a9735d690d8f4f0455ecb9970ca;p=ardour.git

diff --git a/gtk2_ardour/marker_time_axis.h b/gtk2_ardour/marker_time_axis.h
index a46025cd19..e321fe4003 100644
--- a/gtk2_ardour/marker_time_axis.h
+++ b/gtk2_ardour/marker_time_axis.h
@@ -21,19 +21,22 @@
 #ifndef __ardour_marker_time_axis_h__
 #define __ardour_marker_time_axis_h__
 
-#include <gtk--.h>
-#include <gtk-canvas.h>
+#include <string>
+#include <libgnomecanvas/libgnomecanvas.h>
 
 #include "ardour_dialog.h"
 #include "route_ui.h"
 #include "enums.h"
 #include "time_axis_view.h"
-#include <string>
+#include "canvas.h"
 #include "visual_time_axis.h"
 
 namespace ARDOUR {
 	class Session;
 }
+namespace ARDOUR {
+	class Menu;
+}
 
 class PublicEditor;
 class ImageFrameView ;
@@ -63,7 +66,7 @@ class MarkerTimeAxis : public VisualTimeAxis
 		 * @param name the name/id of this time axis
 		 * @param tav the associated track view that this MarkerTimeAxis is marking up
 		 */
-		MarkerTimeAxis(PublicEditor& ed, ARDOUR::Session& sess, Gtk::Widget* canvas, std::string name, TimeAxisView* tav) ;
+		MarkerTimeAxis(PublicEditor& ed, ARDOUR::Session& sess, ArdourCanvas::Canvas& canvas, const string & name, TimeAxisView* tav) ;
 		
 		/**
 		 * Destructor
@@ -120,13 +123,6 @@ class MarkerTimeAxis : public VisualTimeAxis
 		TimeAxisView* get_marked_time_axis() ;
 
 
-	protected:
-	
-		/**
-		 * Handle the closing of the renaming dialog during the rename of this item
-		 */
-		virtual void finish_route_rename() ;
-
 	private:
 	
 		/**