From effc4430b3d4e1a2a1c04eb363f1d5b783489c48 Mon Sep 17 00:00:00 2001
From: Chris Apers
Date: Mon, 20 Dec 2004 17:10:53 +0000
Subject: Prevent conflict with the new OSystem enum

svn-id: r16169
---
 backends/PalmOS/Src/palm.cpp    | 10 ++--------
 backends/PalmOS/Src/palmevt.cpp |  2 +-
 2 files changed, 3 insertions(+), 9 deletions(-)

(limited to 'backends')

diff --git a/backends/PalmOS/Src/palm.cpp b/backends/PalmOS/Src/palm.cpp
index 831aedcef8..b7cecb341f 100644
--- a/backends/PalmOS/Src/palm.cpp
+++ b/backends/PalmOS/Src/palm.cpp
@@ -82,7 +82,7 @@ void OSystem_PALMOS::battery_handler() {
 	}
 
 	if (voltage <= criticalThreshold) {
-		EventType event;
+		::EventType event;
 		event.eType = keyDownEvent;
 		event.data.keyDown.chr = vchrAutoOff;
 		event.data.keyDown.modifiers = commandKeyMask;
@@ -187,7 +187,7 @@ void OSystem_PALMOS::setFeatureState(Feature f, bool enable) {
 		case kFeatureAspectRatioCorrection:
 			if (_mode == GFX_WIDE && OPTIONS_TST(kOptDeviceZodiac)) {
 				_adjustAspectRatio ^= true;
-				ClearScreen();
+				clearScreen();
 			}
 			break;
 	}
@@ -300,9 +300,3 @@ OSystem_PALMOS::OSystem_PALMOS() {
 	memset(&_sound,0,sizeof(SoundDataType));
 }
 
-void ClearScreen() {
-	RGBColorType rgb	= {0, 0,0,0};
-	RectangleType r		= {0, 0, gVars->screenFullWidth, gVars->screenFullHeight};
-	WinSetForeColor(WinRGBToIndex(&rgb));
-	WinDrawRectangle(&r,0);
-}
diff --git a/backends/PalmOS/Src/palmevt.cpp b/backends/PalmOS/Src/palmevt.cpp
index 1fcbf123aa..cbdc0465c1 100644
--- a/backends/PalmOS/Src/palmevt.cpp
+++ b/backends/PalmOS/Src/palmevt.cpp
@@ -105,7 +105,7 @@ void OSystem_PALMOS::getCoordinates(EventPtr event, Coord *x, Coord *y) {
 }
 
 bool OSystem_PALMOS::pollEvent(Event &event) {
-	EventType ev;
+	::EventType ev;
 	Boolean handled;
 	UInt32 keyCurrentState;
 	Coord x, y;
-- 
cgit v1.2.3