Test using wxString::ToCDouble() in wxAny.

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

diff --git a/include/wx/platform.h b/include/wx/platform.h
index c91ac39e998e88fe1f5d4a5cb0896a3c317cf96b..9eaffa8a8d3e6b15833629fb0a36824f30200fda 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -74,15 +74,11 @@
 #    endif
 #endif /* Win32 */
 
-#if defined(__WXMSW__)
+#if defined(_WIN32)
 #   if !defined(__WINDOWS__)
 #       define __WINDOWS__
 #   endif
 
-#   ifndef _WIN32
-#        define _WIN32
-#   endif
-
 #   ifndef WIN32
 #        define WIN32
 #   endif
@@ -90,7 +86,25 @@
 #   ifndef __WIN32__
 #        define __WIN32__
 #   endif
-#endif /* __WXMSW__ */
+#endif /* _WIN32 */
+
+/* Don't use widget toolkit specific code in non-GUI code */
+#if defined(wxUSE_GUI) && !wxUSE_GUI
+#   ifdef __WXMSW__
+#       undef __WXMSW__
+#   endif
+#   ifdef __WXGTK__
+#       undef __WXGTK__
+#   endif
+#endif
+
+#if defined(__WXGTK__) && defined(__WINDOWS__)
+
+#   ifdef __WXMSW__
+#       undef __WXMSW__
+#   endif
+
+#endif /* __WXGTK__ && __WINDOWS__ */
 
 /* detect MS SmartPhone */
 #if defined( WIN32_PLATFORM_WFSP )
@@ -541,7 +555,6 @@
     !defined(__DOS__) && \
     !defined(__WXPM__) && \
     !defined(__WXMOTIF__) && \
-    !defined(__WXGTK__) && \
     !defined(__WXX11__)
 #    include "wx/msw/gccpriv.h"
 #else