Merge branch 'master' into xeen

1 files changed, 59 insertions, 7 deletions

diff --git a/engines/wage/gui.h b/engines/wage/gui.h
index ba1bb5ef3b..898c7c3162 100644
--- a/engines/wage/gui.h
+++ b/engines/wage/gui.h
@@ -51,15 +51,25 @@
 #include "common/str-array.h"
 #include "graphics/font.h"
 #include "graphics/managed_surface.h"
+#include "graphics/macgui/macwindowmanager.h"
+#include "graphics/macgui/macwindow.h"
+#include "graphics/macgui/macmenu.h"
+#include "graphics/macgui/macwindowborder.h"
+
 #include "common/events.h"
 #include "common/rect.h"
 
-#include "wage/macwindow.h"
-#include "wage/macwindowmanager.h"
+#include "common/file.h"
+#include "graphics/pixelformat.h"
+#include "image/bmp.h"
+
+#include "graphics/palette.h"
+
 
 namespace Wage {
 
-class Menu;
+using namespace Graphics::MacWindowConstants;
+	
 class Scene;
 class WageEngine;
 
@@ -67,6 +77,44 @@ enum {
 	kCursorHeight = 12
 };
 
+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
+};
+
 class Gui {
 public:
 	Gui(WageEngine *engine);
@@ -107,6 +155,9 @@ private:
 	int calcTextX(int x, int textLine);
 	int calcTextY(int y);
 	void updateTextSelection(int x, int y);
+	
+	void loadBorders();
+	void loadBorder(Graphics::MacWindow *target, Common::String filename, bool active);
 
 public:
 	Graphics::ManagedSurface _screen;
@@ -121,13 +172,14 @@ public:
 
 	Scene *_scene;
 
-	MacWindowManager _wm;
-	MacWindow *_sceneWindow;
-	MacWindow *_consoleWindow;
+	Graphics::MacWindowManager _wm;
+	Graphics::MacWindow *_sceneWindow;
+	Graphics::MacWindow *_consoleWindow;
 
 private:
+
 	Graphics::ManagedSurface _console;
-	Menu *_menu;
+	Graphics::Menu *_menu;
 	bool _sceneDirty;
 	bool _consoleDirty;