diff options
author | Jesse Hall <jessehall@google.com> | 2012-07-23 10:13:06 -0700 |
---|---|---|
committer | android code review <noreply-gerritcodereview@google.com> | 2012-07-23 10:13:06 -0700 |
commit | d95f84da47d4e5c1f9bce2770400fd0d61b0c0b6 (patch) | |
tree | b39ee901bb528b7e3593117cde724ef75d438b67 /distrib/sdl-1.2.15/src/video/quartz/SDL_QuartzVideo.m | |
parent | 2b3a42e7d0b441f71fc2e2b07269dd1f8151c977 (diff) | |
parent | e4c5d95ed37611acc6a186522315195b4ebfb9ef (diff) | |
download | external_qemu-d95f84da47d4e5c1f9bce2770400fd0d61b0c0b6.zip external_qemu-d95f84da47d4e5c1f9bce2770400fd0d61b0c0b6.tar.gz external_qemu-d95f84da47d4e5c1f9bce2770400fd0d61b0c0b6.tar.bz2 |
Merge "Apply Android changes from sdl-1.2.12 to sdl-1.2.15"
Diffstat (limited to 'distrib/sdl-1.2.15/src/video/quartz/SDL_QuartzVideo.m')
-rw-r--r-- | distrib/sdl-1.2.15/src/video/quartz/SDL_QuartzVideo.m | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/distrib/sdl-1.2.15/src/video/quartz/SDL_QuartzVideo.m b/distrib/sdl-1.2.15/src/video/quartz/SDL_QuartzVideo.m index fa04e9d..bb20172 100644 --- a/distrib/sdl-1.2.15/src/video/quartz/SDL_QuartzVideo.m +++ b/distrib/sdl-1.2.15/src/video/quartz/SDL_QuartzVideo.m @@ -23,6 +23,7 @@ #include "SDL_QuartzVideo.h" #include "SDL_QuartzWindow.h" +#include "SDL_QuartzWM.h" /* These APIs aren't just deprecated; they're gone from the headers in the 10.7 SDK. If we're using a >= 10.7 SDK, but targeting < 10.7, then we @@ -220,7 +221,12 @@ static SDL_VideoDevice* QZ_CreateDevice (int device_index) device->SetCaption = QZ_SetCaption; device->SetIcon = QZ_SetIcon; device->IconifyWindow = QZ_IconifyWindow; - /*device->GetWMInfo = QZ_GetWMInfo;*/ + device->SetWindowPos = QZ_SetWindowPos; + device->GetWindowPos = QZ_GetWindowPos; + device->IsWindowVisible = QZ_IsWindowVisible; + device->GetMonitorDPI = QZ_GetMonitorDPI; + device->GetMonitorRect = QZ_GetMonitorRect; + device->GetWMInfo = QZ_GetWMInfo; device->GrabInput = QZ_GrabInput; /* |