Patched to compile.
authorRyan C. Gordon
Tue, 05 Jan 2016 05:22:35 -0500
changeset 100312b3baddd9afa
parent 10030 061b1b467bd3
child 10032 e661304722ce
Patched to compile.
src/video/uikit/SDL_uikitappdelegate.m
src/video/windows/SDL_windowsmodes.c
src/video/x11/SDL_x11modes.c
     1.1 --- a/src/video/uikit/SDL_uikitappdelegate.m	Tue Jan 05 02:29:16 2016 -0500
     1.2 +++ b/src/video/uikit/SDL_uikitappdelegate.m	Tue Jan 05 05:22:35 2016 -0500
     1.3 @@ -451,10 +451,11 @@
     1.4  {
     1.5      NSURL *fileURL = url.filePathURL;
     1.6      if (fileURL != nil) {
     1.7 -        SDL_SendDropFile([fileURL.path UTF8String]);
     1.8 +        SDL_SendDropFile(NULL, [fileURL.path UTF8String]);
     1.9      } else {
    1.10 -        SDL_SendDropFile([url.absoluteString UTF8String]);
    1.11 +        SDL_SendDropFile(NULL, [url.absoluteString UTF8String]);
    1.12      }
    1.13 +    SDL_SendDropComplete(NULL);
    1.14      return YES;
    1.15  }
    1.16  
     2.1 --- a/src/video/windows/SDL_windowsmodes.c	Tue Jan 05 02:29:16 2016 -0500
     2.2 +++ b/src/video/windows/SDL_windowsmodes.c	Tue Jan 05 05:22:35 2016 -0500
     2.3 @@ -23,6 +23,7 @@
     2.4  #if SDL_VIDEO_DRIVER_WINDOWS
     2.5  
     2.6  #include "SDL_windowsvideo.h"
     2.7 +#include "../../../include/SDL_assert.h"
     2.8  
     2.9  /* Windows CE compatibility */
    2.10  #ifndef CDS_FULLSCREEN
    2.11 @@ -342,7 +343,7 @@
    2.12          (LONG) (pDevMode->dmPosition.x + (pDevMode->dmPelsWidth / 2)),
    2.13          (LONG) (pDevMode->dmPosition.y + (pDevMode->dmPelsHeight / 2))
    2.14      };
    2.15 -    HMONITOR hmon = MonitorFromPoint(&pt, MONITOR_DEFAULTTONULL);
    2.16 +    HMONITOR hmon = MonitorFromPoint(pt, MONITOR_DEFAULTTONULL);
    2.17      MONITORINFO minfo;
    2.18      const RECT *work;
    2.19      BOOL rc = FALSE;
    2.20 @@ -360,7 +361,7 @@
    2.21          return SDL_SetError("Couldn't find monitor data");
    2.22      }
    2.23  
    2.24 -    work = &minfo->rcWork;
    2.25 +    work = &minfo.rcWork;
    2.26      rect->x = (int)SDL_ceil(work->left * data->ScaleX);
    2.27      rect->y = (int)SDL_ceil(work->top * data->ScaleY);
    2.28      rect->w = (int)SDL_ceil((work->right - work->left) * data->ScaleX);
     3.1 --- a/src/video/x11/SDL_x11modes.c	Tue Jan 05 02:29:16 2016 -0500
     3.2 +++ b/src/video/x11/SDL_x11modes.c	Tue Jan 05 05:22:35 2016 -0500
     3.3 @@ -1095,9 +1095,9 @@
     3.4                                      &real_type, &real_format, &items_read,
     3.5                                      &items_left, &propdata);
     3.6      if ((status == Success) && (items_read >= 4)) {
     3.7 -        retval = 0;
     3.8          const long *p = (long*) propdata;
     3.9          const SDL_Rect usable = { (int)p[0], (int)p[1], (int)p[2], (int)p[3] };
    3.10 +        retval = 0;
    3.11          if (!SDL_IntersectRect(rect, &usable, rect)) {
    3.12              SDL_zerop(rect);
    3.13          }