X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fimageframe_time_axis_view.h;h=45725038d1f81ff339c14ec8b9eef664287d39b4;hb=185be4e841e182bbe7cb7820f9cb6371ebebe15d;hp=41c111fdc2ade19c4e20a41c52c7e4f9c7e6629a;hpb=209d967b1bb80a9735d690d8f4f0455ecb9970ca;p=ardour.git

diff --git a/gtk2_ardour/imageframe_time_axis_view.h b/gtk2_ardour/imageframe_time_axis_view.h
index 41c111fdc2..45725038d1 100644
--- a/gtk2_ardour/imageframe_time_axis_view.h
+++ b/gtk2_ardour/imageframe_time_axis_view.h
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #ifndef __ardour_imageframe_time_axis_view_h__
@@ -24,10 +23,15 @@
 #include <list>
 #include <cmath>
 
-#include <gtk--.h>
-#include <gtk-canvas.h>
+#include <gdkmm/color.h>
+
 #include <jack/jack.h>
 
+#include <libgnomecanvasmm.h>
+#include "canvas.h"
+#include "simplerect.h"
+
+
 class PublicEditor ;
 class ImageFrameTimeAxis ;
 class ImageFrameView ;
@@ -39,7 +43,7 @@ class ImageFrameTimeAxisGroup ;
  * maintains the list of items that have been added to it
  *
  */
-class ImageFrameTimeAxisView : public SigC::Object
+class ImageFrameTimeAxisView : public sigc::trackable
 {
 	public:
 		//---------------------------------------------------------------------------------------//
@@ -71,7 +75,7 @@ class ImageFrameTimeAxisView : public SigC::Object
 		/**
 		 *
 		 */
-		GtkCanvasItem* canvas_item() { return canvas_group; }
+		ArdourCanvas::Group * canvas_item() { return &canvas_group; }
 		
 		
 		//---------------------------------------------------------------------------------------//
@@ -112,7 +116,7 @@ class ImageFrameTimeAxisView : public SigC::Object
 		 *
 		 * @param color the new base color
 		 */
-		void apply_color (GdkColor&) ;
+		void apply_color (Gdk::Color&) ;
 		
 		//---------------------------------------------------------------------------------------//
 		// Child ImageFrameTimeAxisGroup Accessors/Mutators
@@ -222,10 +226,10 @@ class ImageFrameTimeAxisView : public SigC::Object
 		// Emitted Signals
 		
 		/** Emitted when and ImageFrameGroup is added to this time axis */
-		SigC::Signal2<void,ImageFrameTimeAxisGroup*,void*> ImageFrameGroupAdded ;
+		sigc::signal<void,ImageFrameTimeAxisGroup*,void*> ImageFrameGroupAdded ;
 		
 		/** Emitted when an ImageFrameGroup is removed from this time axis */
-		SigC::Signal2<void,std::string,void*> ImageFrameGroupRemoved ;
+		sigc::signal<void,std::string,void*> ImageFrameGroupRemoved ;
 		
 	protected:
 
@@ -256,14 +260,14 @@ class ImageFrameTimeAxisView : public SigC::Object
 		/* the TimeAxisView that this object is acting as the view helper for */
 		ImageFrameTimeAxis& _trackview ;
 		
-		GtkCanvasItem *canvas_group ;
-		GtkCanvasItem *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 ;
 		
 		/* XXX why are these different? */
-		GdkColor region_color ;
+		Gdk::Color region_color ;
 		uint32_t stream_base_color ;
 		
 } ; /* class ImageFrameTimeAxisView */