Fixed mismerged patch.
authorRyan C. Gordon
Thu, 11 Aug 2005 05:08:28 +0000
changeset 1115040aa1bea9fc
parent 1114 242a35a85852
child 1116 080ed9ef0609
Fixed mismerged patch.
src/video/windx5/SDL_dx5events.c
     1.1 --- a/src/video/windx5/SDL_dx5events.c	Thu Aug 11 01:02:01 2005 +0000
     1.2 +++ b/src/video/windx5/SDL_dx5events.c	Thu Aug 11 05:08:28 2005 +0000
     1.3 @@ -181,7 +181,7 @@
     1.4  			SetDIerror("DirectInputDevice::QueryInterface", result);
     1.5  			return(-1);
     1.6  		}
     1.7 -		topwnd =  GetTopLevelParent(SDL_Window, GA_ROOT);
     1.8 +		topwnd =  GetTopLevelParent(SDL_Window);
     1.9  		result = IDirectInputDevice2_SetCooperativeLevel(SDL_DIdev[i],
    1.10  					topwnd, inputs[i].win_level);
    1.11  		if ( result != DI_OK ) {
    1.12 @@ -665,7 +665,7 @@
    1.13  				level = inputs[i].win_level;
    1.14  			}
    1.15  			IDirectInputDevice2_Unacquire(SDL_DIdev[i]);
    1.16 -			topwnd = GetTopLevelParent(SDL_Window, GA_ROOT);
    1.17 +			topwnd = GetTopLevelParent(SDL_Window);
    1.18  			result = IDirectInputDevice2_SetCooperativeLevel(
    1.19  					SDL_DIdev[i], topwnd, level);
    1.20  			IDirectInputDevice2_Acquire(SDL_DIdev[i]);