MacOS [sic] required changes for Rect in Push 2 code

10 files changed, 41 insertions, 4 deletions

diff --git a/libs/surfaces/push2/canvas.cc b/libs/surfaces/push2/canvas.cc
index 611ab60aa1..75fced70b7 100644
--- a/libs/surfaces/push2/canvas.cc
+++ b/libs/surfaces/push2/canvas.cc
@@ -29,6 +29,10 @@
 #include "layout.h"
 #include "push2.h"
 
+#ifdef __APPLE__
+#define Rect ArdourCanvas::Rect
+#endif
+
 using namespace ArdourCanvas;
 using namespace ArdourSurface;
 using namespace PBD;
diff --git a/libs/surfaces/push2/knob.cc b/libs/surfaces/push2/knob.cc
index 77fb58f00d..0b0e893858 100644
--- a/libs/surfaces/push2/knob.cc
+++ b/libs/surfaces/push2/knob.cc
@@ -37,6 +37,10 @@
 
 #include "pbd/i18n.h"
 
+#ifdef __APPLE__
+#define Rect ArdourCanvas::Rect
+#endif
+
 using namespace PBD;
 using namespace ARDOUR;
 using namespace ArdourSurface;
diff --git a/libs/surfaces/push2/layout.cc b/libs/surfaces/push2/layout.cc
index 10ff7a8771..902bf69328 100644
--- a/libs/surfaces/push2/layout.cc
+++ b/libs/surfaces/push2/layout.cc
@@ -20,6 +20,10 @@
 #include "layout.h"
 #include "push2.h"
 
+#ifdef __APPLE__
+#define Rect ArdourCanvas::Rect
+#endif
+
 using namespace ARDOUR;
 using namespace ArdourSurface;
 using namespace ArdourCanvas;
diff --git a/libs/surfaces/push2/menu.cc b/libs/surfaces/push2/menu.cc
index 08715877e0..beefa6816f 100644
--- a/libs/surfaces/push2/menu.cc
+++ b/libs/surfaces/push2/menu.cc
@@ -21,7 +21,10 @@
 #include <cairomm/region.h>
 #include <pangomm/layout.h>
 
+#include "pbd/i18n.h"
+
 #include "canvas/text.h"
+#include "canvas/types.h"
 #include "canvas/rectangle.h"
 #include "canvas/colors.h"
 
@@ -29,6 +32,12 @@
 #include "gui.h"
 #include "push2.h"
 
+#include "menu.h"
+
+#ifdef __APPLE__
+#define Rect ArdourCanvas::Rect
+#endif
+
 using namespace ARDOUR;
 using namespace std;
 using namespace PBD;
@@ -36,9 +45,6 @@ using namespace Glib;
 using namespace ArdourSurface;
 using namespace ArdourCanvas;
 
-#include "pbd/i18n.h"
-#include "menu.h"
-
 Push2Menu::Push2Menu (Item* parent, vector<string> s)
 	: Container (parent)
 	, baseline (-1)
diff --git a/libs/surfaces/push2/menu.h b/libs/surfaces/push2/menu.h
index a3a08abb73..ef4b9e2311 100644
--- a/libs/surfaces/push2/menu.h
+++ b/libs/surfaces/push2/menu.h
@@ -35,6 +35,7 @@ namespace Cairo {
 namespace ArdourCanvas {
 	class Text;
 	class Rectangle;
+	class Rect;
 }
 
 namespace ArdourSurface {
diff --git a/libs/surfaces/push2/mix.cc b/libs/surfaces/push2/mix.cc
index 1ec4868a6c..81428ef196 100644
--- a/libs/surfaces/push2/mix.cc
+++ b/libs/surfaces/push2/mix.cc
@@ -59,6 +59,10 @@
 
 #include "pbd/i18n.h"
 
+#ifdef __APPLE__
+#define Rect ArdourCanvas::Rect
+#endif
+
 using namespace ARDOUR;
 using namespace std;
 using namespace PBD;
diff --git a/libs/surfaces/push2/scale.cc b/libs/surfaces/push2/scale.cc
index 424a480ed2..72062129e9 100644
--- a/libs/surfaces/push2/scale.cc
+++ b/libs/surfaces/push2/scale.cc
@@ -29,6 +29,10 @@
 #include "push2.h"
 #include "scale.h"
 
+#ifdef __APPLE__
+#define Rect ArdourCanvas::Rect
+#endif
+
 using namespace ARDOUR;
 using namespace std;
 using namespace PBD;
diff --git a/libs/surfaces/push2/splash.cc b/libs/surfaces/push2/splash.cc
index 0c3e36d9fc..601f885467 100644
--- a/libs/surfaces/push2/splash.cc
+++ b/libs/surfaces/push2/splash.cc
@@ -29,6 +29,10 @@
 
 #include "splash.h"
 
+#ifdef __APPLE__
+#define Rect ArdourCanvas::Rect
+#endif
+
 using namespace ARDOUR;
 using namespace PBD;
 using namespace std;
diff --git a/libs/surfaces/push2/track_mix.cc b/libs/surfaces/push2/track_mix.cc
index 85cbf4697c..f83b38aad7 100644
--- a/libs/surfaces/push2/track_mix.cc
+++ b/libs/surfaces/push2/track_mix.cc
@@ -55,6 +55,7 @@
 #include "canvas/meter.h"
 #include "canvas/rectangle.h"
 #include "canvas/text.h"
+#include "canvas/types.h"
 
 #include "canvas.h"
 #include "knob.h"
@@ -64,6 +65,10 @@
 #include "track_mix.h"
 #include "utils.h"
 
+#ifdef __APPLE__
+#define Rect ArdourCanvas::Rect
+#endif
+
 using namespace ARDOUR;
 using namespace std;
 using namespace PBD;
@@ -201,7 +206,7 @@ TrackMixLayout::hide ()
 }
 
 void
-TrackMixLayout::render (ArdourCanvas::Rect const & area, Cairo::RefPtr<Cairo::Context> context) const
+TrackMixLayout::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) const
 {
 	Container::render (area, context);
 }
diff --git a/libs/surfaces/push2/track_mix.h b/libs/surfaces/push2/track_mix.h
index ec945f4cab..53c08ea219 100644
--- a/libs/surfaces/push2/track_mix.h
+++ b/libs/surfaces/push2/track_mix.h
@@ -33,6 +33,7 @@ namespace ArdourCanvas {
 	class Text;
 	class Line;
 	class VBox;
+	class Rect;
 }
 
 namespace ArdourSurface {