shared_ptr fixes

[ardour.git] / gtk2_ardour / imageframe_time_axis_view.h

diff --git a/gtk2_ardour/imageframe_time_axis_view.h b/gtk2_ardour/imageframe_time_axis_view.h
index 41c111fdc2ade19c4e20a41c52c7e4f9c7e6629a..d51901d4e08ee4358702f4daa0ea7eb5b3e40e30 100644 (file)
--- a/gtk2_ardour/imageframe_time_axis_view.h
+++ b/gtk2_ardour/imageframe_time_axis_view.h
@@ -24,10 +24,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 +44,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 +76,7 @@ class ImageFrameTimeAxisView : public SigC::Object
                /**
                 *
                 */
-               GtkCanvasItem* canvas_item() { return canvas_group; }
+               ArdourCanvas::Group * canvas_item() { return &canvas_group; }
                
                
                //---------------------------------------------------------------------------------------//
@@ -112,7 +117,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 +227,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 +261,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 */