[Scummvm-cvs-logs] scummvm master -> a72ab2f448b880a30dbce319808fca64c4121e40

lordhoto lordhoto at gmail.com
Tue Aug 9 14:59:53 CEST 2011


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a72ab2f448 BACKENDS: Fix compilation.


Commit: a72ab2f448b880a30dbce319808fca64c4121e40
    https://github.com/scummvm/scummvm/commit/a72ab2f448b880a30dbce319808fca64c4121e40
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-08-09T05:56:38-07:00

Commit Message:
BACKENDS: Fix compilation.

Changed paths:
    backends/graphics/gph/gph-graphics.cpp
    backends/graphics/linuxmotosdl/linuxmotosdl-graphics.cpp
    backends/graphics/wincesdl/wincesdl-graphics.cpp
    backends/graphics/wincesdl/wincesdl-graphics.h



diff --git a/backends/graphics/gph/gph-graphics.cpp b/backends/graphics/gph/gph-graphics.cpp
index 2e8bfa6..96b0619 100644
--- a/backends/graphics/gph/gph-graphics.cpp
+++ b/backends/graphics/gph/gph-graphics.cpp
@@ -141,7 +141,7 @@ void GPHGraphicsManager::initSize(uint w, uint h, const Graphics::PixelFormat *f
 	if (w > 320 || h > 240){
 		setGraphicsMode(GFX_HALF);
 		setGraphicsModeIntern();
-		_sdlEventSource->toggleMouseGrab();
+		_eventSource->toggleMouseGrab();
 	}
 
 	_videoMode.overlayWidth = 320;
@@ -585,7 +585,6 @@ void GPHGraphicsManager::transformMouseCoordinates(Common::Point &point) {
 			point.x *= 2;
 			point.y *= 2;
 		}
-		g_system->getEventManager()->pushEvent(newEvent);
 		point.x /= _videoMode.scaleFactor;
 		point.y /= _videoMode.scaleFactor;
 		if (_videoMode.aspectRatioCorrection)
diff --git a/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.cpp b/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.cpp
index e59d3f9..de9838a 100644
--- a/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.cpp
+++ b/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.cpp
@@ -134,7 +134,7 @@ void LinuxmotoSdlGraphicsManager::initSize(uint w, uint h) {
 	if	(w > 320 || h > 240) {
 		setGraphicsMode(GFX_HALF);
 		setGraphicsModeIntern();
-		_sdlEventSource->toggleMouseGrab();
+		_eventSource->toggleMouseGrab();
 	}
 
 	_transactionDetails.sizeChanged = true;
@@ -484,7 +484,6 @@ void LinuxmotoSdlGraphicsManager::transformMouseCoordinates(Common::Point &point
 			point.x *= 2;
 			point.y *= 2;
 		}
-		g_system->getEventManager()->pushEvent(newEvent);
 		point.x /= _videoMode.scaleFactor;
 		point.y /= _videoMode.scaleFactor;
 		if (_videoMode.aspectRatioCorrection)
diff --git a/backends/graphics/wincesdl/wincesdl-graphics.cpp b/backends/graphics/wincesdl/wincesdl-graphics.cpp
index b0cbb87..58b735e 100644
--- a/backends/graphics/wincesdl/wincesdl-graphics.cpp
+++ b/backends/graphics/wincesdl/wincesdl-graphics.cpp
@@ -934,7 +934,7 @@ bool WINCESdlGraphicsManager::loadGFXMode() {
 		_toolbarHigh = NULL;
 
 	// keyboard cursor control, some other better place for it?
-	_sdlEventSource->resetKeyboadEmulation(_videoMode.screenWidth * _scaleFactorXm / _scaleFactorXd - 1, _videoMode.screenHeight * _scaleFactorXm / _scaleFactorXd - 1);
+	_eventSource->resetKeyboadEmulation(_videoMode.screenWidth * _scaleFactorXm / _scaleFactorXd - 1, _videoMode.screenHeight * _scaleFactorXm / _scaleFactorXd - 1);
 
 	return true;
 }
diff --git a/backends/graphics/wincesdl/wincesdl-graphics.h b/backends/graphics/wincesdl/wincesdl-graphics.h
index edf3cc5..2e8c331 100644
--- a/backends/graphics/wincesdl/wincesdl-graphics.h
+++ b/backends/graphics/wincesdl/wincesdl-graphics.h
@@ -160,8 +160,6 @@ public:
 
 	virtual void transformMouseCoordinates(Common::Point &point);
 
-	virtual void transformMouseCoordinates(Common::Point &point);
-
 private:
 	bool update_scalers();
 	void drawToolbarMouse(SDL_Surface *surf, bool draw);






More information about the Scummvm-git-logs mailing list