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

1 files changed, 9 insertions, 3 deletions

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)