warning fix after huge file patch

[wxWidgets.git] / src / common / wxchar.cpp

diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp
index 230a9338ac7f2e9e2ebfaedee1178a8ce2759678..e09e7e06b6fdffcf37c41031eedb57259141cd9c 100644 (file)
--- a/src/common/wxchar.cpp
+++ b/src/common/wxchar.cpp
@@ -2,10 +2,10 @@
 // Name:        wxchar.cpp
 // Purpose:     wxChar implementation
 // Author:      Ove Kåven
 // Name:        wxchar.cpp
 // Purpose:     wxChar implementation
 // Author:      Ove Kåven

-// Modified by:
+// Modified by: Ron Lee

 // Created:     09/04/99
 // RCS-ID:      $Id$
 // Created:     09/04/99
 // RCS-ID:      $Id$

-// Copyright:   (c) wxWindows copyright
+// Copyright:   (c) wxWidgets copyright

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -130,11 +130,11 @@ bool WXDLLEXPORT wxOKlibc()
             (strcasecmp(cur_locale + strlen(cur_locale) - 4, "utf8")) ||
             (strcasecmp(cur_locale + strlen(cur_locale) - 5, "utf-8"))) {
       // nope, don't use libc conversion
             (strcasecmp(cur_locale + strlen(cur_locale) - 4, "utf8")) ||
             (strcasecmp(cur_locale + strlen(cur_locale) - 5, "utf-8"))) {
       // nope, don't use libc conversion

-      return FALSE;
+      return false;

     }
   }
 #endif
     }
   }
 #endif

-  return TRUE;
+  return true;

 }
 
 // ============================================================================
 }
 
 // ============================================================================


@@ -180,10 +180,10 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax,
         {
             static char s_szFlags[256] = "%";
             size_t flagofs = 1;
         {
             static char s_szFlags[256] = "%";
             size_t flagofs = 1;

-            bool adj_left = FALSE,
-                 in_prec = FALSE,
-                 prec_dot = FALSE,
-                 done = FALSE;
+            bool adj_left = false,
+                 in_prec = false,
+                 prec_dot = false,
+                 done = false;

             int ilen = 0;
             size_t min_width = 0,
                    max_width = wxSTRING_MAXLEN;
             int ilen = 0;
             size_t min_width = 0,
                    max_width = wxSTRING_MAXLEN;


@@ -194,14 +194,16 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax,
                 if (in_prec && !prec_dot) \
                 { \
                     s_szFlags[flagofs++] = '.'; \
                 if (in_prec && !prec_dot) \
                 { \
                     s_szFlags[flagofs++] = '.'; \

-                    prec_dot = TRUE; \
+                    prec_dot = true; \

                 }
 
 #define APPEND_CH(ch) \
                 }
 
 #define APPEND_CH(ch) \

-                if ( lenCur == lenMax ) \
-                    return -1; \
-                \
-                buf[lenCur++] = ch
+                { \
+                    if ( lenCur == lenMax ) \
+                        return -1; \
+                    \
+                    buf[lenCur++] = ch; \
+                }

 
 #define APPEND_STR(s) \
                 { \
 
 #define APPEND_STR(s) \
                 { \


@@ -218,12 +220,12 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax,
                     case wxT('\0'):
                         APPEND_CH(_T('\0'));
 
                     case wxT('\0'):
                         APPEND_CH(_T('\0'));
 

-                        done = TRUE;
+                        done = true;

                         break;
 
                     case wxT('%'):
                         APPEND_CH(_T('%'));
                         break;
 
                     case wxT('%'):
                         APPEND_CH(_T('%'));

-                        done = TRUE;
+                        done = true;

                         break;
 
                     case wxT('#'):
                         break;
 
                     case wxT('#'):


@@ -237,14 +239,14 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax,
 
                     case wxT('-'):
                         CHECK_PREC
 
                     case wxT('-'):
                         CHECK_PREC

-                        adj_left = TRUE;
+                        adj_left = true;

                         s_szFlags[flagofs++] = ch;
                         break;
 
                     case wxT('.'):
                         CHECK_PREC
                         s_szFlags[flagofs++] = ch;
                         break;
 
                     case wxT('.'):
                         CHECK_PREC

-                        in_prec = TRUE;
-                        prec_dot = FALSE;
+                        in_prec = true;
+                        prec_dot = false;

                         max_width = 0;
                         // dot will be auto-added to s_szFlags if non-negative
                         // number follows
                         max_width = 0;
                         // dot will be auto-added to s_szFlags if non-negative
                         // number follows


@@ -370,7 +372,7 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax,
                             APPEND_STR(tmp);
                         }
 
                             APPEND_STR(tmp);
                         }
 

-                        done = TRUE;
+                        done = true;

                         break;
 
                     case wxT('e'):
                         break;
 
                     case wxT('e'):


@@ -398,7 +400,7 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax,
                             APPEND_STR(tmp);
                         }
 
                             APPEND_STR(tmp);
                         }
 

