GRAPHICS: Create wrapper namespace for MacMenu constants

3 files changed, 75 insertions, 69 deletions

diff --git a/engines/wage/gui.cpp b/engines/wage/gui.cpp
index f8971e13bc..d74b77bb0c 100644
--- a/engines/wage/gui.cpp
+++ b/engines/wage/gui.cpp
@@ -62,22 +62,22 @@
 namespace Wage {
 
 static const Graphics::MenuData menuSubItems[] = {
-	{ Graphics::kMenuHighLevel, "File",	0, 0, false },
-	{ Graphics::kMenuHighLevel, "Edit",	0, 0, false },
-	{ Graphics::kMenuFile, "New",			Graphics::kMenuActionNew, 0, false },
-	{ Graphics::kMenuFile, "Open...",		Graphics::kMenuActionOpen, 0, true },
-	{ Graphics::kMenuFile, "Close",			Graphics::kMenuActionClose, 0, true },
-	{ Graphics::kMenuFile, "Save",			Graphics::kMenuActionSave, 0, true },
-	{ Graphics::kMenuFile, "Save as...",	Graphics::kMenuActionSaveAs, 0, true },
-	{ Graphics::kMenuFile, "Revert",		Graphics::kMenuActionRevert, 0, false },
-	{ Graphics::kMenuFile, "Quit",			Graphics::kMenuActionQuit, 0, true },
-
-	{ Graphics::kMenuEdit, "Undo",			Graphics::kMenuActionUndo, 'Z', false },
-	{ Graphics::kMenuEdit, NULL,			0, 0, false },
-	{ Graphics::kMenuEdit, "Cut",			Graphics::kMenuActionCut, 'K', false },
-	{ Graphics::kMenuEdit, "Copy",			Graphics::kMenuActionCopy, 'C', false },
-	{ Graphics::kMenuEdit, "Paste",			Graphics::kMenuActionPaste, 'V', false },
-	{ Graphics::kMenuEdit, "Clear",			Graphics::kMenuActionClear, 'B', false },
+	{ kMenuHighLevel, "File",	0, 0, false },
+	{ kMenuHighLevel, "Edit",	0, 0, false },
+	{ kMenuFile, "New",			kMenuActionNew, 0, false },
+	{ kMenuFile, "Open...",		kMenuActionOpen, 0, true },
+	{ kMenuFile, "Close",			kMenuActionClose, 0, true },
+	{ kMenuFile, "Save",			kMenuActionSave, 0, true },
+	{ kMenuFile, "Save as...",	kMenuActionSaveAs, 0, true },
+	{ kMenuFile, "Revert",		kMenuActionRevert, 0, false },
+	{ kMenuFile, "Quit",			kMenuActionQuit, 0, true },
+
+	{ kMenuEdit, "Undo",			kMenuActionUndo, 'Z', false },
+	{ kMenuEdit, NULL,			0, 0, false },
+	{ kMenuEdit, "Cut",			kMenuActionCut, 'K', false },
+	{ kMenuEdit, "Copy",			kMenuActionCopy, 'C', false },
+	{ kMenuEdit, "Paste",			kMenuActionPaste, 'V', false },
+	{ kMenuEdit, "Clear",			kMenuActionClear, 'B', false },
 
 	{ 0, NULL,			0, 0, false }
 };
@@ -148,7 +148,7 @@ Gui::Gui(WageEngine *engine) {
 	_menu->setCommandsCallback(menuCommandsCallback, this);
 
 	_menu->addStaticMenus(menuSubItems);
-	_menu->addMenuSubItem(Graphics::kMenuAbout, _engine->_world->getAboutMenuItemName(), Graphics::kMenuActionAbout);
+	_menu->addMenuSubItem(kMenuAbout, _engine->_world->getAboutMenuItemName(), kMenuActionAbout);
 
 	_commandsMenuId = _menu->addMenuItem(_engine->_world->_commandsMenuName.c_str());
 	regenCommandsMenu();
@@ -298,7 +298,7 @@ void Gui::regenWeaponsMenu() {
 			command += " ";
 			command += obj->_name;
 
-			_menu->addMenuSubItem(_weaponsMenuId, command.c_str(), Graphics::kMenuActionCommand, 0, 0, true);
+			_menu->addMenuSubItem(_weaponsMenuId, command.c_str(), kMenuActionCommand, 0, 0, true);
 
 			empty = false;
 		}
@@ -321,39 +321,39 @@ void menuCommandsCallback(int action, Common::String &text, void *data) {
 
 void Gui::executeMenuCommand(int action, Common::String &text) {
 	switch(action) {
-	case Graphics::kMenuActionAbout:
-	case Graphics::kMenuActionNew:
-	case Graphics::kMenuActionClose:
-	case Graphics::kMenuActionRevert:
-	case Graphics::kMenuActionQuit:
+	case kMenuActionAbout:
+	case kMenuActionNew:
+	case kMenuActionClose:
+	case kMenuActionRevert:
+	case kMenuActionQuit:
 		break;
 
-	case Graphics::kMenuActionOpen:
+	case kMenuActionOpen:
 		_engine->scummVMSaveLoadDialog(false);
 		break;
 
-	case Graphics::kMenuActionSave:
-	case Graphics::kMenuActionSaveAs:
+	case kMenuActionSave:
+	case kMenuActionSaveAs:
 		_engine->scummVMSaveLoadDialog(true);
 		break;
 
-	case Graphics::kMenuActionUndo:
+	case kMenuActionUndo:
 		actionUndo();
 		break;
-	case Graphics::kMenuActionCut:
+	case kMenuActionCut:
 		actionCut();
 		break;
-	case Graphics::kMenuActionCopy:
+	case kMenuActionCopy:
 		actionCopy();
 		break;
-	case Graphics::kMenuActionPaste:
+	case kMenuActionPaste:
 		actionPaste();
 		break;
-	case Graphics::kMenuActionClear:
+	case kMenuActionClear:
 		actionClear();
 		break;
 
-	case Graphics::kMenuActionCommand:
+	case kMenuActionCommand:
 		_engine->processTurn(&text, NULL);
 		break;
 
diff --git a/engines/wage/gui.h b/engines/wage/gui.h
index ed841b0e0d..4c9580d372 100644
--- a/engines/wage/gui.h
+++ b/engines/wage/gui.h
@@ -53,11 +53,14 @@
 #include "graphics/managed_surface.h"
 #include "graphics/macgui/macwindowmanager.h"
 #include "graphics/macgui/macwindow.h"
+#include "graphics/macgui/macmenu.h"
 
 #include "common/events.h"
 #include "common/rect.h"
 
 namespace Wage {
+	
+using namespace Graphics::MacMenuConstants;
 
 class Scene;
 class WageEngine;
diff --git a/graphics/macgui/macmenu.h b/graphics/macgui/macmenu.h
index e0309b25e6..ce0b0ed8db 100644
--- a/graphics/macgui/macmenu.h
+++ b/graphics/macgui/macmenu.h
@@ -53,43 +53,46 @@ namespace Graphics {
 struct MenuItem;
 struct MenuSubItem;
 
-enum {
-	kFontStyleBold = 1,
-	kFontStyleItalic = 2,
-	kFontStyleUnderline = 4,
-	kFontStyleOutline = 8,
-	kFontStyleShadow = 16,
-	kFontStyleCondensed = 32,
-	kFontStyleExtended = 64
-};
-
-enum {
-	kMenuHighLevel = -1,
-	kMenuAbout = 0,
-	kMenuFile = 1,
-	kMenuEdit = 2,
-	kMenuCommands = 3,
-	kMenuWeapons = 4
-};
-
-enum {
-	kMenuActionAbout,
-	kMenuActionNew,
-	kMenuActionOpen,
-	kMenuActionClose,
-	kMenuActionSave,
-	kMenuActionSaveAs,
-	kMenuActionRevert,
-	kMenuActionQuit,
-
-	kMenuActionUndo,
-	kMenuActionCut,
-	kMenuActionCopy,
-	kMenuActionPaste,
-	kMenuActionClear,
-
-	kMenuActionCommand
-};
+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;