libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-13 15:40:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

WINTERMUTE: Deconstify UIObject::getHeight() to fix a shadowed overload.

Browse Source
This commit is contained in:
Einar Johan Trøan Sømåen 2013-10-28 18:37:20 +01:00
parent ad58641242
commit 889c3c9801
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
engines/wintermute/ui/ui_object.cpp
View File

@ -652,7 +652,10 @@ int32 UIObject::getWidth() const {
return _width;
}
int32 UIObject::getHeight() const {
// Has to be non-const to allow the virtual override to work,
// as other getHeight()-functions currently have the potential
// of having side-effects.
int32 UIObject::getHeight() {
return _height;
}

2
engines/wintermute/ui/ui_object.h
View File

@ -69,7 +69,7 @@ public:
TUIObjectType _type;
int32 getWidth() const;
int32 getHeight() const;
int32 getHeight() override;
void setHeight(int32 height);
void setWidth(int32 width);
bool isDisabled() const;