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

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;

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;

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;

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)

libs/surfaces/push2/menu.h

@@ -35,6 +35,7 @@ namespace Cairo {
 namespace ArdourCanvas {
 	class Text;
 	class Rectangle;
+	class Rect;
 }
 
 namespace ArdourSurface {

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;

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;

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;

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);
 }

libs/surfaces/push2/track_mix.h

@@ -33,6 +33,7 @@ namespace ArdourCanvas {
 	class Text;
 	class Line;
 	class VBox;
+	class Rect;
 }
 
 namespace ArdourSurface {