WINTERMUTE: Make sprites private in UIButton

3 files changed, 18 insertions, 6 deletions

diff --git a/engines/wintermute/ad/ad_response_box.cpp b/engines/wintermute/ad/ad_response_box.cpp
index 229ba8152b..8454f213b7 100644
--- a/engines/wintermute/ad/ad_response_box.cpp
+++ b/engines/wintermute/ad/ad_response_box.cpp
@@ -148,10 +148,10 @@ bool AdResponseBox::createButtons() {
 			if (_responses[i]->getIcon()) {
 				btn->putImage(_responses[i]->getIcon());
 				if (_responses[i]->getIconHover()) {
-					btn->_imageHover = _responses[i]->getIconHover();
+					btn->putImageHover(_responses[i]->getIconHover());
 				}
 				if (_responses[i]->getIconPressed()) {
-					btn->_imagePress = _responses[i]->getIconPressed();
+					btn->putImagePress(_responses[i]->getIconPressed());
 				}
 
 				btn->setCaption(_responses[i]->getText());
diff --git a/engines/wintermute/ui/ui_button.cpp b/engines/wintermute/ui/ui_button.cpp
index eff1059e1f..1d266740a1 100644
--- a/engines/wintermute/ui/ui_button.cpp
+++ b/engines/wintermute/ui/ui_button.cpp
@@ -1218,4 +1218,12 @@ void UIButton::putFontPress(BaseFont *font) {
 	_fontPress = font;
 }
 
+void UIButton::putImageHover(BaseSprite *sprite) {
+	_imageHover = sprite;
+}
+
+void UIButton::putImagePress(BaseSprite *sprite) {
+	_imagePress = sprite;
+}
+
 } // End of namespace Wintermute
diff --git a/engines/wintermute/ui/ui_button.h b/engines/wintermute/ui/ui_button.h
index 2d7cb012dd..bf2144f18e 100644
--- a/engines/wintermute/ui/ui_button.h
+++ b/engines/wintermute/ui/ui_button.h
@@ -58,15 +58,14 @@ public:
 	virtual bool scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, const char *name) override;
 	virtual const char *scToString() override;
 
-	BaseSprite *_imageHover;
-	BaseSprite *_imagePress;
-	BaseSprite *_imageDisable;
-	BaseSprite *_imageFocus;
 	TTextAlign _align;
 	
 	void putFontHover(BaseFont *font);
 	BaseFont *getFontHover();
 	void putFontPress(BaseFont *font);
+	
+	void putImageHover(BaseSprite *sprite);
+	void putImagePress(BaseSprite *sprite);
 
 private:
 	bool _pixelPerfect;
@@ -83,6 +82,11 @@ private:
 	BaseFont *_fontPress;
 	BaseFont *_fontHover;
 	BaseFont *_fontFocus;
+	BaseSprite *_imageHover;
+	BaseSprite *_imagePress;
+	BaseSprite *_imageDisable;
+	BaseSprite *_imageFocus;
+
 };
 
 } // End of namespace Wintermute