Updated so that code compiles again

svn-id: r47769

4 files changed, 13 insertions, 8 deletions

diff --git a/backends/platform/PalmOS/Src/base_gfx.cpp b/backends/platform/PalmOS/Src/base_gfx.cpp
index 2d2904bdec..46238efdc2 100644
--- a/backends/platform/PalmOS/Src/base_gfx.cpp
+++ b/backends/platform/PalmOS/Src/base_gfx.cpp
@@ -73,7 +73,7 @@ bool OSystem_PalmBase::setGraphicsMode(int mode) {
  *
  */
 
-void OSystem_PalmBase::initSize(uint w, uint h) {
+void OSystem_PalmBase::initSize(uint w, uint h, const Graphics::PixelFormat *format) {
 	_screenWidth	= w;
 	_screenHeight	= h;
 
diff --git a/backends/platform/PalmOS/Src/base_mouse.cpp b/backends/platform/PalmOS/Src/base_mouse.cpp
index 053a0ed3a7..bf11a4b106 100644
--- a/backends/platform/PalmOS/Src/base_mouse.cpp
+++ b/backends/platform/PalmOS/Src/base_mouse.cpp
@@ -42,7 +42,7 @@ bool OSystem_PalmBase::showMouse(bool visible) {
 	return last;
 }
 
-void OSystem_PalmBase::setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, byte keycolor, int cursorTargetScale) {
+void OSystem_PalmBase::setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, int cursorTargetScale, const Graphics::PixelFormat *format) {
 	if (w == 0 || h == 0)
 		return;
 
@@ -55,8 +55,11 @@ void OSystem_PalmBase::setMouseCursor(const byte *buf, uint w, uint h, int hotsp
 		_mouseCurState.w = w;
 		_mouseCurState.h = h;
 
-		free(_mouseDataP);
-		free(_mouseBackupP);
+		if (_mouseDataP)
+			free(_mouseDataP);
+
+		if (_mouseBackupP)
+			free(_mouseBackupP);
 
 		_mouseDataP = (byte *)malloc(w * h);
 		_mouseBackupP = (byte *)malloc(w * h * 2); // if 16bit = *2
diff --git a/backends/platform/PalmOS/Src/be_base.h b/backends/platform/PalmOS/Src/be_base.h
index 3f6da2e058..1d5883be38 100644
--- a/backends/platform/PalmOS/Src/be_base.h
+++ b/backends/platform/PalmOS/Src/be_base.h
@@ -212,7 +212,7 @@ public:
 	virtual int getDefaultGraphicsMode() const;
 	virtual bool setGraphicsMode(int mode);
 
-	void initSize(uint w, uint h);
+	void initSize(uint w, uint h, const Graphics::PixelFormat *format);
 	int16 getWidth() { return _screenWidth; }
 	int16 getHeight() { return _screenHeight; }
 
@@ -222,7 +222,7 @@ public:
 
 	bool showMouse(bool visible);
 	void warpMouse(int x, int y);
-	void setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, byte keycolor, int cursorTargetScale);
+	void setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, int cursorTargetScale, const Graphics::PixelFormat *format);
 
 	virtual void showOverlay() = 0;
 	virtual void hideOverlay() = 0;
@@ -239,7 +239,8 @@ public:
 
 	bool pollEvent(Common::Event &event);
 
-	void getTimeAndDate(TimeDate &t) const;
+
+	void getTimeAndDate(TimeDate& td) const;
 	virtual uint32 getMillis();
 	virtual void delayMillis(uint msecs);
 
diff --git a/backends/platform/PalmOS/Src/be_os5.cpp b/backends/platform/PalmOS/Src/be_os5.cpp
index 91e9818c02..c9ef9ecf7c 100644
--- a/backends/platform/PalmOS/Src/be_os5.cpp
+++ b/backends/platform/PalmOS/Src/be_os5.cpp
@@ -115,10 +115,11 @@ void OSystem_PalmOS5::setFeatureState(Feature f, bool enable) {
 }
 
 void OSystem_PalmOS5::setWindowCaption(const char *caption) {
+/*
 FIXME/TODO: Convert caption from ISO Latin 1 to "right" encoding ?
 If the output encoding is unclear or conversion impossible,
 then one could just skip over any chars > 0x7F and display the rest
-
+*/
 	Err e;
 	Char buf[64];
 	Coord w, y, h = FntLineHeight() + 2;