-                        done = TRUE;
+                        done = true;

                         break;
 
                     case wxT('p'):
                         break;
 
                     case wxT('p'):


@@ -413,52 +415,77 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax,
                                 wxConvLibc.cMB2WX(szScratch);
                             APPEND_STR(tmp);
 
                                 wxConvLibc.cMB2WX(szScratch);
                             APPEND_STR(tmp);
 

-                            done = TRUE;
+                            done = true;

                         }
                         break;
 
                     case wxT('c'):
                         {
                         }
                         break;
 
                     case wxT('c'):
                         {

-                            wxChar val = va_arg(argptr, int);
-                            // we don't need to honor padding here, do we?
+                            int val = va_arg(argptr, int);
+#if wxUSE_UNICODE
+                            if (ilen == -1)
+                            {
+                                const char buf[2] = { val, 0 };
+                                val = wxString(buf, wxConvLibc)[0u];
+                            }
+#elif wxUSE_WCHAR_T
+                            if (ilen == 1)
+                            {
+                                const wchar_t buf[2] = { val, 0 };
+                                val = wxString(buf, wxConvLibc)[0u];
+                            }
+#endif
+                            size_t i;
+
+                            if (!adj_left)
+                                for (i = 1; i < min_width; i++)
+                                    APPEND_CH(_T(' '));
+

                             APPEND_CH(val);
 
                             APPEND_CH(val);
 

-                            done = TRUE;
+                            if (adj_left)
+                                for (i = 1; i < min_width; i++)
+                                    APPEND_CH(_T(' '));
+
+                            done = true;

                         }
                         break;
 
                     case wxT('s'):
                         }
                         break;
 
                     case wxT('s'):

-                        if (ilen == -1)

                         {
                         {

-                            // wx extension: we'll let %hs mean non-Unicode
-                            // strings
-                            char *val = va_arg(argptr, char *);
+                            const wxChar *val = NULL;

 #if wxUSE_UNICODE
 #if wxUSE_UNICODE

-                            // ASCII->Unicode constructor handles max_width
-                            // right
-                            wxString s(val, wxConvLibc, max_width);
-#else
-                            size_t len = wxSTRING_MAXLEN;
-                            if (val)
+                            wxString s;
+
+                            if (ilen == -1)

                             {
                             {

-                                for ( len = 0;
-                                      val[len] && (len < max_width);
-                                      len++ )
-                                    ;
+                                // wx extension: we'll let %hs mean non-Unicode
+                                // strings
+                                char *v = va_arg(argptr, char *);
+
+                                if (v)
+                                    val = s = wxString(v, wxConvLibc);
+                            }
+                            else
+#elif wxUSE_WCHAR_T
+                            wxString s;
+
+                            if (ilen == 1)
+                            {
+                                // %ls means Unicode strings
+                                wchar_t *v = va_arg(argptr, wchar_t *);
+
+                                if (v)
+                                    val = s = wxString(v, wxConvLibc);

                             }
                             else
                             }
                             else

-                                val = wxT("(null)");
-                            wxString s(val, len);

 #endif
 #endif

-                            if (s.Len() < min_width)
-                                s.Pad(min_width - s.Len(), wxT(' '), adj_left);
+                            {
+                                val = va_arg(argptr, wxChar *);
+                            }
+
+                            size_t len = 0;

 
 

-                            APPEND_STR(s);
-                        }
-                        else
-                        {
-                            wxChar *val = va_arg(argptr, wxChar *);
-                            size_t len = wxSTRING_MAXLEN;

                             if (val)
                             {
                                 for ( len = 0;
                             if (val)
                             {
                                 for ( len = 0;


@@ -466,16 +493,32 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax,
                                       len++ )
                                     ;
                             }
                                       len++ )
                                     ;
                             }

-                            else
+                            else if (max_width >= 6)
+                            {

                                 val = wxT("(null)");
                                 val = wxT("(null)");

+                                len = 6;
+                            }
+                            else
+                            {
+                                val = wxT("");
+                                len = 0;
+                            }
+
+                            size_t i;

 
 

-                            wxString s(val, len);
-                            if (s.Len() < min_width)
-                                s.Pad(min_width - s.Len(), wxT(' '), adj_left);
+                            if (!adj_left)
+                                for (i = len; i < min_width; i++)
+                                    APPEND_CH(_T(' '));

 
 

-                            APPEND_STR(s);
+                            for (i = 0; i < len; i++)
+                                APPEND_CH(val[i]);
+
+                            if (adj_left)
+                                for (i = len; i < min_width; i++)
+                                    APPEND_CH(_T(' '));
+
+                            done = true;

                         }
                         }

