WINTERMUTE: Remove references to HWND

9 files changed, 15 insertions, 16 deletions

diff --git a/engines/wintermute/Ad/AdGame.cpp b/engines/wintermute/Ad/AdGame.cpp
index 3485b3eecd..bfeac84f94 100644
--- a/engines/wintermute/Ad/AdGame.cpp
+++ b/engines/wintermute/Ad/AdGame.cpp
@@ -1953,7 +1953,7 @@ HRESULT CAdGame::onMouseLeftDown() {
 

 	if (_activeObject != NULL) Game->_capturedObject = Game->_activeObject;

 	_mouseLeftDown = true;

-	CBPlatform::setCapture(_renderer->_window);

+	CBPlatform::setCapture(/*_renderer->_window*/);

 

 	return S_OK;

 }

diff --git a/engines/wintermute/Base/BGame.cpp b/engines/wintermute/Base/BGame.cpp
index def660274a..7946bf8bbc 100644
--- a/engines/wintermute/Base/BGame.cpp
+++ b/engines/wintermute/Base/BGame.cpp
@@ -673,7 +673,7 @@ HRESULT CBGame::initLoop() {
 

 

 //////////////////////////////////////////////////////////////////////

-HRESULT CBGame::initInput(HINSTANCE hInst, HWND hWnd) {

+HRESULT CBGame::initInput() {

 	return S_OK;

 }

 

@@ -4233,7 +4233,7 @@ HRESULT CBGame::onMouseLeftDown() {
 

 	if (_activeObject != NULL) _capturedObject = _activeObject;

 	_mouseLeftDown = true;

-	CBPlatform::setCapture(_renderer->_window);

+	CBPlatform::setCapture(/*_renderer->_window*/);

 

 	return S_OK;

 }

diff --git a/engines/wintermute/Base/BGame.h b/engines/wintermute/Base/BGame.h
index 70ae0d5be1..0d1d0fe15d 100644
--- a/engines/wintermute/Base/BGame.h
+++ b/engines/wintermute/Base/BGame.h
@@ -159,7 +159,7 @@ public:
 	float _offsetPercentY;

 	CBObject *_mainObject;

 

-	HRESULT initInput(HINSTANCE hInst, HWND hWnd);

+	HRESULT initInput();

 	HRESULT initLoop();

 	uint32 _currentTime;

 	uint32 _deltaTime;

diff --git a/engines/wintermute/Base/BRenderer.h b/engines/wintermute/Base/BRenderer.h
index 0822e0d521..e9c397c9e4 100644
--- a/engines/wintermute/Base/BRenderer.h
+++ b/engines/wintermute/Base/BRenderer.h
@@ -104,8 +104,8 @@ public:
 	bool pointInViewport(POINT *P);

 	uint32 _forceAlphaColor;

 	HINSTANCE _instance;

-	HWND _window;

-	HWND _clipperWindow;

+	uint32 _window;

+	uint32 _clipperWindow;

 	bool _active;

 	bool _ready;

 	bool _windowed;

diff --git a/engines/wintermute/PlatformSDL.cpp b/engines/wintermute/PlatformSDL.cpp
index b31c825244..cbfa93c488 100644
--- a/engines/wintermute/PlatformSDL.cpp
+++ b/engines/wintermute/PlatformSDL.cpp
@@ -207,7 +207,7 @@ bool CBPlatform::setCursorPos(int X, int Y) {
 }

 

 //////////////////////////////////////////////////////////////////////////

-bool CBPlatform::showWindow(HWND hWnd, int nCmdShow) {

+bool CBPlatform::showWindow(int nCmdShow) {

 	return false;

 }

 

@@ -230,8 +230,8 @@ bool CBPlatform::copyFile(const char *from, const char *to, bool failIfExists) {
 }

 

 //////////////////////////////////////////////////////////////////////////

-HWND CBPlatform::setCapture(HWND hWnd) {

-	return 0;

+void CBPlatform::setCapture() {

+	return;

 }

 

 //////////////////////////////////////////////////////////////////////////

@@ -240,7 +240,7 @@ bool CBPlatform::releaseCapture() {
 }

 

 //////////////////////////////////////////////////////////////////////////

-bool CBPlatform::setForegroundWindow(HWND hWnd) {

+bool CBPlatform::setForegroundWindow() {

 	return false;

 }

 

diff --git a/engines/wintermute/PlatformSDL.h b/engines/wintermute/PlatformSDL.h
index 9b567c8b30..6b8879328a 100644
--- a/engines/wintermute/PlatformSDL.h
+++ b/engines/wintermute/PlatformSDL.h
@@ -52,12 +52,12 @@ public:
 	static uint32 getTime();

 	static bool getCursorPos(LPPOINT lpPoint);

 	static bool setCursorPos(int X, int Y);

-	static bool showWindow(HWND hWnd, int nCmdShow);

+	static bool showWindow(int nCmdShow);

 	static bool deleteFile(const char *lpFileName);

 	static bool copyFile(const char *from, const char *to, bool failIfExists);

-	static HWND setCapture(HWND hWnd);

+	static void setCapture();

 	static bool releaseCapture();

-	static bool setForegroundWindow(HWND hWnd);

+	static bool setForegroundWindow();

 

 	static bool setRectEmpty(LPRECT lprc);

 	static bool isRectEmpty(const LPRECT lprc);

diff --git a/engines/wintermute/utils/utils.cpp b/engines/wintermute/utils/utils.cpp
index ab7ebac565..46e5a8da36 100644
--- a/engines/wintermute/utils/utils.cpp
+++ b/engines/wintermute/utils/utils.cpp
@@ -114,7 +114,7 @@ void CBUtils::createPath(const char *path, bool pathOnly) {
 

 

 //////////////////////////////////////////////////////////////////////////

-void CBUtils::debugMessage(HWND hWnd, const char *text) {

+void CBUtils::debugMessage(const char *text) {

 	//MessageBox(hWnd, Text, "WME", MB_OK|MB_ICONINFORMATION);

 }

 

diff --git a/engines/wintermute/utils/utils.h b/engines/wintermute/utils/utils.h
index ed6c2f3bc5..52678a3e9f 100644
--- a/engines/wintermute/utils/utils.h
+++ b/engines/wintermute/utils/utils.h
@@ -44,7 +44,7 @@ public:
 

 	static void createPath(const char *Path, bool PathOnly = false);

 

-	static void debugMessage(HWND hWnd, const char *Text);

+	static void debugMessage(const char *Text);

 	static char *setString(char **String, const char *Value);

 

 	static int strNumEntries(const char *Str, const char Delim = ',');

diff --git a/engines/wintermute/wintypes.h b/engines/wintermute/wintypes.h
index efddc13614..9f4d5e035a 100644
--- a/engines/wintermute/wintypes.h
+++ b/engines/wintermute/wintypes.h
@@ -66,7 +66,6 @@ typedef struct tagPOINT {
 

 

 typedef uint32 HINSTANCE;

-typedef uint32 HWND;

 

 typedef int32 HRESULT;