From ffbc6b0c783b5d86a91ef15a4974cde7f606c585 Mon Sep 17 00:00:00 2001
From: Borja Lorente
Date: Fri, 29 Jul 2016 11:19:26 +0200
Subject: GRAPHICS: Create wrapper namespace for MacMenu constants

---
 graphics/macgui/macmenu.h | 77 ++++++++++++++++++++++++-----------------------
 1 file changed, 40 insertions(+), 37 deletions(-)

(limited to 'graphics/macgui/macmenu.h')

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;
-- 
cgit v1.2.3