-                        done = TRUE;

                         break;
 
                     case wxT('n'):
                         break;
 
                     case wxT('n'):


@@ -494,14 +537,14 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax,
                             long int *val = va_arg(argptr, long int *);
                             *val = lenCur;
                         }
                             long int *val = va_arg(argptr, long int *);
                             *val = lenCur;
                         }

-                        done = TRUE;
+                        done = true;

                         break;
 
                     default:
                         // bad format, leave unchanged
                         APPEND_CH(_T('%'));
                         APPEND_CH(ch);
                         break;
 
                     default:
                         // bad format, leave unchanged
                         APPEND_CH(_T('%'));
                         APPEND_CH(ch);

-                        done = TRUE;
+                        done = true;

                         break;
                 }
             }
                         break;
                 }
             }


@@ -540,27 +583,44 @@ int WXDLLEXPORT wxSnprintf_(wxChar *buf, size_t len, const wxChar *format, ...)
 }
 #endif // wxSnprintf_
 
 }
 #endif // wxSnprintf_
 

+#if defined(__DMC__)
+    /* Digital Mars adds count to _stprintf (C99) so convert */
+    #if wxUSE_UNICODE
+        int wxSprintf (wchar_t * __RESTRICT s, const wchar_t * __RESTRICT format, ... )
+        {
+            va_list arglist;
+
+            va_start( arglist, format );
+            int iLen = swprintf ( s, -1, format, arglist );
+            va_end( arglist );
+            return iLen ;
+        }
+
+    #endif // wxUSE_UNICODE
+
+#endif //__DMC__
+

 // ----------------------------------------------------------------------------
 // implement the standard IO functions for wide char if libc doesn't have them
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // implement the standard IO functions for wide char if libc doesn't have them
 // ----------------------------------------------------------------------------
 

-#ifdef wxNEED_FPUTWC
-
+#ifdef wxNEED_FPUTS

 int wxFputs(const wchar_t *ws, FILE *stream)
 {
     // counting the number of wide characters written isn't worth the trouble,
     // simply distinguish between ok and error
     return fputs(wxConvLibc.cWC2MB(ws), stream) == -1 ? -1 : 0;
 }
 int wxFputs(const wchar_t *ws, FILE *stream)
 {
     // counting the number of wide characters written isn't worth the trouble,
     // simply distinguish between ok and error
     return fputs(wxConvLibc.cWC2MB(ws), stream) == -1 ? -1 : 0;
 }

+#endif // wxNEED_FPUTS

 
 

+#ifdef wxNEED_PUTC

 int /* not wint_t */ wxPutc(wchar_t wc, FILE *stream)
 {
     wchar_t ws[2] = { wc, L'\0' };
 
     return wxFputs(ws, stream);
 }
 int /* not wint_t */ wxPutc(wchar_t wc, FILE *stream)
 {
     wchar_t ws[2] = { wc, L'\0' };
 
     return wxFputs(ws, stream);
 }

