Switched to use libgnomecanvas (not the C++ one).

git-svn-id: svn://localhost/trunk/ardour2@30 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 17 insertions, 17 deletions

diff --git a/gtk2_ardour/automation_line.h b/gtk2_ardour/automation_line.h
index 48658b2ecb..7984381fde 100644
--- a/gtk2_ardour/automation_line.h
+++ b/gtk2_ardour/automation_line.h
@@ -27,7 +27,7 @@
 #include <sys/types.h>
 
 #include <gtkmm.h>
-#include <gtk-canvas.h>
+#include <libgnomecanvas/libgnomecanvas.h>
 #include <sigc++/signal.h>
 
 #include <pbd/undo.h>
@@ -48,7 +48,7 @@ class Selection;
 class ControlPoint 
 {
   public:
-	ControlPoint (AutomationLine& al, gint (*event_handler)(GtkCanvasItem*, GdkEvent*, gpointer));
+	ControlPoint (AutomationLine& al, gint (*event_handler)(GnomeCanvasItem*, GdkEvent*, gpointer));
 	ControlPoint (const ControlPoint&, bool dummy_arg_to_force_special_copy_constructor);
 	~ControlPoint ();
 
@@ -70,7 +70,7 @@ class ControlPoint
 	void set_size (double);
 	void set_visible (bool);
 
-	GtkCanvasItem* item;
+	GnomeCanvasItem* item;
 	AutomationLine& line;
 	uint32_t view_index;
 	ARDOUR::AutomationList::iterator model;
@@ -87,9 +87,9 @@ class ControlPoint
 class AutomationLine : public sigc::trackable
 {
   public:
-	AutomationLine (string name, TimeAxisView&, GtkCanvasItem *, ARDOUR::AutomationList&,
-			gint (*point_event_handler)(GtkCanvasItem*, GdkEvent*, gpointer),
-			gint (*line_event_handler)(GtkCanvasItem*, GdkEvent*, gpointer));
+	AutomationLine (string name, TimeAxisView&, GnomeCanvasItem *, ARDOUR::AutomationList&,
+			gint (*point_event_handler)(GnomeCanvasItem*, GdkEvent*, gpointer),
+			gint (*line_event_handler)(GnomeCanvasItem*, GdkEvent*, gpointer));
 
 	virtual ~AutomationLine ();
 
@@ -130,17 +130,17 @@ class AutomationLine : public sigc::trackable
 
 	TimeAxisView& trackview;
 
-	GtkCanvasGroup* canvas_group() const { return GTK_CANVAS_GROUP(group); }
-	GtkCanvasItem*  parent_group() const { return _parent_group; }
-	GtkCanvasItem*  grab_item() const { return line; }
+	GnomeCanvasGroup* canvas_group() const { return GNOME_CANVAS_GROUP(group); }
+	GnomeCanvasItem*  parent_group() const { return _parent_group; }
+	GnomeCanvasItem*  grab_item() const { return line; }
 
 	void show_selection();
 	void hide_selection ();
 
 	void set_point_size (double size);
 
-	static void invalidate_point (GtkCanvasPoints*, uint32_t index);
-	static bool invalid_point (GtkCanvasPoints*, uint32_t index);
+	static void invalidate_point (GnomeCanvasPoints*, uint32_t index);
+	static bool invalid_point (GnomeCanvasPoints*, uint32_t index);
 	
 	virtual string  get_verbose_cursor_string (float);
 	virtual void view_to_model_y (double&) = 0;
@@ -167,15 +167,15 @@ class AutomationLine : public sigc::trackable
 	bool    no_draw : 1;
 	bool    points_visible : 1;
 	
-	GtkCanvasItem*  _parent_group;
-	GtkCanvasItem*   group;
-	GtkCanvasItem*   line; /* line */
-	GtkCanvasPoints* point_coords; /* coordinates for canvas line */
+	GnomeCanvasItem*  _parent_group;
+	GnomeCanvasItem*   group;
+	GnomeCanvasItem*   line; /* line */
+	GnomeCanvasPoints* point_coords; /* coordinates for canvas line */
 	vector<ControlPoint*> control_points; /* visible control points */
 
-	gint   (*point_callback)(GtkCanvasItem*, GdkEvent*, gpointer);
+	gint   (*point_callback)(GnomeCanvasItem*, GdkEvent*, gpointer);
 
-	void determine_visible_control_points (GtkCanvasPoints*);
+	void determine_visible_control_points (GnomeCanvasPoints*);
 	void sync_model_from (ControlPoint&);
 	void sync_model_with_view_point (ControlPoint&);
 	void sync_model_with_view_line (uint32_t, uint32_t);