aboutsummaryrefslogtreecommitdiff
path: root/graphics/macgui/macwindowmanager.h
diff options
context:
space:
mode:
authorEugene Sandulenko2017-01-14 13:17:38 +0100
committerEugene Sandulenko2017-01-14 13:17:38 +0100
commit0ecaa79f08d7cf4caed3f274a728906de5e2115a (patch)
tree33b8d4055468fc05c5aed033a623f1ae93742451 /graphics/macgui/macwindowmanager.h
parent8690fe444e6959bc2aa17ba7517303dbceda86c8 (diff)
downloadscummvm-rg350-0ecaa79f08d7cf4caed3f274a728906de5e2115a.tar.gz
scummvm-rg350-0ecaa79f08d7cf4caed3f274a728906de5e2115a.tar.bz2
scummvm-rg350-0ecaa79f08d7cf4caed3f274a728906de5e2115a.zip
GRAPHICS: Renamed Menu to MacMenu to avoid potential name collision
Diffstat (limited to 'graphics/macgui/macwindowmanager.h')
-rw-r--r--graphics/macgui/macwindowmanager.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/graphics/macgui/macwindowmanager.h b/graphics/macgui/macwindowmanager.h
index 8f04861b68..bd597f6626 100644
--- a/graphics/macgui/macwindowmanager.h
+++ b/graphics/macgui/macwindowmanager.h
@@ -59,7 +59,7 @@ using namespace MacGUIConstants;
class ManagedSurface;
-class Menu;
+class MacMenu;
class MacFontManager;
@@ -109,7 +109,7 @@ public:
* afterwards.
* @return Pointer to a new empty menu.
*/
- Menu *addMenu();
+ MacMenu *addMenu();
/**
* Set the desired window state to active.
* @param id ID of the window that has to be set to active.
@@ -191,7 +191,7 @@ private:
MacPatterns _patterns;
- Menu *_menu;
+ MacMenu *_menu;
bool _cursorIsArrow;
};