-
-#endif // wxNEED_FPUTWC
+#endif // wxNEED_PUTC

 
 // NB: we only implement va_list functions here, the ones taking ... are
 //     defined below for wxNEED_PRINTF_CONVERSION case anyhow and we reuse
 
 // NB: we only implement va_list functions here, the ones taking ... are
 //     defined below for wxNEED_PRINTF_CONVERSION case anyhow and we reuse


@@ -599,7 +659,7 @@ int vfwprintf(FILE *stream, const wxChar *format, va_list argptr)
     if ( rc != -1 )
     {
         // we can't do much better without Unicode support in libc...
     if ( rc != -1 )
     {
         // we can't do much better without Unicode support in libc...

-        if ( fprintf(stream, "%s", s.mb_str()) == -1 )
+        if ( fprintf(stream, "%s", (const char*)s.mb_str() ) == -1 )

             return -1;
     }
 
             return -1;
     }
 


@@ -644,7 +704,7 @@ int vwprintf(const wxChar *format, va_list argptr)
    So to use native functions in order to get our semantics we must do the
    following translations in Unicode mode (nothing to do in ANSI mode):
 
    So to use native functions in order to get our semantics we must do the
    following translations in Unicode mode (nothing to do in ANSI mode):
 

-   wxWindows specifier      POSIX specifier
+   wxWidgets specifier      POSIX specifier

    ----------------------------------------
 
    %hc, %C, %hC             %c
    ----------------------------------------
 
    %hc, %C, %hC             %c


@@ -714,10 +774,10 @@ private:
                ch == _T('0') || ch == _T(' ') || ch == _T('#');
     }
 
                ch == _T('0') || ch == _T(' ') || ch == _T('#');
     }
 

-    void SkipDigits(const wxChar **ppc)
+    void SkipDigits(const wxChar **ptpc)

     {
     {

-        while ( **ppc >= _T('0') && **ppc <= _T('9') )
-            CopyFmtChar(*(*ppc)++);
+        while ( **ptpc >= _T('0') && **ptpc <= _T('9') )
+            CopyFmtChar(*(*ptpc)++);

     }
 
     // the translated format
     }
 
     // the translated format


@@ -752,7 +812,11 @@ wxFormatConverter::wxFormatConverter(const wxChar *format)
             // precision?
             if ( *format == _T('.') )
             {
             // precision?
             if ( *format == _T('.') )
             {

-                SkipDigits(&format);
+                CopyFmtChar(*format++);
+                if ( *format == _T('*') )
+                    CopyFmtChar(*format++);
+                else
+                    SkipDigits(&format);

             }
 
             // next we can have a size modifier
             }
 
             // next we can have a size modifier


@@ -799,23 +863,14 @@ wxFormatConverter::wxFormatConverter(const wxChar *format)
                 case _T('c'):
                 case _T('s'):
                     // %c -> %lc but %hc stays %hc and %lc is still %lc
                 case _T('c'):
                 case _T('s'):
                     // %c -> %lc but %hc stays %hc and %lc is still %lc

-                    switch ( size )
-                    {
-                        case Default:
-                            InsertFmtChar(_T('l'));
-                            break;
-
-                        case Short:
-                            CopyFmtChar(_T('h'));
-                            break;
-
-                        case Long:
-                            ;
-                    }
+                    if ( size == Default)
+                        InsertFmtChar(_T('l'));

                     // fall through
 
                 default:
                     // nothing special to do
                     // fall through
 
                 default:
                     // nothing special to do

+                    if ( size != Default )
+                        CopyFmtChar(*(format - 1));

                     CopyFmtChar(*format++);
             }
         }
                     CopyFmtChar(*format++);
             }
         }


@@ -827,6 +882,14 @@ wxFormatConverter::wxFormatConverter(const wxChar *format)
     #define wxFormatConverter(x) (x)
 #endif // wxNEED_PRINTF_CONVERSION/!wxNEED_PRINTF_CONVERSION
 
     #define wxFormatConverter(x) (x)
 #endif // wxNEED_PRINTF_CONVERSION/!wxNEED_PRINTF_CONVERSION
 

+#ifdef __WXDEBUG__
+// For testing the format converter
+wxString wxConvertFormat(const wxChar *format)
+{
+    return wxString(wxFormatConverter(format));
+}
+#endif
+

 // ----------------------------------------------------------------------------
 // wxPrintf(), wxScanf() and relatives
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxPrintf(), wxScanf() and relatives
 // ----------------------------------------------------------------------------


