Mercurial > sdl-ios-xcode
changeset 1481:deb22b9fe970
Yet more Win64 tweaks
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Tue, 07 Mar 2006 16:02:59 +0000 |
| parents | 0a2bd6507477 |
| children | 141528317f4f |
| files | src/video/wincommon/SDL_lowvideo.h src/video/wincommon/SDL_syswm.c |
| diffstat | 2 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/video/wincommon/SDL_lowvideo.h Tue Mar 07 05:21:32 2006 +0000 +++ b/src/video/wincommon/SDL_lowvideo.h Tue Mar 07 16:02:59 2006 +0000 @@ -39,6 +39,9 @@ #ifndef GWLP_WNDPROC #define GWLP_WNDPROC GWL_WNDPROC #endif +#ifndef GCLP_HICON +#define GCLP_HICON GCL_HICON +#endif #include "../SDL_sysvideo.h" @@ -118,7 +121,7 @@ /* DJM: This is really from SDL_sysevents.c, we need it in GDL_CreateWindow as well */ -LONG CALLBACK WinMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam); +LRESULT CALLBACK WinMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam); /* JFP: Implementation of ToUnicode() that works on 9x/ME/2K/XP */ typedef int (WINAPI *ToUnicodeFN)(UINT, UINT, PBYTE, LPWSTR, int, UINT);
--- a/src/video/wincommon/SDL_syswm.c Tue Mar 07 05:21:32 2006 +0000 +++ b/src/video/wincommon/SDL_syswm.c Tue Mar 07 16:02:59 2006 +0000 @@ -220,7 +220,7 @@ if ( screen_icn == NULL ) { SDL_SetError("Couldn't create Win32 icon handle"); } else { - SetClassLongPtr(SDL_Window, GCL_HICON, (LONG_PTR)screen_icn); + SetClassLongPtr(SDL_Window, GCLP_HICON, (LONG_PTR)screen_icn); } SDL_stack_free(icon_win32); #endif /* DISABLE_ICON_SUPPORT */