Mercurial > sdl-ios-xcode

changeset 4751:f3908cd80b10

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Changed StopTextInput to take an SDL_Window parameter.
author dewyatt
date Sat, 10 Jul 2010 13:15:47 -0400
parents 22aa6a631d34
children dc7bdcf06367
files include/SDL_keyboard.h src/SDL_compat.c src/video/SDL_sysvideo.h src/video/SDL_video.c src/video/win32/SDL_win32keyboard.c src/video/win32/SDL_win32keyboard.h
diffstat 6 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/include/SDL_keyboard.h	Thu Jul 08 01:35:47 2010 -0400
+++ b/include/SDL_keyboard.h	Sat Jul 10 13:15:47 2010 -0400
@@ -147,7 +147,7 @@
  *  
  *  \sa SDL_StartTextInput()
  */
-extern DECLSPEC void SDLCALL SDL_StopTextInput(void);
+extern DECLSPEC void SDLCALL SDL_StopTextInput(SDL_Window *window);
 
 /**
  *  \brief Set the rectangle used to type Unicode text inputs.
--- a/src/SDL_compat.c	Thu Jul 08 01:35:47 2010 -0400
+++ b/src/SDL_compat.c	Sat Jul 10 13:15:47 2010 -0400
@@ -1744,7 +1744,7 @@
         break;
     case 0:
         SDL_enabled_UNICODE = 0;
-        SDL_StopTextInput();
+        SDL_StopTextInput(SDL_VideoWindow);
         break;
     }
     return previous;
--- a/src/video/SDL_sysvideo.h	Thu Jul 08 01:35:47 2010 -0400
+++ b/src/video/SDL_sysvideo.h	Sat Jul 10 13:15:47 2010 -0400
@@ -300,7 +300,7 @@
 
     /* Text input */
     void (*StartTextInput) (_THIS, SDL_Window *window);
-    void (*StopTextInput) (_THIS);
+    void (*StopTextInput) (_THIS, SDL_Window *window);
     void (*SetTextInputRect) (_THIS, SDL_Rect *rect);
 
     /* * * */
--- a/src/video/SDL_video.c	Thu Jul 08 01:35:47 2010 -0400
+++ b/src/video/SDL_video.c	Sat Jul 10 13:15:47 2010 -0400
@@ -3395,10 +3395,10 @@
 }
 
 void
-SDL_StopTextInput(void)
+SDL_StopTextInput(SDL_Window *window)
 {
     if (_this && _this->StopTextInput) {
-        _this->StopTextInput(_this);
+        _this->StopTextInput(_this, window);
     }
     SDL_EventState(SDL_TEXTINPUT, SDL_DISABLE);
     SDL_EventState(SDL_TEXTEDITING, SDL_DISABLE);
--- a/src/video/win32/SDL_win32keyboard.c	Thu Jul 08 01:35:47 2010 -0400
+++ b/src/video/win32/SDL_win32keyboard.c	Sat Jul 10 13:15:47 2010 -0400
@@ -130,7 +130,7 @@
 }
 
 void
-WIN_StopTextInput(_THIS)
+WIN_StopTextInput(_THIS, SDL_Window *window)
 {
 
 }
--- a/src/video/win32/SDL_win32keyboard.h	Thu Jul 08 01:35:47 2010 -0400
+++ b/src/video/win32/SDL_win32keyboard.h	Sat Jul 10 13:15:47 2010 -0400
@@ -32,7 +32,7 @@
 extern void WIN_QuitKeyboard(_THIS);
 
 extern void WIN_StartTextInput(_THIS, SDL_Window *window);
-extern void WIN_StopTextInput(_THIS);
+extern void WIN_StopTextInput(_THIS, SDL_Window *window);
 extern void WIN_SetTextInputRect(_THIS, SDL_Rect *rect);
 
 #endif /* _SDL_win32keyboard_h */