@@ -899,12 +962,14 @@ int wxSprintf( wxChar *str, const wxChar *format, ... )
     va_list argptr;
     va_start(argptr, format);
 
     va_list argptr;
     va_start(argptr, format);
 

-    // callers of wxSprintf() deserve what they get
-    int ret = vswprintf( str, UINT_MAX, wxFormatConverter(format), argptr );
+    // note that wxString::FormatV() uses wxVsnprintf(), not wxSprintf(), so
+    // it's safe to implement this one in terms of it
+    wxString s(wxString::FormatV(format, argptr));
+    wxStrcpy(str, s);

 
     va_end(argptr);
 
 
     va_end(argptr);
 

-    return ret;
+    return s.length();

 }
 
 int wxFprintf( FILE *stream, const wxChar *format, ... )
 }
 
 int wxFprintf( FILE *stream, const wxChar *format, ... )


@@ -944,7 +1009,7 @@ int wxVsnprintf( wxChar *str, size_t size, const wxChar *format, va_list argptr
 int wxVsprintf( wxChar *str, const wxChar *format, va_list argptr )
 {
     // same as for wxSprintf()
 int wxVsprintf( wxChar *str, const wxChar *format, va_list argptr )
 {
     // same as for wxSprintf()

-    return vswprintf(str, UINT_MAX, wxFormatConverter(format), argptr);
+    return vswprintf(str, INT_MAX / 4, wxFormatConverter(format), argptr);

 }
 
 #endif // wxNEED_PRINTF_CONVERSION
 }
 
 #endif // wxNEED_PRINTF_CONVERSION


@@ -965,7 +1030,7 @@ inline WORD wxMSW_ctype(wxChar ch)
 
 WXDLLEXPORT int wxIsalnum(wxChar ch) { return IsCharAlphaNumeric(ch); }
 WXDLLEXPORT int wxIsalpha(wxChar ch) { return IsCharAlpha(ch); }
 
 WXDLLEXPORT int wxIsalnum(wxChar ch) { return IsCharAlphaNumeric(ch); }
 WXDLLEXPORT int wxIsalpha(wxChar ch) { return IsCharAlpha(ch); }

-WXDLLEXPORT int wxIsctrl(wxChar ch) { return wxMSW_ctype(ch) & C1_CNTRL; }
+WXDLLEXPORT int wxIscntrl(wxChar ch) { return wxMSW_ctype(ch) & C1_CNTRL; }

 WXDLLEXPORT int wxIsdigit(wxChar ch) { return wxMSW_ctype(ch) & C1_DIGIT; }
 WXDLLEXPORT int wxIsgraph(wxChar ch) { return wxMSW_ctype(ch) & (C1_DIGIT|C1_PUNCT|C1_ALPHA); }
 WXDLLEXPORT int wxIslower(wxChar ch) { return IsCharLower(ch); }
 WXDLLEXPORT int wxIsdigit(wxChar ch) { return wxMSW_ctype(ch) & C1_DIGIT; }
 WXDLLEXPORT int wxIsgraph(wxChar ch) { return wxMSW_ctype(ch) & (C1_DIGIT|C1_PUNCT|C1_ALPHA); }
 WXDLLEXPORT int wxIslower(wxChar ch) { return IsCharLower(ch); }


@@ -1205,28 +1270,6 @@ WXDLLEXPORT long int wxStrtol(const wxChar *nptr, wxChar **endptr, int base)
 }
 #endif // wxNEED_WX_STRING_H
 
 }
 #endif // wxNEED_WX_STRING_H
 

