test/testime.c
changeset 6785 c094c438c0a6
parent 6318 49b2cb56db6e
child 7191 75360622e65f
     1.1 --- a/test/testime.c	Mon Dec 31 10:14:38 2012 -0800
     1.2 +++ b/test/testime.c	Mon Dec 31 10:26:38 2012 -0800
     1.3 @@ -20,13 +20,13 @@
     1.4  #include "SDL_ttf.h"
     1.5  #endif
     1.6  
     1.7 -#include "common.h"
     1.8 +#include "SDL_test_common.h"
     1.9  
    1.10  #define DEFAULT_PTSIZE  30
    1.11  #define DEFAULT_FONT    "/System/Library/Fonts/华文细黑.ttf"
    1.12  #define MAX_TEXT_LENGTH 256
    1.13  
    1.14 -static CommonState *state;
    1.15 +static SDLTest_CommonState *state;
    1.16  static SDL_Rect textRect, markedRect;
    1.17  static SDL_Color lineColor = {0,0,0,0};
    1.18  static SDL_Color backColor = {255,255,255,0};
    1.19 @@ -211,12 +211,12 @@
    1.20      const char *fontname = DEFAULT_FONT;
    1.21  
    1.22      /* Initialize test framework */
    1.23 -    state = CommonCreateState(argv, SDL_INIT_VIDEO);
    1.24 +    state = SDLTest_CommonCreateState(argv, SDL_INIT_VIDEO);
    1.25      if (!state) {
    1.26          return 1;
    1.27      }
    1.28      for (i = 1; i < argc;i++) {
    1.29 -        CommonArg(state, i);
    1.30 +        SDLTest_CommonArg(state, i);
    1.31      }
    1.32      for (argc--, argv++; argc > 0; argc--, argv++)
    1.33      {
    1.34 @@ -239,7 +239,7 @@
    1.35          }
    1.36      }
    1.37      
    1.38 -    if (!CommonInit(state)) {
    1.39 +    if (!SDLTest_CommonInit(state)) {
    1.40          return 2;
    1.41      }
    1.42  
    1.43 @@ -273,7 +273,7 @@
    1.44      while (!done) {
    1.45          /* Check for events */
    1.46          while (SDL_PollEvent(&event)) {
    1.47 -            CommonEvent(state, &event, &done);
    1.48 +            SDLTest_CommonEvent(state, &event, &done);
    1.49              switch(event.type) {
    1.50                  case SDL_KEYDOWN: {
    1.51                      switch (event.key.keysym.sym)
    1.52 @@ -361,7 +361,7 @@
    1.53          }
    1.54      }
    1.55      CleanupVideo();
    1.56 -    CommonQuit(state);
    1.57 +    SDLTest_CommonQuit(state);
    1.58      return 0;
    1.59  }
    1.60