Changeset 3667 in vbox for trunk

Timestamp:

Jul 17, 2007 8:37:30 AM (17 years ago)

Author:

vboxsync

Message:

no SDL_syswm on Quartz yet

File:

• trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

@@ -40 +40 @@
 #endif
 
+#ifndef RT_OS_DARWIN
 #include <SDL_syswm.h>           /* for SDL_GetWMInfo() */
+#endif
 
 #include "VBoxSDL.h"
@@ -513 +515 @@
         if (!canShow)
             return E_POINTER;
+#ifdef RT_OS_DARWIN
+        /* SDL feature not available on Quartz */
+        *canShow = TRUE;
+#else
         SDL_SysWMinfo info;
         SDL_VERSION(&info.version);
         *canShow = !!SDL_GetWMInfo(&info);
+#endif
         return S_OK;
     }
@@ -521 +528 @@
     STDMETHOD(OnShowWindow) (ULONG64 *winId)
     {
+#ifndef RT_OS_DARWIN
         SDL_SysWMinfo info;
         SDL_VERSION(&info.version);
         if (SDL_GetWMInfo(&info))
         {
-#if defined (__LINUX__)
+#if defined (RT_OS_LINUX)
             *winId = (ULONG64) info.info.x11.wmwindow;
-#elif defined (__WIN__)
+#elif defined (RT_OS_WIN)
             *winId = (ULONG64) info.window;
 #else
@@ -535 +543 @@
             return S_OK;
         }
+#endif /* !RT_OS_DARWIN */
         AssertFailed();
         return E_FAIL;