From 0ecaa79f08d7cf4caed3f274a728906de5e2115a Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sat, 14 Jan 2017 13:17:38 +0100
Subject: GRAPHICS: Renamed Menu to MacMenu to avoid potential name collision

---
 engines/macventure/gui.cpp | 2 +-
 engines/macventure/gui.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines/macventure')

diff --git a/engines/macventure/gui.cpp b/engines/macventure/gui.cpp
index 87d51619d8..0008e34afa 100644
--- a/engines/macventure/gui.cpp
+++ b/engines/macventure/gui.cpp
@@ -68,7 +68,7 @@ enum {
 
 const bool kLoadStaticMenus = true;
 
-static const Graphics::MenuData menuSubItems[] = {
+static const Graphics::MacMenuData menuSubItems[] = {
 	{ kMenuHighLevel,	"File",				0, 0, false },
 	{ kMenuHighLevel,	"Edit",				0, 0, false },
 	{ kMenuHighLevel,	"Special",			0, 0, false },
diff --git a/engines/macventure/gui.h b/engines/macventure/gui.h
index b57e00fa1b..fa27e16f1e 100644
--- a/engines/macventure/gui.h
+++ b/engines/macventure/gui.h
@@ -183,7 +183,7 @@ private: // Attributes
 	Graphics::MacWindow *_exitsWindow;
 	Graphics::MacWindow *_diplomaWindow;
 	Common::Array<Graphics::MacWindow*> _inventoryWindows;
-	Graphics::Menu *_menu;
+	Graphics::MacMenu *_menu;
 	Dialog *_dialog;
 
 	Container *_graphics;
-- 
cgit v1.2.3