pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changed StopTextInput to take an SDL_Window parameter.

Browse source
This commit is contained in:
dewyatt 2010-07-10 13:15:47 -04:00
parent 2beaeb4080
commit 2f1a5c4653
6 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/SDL_keyboard.h
View file

@ -147,7 +147,7 @@ extern DECLSPEC void SDLCALL SDL_StartTextInput(SDL_Window *window);
* *
* \sa SDL_StartTextInput() * \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. * \brief Set the rectangle used to type Unicode text inputs.

2
src/SDL_compat.c
View file

@ -1744,7 +1744,7 @@ SDL_EnableUNICODE(int enable)
break; break;
case 0: case 0:
SDL_enabled_UNICODE = 0; SDL_enabled_UNICODE = 0;
SDL_StopTextInput(); SDL_StopTextInput(SDL_VideoWindow);
break; break;
} }
return previous; return previous;

2
src/video/SDL_sysvideo.h
View file

@ -300,7 +300,7 @@ struct SDL_VideoDevice
/* Text input */ /* Text input */
void (*StartTextInput) (_THIS, SDL_Window *window); void (*StartTextInput) (_THIS, SDL_Window *window);
void (*StopTextInput) (_THIS); void (*StopTextInput) (_THIS, SDL_Window *window);
void (*SetTextInputRect) (_THIS, SDL_Rect *rect); void (*SetTextInputRect) (_THIS, SDL_Rect *rect);
/* * * */ /* * * */

4
src/video/SDL_video.c
View file

@ -3395,10 +3395,10 @@ SDL_StartTextInput(SDL_Window *window)
} }
void void
SDL_StopTextInput(void) SDL_StopTextInput(SDL_Window *window)
{ {
if (_this && _this->StopTextInput) { if (_this && _this->StopTextInput) {
_this->StopTextInput(_this); _this->StopTextInput(_this, window);
} }
SDL_EventState(SDL_TEXTINPUT, SDL_DISABLE); SDL_EventState(SDL_TEXTINPUT, SDL_DISABLE);
SDL_EventState(SDL_TEXTEDITING, SDL_DISABLE); SDL_EventState(SDL_TEXTEDITING, SDL_DISABLE);

2
src/video/win32/SDL_win32keyboard.c
View file

@ -130,7 +130,7 @@ WIN_StartTextInput(_THIS, SDL_Window *window)
} }
void void
WIN_StopTextInput(_THIS) WIN_StopTextInput(_THIS, SDL_Window *window)
{ {
} }

2
src/video/win32/SDL_win32keyboard.h
View file

@ -32,7 +32,7 @@ extern void WIN_UpdateKeymap(void);
extern void WIN_QuitKeyboard(_THIS); extern void WIN_QuitKeyboard(_THIS);
extern void WIN_StartTextInput(_THIS, SDL_Window *window); 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); extern void WIN_SetTextInputRect(_THIS, SDL_Rect *rect);
#endif /* _SDL_win32keyboard_h */ #endif /* _SDL_win32keyboard_h */