WAGE: Decoupled Window class too

1 files changed, 6 insertions, 3 deletions

diff --git a/engines/wage/macwindow.h b/engines/wage/macwindow.h
index 797e2f9c2a..4b2f71e82c 100644
--- a/engines/wage/macwindow.h
+++ b/engines/wage/macwindow.h
@@ -52,6 +52,8 @@
 
 namespace Wage {
 
+class MacWindowManager;
+
 enum WindowType {
 	kWindowUnknown,
 	kWindowWindow,
@@ -74,7 +76,7 @@ enum WindowClick {
 
 class BaseMacWindow {
 public:
-	BaseMacWindow(int id);
+	BaseMacWindow(int id, MacWindowManager *wm);
 	virtual ~BaseMacWindow() {}
 
 	const Common::Rect &getDimensions() { return _dims; }
@@ -102,11 +104,13 @@ protected:
 
 	bool (*_callback)(WindowClick, Common::Event &, void *);
 	void *_dataPtr;
+
+	MacWindowManager *_wm;
 };
 
 class MacWindow : public BaseMacWindow {
 public:
-	MacWindow(int id, bool scrollable, bool resizable);
+	MacWindow(int id, bool scrollable, bool resizable, MacWindowManager *wm);
 	virtual ~MacWindow();
 	void move(int x, int y);
 	void resize(int w, int h);
@@ -127,7 +131,6 @@ private:
 	void drawBox(Graphics::ManagedSurface *g, int x, int y, int w, int h);
 	void fillRect(Graphics::ManagedSurface *g, int x, int y, int w, int h, int color = kColorBlack);
 	const Graphics::Font *getTitleFont();
-	bool builtInFonts();
 	void updateInnerDims();
 	WindowClick isInBorder(int x, int y);