diff options
| author | Eugene Sandulenko | 2017-01-14 13:17:38 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2017-01-14 13:17:38 +0100 |
| commit | 0ecaa79f08d7cf4caed3f274a728906de5e2115a (patch) | |
| tree | 33b8d4055468fc05c5aed033a623f1ae93742451 /engines/macventure | |
| parent | 8690fe444e6959bc2aa17ba7517303dbceda86c8 (diff) | |
| download | scummvm-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 'engines/macventure')
| -rw-r--r-- | engines/macventure/gui.cpp | 2 | ||||
| -rw-r--r-- | engines/macventure/gui.h | 2 |
2 files changed, 2 insertions, 2 deletions
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; |