Mercurial > sdl-ios-xcode
comparison src/video/win32/SDL_win32window.c @ 4763:518d1679d2d0
Merged Daniel's Google Summer of Code work from SDL-gsoc2010_IME
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Sun, 22 Aug 2010 12:39:27 -0700 |
parents | c24ba2cc9583 436183eb30c8 |
children | 69d9db65f248 |
comparison
equal
deleted
inserted
replaced
4762:833a225613e2 | 4763:518d1679d2d0 |
---|---|
75 return -1; | 75 return -1; |
76 } | 76 } |
77 | 77 |
78 /* Set up the window proc function */ | 78 /* Set up the window proc function */ |
79 data->wndproc = (WNDPROC) GetWindowLongPtr(hwnd, GWLP_WNDPROC); | 79 data->wndproc = (WNDPROC) GetWindowLongPtr(hwnd, GWLP_WNDPROC); |
80 if (data->wndproc == DefWindowProc) { | 80 if (data->wndproc == WIN_WindowProc) { |
81 data->wndproc = NULL; | 81 data->wndproc = NULL; |
82 } | 82 } |
83 SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG_PTR) WIN_WindowProc); | 83 else { |
84 SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG_PTR) WIN_WindowProc); | |
85 } | |
84 | 86 |
85 /* Fill in the SDL window with the window data */ | 87 /* Fill in the SDL window with the window data */ |
86 { | 88 { |
87 POINT point; | 89 POINT point; |
88 point.x = 0; | 90 point.x = 0; |