1. wxLoad/SaveFileSelector return "wxString" instead of "char *"

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 1bc6681f557edf73b4a6c29bd3ab1ac9f2d507ce..2c3b71ec0ce70f3d4ce2657d113ccbbf32e0ebbc 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -79,6 +79,10 @@
 #define __WIN95__
 #endif
 
 #define __WIN95__
 #endif
 

+#if defined(TWIN32) && !defined(__TWIN32__)
+#define __TWIN32__
+#endif
+

 #endif // wxMSW
 
 // Make sure the environment is set correctly
 #endif // wxMSW
 
 // Make sure the environment is set correctly


@@ -129,14 +133,24 @@
 #elif defined(__WATCOMC__)
     typedef unsigned int bool;
 #elif defined(__SUNCC__)
 #elif defined(__WATCOMC__)
     typedef unsigned int bool;
 #elif defined(__SUNCC__)

-    // If we use int, we get identically overloaded functions in config.cpp
-    typedef unsigned char bool;
+    #ifdef __SUNPRO_CC
+        // starting from version 5.0 Sun CC understands 'bool'
+        #if __SUNPRO_CC <= 0x0420
+            // If we use int, we get identically overloaded functions in config.cpp
+            typedef unsigned char bool;
+        #endif // Sun CC version
+    #else
+        #error "Unknown compiler: only Sun's CC and gcc are currently reckognized."
+    #endif // Sun CC

 #endif
 
 #if ( defined(_MSC_VER) && (_MSC_VER <= 800) ) || defined(__GNUWIN32__) || (defined(__BORLANDC__) && defined(__WIN16__)) || defined(__SC__) || defined(__SALFORDC__)
 #endif
 
 #if ( defined(_MSC_VER) && (_MSC_VER <= 800) ) || defined(__GNUWIN32__) || (defined(__BORLANDC__) && defined(__WIN16__)) || defined(__SC__) || defined(__SALFORDC__)

-    #define byte unsigned char
+// Not a good idea, because later system files (e.g. windows.h)
+// may try to define it. Use wxByte instead.
+// #define byte unsigned char

 #endif
 
 #endif
 

+typedef unsigned char wxByte;

 typedef short int WXTYPE;
 typedef int wxWindowID;
 
 typedef short int WXTYPE;
 typedef int wxWindowID;
 


@@ -212,6 +226,10 @@ class WXDLLEXPORT wxEvent;
 // Error codes
 // ----------------------------------------------------------------------------
 
 // Error codes
 // ----------------------------------------------------------------------------
 

+#ifdef ERR_PARAM
+#undef ERR_PARAM
+#endif
+

 /// Standard error codes
 enum  ErrCode
 {
 /// Standard error codes
 enum  ErrCode
 {