-#if defined(__WXMAC__) && !defined(__DARWIN__) && !wxUSE_UNICODE
-WXDLLEXPORT FILE * wxFopen(const wxChar *path, const wxChar *mode)
-{
-    return fopen( wxMacStringToCString(path), mode );
-}
-
-WXDLLEXPORT FILE * wxFreopen(const wxChar *path, const wxChar *mode, FILE *stream)
-{
-    return freopen( wxMacStringToCString(path), mode, stream );
-}
-
-WXDLLEXPORT int wxRemove(const wxChar *path)
-{
-    return remove( wxMacStringToCString(path) );
-}
-
-WXDLLEXPORT int wxRename(const wxChar *oldpath, const wxChar *newpath)
-{
-    return rename( wxMacStringToCString(oldpath), wxMacStringToCString(newpath) );
-}
-#endif
-

 #ifdef wxNEED_WX_STDIO_H
 WXDLLEXPORT FILE * wxFopen(const wxChar *path, const wxChar *mode)
 {
 #ifdef wxNEED_WX_STDIO_H
 WXDLLEXPORT FILE * wxFopen(const wxChar *path, const wxChar *mode)
 {


@@ -1286,36 +1329,16 @@ long     WXDLLEXPORT wxAtol(const wxChar *psz)
 
 wxChar * WXDLLEXPORT wxGetenv(const wxChar *name)
 {
 
 wxChar * WXDLLEXPORT wxGetenv(const wxChar *name)
 {

-  static wxHashTable env;
-
-  // check if we already have stored the converted env var
-  wxObject *data = env.Get(name);
-  if (!data)
-  {
-    // nope, retrieve it,

 #if wxUSE_UNICODE
 #if wxUSE_UNICODE

-    wxCharBuffer buffer = wxConvLocal.cWX2MB(name);
-    // printf( "buffer %s\n", (const char*) buffer );
-    const char *val = getenv( (const char *)buffer );
+    // NB: buffer returned by getenv() is allowed to be overwritten next
+    //     time getenv() is called, so it is OK to use static string
+    //     buffer to hold the data.
+    static wxWCharBuffer value((wxChar*)NULL);
+    value = wxConvLocal.cMB2WX(getenv(wxConvLocal.cWX2MB(name)));
+    return value.data();

 #else
 #else

-    const char *val = getenv( name );
+    return getenv(name);

 #endif
 #endif

-
-    if (!val) return (wxChar *)NULL;
-    // printf( "home %s\n", val );
-
-    // convert it,
-#if wxUSE_UNICODE
-    data = (wxObject *)new wxString(val, wxConvLocal);
-#else
-    data = (wxObject *)new wxString(val);
-#endif
-
-    // and store it
-    env.Put(name, data);
-  }
-  // return converted env var
-  return (wxChar *)((wxString *)data)->c_str();

 }
 
 int WXDLLEXPORT wxSystem(const wxChar *psz)
 }
 
 int WXDLLEXPORT wxSystem(const wxChar *psz)


@@ -1347,6 +1370,18 @@ WXDLLEXPORT size_t   wxStrftime(wxChar *s, size_t max, const wxChar *fmt, const
 }
 #endif // wxNEED_WX_TIME_H
 
 }
 #endif // wxNEED_WX_TIME_H
 

+#ifndef wxCtime
+WXDLLEXPORT wxChar *wxCtime(const time_t *timep)
+{
+    static wxChar   buf[128];
+
+    wxStrncpy( buf, wxConvertMB2WX( ctime( timep ) ), sizeof( buf ) );
+    buf[ sizeof( buf ) - 1 ] = _T('\0');
+
+    return buf;
+}
+#endif // wxCtime
+

 #endif // wxUSE_WCHAR_T
 
 // ----------------------------------------------------------------------------
 #endif // wxUSE_WCHAR_T
 
 // ----------------------------------------------------------------------------


@@ -1411,19 +1446,20 @@ int isascii( int c )
 }
 #endif
 
 }
 #endif
 

-#if defined(__WXWINCE__)
+#if defined(__WXWINCE__) && (_WIN32_WCE <= 211)
+#if (_WIN32_WCE < 300)

 void *calloc( size_t num, size_t size )
 {
     void** ptr = (void **)malloc(num * size);
     memset( ptr, 0, num * size);
     return ptr;
 }
 void *calloc( size_t num, size_t size )
 {
     void** ptr = (void **)malloc(num * size);
     memset( ptr, 0, num * size);
     return ptr;
 }

+#endif

 
 

-#if (_WIN32_WCE <= 211)

 int isspace(int c)
 {
     return (c == ' ');
 }
 int isspace(int c)
 {
     return (c == ' ');
 }

-#endif

 
 #endif
 
 #endif

+