include/SDL_events.h
changeset 6917 47dc155b774d
parent 6885 700f1b25f77f
child 6949 4de584a3a027
     1.1 --- a/include/SDL_events.h	Mon Feb 25 00:47:47 2013 -0500
     1.2 +++ b/include/SDL_events.h	Mon Feb 25 00:56:21 2013 -0500
     1.3 @@ -314,7 +314,7 @@
     1.4      Uint32 type;        /**< ::SDL_CONTROLLERAXISMOTION */
     1.5      Uint32 timestamp;
     1.6      Uint8 which;        /**< The joystick instance id */
     1.7 -    SDL_CONTROLLER_AXIS axis;         /**< The joystick axis index */
     1.8 +    SDL_GameControllerAxis axis;         /**< The joystick axis index */
     1.9      int value;          /**< The axis value (range: -32768 to 32767) */
    1.10  } SDL_ControllerAxisEvent;
    1.11  
    1.12 @@ -327,7 +327,7 @@
    1.13      Uint32 type;        /**< ::SDL_CONTROLLERBUTTONDOWN or ::SDL_CONTROLLERBUTTONUP */
    1.14      Uint32 timestamp;
    1.15      Uint8 which;        /**< The joystick instance id */
    1.16 -    SDL_CONTROLLER_BUTTON button;       /**< The joystick button index */
    1.17 +    SDL_GameControllerButton button;       /**< The joystick button index */
    1.18      Uint8 state;        /**< ::SDL_PRESSED or ::SDL_RELEASED */
    1.19  } SDL_ControllerButtonEvent;
    1.20