Use *wxTopLevelWindowGTK*RequestUserAttention*; because *int* isn't the case always...

[wxWidgets.git] / include / wx / platform.h

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 6bb277a2bf538f911a7ca66a542070957b84a4fc..2e0320a1445ad4ae92f29d5faa4491dc42e223c9 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -57,9 +57,7 @@
    first define Windows symbols if they're not defined on the command line: we
    can autodetect everything we need if _WIN32 is defined
  */
    first define Windows symbols if they're not defined on the command line: we
    can autodetect everything we need if _WIN32 is defined
  */

-#if defined(__CYGWIN32__) && !defined(__WXMOTIF__) && !defined(__WXGTK__) \
-    && !defined(__WXX11__)
-    /* for Cygwin, default to wxMSW unless otherwise specified */
+#if defined(__CYGWIN__) && defined(__WINDOWS__)

 #    ifndef __WXMSW__
 #        define __WXMSW__
 #    endif
 #    ifndef __WXMSW__
 #        define __WXMSW__
 #    endif


@@ -474,12 +472,6 @@
 #   include "wx/msw/wince/libraries.h"
 #endif
 
 #   include "wx/msw/wince/libraries.h"
 #endif
 

-/* Force inclusion of main PalmOS header: */
-#ifdef __WXPALMOS__
-#   include <PalmOS.h>
-#   undef Abs
-#endif
-

 /*
    This macro can be used to test the gcc version and can be used like this:
 
 /*
    This macro can be used to test the gcc version and can be used like this:
 


@@ -499,9 +491,10 @@
    at least maj.min
  */
 #if ( defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || \
    at least maj.min
  */
 #if ( defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || \

-    defined( __CYGWIN__ ) || \
+    ( defined( __CYGWIN__ ) && defined( __WINDOWS__ ) ) || \

       (defined(__WATCOMC__) && __WATCOMC__ >= 1200) ) && \
     !defined(__DOS__) && \
       (defined(__WATCOMC__) && __WATCOMC__ >= 1200) ) && \
     !defined(__DOS__) && \

+    !defined(__WXOS2__) && \

     !defined(__WXMOTIF__) && \
     !defined(__WXGTK__) && \
     !defined(__WXX11__) && \
     !defined(__WXMOTIF__) && \
     !defined(__WXGTK__) && \
     !defined(__WXX11__) && \


@@ -568,4 +561,3 @@
 #endif
 
 #endif /* _WX_PLATFORM_H_ */
 #endif
 
 #endif /* _WX_PLATFORM_H_ */

-