# HG changeset patch # User Ryan C. Gordon # Date 1123736908 0 # Node ID 040aa1bea9fca6b46afd4d873ba800f0241eb5d4 # Parent 242a35a858527092d7ae135cfd29d9f69e019ab3 Fixed mismerged patch. diff -r 242a35a85852 -r 040aa1bea9fc 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]);