Xcode-iOS/Demos/src/keyboard.c
changeset 6310 f830e73e2acf
parent 6159 fb6f363032fd
child 6392 fa7eb111f994
     1.1 --- a/Xcode-iOS/Demos/src/keyboard.c	Fri May 25 18:21:10 2012 -0400
     1.2 +++ b/Xcode-iOS/Demos/src/keyboard.c	Fri May 25 18:21:22 2012 -0400
     1.3 @@ -35,9 +35,9 @@
     1.4  */
     1.5  typedef struct
     1.6  {
     1.7 -    SDL_ScanCode scancode;      /* scancode of the key we want to map */
     1.8 +    SDL_Scancode scancode;      /* scancode of the key we want to map */
     1.9      int allow_no_mod;           /* is the map valid if the key has no modifiers? */
    1.10 -    SDLMod mod;                 /* what modifiers are allowed for the mapping */
    1.11 +    SDL_Keymod mod;             /* what modifiers are allowed for the mapping */
    1.12      int index;                  /* what index in the font does the scancode map to */
    1.13  } fontMapping;
    1.14  
    1.15 @@ -114,7 +114,7 @@
    1.16  	If there is no entry for the key, -1 is returned
    1.17  */
    1.18  int
    1.19 -keyToIndex(SDL_KeySym key)
    1.20 +keyToIndex(SDL_Keysym key)
    1.21  {
    1.22      int i, index = -1;
    1.23      for (i = 0; i < TABLE_SIZE; i++) {
    1.24 @@ -240,8 +240,8 @@
    1.25      int index;                  /* index of last key we pushed in the bitmap font */
    1.26      SDL_Window *window;
    1.27      SDL_Event event;            /* last event received */
    1.28 -    SDLMod mod;                 /* key modifiers of last key we pushed */
    1.29 -    SDL_ScanCode scancode;      /* scancode of last key we pushed */
    1.30 +    SDL_Keymod mod;             /* key modifiers of last key we pushed */
    1.31 +    SDL_Scancode scancode;      /* scancode of last key we pushed */
    1.32  
    1.33      if (SDL_Init(SDL_INIT_VIDEO) < 0) {
    1.34          printf("Error initializing SDL: %s", SDL_GetError());