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

diff --git a/libs/surfaces/push2/canvas.cc b/libs/surfaces/push2/canvas.cc
index 611ab60aa1eedf9e8a4796345115d6966f18c923..75fced70b74b249bf3d477fbe5248882bf39753c 100644 (file)
--- 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 77fb58f00d91f18a00449c5d85663c09eccec96f..0b0e8938582792ea06761d21911d8cf179345168 100644 (file)
--- 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 10ff7a877118382d86ca2d4b641013ba47745efd..902bf6932823acdd71facaa94a62732c3f69148b 100644 (file)
--- 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 08715877e086c3b537ca002784a53e27ca247230..beefa6816fe02a6e49a1cbcf648022132a1f86d8 100644 (file)
--- 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 a3a08abb738e1faaf88c8917030a0fe45a34189e..ef4b9e2311cc6e373877d60d191f07ce3fce3c57 100644 (file)
--- 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 1ec4868a6cbbb6164e3fa467470882b5853b75ef..81428ef19659cf103f99eac29f8254dd9f9788c8 100644 (file)
--- 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 424a480ed2b380c9e827158bd51cc7e3b811850c..72062129e9d7c81b8669c1ab4d73182dda490dc2 100644 (file)
--- 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 0c3e36d9fcb2d3d9227aa8c2b49caffdc96a3bdc..601f885467dd35f9859dd593425fa48bfb5f657f 100644 (file)
--- 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 85cbf4697c8cac47fbfa2e15019a99200f36e7d1..f83b38aad7bb64f3fe08f68ddb7e326c69e9353e 100644 (file)
--- 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 ec945f4cab47533ef6027499ab83d6f44d2237f4..53c08ea2198b6887e6fd98a4bc1c4df7bb39e073 100644 (file)
--- 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 {