X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fimageframe_time_axis.h;h=cefd0c5d097f44333d42c716e4958e1b5a8a852d;hb=ce6c41c060c700489a9ac9fc5080bf2920c17ae2;hp=e561404716470528a01c070a8293229c93855ff2;hpb=e493b2b7c4fbbbfc457f02babf9546289b430177;p=ardour.git

diff --git a/gtk2_ardour/imageframe_time_axis.h b/gtk2_ardour/imageframe_time_axis.h
index e561404716..cefd0c5d09 100644
--- a/gtk2_ardour/imageframe_time_axis.h
+++ b/gtk2_ardour/imageframe_time_axis.h
@@ -21,19 +21,23 @@
 #ifndef __ardour_imageframe_time_axis_h__
 #define __ardour_imageframe_time_axis_h__
 
-#include <gtkmm.h>
-#include <gtk-canvas.h>
+#include <list>
+
+//#include <libgnomecanvas.h>
 
 #include "ardour_dialog.h"
 #include "enums.h"
 #include "time_axis_view.h"
-#include <list>
+#include "canvas.h"
 #include "visual_time_axis.h"
 
 namespace ARDOUR
 {
 	class Session ;
 }
+namespace Gtk {
+	class Menu;
+}
 
 class PublicEditor ;
 class ImageFrameView ;
@@ -59,7 +63,7 @@ class ImageFrameTimeAxis : public VisualTimeAxis
 		 * @param sess the current session
 		 * @param canvas the parent canvas item
 		 */
-		ImageFrameTimeAxis(std::string track_id, PublicEditor& ed, ARDOUR::Session& sess, Gtk::Widget *canvas) ;
+		ImageFrameTimeAxis(const string & track_id, PublicEditor& ed, ARDOUR::Session& sess, ArdourCanvas::Canvas& canvas) ;
 		
 		/**
 		 * Destructor
@@ -123,7 +127,7 @@ class ImageFrameTimeAxis : public VisualTimeAxis
 		 * @param track_id the track_id of the MarkerTimeAxis to search for
 		 * @return the named markerTimeAxis, or 0 if the named MarkerTimeAxis is not associated with this ImageFrameTimeAxis
 		 */
-		MarkerTimeAxis* get_named_marker_time_axis(std::string track_id) ;
+		MarkerTimeAxis* get_named_marker_time_axis(const string & track_id) ;
 		
 		/**
 		 * Removes the named markerTimeAxis from those associated with this ImageFrameTimeAxis
@@ -132,7 +136,7 @@ class ImageFrameTimeAxis : public VisualTimeAxis
 		 * @param src the identity of the object that initiated the change
 		 * @return the removed MarkerTimeAxis
 		 */
-		MarkerTimeAxis* remove_named_marker_time_axis(std::string track_id, void* src) ;
+		MarkerTimeAxis* remove_named_marker_time_axis(const string & track_id, void* src) ;
 		
 		/**
 		 * Removes tav from the list of MarkerTimaAxis associated with this ImageFrameTimeAxis