From 29f4526db9e22353b91ca4b3b533ce7c2f1780aa Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Thu, 11 Aug 2005 05:08:28 +0000 Subject: [PATCH] Fixed mismerged patch. --- src/video/windx5/SDL_dx5events.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/video/windx5/SDL_dx5events.c b/src/video/windx5/SDL_dx5events.c index 9629d3506..18d83c70f 100644 --- a/src/video/windx5/SDL_dx5events.c +++ b/src/video/windx5/SDL_dx5events.c @@ -181,7 +181,7 @@ static int DX5_DInputInit(_THIS) SetDIerror("DirectInputDevice::QueryInterface", result); return(-1); } - topwnd = GetTopLevelParent(SDL_Window, GA_ROOT); + topwnd = GetTopLevelParent(SDL_Window); result = IDirectInputDevice2_SetCooperativeLevel(SDL_DIdev[i], topwnd, inputs[i].win_level); if ( result != DI_OK ) { @@ -665,7 +665,7 @@ void DX5_DInputReset(_THIS, int fullscreen) level = inputs[i].win_level; } IDirectInputDevice2_Unacquire(SDL_DIdev[i]); - topwnd = GetTopLevelParent(SDL_Window, GA_ROOT); + topwnd = GetTopLevelParent(SDL_Window); result = IDirectInputDevice2_SetCooperativeLevel( SDL_DIdev[i], topwnd, level); IDirectInputDevice2_Acquire(SDL_DIdev[i]);