fix #1637 (needs merging to 2.0.1 branch); remove debug printf

[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 37b98b33c3fa2e033f3e02f990cffc5403c8ab4b..45725038d1f81ff339c14ec8b9eef664287d39b4 100644 (file)
--- 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 <gtkmm.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 ;
@@ -71,7 +75,7 @@ class ImageFrameTimeAxisView : public sigc::trackable
                /**
                 *
                 */
-               GtkCanvasItem* canvas_item() { return canvas_group; }
+               ArdourCanvas::Group * canvas_item() { return &canvas_group; }
                
                
                //---------------------------------------------------------------------------------------//
@@ -112,7 +116,7 @@ class ImageFrameTimeAxisView : public sigc::trackable
                 *
                 * @param color the new base color
                 */
-               void apply_color (GdkColor&) ;
+               void apply_color (Gdk::Color&) ;
                
                //---------------------------------------------------------------------------------------//
                // Child ImageFrameTimeAxisGroup Accessors/Mutators
@@ -256,14 +260,14 @@ class ImageFrameTimeAxisView : public sigc::trackable
                /* 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 */