X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftime_axis_view.h;h=59bb6c58eaac4227df7e182a7539e2f38808bb9d;hb=aaa44a37aaf585b9bcd9268a9551a005e6269bdb;hp=d422b289707141c2a383462764351d742d552fbb;hpb=183f69970c6c436b102f8b2fbe1bc6070c9e9bfe;p=ardour.git

diff --git a/gtk2_ardour/time_axis_view.h b/gtk2_ardour/time_axis_view.h
index d422b28970..59bb6c58ea 100644
--- a/gtk2_ardour/time_axis_view.h
+++ b/gtk2_ardour/time_axis_view.h
@@ -25,8 +25,6 @@
 #include <list>
 
 #include <gtkmm.h>
-#include <libgnomecanvasmm/group.h>
-#include <libgnomecanvasmm/canvas.h>
 
 #include <ardour/types.h>
 #include <ardour/region.h>
@@ -35,6 +33,7 @@
 #include "axis_view.h"
 #include "enums.h"
 #include "editing.h"
+#include "canvas.h"
 
 namespace ARDOUR {
 	class Session;
@@ -75,7 +74,7 @@ class TimeAxisView : public virtual AxisView
 		Small = 21
 	};
 
-	TimeAxisView(ARDOUR::Session& sess, PublicEditor& ed, TimeAxisView* parent, Gtk::Widget *canvas);
+	TimeAxisView(ARDOUR::Session& sess, PublicEditor& ed, TimeAxisView* parent, ArdourCanvas::Canvas& canvas);
 	virtual ~TimeAxisView ();
 
 	/* public data: XXX create accessor/mutators for these ?? */
@@ -88,7 +87,7 @@ class TimeAxisView : public virtual AxisView
 	int     order;
 
 	
-	Gnome::Canvas::Item   *canvas_display;
+	ArdourCanvas::Group   *canvas_display;
  	Gtk::VBox       *control_parent;
 
 	/* The Standard LHS Controls */
@@ -169,7 +168,7 @@ class TimeAxisView : public virtual AxisView
 		return 0;
 	}
 
-  	void order_selection_trims (Gnome::Canvas::Item *item, bool put_start_on_top);
+  	void order_selection_trims (ArdourCanvas::Item *item, bool put_start_on_top);
 
 	virtual void get_selectables (jack_nframes_t start, jack_nframes_t end, double top, double bot, list<Selectable*>& results);
 	virtual void get_inverted_selectables (Selection&, list<Selectable *>& results);
@@ -230,7 +229,7 @@ class TimeAxisView : public virtual AxisView
          * Do anything that needs to be done to dynamically reset
 	 * the LHS control menu.
 	 */
-	virtual gint handle_display_menu_map_event (GdkEventAny *ev) { return FALSE; }
+	virtual bool handle_display_menu_map_event (GdkEventAny *ev) { return false; }
 
 	/**
 	 * Build the standard LHS control size menu for the default TrackHeight options.
@@ -273,7 +272,7 @@ class TimeAxisView : public virtual AxisView
 
 	/* selection display */
 
-	Gnome::Canvas::Group      *selection_group;
+	ArdourCanvas::Group      *selection_group;
 
 	list<SelectionRect*> free_selection_rects;
 	list<SelectionRect*> used_selection_rects;