aboutsummaryrefslogtreecommitdiff
path: root/graphics/macgui
diff options
context:
space:
mode:
authorBorja Lorente2016-07-29 11:17:00 +0200
committerBorja Lorente2016-07-30 10:06:14 +0200
commitd8652af84e4f909854d753f0ed6aa1dcc4b0a269 (patch)
tree82259a5b7c349791d2a2cc93dca4f482867613d2 /graphics/macgui
parent744034bd986b5a42b9dea8b9acadfd0c62ce536d (diff)
downloadscummvm-rg350-d8652af84e4f909854d753f0ed6aa1dcc4b0a269.tar.gz
scummvm-rg350-d8652af84e4f909854d753f0ed6aa1dcc4b0a269.tar.bz2
scummvm-rg350-d8652af84e4f909854d753f0ed6aa1dcc4b0a269.zip
GRAPHICS: Change namespace of MacMenu
Diffstat (limited to 'graphics/macgui')
-rw-r--r--graphics/macgui/macwindowmanager.cpp4
-rw-r--r--graphics/macgui/macwindowmanager.h12
2 files changed, 6 insertions, 10 deletions
diff --git a/graphics/macgui/macwindowmanager.cpp b/graphics/macgui/macwindowmanager.cpp
index dc2c46c30d..7d919a4d6b 100644
--- a/graphics/macgui/macwindowmanager.cpp
+++ b/graphics/macgui/macwindowmanager.cpp
@@ -158,8 +158,8 @@ MacWindow *MacWindowManager::addWindow(bool scrollable, bool resizable, bool edi
return w;
}
-Wage::Menu *MacWindowManager::addMenu() {
- _menu = new Wage::Menu(_lastId, _screen->getBounds(), this);
+Menu *MacWindowManager::addMenu() {
+ _menu = new Menu(_lastId, _screen->getBounds(), this);
_windows.push_back(_menu);
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;