Fixed mismerged patch.
authorRyan C. Gordon <icculus@icculus.org>
Thu, 11 Aug 2005 05:08:28 +0000
changeset 1115 040aa1bea9fc
parent 1114 242a35a85852
child 1116 080ed9ef0609
Fixed mismerged patch.
src/video/windx5/SDL_dx5events.c
--- a/src/video/windx5/SDL_dx5events.c	Thu Aug 11 01:02:01 2005 +0000
+++ b/src/video/windx5/SDL_dx5events.c	Thu Aug 11 05:08:28 2005 +0000
@@ -181,7 +181,7 @@
 			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 @@
 				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]);