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

1 files changed, 5 insertions, 7 deletions

diff --git a/gtk2_ardour/enums.h b/gtk2_ardour/enums.h
index 680421e271..aa789a634c 100644
--- a/gtk2_ardour/enums.h
+++ b/gtk2_ardour/enums.h
@@ -27,10 +27,8 @@ enum Width {
 	Narrow,
 };
 
-namespace Gnome {
-	namespace Canvas {
-		class SimpleRect;
-	}
+namespace ArdourCanvas {
+	class Rectangle;
 }
 
 enum LayerDisplay {
@@ -40,9 +38,9 @@ enum LayerDisplay {
 };
 
 struct SelectionRect {
-    Gnome::Canvas::SimpleRect *rect;
-    Gnome::Canvas::SimpleRect *end_trim;
-    Gnome::Canvas::SimpleRect *start_trim;
+    ArdourCanvas::Rectangle *rect;
+    ArdourCanvas::Rectangle *end_trim;
+    ArdourCanvas::Rectangle *start_trim;
     uint32_t id;
 };