X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/09785dd38dd19ef122acd0933677fa86a0b3232e..1b23f6f700ecb9396557859bc2623b3564146415:/include/wx/platform.h diff --git a/include/wx/platform.h b/include/wx/platform.h index b874db6b36..d8195ab78e 100644 --- a/include/wx/platform.h +++ b/include/wx/platform.h @@ -280,6 +280,14 @@ #define __X__ #endif +#ifdef __SC__ + #ifdef __DMC__ + #define __DIGITALMARS__ + #else + #define __SYMANTEC__ + #endif +#endif + /* This macro can be used to test the gcc version and can be used like this: @@ -300,21 +308,13 @@ */ #if defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || \ defined( __CYGWIN__ ) || \ - (defined(__WATCOMC__) && __WATCOMC__ >= 1200) || defined(__DIGITALMARS__) + (defined(__WATCOMC__) && __WATCOMC__ >= 1200) #include "wx/msw/gccpriv.h" #else #undef wxCHECK_W32API_VERSION #define wxCHECK_W32API_VERSION(maj, min) (0) #endif -#ifdef __SC__ - #ifdef __DMC__ - #define __DIGITALMARS__ - #else - #define __SYMANTEC__ - #endif -#endif - #if defined (__WXMSW__) #if !defined(__WATCOMC__) #define wxHAVE_RAW_BITMAP @@ -332,8 +332,7 @@ * Presently, only Windows and GTK+ support wxEVT_MENU_OPEN. */ #ifndef wxUSE_IDLEMENUUPDATES - #if (defined(__WXMSW__) && !defined(__WXWINCE)) ||\ - defined(__WXGTK__) + #if defined(__WXMSW__) || defined(__WXGTK__) #define wxUSE_IDLEMENUUPDATES 0 #else #define wxUSE_IDLEMENUUPDATES 1