Fixed wxDatePickerCtrl under OS X

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

diff --git a/include/wx/wxcrtbase.h b/include/wx/wxcrtbase.h
index 0afdc2ec5c15bd1ea7f9b69a5386370ce5d9efde..a48756a4314b62692380287b2b594a845fcf96e4 100644 (file)
--- a/include/wx/wxcrtbase.h
+++ b/include/wx/wxcrtbase.h
@@ -2,7 +2,7 @@
  * Name:        wx/wxcrtbase.h
  * Purpose:     Type-safe ANSI and Unicode builds compatible wrappers for
  *              CRT functions
- * Author:      Joel Farley, Ove K�ven
+ * Author:      Joel Farley, Ove Kaaven
  * Modified by: Vadim Zeitlin, Robert Roebling, Ron Lee
  * Created:     1998/06/12
  * RCS-ID:      $Id$
@@ -28,11 +28,17 @@
         include this one!
  */
 
+#if !defined(__WXPALMOS5__)
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
-#include <wctype.h>
+#if defined(__WXPALMOS__)
+    #include <wchar.h>
+#else
+    #include <wctype.h>
+#endif
 #include <time.h>
+#endif
 
 #if defined(__WINDOWS__) && !defined(__WXWINCE__)
     #include <io.h>
@@ -157,7 +163,7 @@ WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size );
 #define wxCRT_StrstrW    wcsstr
 
 /* these functions are not defined under CE, at least in VC8 CRT */
-#ifndef __WXWINCE__
+#if !defined(__WXWINCE__) && !defined(__WXPALMOS__)
     #define wxCRT_StrcollA   strcoll
     #define wxCRT_StrxfrmA   strxfrm
 
@@ -223,7 +229,7 @@ WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size );
  * versions */
 #if !defined(wxCRT_StricmpA)
     #if defined(__BORLANDC__) || defined(__WATCOMC__) || \
-            defined(__SALFORDC__) || defined(__VISAGECPP__) || \
+            defined(__VISAGECPP__) || \
             defined(__EMX__) || defined(__DJGPP__)
         #define wxCRT_StricmpA stricmp
         #define wxCRT_StrnicmpA strnicmp
@@ -232,7 +238,7 @@ WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size );
          * quick hack should do until one can be written.
          */
         #define wxCRT_StricmpA StrCaselessCompare
-        #define wxCRT_StrnicmpA strnicmp
+        #define wxCRT_StrnicmpA StrNCaselessCompare
     #elif defined(__SYMANTEC__) || defined(__VISUALC__) || \
             (defined(__MWERKS__) && defined(__INTEL__))
         #define wxCRT_StricmpA _stricmp
@@ -401,7 +407,7 @@ WXDLLIMPEXP_BASE wchar_t *wxCRT_StrtokW(wchar_t *psz, const wchar_t *delim, wcha
                                   stdio.h
    ------------------------------------------------------------------------- */
 
-#if defined(__UNIX__) || defined(__WXMAC__)
+#if defined(__UNIX__) || defined(__WXMAC__) || defined(__WXPALMOS__)
     #define wxMBFILES 1
 #else
     #define wxMBFILES 0
@@ -541,7 +547,7 @@ WXDLLIMPEXP_BASE wchar_t * wxCRT_GetenvW(const wchar_t *name);
     /* _wtof doesn't exist */
 #else
 #ifndef __VMS
-    #define wxCRT_AtofW(s)         wcstof(s, NULL)
+    #define wxCRT_AtofW(s)         wcstod(s, NULL)
 #endif
     #define wxCRT_AtolW(s)         wcstol(s, NULL, 10)
     /* wcstoi doesn't exist */
@@ -561,6 +567,9 @@ WXDLLIMPEXP_BASE wchar_t * wxCRT_GetenvW(const wchar_t *name);
 #if defined(__MWERKS__) && defined(__MSL__)
     #define wxNEED_WX_MBSTOWCS
 #endif
+#if defined(__WXPALMOS__)
+    #define wxNEED_WX_MBSTOWCS
+#endif
 
 #ifdef __DARWIN__
     #if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2
@@ -585,8 +594,10 @@ WXDLLIMPEXP_BASE wchar_t * wxCRT_GetenvW(const wchar_t *name);
    ------------------------------------------------------------------------- */
 
 #define wxCRT_StrftimeA  strftime
+#ifndef __WXPALMOS__
 /* FIXME-UTF8: when is this available? */
 #define wxCRT_StrftimeW  wcsftime
+#endif /* ! __WXPALMOS__ */
 
 #ifndef wxCRT_StrftimeW
 WXDLLIMPEXP_BASE size_t wxCRT_StrftimeW(wchar_t *s, size_t max,