include/SDL_syswm.h
changeset 1361 19418e4422cb
parent 1358 c71e05b4dc2e
child 1433 bb6839704ed6
     1.1 --- a/include/SDL_syswm.h	Fri Feb 10 07:29:08 2006 +0000
     1.2 +++ b/include/SDL_syswm.h	Thu Feb 16 10:11:48 2006 +0000
     1.3 @@ -45,18 +45,13 @@
     1.4  typedef struct SDL_SysWMinfo SDL_SysWMinfo;
     1.5  #else
     1.6  
     1.7 +/* This is the structure for custom window manager events */
     1.8 +#if SDL_VIDEO_DRIVER_X11
     1.9  #if defined(__APPLE__) && defined(__MACH__)
    1.10  // conflicts with Quickdraw.h
    1.11  #define Cursor X11Cursor
    1.12  #endif
    1.13  
    1.14 -/* This is the structure for custom window manager events */
    1.15 -#if (defined(unix) || defined(__unix__) || defined(_AIX) || \
    1.16 -         defined(__OpenBSD__) || defined(__NetBSD__) || \
    1.17 -         (defined(__APPLE__) && defined(__MACH__))) && \
    1.18 -    (!defined(DISABLE_X11) && !defined(__CYGWIN32__) && !defined(ENABLE_NANOX) && \
    1.19 -         !defined(__QNXNTO__))
    1.20 - /* AIX is unix, of course, but the native compiler CSet doesn't define unix */
    1.21  #include <X11/Xlib.h>
    1.22  #include <X11/Xatom.h>
    1.23  
    1.24 @@ -105,7 +100,7 @@
    1.25  	} info;
    1.26  } SDL_SysWMinfo;
    1.27  
    1.28 -#elif defined(ENABLE_NANOX)
    1.29 +#elif SDL_VIDEO_DRIVER_NANOX
    1.30  #include <microwin/nano-X.h>
    1.31  
    1.32  /* The generic custom event structure */
    1.33 @@ -120,7 +115,7 @@
    1.34  	GR_WINDOW_ID window ;	/* The display window */
    1.35  } SDL_SysWMinfo;
    1.36  
    1.37 -#elif defined(WIN32)
    1.38 +#elif SDL_VIDEO_DRIVER_WINDIB || SDL_VIDEO_DRIVER_DDRAW
    1.39  #include "SDL_windows.h"
    1.40  
    1.41  /* The windows custom event structure */
    1.42 @@ -139,7 +134,7 @@
    1.43  	HGLRC hglrc;			/* The OpenGL context, if any */
    1.44  } SDL_SysWMinfo;
    1.45  
    1.46 -#elif defined(__riscos__)
    1.47 +#elif SDL_VIDEO_DRIVER_RISCOS
    1.48  
    1.49  /* RISC OS custom event structure */
    1.50  struct SDL_SysWMmsg {
    1.51 @@ -156,7 +151,7 @@
    1.52  	int window;		/* The RISC OS display window */
    1.53  } SDL_SysWMinfo;
    1.54  
    1.55 -#elif defined(__QNXNTO__)
    1.56 +#elif SDL_VIDEO_DRIVER_PHOTON
    1.57  #include <sys/neutrino.h>
    1.58  #include <Ph.h>
    1.59  
    1.60 @@ -186,7 +181,7 @@
    1.61  	int data;
    1.62  } SDL_SysWMinfo;
    1.63  
    1.64 -#endif /* OS type */
    1.65 +#endif /* video driver type */
    1.66  
    1.67  #endif /* SDL_PROTOTYPES_ONLY */
    1.68