X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftime_axis_view.h;h=1b132322e422527abb36cfc32f615c4e3330701f;hb=b1a99f89da52018d3995592eb821f8e4a3c89a28;hp=17d687c6c2a77a8ed47dfb699a81be6fad764b5a;hpb=ab91bcfdace8f4c3e76de3a9ffbfff93102997fb;p=ardour.git

diff --git a/gtk2_ardour/time_axis_view.h b/gtk2_ardour/time_axis_view.h
index 17d687c6c2..1b132322e4 100644
--- a/gtk2_ardour/time_axis_view.h
+++ b/gtk2_ardour/time_axis_view.h
@@ -24,9 +24,12 @@
 #include <vector>
 #include <list>
 
-#include <gtkmm.h>
-#include <libgnomecanvasmm/group.h>
-#include <libgnomecanvasmm/canvas.h>
+#include <gtkmm/box.h>
+#include <gtkmm/frame.h>
+#include <gtkmm/eventbox.h>
+#include <gtkmm/table.h>
+#include <gtkmm/entry.h>
+#include <gtkmm/label.h>
 
 #include <ardour/types.h>
 #include <ardour/region.h>
@@ -35,6 +38,7 @@
 #include "axis_view.h"
 #include "enums.h"
 #include "editing.h"
+#include "canvas.h"
 
 namespace ARDOUR {
 	class Session;
@@ -44,6 +48,10 @@ namespace ARDOUR {
 	class Playlist;
 }
 
+namespace Gtk {
+	class Menu;
+}
+
 class PublicEditor;
 class AudioRegionSelection;
 class TimeSelection;
@@ -75,7 +83,7 @@ class TimeAxisView : public virtual AxisView
 		Small = 21
 	};
 
-	TimeAxisView(ARDOUR::Session& sess, PublicEditor& ed, TimeAxisView* parent, Gnome::Canvas::Canvas& canvas);
+	TimeAxisView(ARDOUR::Session& sess, PublicEditor& ed, TimeAxisView* parent, ArdourCanvas::Canvas& canvas);
 	virtual ~TimeAxisView ();
 
 	/* public data: XXX create accessor/mutators for these ?? */
@@ -88,7 +96,7 @@ class TimeAxisView : public virtual AxisView
 	int     order;
 
 	
-	Gnome::Canvas::Group   *canvas_display;
+	ArdourCanvas::Group   *canvas_display;
  	Gtk::VBox       *control_parent;
 
 	/* The Standard LHS Controls */
@@ -169,7 +177,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 +238,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 +281,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;