GRAPHICS: Move MacMenu constants

4 files changed, 26 insertions, 48 deletions

diff --git a/graphics/macgui/macmenu.cpp b/graphics/macgui/macmenu.cpp
index 3a4d624356..6169b3e3cd 100644
--- a/graphics/macgui/macmenu.cpp
+++ b/graphics/macgui/macmenu.cpp
@@ -66,6 +66,25 @@ enum {
 	kMenuItemHeight = 20
 };
 
+enum {
+	kMenuHighLevel = -1
+};
+
+enum {
+	kFontStyleBold = 1,
+	kFontStyleItalic = 2,
+	kFontStyleUnderline = 4,
+	kFontStyleOutline = 8,
+	kFontStyleShadow = 16,
+	kFontStyleCondensed = 32,
+	kFontStyleExtended = 64
+};
+
+enum {
+	kMenuActionCommand
+};
+
+
 struct MenuSubItem {
 	Common::String text;
 	int action;
diff --git a/graphics/macgui/macmenu.h b/graphics/macgui/macmenu.h
index ce0b0ed8db..5c08f4feed 100644
--- a/graphics/macgui/macmenu.h
+++ b/graphics/macgui/macmenu.h
@@ -53,47 +53,6 @@ namespace Graphics {
 struct MenuItem;
 struct MenuSubItem;
 
-namespace MacMenuConstants {
-	enum MacMenuFontStyle {
-		kFontStyleBold = 1,
-		kFontStyleItalic = 2,
-		kFontStyleUnderline = 4,
-		kFontStyleOutline = 8,
-		kFontStyleShadow = 16,
-		kFontStyleCondensed = 32,
-		kFontStyleExtended = 64
-	};
-
-	enum MacMenuTab {
-		kMenuHighLevel = -1,
-		kMenuAbout = 0,
-		kMenuFile = 1,
-		kMenuEdit = 2,
-		kMenuCommands = 3,
-		kMenuWeapons = 4
-	};
-
-	enum MacMenuAction {
-		kMenuActionAbout,
-		kMenuActionNew,
-		kMenuActionOpen,
-		kMenuActionClose,
-		kMenuActionSave,
-		kMenuActionSaveAs,
-		kMenuActionRevert,
-		kMenuActionQuit,
-
-		kMenuActionUndo,
-		kMenuActionCut,
-		kMenuActionCopy,
-		kMenuActionPaste,
-		kMenuActionClear,
-
-		kMenuActionCommand
-	};
-}
-using namespace MacMenuConstants;
-
 struct MenuData {
 	int menunum;
 	const char *title;
diff --git a/graphics/macgui/macwindowmanager.cpp b/graphics/macgui/macwindowmanager.cpp
index 6c6e4282b7..3d4ef3bc71 100644
--- a/graphics/macgui/macwindowmanager.cpp
+++ b/graphics/macgui/macwindowmanager.cpp
@@ -186,11 +186,11 @@ void MacWindowManager::setActive(int id) {
 
 struct PlotData {
 	Graphics::ManagedSurface *surface;
-	Patterns *patterns;
+	MacPatterns *patterns;
 	uint fillType;
 	int thickness;
 
-	PlotData(Graphics::ManagedSurface *s, Patterns *p, int f, int t) :
+	PlotData(Graphics::ManagedSurface *s, MacPatterns *p, int f, int t) :
 		surface(s), patterns(p), fillType(f), thickness(t) {}
 };
 
diff --git a/graphics/macgui/macwindowmanager.h b/graphics/macgui/macwindowmanager.h
index d5b817bdca..5be82e39a3 100644
--- a/graphics/macgui/macwindowmanager.h
+++ b/graphics/macgui/macwindowmanager.h
@@ -63,7 +63,7 @@ namespace MacGUIConstants {
 		kDesktopArc = 7
 	};
 
-	enum MacGUIColor {
+	enum {
 		kColorBlack = 0,
 		kColorGray = 1,
 		kColorWhite = 2,
@@ -71,7 +71,7 @@ namespace MacGUIConstants {
 		kColorGreen2 = 4
 	};
 
-	enum MacGUIPattern {
+	enum {
 		kPatternSolid = 1,
 		kPatternStripes = 2,
 		kPatternCheckers = 3,
@@ -84,7 +84,7 @@ class ManagedSurface;
 
 class Menu;
 
-typedef Common::Array<byte *> Patterns;
+typedef Common::Array<byte *> MacPatterns;
 
 class MacWindowManager {
 public:
@@ -107,7 +107,7 @@ public:
 
 	BaseMacWindow *getWindow(int id) { return _windows[id]; }
 
-	Patterns &getPatterns() { return _patterns; }
+	MacPatterns &getPatterns() { return _patterns; }
 	void drawFilledRoundRect(ManagedSurface *surface, Common::Rect &rect, int arc, int color);
 
 	void pushArrowCursor();
@@ -128,7 +128,7 @@ private:
 
 	bool _fullRefresh;
 
-	Patterns _patterns;
+	MacPatterns _patterns;
 
 	Menu *_menu;