Changed StopTextInput to take an SDL_Window parameter.
1.1 --- a/include/SDL_keyboard.h Thu Jul 08 01:35:47 2010 -0400
1.2 +++ b/include/SDL_keyboard.h Sat Jul 10 13:15:47 2010 -0400
1.3 @@ -147,7 +147,7 @@
1.4 *
1.5 * \sa SDL_StartTextInput()
1.6 */
1.7 -extern DECLSPEC void SDLCALL SDL_StopTextInput(void);
1.8 +extern DECLSPEC void SDLCALL SDL_StopTextInput(SDL_Window *window);
1.9
1.10 /**
1.11 * \brief Set the rectangle used to type Unicode text inputs.
2.1 --- a/src/SDL_compat.c Thu Jul 08 01:35:47 2010 -0400
2.2 +++ b/src/SDL_compat.c Sat Jul 10 13:15:47 2010 -0400
2.3 @@ -1744,7 +1744,7 @@
2.4 break;
2.5 case 0:
2.6 SDL_enabled_UNICODE = 0;
2.7 - SDL_StopTextInput();
2.8 + SDL_StopTextInput(SDL_VideoWindow);
2.9 break;
2.10 }
2.11 return previous;
3.1 --- a/src/video/SDL_sysvideo.h Thu Jul 08 01:35:47 2010 -0400
3.2 +++ b/src/video/SDL_sysvideo.h Sat Jul 10 13:15:47 2010 -0400
3.3 @@ -300,7 +300,7 @@
3.4
3.5 /* Text input */
3.6 void (*StartTextInput) (_THIS, SDL_Window *window);
3.7 - void (*StopTextInput) (_THIS);
3.8 + void (*StopTextInput) (_THIS, SDL_Window *window);
3.9 void (*SetTextInputRect) (_THIS, SDL_Rect *rect);
3.10
3.11 /* * * */
4.1 --- a/src/video/SDL_video.c Thu Jul 08 01:35:47 2010 -0400
4.2 +++ b/src/video/SDL_video.c Sat Jul 10 13:15:47 2010 -0400
4.3 @@ -3395,10 +3395,10 @@
4.4 }
4.5
4.6 void
4.7 -SDL_StopTextInput(void)
4.8 +SDL_StopTextInput(SDL_Window *window)
4.9 {
4.10 if (_this && _this->StopTextInput) {
4.11 - _this->StopTextInput(_this);
4.12 + _this->StopTextInput(_this, window);
4.13 }
4.14 SDL_EventState(SDL_TEXTINPUT, SDL_DISABLE);
4.15 SDL_EventState(SDL_TEXTEDITING, SDL_DISABLE);
5.1 --- a/src/video/win32/SDL_win32keyboard.c Thu Jul 08 01:35:47 2010 -0400
5.2 +++ b/src/video/win32/SDL_win32keyboard.c Sat Jul 10 13:15:47 2010 -0400
5.3 @@ -130,7 +130,7 @@
5.4 }
5.5
5.6 void
5.7 -WIN_StopTextInput(_THIS)
5.8 +WIN_StopTextInput(_THIS, SDL_Window *window)
5.9 {
5.10
5.11 }
6.1 --- a/src/video/win32/SDL_win32keyboard.h Thu Jul 08 01:35:47 2010 -0400
6.2 +++ b/src/video/win32/SDL_win32keyboard.h Sat Jul 10 13:15:47 2010 -0400
6.3 @@ -32,7 +32,7 @@
6.4 extern void WIN_QuitKeyboard(_THIS);
6.5
6.6 extern void WIN_StartTextInput(_THIS, SDL_Window *window);
6.7 -extern void WIN_StopTextInput(_THIS);
6.8 +extern void WIN_StopTextInput(_THIS, SDL_Window *window);
6.9 extern void WIN_SetTextInputRect(_THIS, SDL_Rect *rect);
6.10
6.11 #endif /* _SDL_win32keyboard_h */