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 /graphics/macgui/macmenu.h | |
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 'graphics/macgui/macmenu.h')
-rw-r--r-- | graphics/macgui/macmenu.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/graphics/macgui/macmenu.h b/graphics/macgui/macmenu.h index 39fc57509f..e7dde9a59a 100644 --- a/graphics/macgui/macmenu.h +++ b/graphics/macgui/macmenu.h @@ -27,10 +27,10 @@ namespace Graphics { -struct MenuItem; -struct MenuSubItem; +struct MacMenuItem; +struct MacMenuSubItem; -struct MenuData { +struct MacMenuData { int menunum; const char *title; int action; @@ -38,16 +38,16 @@ struct MenuData { bool enabled; }; -class Menu : public BaseMacWindow { +class MacMenu : public BaseMacWindow { public: - Menu(int id, const Common::Rect &bounds, MacWindowManager *wm); - ~Menu(); + MacMenu(int id, const Common::Rect &bounds, MacWindowManager *wm); + ~MacMenu(); static Common::StringArray *readMenuFromResource(Common::SeekableReadStream *res); void setCommandsCallback(void (*callback)(int, Common::String &, void *), void *data) { _ccallback = callback; _cdata = data; } - void addStaticMenus(const MenuData *data); + void addStaticMenus(const MacMenuData *data); void calcDimensions(); int addMenuItem(const char *name); @@ -72,10 +72,10 @@ private: private: const Font *getMenuFont(); - const char *getAcceleratorString(MenuSubItem *item, const char *prefix); - int calculateMenuWidth(MenuItem *menu); - void calcMenuBounds(MenuItem *menu); - void renderSubmenu(MenuItem *menu); + const char *getAcceleratorString(MacMenuSubItem *item, const char *prefix); + int calculateMenuWidth(MacMenuItem *menu); + void calcMenuBounds(MacMenuItem *menu); + void renderSubmenu(MacMenuItem *menu); bool keyEvent(Common::Event &event); bool mouseClick(int x, int y); @@ -84,7 +84,7 @@ private: bool processMenuShortCut(byte flags, uint16 ascii); - Common::Array<MenuItem *> _items; + Common::Array<MacMenuItem *> _items; const Font *_font; |