include/SDL_keyboard.h
changeset 5220 1fbe1c202501
parent 5219 c1a92e61907d
child 5262 b530ef003506
     1.1 --- a/include/SDL_keyboard.h	Mon Feb 07 09:42:08 2011 -0800
     1.2 +++ b/include/SDL_keyboard.h	Mon Feb 07 10:40:21 2011 -0800
     1.3 @@ -48,7 +48,7 @@
     1.4  typedef struct SDL_Keysym
     1.5  {
     1.6      SDL_Scancode scancode;      /**< SDL physical key code - see ::SDL_Scancode for details */
     1.7 -    SDL_Key sym;                /**< SDL virtual key code - see ::SDL_Key for details */
     1.8 +    SDL_Keycode sym;            /**< SDL virtual key code - see ::SDL_Keycode for details */
     1.9      Uint16 mod;                 /**< current key modifiers */
    1.10      Uint32 unicode;             /**< \deprecated use SDL_TextInputEvent instead */
    1.11  } SDL_Keysym;
    1.12 @@ -80,24 +80,24 @@
    1.13  /**
    1.14   *  \brief Get the current key modifier state for the keyboard.
    1.15   */
    1.16 -extern DECLSPEC SDL_Mod SDLCALL SDL_GetModState(void);
    1.17 +extern DECLSPEC SDL_Keymod SDLCALL SDL_GetModState(void);
    1.18  
    1.19  /**
    1.20   *  \brief Set the current key modifier state for the keyboard.
    1.21   *  
    1.22   *  \note This does not change the keyboard state, only the key modifier flags.
    1.23   */
    1.24 -extern DECLSPEC void SDLCALL SDL_SetModState(SDL_Mod modstate);
    1.25 +extern DECLSPEC void SDLCALL SDL_SetModState(SDL_Keymod modstate);
    1.26  
    1.27  /**
    1.28   *  \brief Get the key code corresponding to the given scancode according
    1.29   *         to the current keyboard layout.
    1.30   *  
    1.31 - *  See ::SDL_Key for details.
    1.32 + *  See ::SDL_Keycode for details.
    1.33   *  
    1.34   *  \sa SDL_GetKeyName()
    1.35   */
    1.36 -extern DECLSPEC SDL_Key SDLCALL SDL_GetKeyFromScancode(SDL_Scancode scancode);
    1.37 +extern DECLSPEC SDL_Keycode SDLCALL SDL_GetKeyFromScancode(SDL_Scancode scancode);
    1.38  
    1.39  /**
    1.40   *  \brief Get the scancode corresponding to the given key code according to the
    1.41 @@ -107,7 +107,7 @@
    1.42   *  
    1.43   *  \sa SDL_GetScancodeName()
    1.44   */
    1.45 -extern DECLSPEC SDL_Scancode SDLCALL SDL_GetScancodeFromKey(SDL_Key key);
    1.46 +extern DECLSPEC SDL_Scancode SDLCALL SDL_GetScancodeFromKey(SDL_Keycode key);
    1.47  
    1.48  /**
    1.49   *  \brief Get a human-readable name for a scancode.
    1.50 @@ -132,7 +132,7 @@
    1.51   *  
    1.52   *  \sa SDL_Key
    1.53   */
    1.54 -extern DECLSPEC const char *SDLCALL SDL_GetKeyName(SDL_Key key);
    1.55 +extern DECLSPEC const char *SDLCALL SDL_GetKeyName(SDL_Keycode key);
    1.56  
    1.57  /**
    1.58   *  \brief Start accepting Unicode text input events.