Merge branch 'master' of https://github.com/scummvm/scummvm into mortevielle

Conflicts:
	engines/engines.mk

1 files changed, 4 insertions, 4 deletions

diff --git a/backends/platform/wince/CEgui/GUIElement.cpp b/backends/platform/wince/CEgui/GUIElement.cpp
index 241cf514f3..c8e68b87fd 100644
--- a/backends/platform/wince/CEgui/GUIElement.cpp
+++ b/backends/platform/wince/CEgui/GUIElement.cpp
@@ -98,19 +98,19 @@ bool GUIElement::drawn() {
 	return _drawn;
 }
 
-int GUIElement::x() {
+int GUIElement::getX() {
 	return _x;
 }
 
-int GUIElement::y() {
+int GUIElement::getY() {
 	return _y;
 }
 
-int GUIElement::width() {
+int GUIElement::getWidth() {
 	return _width;
 }
 
-int GUIElement::height() {
+int GUIElement::getHeight() {
 	return _height;
 }