initial commit of hand merging, plus getting "ancient" waf script to work correctly

1 files changed, 7 insertions, 4 deletions

diff --git a/gtk2_ardour/utils.h b/gtk2_ardour/utils.h
index 7137f273c6..6296ea548b 100644
--- a/gtk2_ardour/utils.h
+++ b/gtk2_ardour/utils.h
@@ -23,12 +23,13 @@
 #include <string>
 #include <cmath>
 #include <vector>
+
 #include "ardour/types.h"
-#include <libgnomecanvasmm/line.h>
+
 #include <gdkmm/types.h>
 #include <gtkmm/menushell.h>
 
-#include "canvas.h"
+#include "canvas/types.h"
 
 namespace PBD {
         class Controllable;
@@ -42,6 +43,10 @@ namespace Gtk {
         class Adjustment;
 }
 
+namespace ArdourCanvas {
+	class Item;
+}
+
 extern sigc::signal<void>  DPIReset;
 
 gint   just_hide_it (GdkEventAny*, Gtk::Window*);
@@ -58,8 +63,6 @@ uint32_t rgba_from_style (std::string, uint32_t, uint32_t, uint32_t, uint32_t, s
 
 void decorate (Gtk::Window& w, Gdk::WMDecoration d);
 
-bool canvas_item_visible (ArdourCanvas::Item* item);
-
 void set_color (Gdk::Color&, int);
 
 bool relay_key_press (GdkEventKey* ev, Gtk::Window* win);