src/video/windib/SDL_dibevents.c
changeset 1472 4aac8563c296
parent 1456 84de7511f79f
child 1480 0a2bd6507477
     1.1 --- a/src/video/windib/SDL_dibevents.c	Mon Mar 06 07:42:36 2006 +0000
     1.2 +++ b/src/video/windib/SDL_dibevents.c	Mon Mar 06 08:11:10 2006 +0000
     1.3 @@ -43,7 +43,7 @@
     1.4  
     1.5  /* The translation table from a Microsoft VK keysym to a SDL keysym */
     1.6  static SDLKey VK_keymap[SDLK_LAST];
     1.7 -static SDL_keysym *TranslateKey(UINT vkey, UINT scancode, SDL_keysym *keysym, int pressed);
     1.8 +static SDL_keysym *TranslateKey(WPARAM vkey, UINT scancode, SDL_keysym *keysym, int pressed);
     1.9  
    1.10  /* Masks for processing the windows KEYDOWN and KEYUP messages */
    1.11  #define REPEATED_KEYMASK	(1<<30)
    1.12 @@ -376,7 +376,7 @@
    1.13  	VK_keymap[VK_APPS] = SDLK_MENU;
    1.14  }
    1.15  
    1.16 -static SDL_keysym *TranslateKey(UINT vkey, UINT scancode, SDL_keysym *keysym, int pressed)
    1.17 +static SDL_keysym *TranslateKey(WPARAM vkey, UINT scancode, SDL_keysym *keysym, int pressed)
    1.18  {
    1.19  	/* Set the keysym information */
    1.20  	keysym->scancode = (unsigned char) scancode;
    1.21 @@ -426,8 +426,8 @@
    1.22  		/* DJM: we want all event's for the user specified
    1.23  			window to be handled by SDL.
    1.24  		 */
    1.25 -		userWindowProc = (WNDPROCTYPE)GetWindowLongPtr(SDL_Window, GWL_WNDPROC);
    1.26 -		SetWindowLongPtr(SDL_Window, GWL_WNDPROC, (LONG_PTR)WinMessage);
    1.27 +		userWindowProc = (WNDPROCTYPE)GetWindowLongPtr(SDL_Window, GWLP_WNDPROC);
    1.28 +		SetWindowLongPtr(SDL_Window, GWLP_WNDPROC, (LONG_PTR)WinMessage);
    1.29  	} else {
    1.30  		SDL_Window = CreateWindow(SDL_Appname, SDL_Appname,
    1.31                          (WS_OVERLAPPED|WS_CAPTION|WS_SYSMENU|WS_MINIMIZEBOX),
    1.32 @@ -444,7 +444,7 @@
    1.33  void DIB_DestroyWindow(_THIS)
    1.34  {
    1.35  	if ( SDL_windowid ) {
    1.36 -		SetWindowLongPtr(SDL_Window, GWL_WNDPROC, (LONG_PTR)userWindowProc);
    1.37 +		SetWindowLongPtr(SDL_Window, GWLP_WNDPROC, (LONG_PTR)userWindowProc);
    1.38  	} else {
    1.39  		DestroyWindow(SDL_Window);
    1.40  	}