Changeset 4866 in vbox

Timestamp:

Sep 17, 2007 6:38:23 PM (17 years ago)

Author:

vboxsync

Message:

VBOX_WITHOUT_XCURSOR for solaris.

File:

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

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

@@ -31 +31 @@
 
 #if defined (VBOXSDL_WITH_X11)
-#include <X11/Xlib.h>
-#include <X11/cursorfont.h>      /* for XC_left_ptr */
-#include <X11/Xcursor/Xcursor.h>
+# include <X11/Xlib.h>
+# include <X11/cursorfont.h>      /* for XC_left_ptr */
+# if !defined (VBOX_WITHOUT_XCURSOR)
+#  include <X11/Xcursor/Xcursor.h>
+# endif
 #endif
 
@@ -1831 +1833 @@
     }
 
+# if !defined(VBOX_WITHOUT_XCURSOR)
     /* SDL uses its own (plain) default cursor. Use the left arrow cursor instead which might look
      * much better if a mouse cursor theme is installed. */
@@ -1836 +1839 @@
     *(Cursor*)gpDefaultCursor->wm_cursor = XCreateFontCursor(gSdlInfo.info.x11.display, XC_left_ptr);
     SDL_SetCursor(gpDefaultCursor);
+# endif
 #endif /* VBOXSDL_WITH_X11 */
 
@@ -2500 +2504 @@
 #endif /* VBOXSDL_WITH_X11 */
         SDL_SetCursor(gpDefaultCursor);
-#ifdef VBOXSDL_WITH_X11
+#if defined(VBOXSDL_WITH_X11) && !defined(VBOX_WITHOUT_XCURSOR)
         XFreeCursor(gSdlInfo.info.x11.display, pDefaultTempX11Cursor);
 #endif /* VBOXSDL_WITH_X11 */
@@ -2514 +2518 @@
 #if defined (RT_OS_WINDOWS)
             ::DestroyCursor(*(HCURSOR *) pCustomTempWMCursor);
-#elif defined (VBOXSDL_WITH_X11)
+#elif defined (VBOXSDL_WITH_X11) && !defined (VBOX_WITHOUT_XCURSOR)
             XFreeCursor(gSdlInfo.info.x11.display, *(Cursor *) pCustomTempWMCursor);
 #endif
@@ -4007 +4011 @@
             ::DeleteObject (hBitmap);
 
-#elif defined (VBOXSDL_WITH_X11)
+#elif defined (VBOXSDL_WITH_X11) && !defined (VBOX_WITHOUT_XCURSOR)
 
         XcursorImage *img = XcursorImageCreate (data->width, data->height);