From b033850e8a07595dee479a37d50e87a828be356c Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Fri, 20 Sep 2013 01:25:41 +0200
Subject: WINTERMUTE: Keep attributes in UIWindow private

---
 engines/wintermute/ui/ui_window.h | 47 +++++++++++++++++++++++----------------
 1 file changed, 28 insertions(+), 19 deletions(-)

(limited to 'engines/wintermute/ui/ui_window.h')

diff --git a/engines/wintermute/ui/ui_window.h b/engines/wintermute/ui/ui_window.h
index 8a726fdff8..9175e3cde8 100644
--- a/engines/wintermute/ui/ui_window.h
+++ b/engines/wintermute/ui/ui_window.h
@@ -38,47 +38,32 @@ namespace Wintermute {
 class UIButton;
 class BaseViewport;
 class UIWindow : public UIObject {
-	uint32 _fadeColor;
 public:
 	bool getWindowObjects(BaseArray<UIObject *> &Objects, bool InteractiveOnly);
 
-	bool _pauseMusic;
 	void cleanup();
 	virtual void makeFreezable(bool freezable);
-	BaseViewport *_viewport;
-	bool _clipContents;
-	bool _inGame;
-	bool _isMenu;
-	bool _fadeBackground;
 
 	virtual bool handleMouseWheel(int delta);
-	UIWindow *_shieldWindow;
-	UIButton *_shieldButton;
+
 	bool close();
 	bool goSystemExclusive();
 	bool goExclusive();
-	TWindowMode _mode;
 	bool moveFocus(bool forward = true);
 	virtual bool handleMouse(TMouseEvent Event, TMouseButton Button);
-	Point32 _dragFrom;
-	bool _dragging;
 	DECLARE_PERSISTENT(UIWindow, UIObject)
-	bool _transparent;
 	bool showWidget(const char *name, bool visible = true);
 	bool enableWidget(const char *name, bool enable = true);
-	Rect32 _titleRect;
-	Rect32 _dragRect;
+
 	virtual bool display(int offsetX = 0, int offsetY = 0) override;
 	UIWindow(BaseGame *inGame);
 	virtual ~UIWindow();
 	virtual bool handleKeypress(Common::Event *event, bool printable = false) override;
 	BaseArray<UIObject *> _widgets;
-	TTextAlign _titleAlign;
+
 	bool loadFile(const char *filename);
 	bool loadBuffer(byte *buffer, bool complete = true);
-	UITiledImage *_backInactive;
-	BaseFont *_fontInactive;
-	BaseSprite *_imageInactive;
+
 	virtual bool listen(BaseScriptHolder *param1, uint32 param2);
 	virtual bool saveAsText(BaseDynamicBuffer *buffer, int indent) override;
 
@@ -87,6 +72,30 @@ public:
 	virtual bool scSetProperty(const char *name, ScValue *value) override;
 	virtual bool scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, const char *name) override;
 	virtual const char *scToString();
+	
+	bool getInGame();
+	TWindowMode getMode();
+
+private:
+	bool _pauseMusic;
+	BaseViewport *_viewport;
+	bool _clipContents;
+	bool _inGame;
+	bool _isMenu;
+	bool _fadeBackground;
+	TWindowMode _mode;
+	Point32 _dragFrom;
+	bool _dragging;
+	bool _transparent;
+	uint32 _fadeColor;
+	UIWindow *_shieldWindow;
+	UIButton *_shieldButton;
+	Rect32 _titleRect;
+	Rect32 _dragRect;
+	UITiledImage *_backInactive;
+	BaseFont *_fontInactive;
+	BaseSprite *_imageInactive;
+	TTextAlign _titleAlign;
 };
 
 } // End of namespace Wintermute
-- 
cgit v1.2.3