diff options
author | Tobia Tesan | 2013-09-20 13:42:53 +0200 |
---|---|---|
committer | Tobia Tesan | 2013-09-21 23:22:16 +0200 |
commit | 2e457d96e8095020bce006fd633382bde6c6ae26 (patch) | |
tree | 6a0355bd732100682b25caeb6cbe493edba1a848 /engines/wintermute/ui/ui_object.h | |
parent | b033850e8a07595dee479a37d50e87a828be356c (diff) | |
download | scummvm-rg350-2e457d96e8095020bce006fd633382bde6c6ae26.tar.gz scummvm-rg350-2e457d96e8095020bce006fd633382bde6c6ae26.tar.bz2 scummvm-rg350-2e457d96e8095020bce006fd633382bde6c6ae26.zip |
WINTERMUTE: Make some members of UIObject private
Diffstat (limited to 'engines/wintermute/ui/ui_object.h')
-rw-r--r-- | engines/wintermute/ui/ui_object.h | 44 |
1 files changed, 33 insertions, 11 deletions
diff --git a/engines/wintermute/ui/ui_object.h b/engines/wintermute/ui/ui_object.h index 5d9508c2cf..bcd90082d1 100644 --- a/engines/wintermute/ui/ui_object.h +++ b/engines/wintermute/ui/ui_object.h @@ -41,7 +41,6 @@ class UIObject : public BaseObject { public: bool getTotalOffset(int *offsetX, int *offsetY); - bool _canFocus; bool focus(); virtual bool handleMouse(TMouseEvent event, TMouseButton button); bool isFocused(); @@ -52,20 +51,11 @@ public: virtual bool display(int offsetX) { return display(offsetX, 0); } virtual bool display(int offsetX, int offsetY); virtual void correctSize(); - bool _sharedFonts; - bool _sharedImages; void setText(const char *text); - char *_text; - BaseFont *_font; - bool _visible; + UITiledImage *_back; - bool _disable; UIObject(BaseGame *inGame = nullptr); virtual ~UIObject(); - int32 _width; - int32 _height; - TUIObjectType _type; - BaseSprite *_image; void setListener(BaseScriptHolder *object, BaseScriptHolder *listenerObject, uint32 listenerParam); BaseScriptHolder *_listenerParamObject; uint32 _listenerParamDWORD; @@ -78,6 +68,38 @@ 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() override; + TUIObjectType _type; + + int32 getWidth(); + int32 getHeight(); + void setHeight(int32 height); + void setWidth(int32 width); + bool isDisabled(); + void setDisabled(bool disable); + bool isVisible(); + void setVisible(bool visible); + bool hasSharedFonts(); + void setSharedFonts(bool shared); + bool hasSharedImages(); + void setSharedImages(bool shared); + BaseSprite *getImage(); + void putImage(BaseSprite *image); + void putFont(BaseFont *font); + BaseFont *getFont(); + bool canFocus(); + +protected: + BaseSprite *_image; + BaseFont *_font; + bool _sharedFonts; + bool _sharedImages; + char *_text; + bool _visible; + bool _disable; + int32 _width; + int32 _height; + bool _canFocus; + }; } // End of namespace Wintermute |