diff options
author | Borja Lorente | 2016-07-29 11:17:00 +0200 |
---|---|---|
committer | Borja Lorente | 2016-07-30 10:06:14 +0200 |
commit | d8652af84e4f909854d753f0ed6aa1dcc4b0a269 (patch) | |
tree | 82259a5b7c349791d2a2cc93dca4f482867613d2 /graphics/macgui/macwindowmanager.h | |
parent | 744034bd986b5a42b9dea8b9acadfd0c62ce536d (diff) | |
download | scummvm-rg350-d8652af84e4f909854d753f0ed6aa1dcc4b0a269.tar.gz scummvm-rg350-d8652af84e4f909854d753f0ed6aa1dcc4b0a269.tar.bz2 scummvm-rg350-d8652af84e4f909854d753f0ed6aa1dcc4b0a269.zip |
GRAPHICS: Change namespace of MacMenu
Diffstat (limited to 'graphics/macgui/macwindowmanager.h')
-rw-r--r-- | graphics/macgui/macwindowmanager.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/graphics/macgui/macwindowmanager.h b/graphics/macgui/macwindowmanager.h index 9a8be93aa8..e30d2d8734 100644 --- a/graphics/macgui/macwindowmanager.h +++ b/graphics/macgui/macwindowmanager.h @@ -56,12 +56,6 @@ #include "graphics/fontman.h" #include "graphics/macgui/macwindow.h" -namespace Wage { - class MacWindow; - class BaseMacWindow; - class Menu; -} - namespace Graphics { enum { @@ -85,6 +79,8 @@ enum { class ManagedSurface; +class Menu; + typedef Common::Array<byte *> Patterns; class MacWindowManager { @@ -97,7 +93,7 @@ public: const Font *getFont(const char *name, FontManager::FontUsage fallback); MacWindow *addWindow(bool scrollable, bool resizable, bool editable); - Wage::Menu *addMenu(); + Menu *addMenu(); void setActive(int id); void setFullRefresh(bool redraw) { _fullRefresh = true; } @@ -131,7 +127,7 @@ private: Patterns _patterns; - Wage::Menu *_menu; + Menu *_menu; bool _builtInFonts; bool _cursorIsArrow; |