Merged Daniel's Google Summer of Code work from SDL-gsoc2010_IME

This commit is contained in:
Sam Lantinga 2010-08-22 12:39:27 -07:00
commit 1f8dacabd7
60 changed files with 3930 additions and 77 deletions

4
src/video/win32/SDL_win32events.c Executable file → Normal file
View file

@ -139,6 +139,8 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
}
#endif
if (IME_HandleMessage(hwnd, msg, wParam, &lParam, data->videodata))
return 0;
switch (msg) {
@ -605,7 +607,7 @@ SDL_RegisterApp(char *name, Uint32 style, void *hInst)
class.hbrBackground = NULL;
class.hInstance = SDL_Instance;
class.style = SDL_Appstyle;
class.lpfnWndProc = DefWindowProc;
class.lpfnWndProc = WIN_WindowProc;
class.cbWndExtra = 0;
class.cbClsExtra = 0;
if (!RegisterClass(&class)) {