remove unused wxAppTraits-related files

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

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 35497c53edbb90a91da1b2137db7b59771a22661..26115817ccf63705e428db94ea9eee98b3c2cdae 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -68,14 +68,14 @@
     using OS X libraries like Carbon or CoreServices.
 
  */
-#if defined(__WXMAC_OSX__) || (defined(__WXCOCOA__) && (!defined(wxUSE_BASE) || !wxUSE_BASE))
+#if defined(__WXMAC_OSX__) || (defined(__WXCOCOA__) && (!defined(wxUSE_BASE) || !wxUSE_BASE)) || defined(__WXASPEN__)
 #   define __WXOSX__
 #endif
 
 #ifdef __WXOSX__
 #    ifdef __WXMAC_XCODE__
 #        include <unistd.h>
-#        include "wx/mac/carbon/config_xcode.h"
+#        include "wx/mac/config_xcode.h"
 #    endif
 #endif
 /*
@@ -211,7 +211,15 @@
    Note that it must be included before defining hardware symbols below as they
    could be already defined by configure
  */
-#include "wx/setup.h"
+#ifdef __GCCXML__
+    /*
+        we're using gccxml to create an XML representation of the entire
+        wxWidgets interface; pass it a special setup.h file
+    */
+    #include "wx/setup_gccxml.h"
+#else
+    #include "wx/setup.h"
+#endif
 
 /*
    Hardware platform detection.
@@ -275,15 +283,18 @@
 #endif
 
 
-/* test for old versions of Borland C, normally need at least 5.82, Turbo explorer, 
-   available for free at http://www.turboexplorer.com/downloads 
+/*
+   test for old versions of Borland C, normally need at least 5.82, Turbo
+   explorer, available for free at http://www.turboexplorer.com/downloads
 */
 #if defined(__BORLANDC__) && (__BORLANDC__ < 0x550)
-#error "This version of wxWidgets requires a newer version of Borland - we recommend 5.82 (Turbo Explorer); You may at your own risk remove this line and try your system"
+#   error "wxWidgets requires a newer version of Borland, we recommend upgrading to 5.82 (Turbo Explorer). You may at your own risk remove this line and try building but be prepared to get build errors."
 #endif /* __BORLANDC__ */
 
 #if defined(__BORLANDC__) && (__BORLANDC__ < 0x582) && (__BORLANDC__ > 0x559)
-#error "This version of wxWidgets has problems with Borland 5.6; we recommend getting Borland 5.82 (Turbo Explorer); You may at your own risk remove this line and try your system"
+#   ifndef _USE_OLD_RW_STL
+#       error "wxWidgets is incompatible with default Borland C++ 5.6 STL library, please add -D_USE_OLD_RW_STL to your bcc32.cfg to use RogueWave STL implementation."
+#   endif
 #endif /* __BORLANDC__ */