Mercurial > sdl-ios-xcode

diff src/video/SDL_video.c @ 4900:69d9db65f248

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged the Windows custom window system hooks into the union used by X11. Added Cocoa custom window system hooks
author Sam Lantinga <slouken@libsdl.org>
date Mon, 27 Sep 2010 01:24:05 -0700
parents c3eb55210a90
children deadc1219bea
line wrap: on
line diff
--- a/src/video/SDL_video.c	Mon Sep 27 00:50:46 2010 -0700
+++ b/src/video/SDL_video.c	Mon Sep 27 01:24:05 2010 -0700
@@ -40,12 +40,14 @@
 
 #if SDL_VIDEO_OPENGL
 #include "SDL_opengl.h"
+#endif /* SDL_VIDEO_OPENGL */
+
+#include "SDL_syswm.h"
 
 /* On Windows, windows.h defines CreateWindow */
 #ifdef CreateWindow
 #undef CreateWindow
 #endif
-#endif /* SDL_VIDEO_OPENGL */
 
 /* Available video drivers */
 static VideoBootStrap *bootstrap[] = {
@@ -3384,6 +3386,11 @@
 {
     CHECK_WINDOW_MAGIC(window, SDL_FALSE);
 
+    if (!info) {
+        return SDL_FALSE;
+    }
+    info->subsystem = SDL_SYSWM_UNKNOWN;
+
     if (!_this->GetWindowWMInfo) {
         return SDL_FALSE;
     }