From d8652af84e4f909854d753f0ed6aa1dcc4b0a269 Mon Sep 17 00:00:00 2001 From: Borja Lorente Date: Fri, 29 Jul 2016 11:17:00 +0200 Subject: GRAPHICS: Change namespace of MacMenu --- graphics/macgui/macwindowmanager.h | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'graphics/macgui/macwindowmanager.h') 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 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; -- cgit v1.2.3