Mercurial > sdl-ios-xcode

comparison src/video/windx5/SDL_dx5events.c @ 975:add87cc1de0a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author Sam Lantinga <slouken@libsdl.org>
date Mon, 15 Nov 2004 21:11:44 +0000
parents fb8b91365766
children 242a35a85852
comparison
equal deleted inserted replaced
974:b8427b5151ed 975:add87cc1de0a
847 #define CS_BYTEALIGNCLIENT 0 847 #define CS_BYTEALIGNCLIENT 0
848 #endif 848 #endif
849 SDL_RegisterApp("SDL_app", CS_BYTEALIGNCLIENT, 0); 849 SDL_RegisterApp("SDL_app", CS_BYTEALIGNCLIENT, 0);
850 if ( SDL_windowid ) { 850 if ( SDL_windowid ) {
851 SDL_Window = (HWND)strtol(SDL_windowid, NULL, 0); 851 SDL_Window = (HWND)strtol(SDL_windowid, NULL, 0);
852 if ( SDL_Window == NULL ) {
853 SDL_SetError("Couldn't get user specified window");
854 return(-1);
855 }
852 856
853 /* DJM: we want all event's for the user specified 857 /* DJM: we want all event's for the user specified
854 window to be handled by SDL. 858 window to be handled by SDL.
855 */ 859 */
856 if (SDL_Window) { 860 userWindowProc = (WNDPROC)GetWindowLong(SDL_Window, GWL_WNDPROC);
857 userWindowProc = (WNDPROC)GetWindowLong(SDL_Window, GWL_WNDPROC); 861 SetWindowLong(SDL_Window, GWL_WNDPROC, (LONG)WinMessage);
858 SetWindowLong(SDL_Window, GWL_WNDPROC, (LONG)WinMessage);
859 }
860 } else { 862 } else {
861 SDL_Window = CreateWindow(SDL_Appname, SDL_Appname, 863 SDL_Window = CreateWindow(SDL_Appname, SDL_Appname,
862 (WS_OVERLAPPED|WS_CAPTION|WS_SYSMENU|WS_MINIMIZEBOX), 864 (WS_OVERLAPPED|WS_CAPTION|WS_SYSMENU|WS_MINIMIZEBOX),
863 CW_USEDEFAULT, CW_USEDEFAULT, 0, 0, NULL, NULL, SDL_Instance, NULL); 865 CW_USEDEFAULT, CW_USEDEFAULT, 0, 0, NULL, NULL, SDL_Instance, NULL);
864 if ( SDL_Window == NULL ) { 866 if ( SDL_Window == NULL ) {
881 { 883 {
882 /* Close down DirectInput */ 884 /* Close down DirectInput */
883 DX5_DInputQuit(this); 885 DX5_DInputQuit(this);
884 886
885 /* Destroy our window */ 887 /* Destroy our window */
886 DestroyWindow(SDL_Window); 888 if ( SDL_windowid ) {
887 } 889 SetWindowLong(SDL_Window, GWL_WNDPROC, (LONG)userWindowProc);
890 } else {
891 DestroyWindow(SDL_Window);
892 }
893 }