Implement wxColour constructors to match other ports by adding char const * and wchar...

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

diff --git a/include/wx/wxcrtbase.h b/include/wx/wxcrtbase.h
index c93692ff68183dd187b87aba37a661bf969e5786..6cc5b4b60dc244e7cd84ce042128d8eb85eab82c 100644 (file)
--- a/include/wx/wxcrtbase.h
+++ b/include/wx/wxcrtbase.h
@@ -34,6 +34,9 @@
 #include <wctype.h>
 #include <time.h>
 
 #include <wctype.h>
 #include <time.h>
 

+#ifdef __WINDOWS__
+#include <io.h>
+#endif

 
 #if defined(HAVE_STRTOK_R) && defined(__DARWIN__) && defined(_MSL_USING_MW_C_HEADERS) && _MSL_USING_MW_C_HEADERS
     char *strtok_r(char *, const char *, char **);
 
 #if defined(HAVE_STRTOK_R) && defined(__DARWIN__) && defined(_MSL_USING_MW_C_HEADERS) && _MSL_USING_MW_C_HEADERS
     char *strtok_r(char *, const char *, char **);


@@ -167,7 +170,7 @@ WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size );
 #endif
 #if defined(__WINDOWS__)
     #define wxCRT_StrdupW _wcsdup
 #endif
 #if defined(__WINDOWS__)
     #define wxCRT_StrdupW _wcsdup

-#elif !defined(__DARWIN__) && !defined( __VMS )
+#elif defined(HAVE_WCSDUP)

     #define wxCRT_StrdupW wcsdup
 #endif
 
     #define wxCRT_StrdupW wcsdup
 #endif