Fixed some valgrind errors from using uninitialized variables in

[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 a8e86131cc7e6d40c2f93723adf8f3d714ad4774..1dd742a4591060f8e63a43b755b57014afab5924 100644 (file)
--- a/gtk2_ardour/marker_time_axis_view.h
+++ b/gtk2_ardour/marker_time_axis_view.h
@@ -22,11 +22,12 @@
 #define __ardour_marker_time_axis_view_h__
 
 #include <list>
-
-#include <gtk--.h>
-#include <gtk-canvas.h>
+#include <gdkmm/color.h>
+#include <libgnomecanvasmm/group.h>
 
 #include <ardour/location.h>
+#include "simplerect.h"
+#include "canvas.h"
 
 class PublicEditor;
 class MarkerTimeAxis;
@@ -40,7 +41,7 @@ class TimeAxisViewItem ;
  * This object is responsible for the time axis canvas view, and
  * maintains the list of items that have been added to it 
  */
-class MarkerTimeAxisView : public SigC::Object
+class MarkerTimeAxisView : public sigc::trackable
 {
        public:
                //---------------------------------------------------------------------------------------//
@@ -73,7 +74,7 @@ class MarkerTimeAxisView : public SigC::Object
                /**
                 *
                 */
-               GtkCanvasItem *canvas_item() { return canvas_group; }
+               ArdourCanvas::Item *canvas_item() { return canvas_group; }
                
                
                //---------------------------------------------------------------------------------------//
@@ -114,7 +115,7 @@ class MarkerTimeAxisView : public SigC::Object
                 *
                 * @param color the new base color
                 */
-               void apply_color(GdkColor& color) ;
+               void apply_color(Gdk::Color& color) ;
 
                //---------------------------------------------------------------------------------------//
                // Child MarkerView Accessors/Mutators
@@ -202,10 +203,10 @@ class MarkerTimeAxisView : public SigC::Object
                // Emitted Signals
                
                /** Emitted when a MarkerView is Added */
-               SigC::Signal2<void,MarkerView*,void*> MarkerViewAdded ;
+               sigc::signal<void,MarkerView*,void*> MarkerViewAdded ;
                
                /** Emitted when a MarkerView Item is removed */
-               SigC::Signal2<void,std::string,void*> MarkerViewRemoved ;
+               sigc::signal<void,std::string,void*> MarkerViewRemoved ;
                
        private:
                /**
@@ -224,14 +225,14 @@ class MarkerTimeAxisView : public SigC::Object
                /* the TimeAxisView that this object is acting as the view helper for */
                MarkerTimeAxis& _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 MarkerTimeAxisView */