upgrade SDL to version 2.0.8

[platform/upstream/SDL.git] / test / testhittesting.c

diff --git a/test/testhittesting.c b/test/testhittesting.c
index fc33d6c..8e897b0 100755 (executable)
--- a/test/testhittesting.c
+++ b/test/testhittesting.c
@@ -14,7 +14,7 @@ const SDL_Rect drag_areas[] = {
 static const SDL_Rect *areas = drag_areas;
 static int numareas = SDL_arraysize(drag_areas);
 
-static SDL_HitTestResult
+static SDL_HitTestResult SDLCALL
 hitTest(SDL_Window *window, const SDL_Point *pt, void *data)
 {
     int i;
@@ -22,7 +22,7 @@ hitTest(SDL_Window *window, const SDL_Point *pt, void *data)
 
     for (i = 0; i < numareas; i++) {
         if (SDL_PointInRect(pt, &areas[i])) {
-            SDLTest_Log("HIT-TEST: DRAGGABLE\n");
+            SDL_Log("HIT-TEST: DRAGGABLE\n");
             return SDL_HITTEST_DRAGGABLE;
         }
     }
@@ -30,7 +30,7 @@ hitTest(SDL_Window *window, const SDL_Point *pt, void *data)
     SDL_GetWindowSize(window, &w, &h);
 
     #define REPORT_RESIZE_HIT(name) { \
-        SDLTest_Log("HIT-TEST: RESIZE_" #name "\n"); \
+        SDL_Log("HIT-TEST: RESIZE_" #name "\n"); \
         return SDL_HITTEST_RESIZE_##name; \
     }
 
@@ -52,11 +52,11 @@ hitTest(SDL_Window *window, const SDL_Point *pt, void *data)
         REPORT_RESIZE_HIT(LEFT);
     }
 
-    SDLTest_Log("HIT-TEST: NORMAL\n");
+    SDL_Log("HIT-TEST: NORMAL\n");
     return SDL_HITTEST_NORMAL;
 }
 
-int SDL_main(int argc, char **argv)
+int main(int argc, char **argv)
 {
     int done = 0;
     SDL_Window *window;
@@ -64,11 +64,11 @@ int SDL_main(int argc, char **argv)
 
     /* !!! FIXME: check for errors. */
     SDL_Init(SDL_INIT_VIDEO);
-    window = SDL_CreateWindow("Drag the red boxes", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, 720, 1280, SDL_WINDOW_BORDERLESS | SDL_WINDOW_RESIZABLE);
+    window = SDL_CreateWindow("Drag the red boxes", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, 640, 480, SDL_WINDOW_BORDERLESS | SDL_WINDOW_RESIZABLE);
     renderer = SDL_CreateRenderer(window, -1, 0);
 
     if (SDL_SetWindowHitTest(window, hitTest, NULL) == -1) {
-        SDLTest_Log("Enabling hit-testing failed!\n");
+        SDL_Log("Enabling hit-testing failed!\n");
         SDL_Quit();
         return 1;
     }
@@ -90,16 +90,16 @@ int SDL_main(int argc, char **argv)
             switch (e.type)
             {
                 case SDL_MOUSEBUTTONDOWN:
-                    SDLTest_Log("button down!\n");
+                    SDL_Log("button down!\n");
                     break;
 
                 case SDL_MOUSEBUTTONUP:
-                    SDLTest_Log("button up!\n");
+                    SDL_Log("button up!\n");
                     break;
 
                 case SDL_WINDOWEVENT:
                     if (e.window.event == SDL_WINDOWEVENT_MOVED) {
-                        SDLTest_Log("Window event moved to (%d, %d)!\n", (int) e.window.data1, (int) e.window.data2);
+                        SDL_Log("Window event moved to (%d, %d)!\n", (int) e.window.data1, (int) e.window.data2);
                     }
                     break;