SourceForge patch #654210 to fix naming/numbering shared libs under OS X

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

diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp
index a161262499f3515c3dd57090fd3c4398651fffa0..ea280f723102e1a02a6e4bc4fdcdd2143fc1ae33 100644 (file)
--- a/src/common/wxchar.cpp
+++ b/src/common/wxchar.cpp
@@ -50,40 +50,56 @@
 #if wxUSE_WCHAR_T
 size_t WXDLLEXPORT wxMB2WC(wchar_t *buf, const char *psz, size_t n)
 {
 #if wxUSE_WCHAR_T
 size_t WXDLLEXPORT wxMB2WC(wchar_t *buf, const char *psz, size_t n)
 {

+  // assume that we have mbsrtowcs() too if we have wcsrtombs()
+#if HAVE_WCSRTOMBS
+  mbstate_t mbstate;
+  memset(&mbstate, 0, sizeof(mbstate_t));
+#endif
+

   if (buf) {
     if (!n || !*psz) {
       if (n) *buf = wxT('\0');
       return 0;
     }
   if (buf) {
     if (!n || !*psz) {
       if (n) *buf = wxT('\0');
       return 0;
     }

+#ifdef HAVE_WCSRTOMBS
+    return mbsrtowcs(buf, &psz, n, &mbstate);
+#else

     return mbstowcs(buf, psz, n);
     return mbstowcs(buf, psz, n);

+#endif

   }
 
   }
 

-  // assume that we have mbsrtowcs() too if we have wcsrtombs()

 #ifdef HAVE_WCSRTOMBS
 #ifdef HAVE_WCSRTOMBS

-  mbstate_t mbstate;

   return mbsrtowcs((wchar_t *) NULL, &psz, 0, &mbstate);
   return mbsrtowcs((wchar_t *) NULL, &psz, 0, &mbstate);

-#else  // !GNU libc
+#else

   return mbstowcs((wchar_t *) NULL, psz, 0);
   return mbstowcs((wchar_t *) NULL, psz, 0);

-#endif // GNU
+#endif

 }
 
 size_t WXDLLEXPORT wxWC2MB(char *buf, const wchar_t *pwz, size_t n)
 {
 }
 
 size_t WXDLLEXPORT wxWC2MB(char *buf, const wchar_t *pwz, size_t n)
 {

+#if HAVE_WCSRTOMBS
+  mbstate_t mbstate;
+  memset(&mbstate, 0, sizeof(mbstate_t));
+#endif
+

   if (buf) {
     if (!n || !*pwz) {
       // glibc2.1 chokes on null input
       if (n) *buf = '\0';
       return 0;
     }
   if (buf) {
     if (!n || !*pwz) {
       // glibc2.1 chokes on null input
       if (n) *buf = '\0';
       return 0;
     }

+#if HAVE_WCSRTOMBS
+    return wcsrtombs(buf, &pwz, n, &mbstate);
+#else

     return wcstombs(buf, pwz, n);
     return wcstombs(buf, pwz, n);

+#endif

   }
 
 #if HAVE_WCSRTOMBS
   }
 
 #if HAVE_WCSRTOMBS

-  mbstate_t mbstate;

   return wcsrtombs((char *) NULL, &pwz, 0, &mbstate);
   return wcsrtombs((char *) NULL, &pwz, 0, &mbstate);

-#else  // !GNU libc
+#else

   return wcstombs((char *) NULL, pwz, 0);
   return wcstombs((char *) NULL, pwz, 0);

-#endif // GNU
+#endif

 }
 #endif // wxUSE_WCHAR_T
 
 }
 #endif // wxUSE_WCHAR_T
 


@@ -108,19 +124,27 @@ bool WXDLLEXPORT wxOKlibc()
   return TRUE;
 }
 
   return TRUE;
 }
 

-#ifndef HAVE_WCSLEN
-size_t   WXDLLEXPORT wcslen(const wchar_t *s)
-{
-  size_t len = 0;
-  while (s[len]) len++;
-  return len;
-}
-#endif
-

 // ============================================================================
 // printf() functions business
 // ============================================================================
 
 // ============================================================================
 // printf() functions business
 // ============================================================================
 

+// special test mode: define all functions below even if we don't really need
+// them to be able to test them
+#ifdef wxTEST_PRINTF
+    #undef wxFprintf
+    #undef wxPrintf
+    #undef wxSprintf
+    #undef wxVfprintf
+    #undef wxVsprintf
+    #undef wxVprintf
+    #undef wxVsnprintf_
+    #undef wxSnprintf_
+
+    #define wxNEED_WPRINTF
+
+    int wxVfprintf( FILE *stream, const wxChar *format, va_list argptr );
+#endif
+

 // ----------------------------------------------------------------------------
 // implement [v]snprintf() if the system doesn't provide a safe one
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // implement [v]snprintf() if the system doesn't provide a safe one
 // ----------------------------------------------------------------------------


@@ -135,9 +159,12 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax,
     // number of characters in the buffer so far, must be less than lenMax
     size_t lenCur = 0;
 
     // number of characters in the buffer so far, must be less than lenMax
     size_t lenCur = 0;
 

-    for (size_t n = 0; format[n]; n++)
+    for ( size_t n = 0; ; n++ )

     {
     {

-        if (format[n] == wxT('%')) {
+        const wxChar chCur = format[n];
+
+        if ( chCur == wxT('%') )
+        {

             static char s_szFlags[256] = "%";
             size_t flagofs = 1;
             bool adj_left = FALSE,
             static char s_szFlags[256] = "%";
             size_t flagofs = 1;
             bool adj_left = FALSE,


@@ -147,7 +174,8 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax,
             int ilen = 0;
             size_t min_width = 0,
                    max_width = wxSTRING_MAXLEN;
             int ilen = 0;
             size_t min_width = 0,
                    max_width = wxSTRING_MAXLEN;

-            do {
+            do
+            {

 
 #define CHECK_PREC \
                 if (in_prec && !prec_dot) \
 
 #define CHECK_PREC \
                 if (in_prec && !prec_dot) \


@@ -163,18 +191,17 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax,
                 buf[lenCur++] = ch
 
 #define APPEND_STR(s) \
                 buf[lenCur++] = ch
 
 #define APPEND_STR(s) \

-                for ( const char *p = s; *p; p++ ) \
-                { \
-                    APPEND_CH((wchar_t)(*p)); \
-                }
-
-#define APPEND_WSTR(s) \
-                for ( const wchar_t *p = s; *p; p++ ) \

                 { \
                 { \

-                    APPEND_CH(*p); \
+                    for ( const wxChar *p = s; *p; p++ ) \
+                    { \
+                        APPEND_CH(*p); \
+                    } \

                 }
 
                 }
 

-                switch (format[++n]) {
+                // what follows '%'?
+                const wxChar ch = format[++n];
+                switch ( ch )
+                {

                     case wxT('\0'):
                         APPEND_CH(_T('\0'));
 
                     case wxT('\0'):
                         APPEND_CH(_T('\0'));
 


@@ -192,57 +219,62 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax,
                     case wxT('+'):
                     case wxT('\''):
                         CHECK_PREC
                     case wxT('+'):
                     case wxT('\''):
                         CHECK_PREC

-                        s_szFlags[flagofs++] = format[n];
+                        s_szFlags[flagofs++] = ch;

                         break;
 
                     case wxT('-'):
                         CHECK_PREC
                         adj_left = TRUE;
                         break;
 
                     case wxT('-'):
                         CHECK_PREC
                         adj_left = TRUE;

-                        s_szFlags[flagofs++] = format[n];
+                        s_szFlags[flagofs++] = ch;

                         break;
 
                     case wxT('.'):
                         CHECK_PREC
                         break;
 
                     case wxT('.'):
                         CHECK_PREC

-                            in_prec = TRUE;
+                        in_prec = TRUE;

                         prec_dot = FALSE;
                         max_width = 0;
                         prec_dot = FALSE;
                         max_width = 0;

-                        // dot will be auto-added to s_szFlags if non-negative number follows
+                        // dot will be auto-added to s_szFlags if non-negative
+                        // number follows

                         break;
 
                     case wxT('h'):
                         ilen = -1;
                         CHECK_PREC
                         break;
 
                     case wxT('h'):
                         ilen = -1;
                         CHECK_PREC

-                        s_szFlags[flagofs++] = format[n];
+                        s_szFlags[flagofs++] = ch;

                         break;
 
                     case wxT('l'):
                         ilen = 1;
                         CHECK_PREC
                         break;
 
                     case wxT('l'):
                         ilen = 1;
                         CHECK_PREC

-                        s_szFlags[flagofs++] = format[n];
+                        s_szFlags[flagofs++] = ch;

                         break;
 
                     case wxT('q'):
                     case wxT('L'):
                         ilen = 2;
                         CHECK_PREC
                         break;
 
                     case wxT('q'):
                     case wxT('L'):
                         ilen = 2;
                         CHECK_PREC

-                        s_szFlags[flagofs++] = format[n];
+                        s_szFlags[flagofs++] = ch;

                         break;
 
                     case wxT('Z'):
                         ilen = 3;
                         CHECK_PREC
                         break;
 
                     case wxT('Z'):
                         ilen = 3;
                         CHECK_PREC

-                        s_szFlags[flagofs++] = format[n];
+                        s_szFlags[flagofs++] = ch;

                         break;
 
                     case wxT('*'):
                         {
                             int len = va_arg(argptr, int);
                         break;
 
                     case wxT('*'):
                         {
                             int len = va_arg(argptr, int);

-                            if (in_prec) {
+                            if (in_prec)
+                            {

                                 if (len<0) break;
                                 CHECK_PREC
                                     max_width = len;
                                 if (len<0) break;
                                 CHECK_PREC
                                     max_width = len;

-                            } else {
-                                if (len<0) {
+                            }
+                            else
+                            {
+                                if (len<0)
+                                {

                                     adj_left = !adj_left;
                                     s_szFlags[flagofs++] = '-';
                                     len = -len;
                                     adj_left = !adj_left;
                                     s_szFlags[flagofs++] = '-';
                                     len = -len;


@@ -259,13 +291,19 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax,
                         {
                             int len = 0;
                             CHECK_PREC
                         {
                             int len = 0;
                             CHECK_PREC

-                                while ((format[n]>=wxT('0')) && (format[n]<=wxT('9'))) {
-                                    s_szFlags[flagofs++] = format[n];
-                                    len = len*10 + (format[n] - wxT('0'));
-                                    n++;
-                                }
-                            if (in_prec) max_width = len;
-                            else min_width = len;
+                            while ( (format[n] >= wxT('0')) &&
+                                    (format[n] <= wxT('9')) )
+                            {
+                                s_szFlags[flagofs++] = format[n];
+                                len = len*10 + (format[n] - wxT('0'));
+                                n++;
+                            }
+
+                            if (in_prec)
+                                max_width = len;
+                            else
+                                min_width = len;
+

                             n--; // the main loop pre-increments n again
                         }
                         break;
                             n--; // the main loop pre-increments n again
                         }
                         break;


@@ -277,35 +315,47 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax,
                     case wxT('x'):
                     case wxT('X'):
                         CHECK_PREC
                     case wxT('x'):
                     case wxT('X'):
                         CHECK_PREC

-                        s_szFlags[flagofs++] = format[n];
+                        s_szFlags[flagofs++] = ch;

                         s_szFlags[flagofs] = '\0';
                         s_szFlags[flagofs] = '\0';

-                        if (ilen == 0 ) {
+                        if (ilen == 0 )
+                        {

                             int val = va_arg(argptr, int);
                             ::sprintf(szScratch, s_szFlags, val);
                         }
                             int val = va_arg(argptr, int);
                             ::sprintf(szScratch, s_szFlags, val);
                         }

-                        else if (ilen == -1) {
-                            short int val = va_arg(argptr, short int);
+                        else if (ilen == -1)
+                        {
+                            // NB: 'short int' value passed through '...'
+                            //      is promoted to 'int', so we have to get
+                            //      an int from stack even if we need a short
+                            short int val = (short int) va_arg(argptr, int);

                             ::sprintf(szScratch, s_szFlags, val);
                         }
                             ::sprintf(szScratch, s_szFlags, val);
                         }

-                        else if (ilen == 1) {
+                        else if (ilen == 1)
+                        {

                             long int val = va_arg(argptr, long int);
                             ::sprintf(szScratch, s_szFlags, val);
                         }
                             long int val = va_arg(argptr, long int);
                             ::sprintf(szScratch, s_szFlags, val);
                         }

-                        else if (ilen == 2) {
+                        else if (ilen == 2)
+                        {

 #if SIZEOF_LONG_LONG
                             long long int val = va_arg(argptr, long long int);
                             ::sprintf(szScratch, s_szFlags, val);
 #if SIZEOF_LONG_LONG
                             long long int val = va_arg(argptr, long long int);
                             ::sprintf(szScratch, s_szFlags, val);

-#else
+#else // !long long

                             long int val = va_arg(argptr, long int);
                             ::sprintf(szScratch, s_szFlags, val);
                             long int val = va_arg(argptr, long int);
                             ::sprintf(szScratch, s_szFlags, val);

-#endif
+#endif // long long/!long long

                         }
                         }

-                        else if (ilen == 3) {
+                        else if (ilen == 3)
+                        {

                             size_t val = va_arg(argptr, size_t);
                             ::sprintf(szScratch, s_szFlags, val);
                         }
 
                             size_t val = va_arg(argptr, size_t);
                             ::sprintf(szScratch, s_szFlags, val);
                         }
 

-                        APPEND_STR(szScratch);
+                        {
+                            const wxMB2WXbuf tmp =
+                                wxConvLibc.cMB2WX(szScratch);
+                            APPEND_STR(tmp);
+                        }

 
                         done = TRUE;
                         break;
 
                         done = TRUE;
                         break;


@@ -316,17 +366,24 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax,
                     case wxT('g'):
                     case wxT('G'):
                         CHECK_PREC
                     case wxT('g'):
                     case wxT('G'):
                         CHECK_PREC

-                        s_szFlags[flagofs++] = format[n];
+                        s_szFlags[flagofs++] = ch;

                         s_szFlags[flagofs] = '\0';
                         s_szFlags[flagofs] = '\0';

-                        if (ilen == 2) {
+                        if (ilen == 2)
+                        {

                             long double val = va_arg(argptr, long double);
                             ::sprintf(szScratch, s_szFlags, val);
                             long double val = va_arg(argptr, long double);
                             ::sprintf(szScratch, s_szFlags, val);

-                        } else {
+                        }
+                        else
+                        {

                             double val = va_arg(argptr, double);
                             ::sprintf(szScratch, s_szFlags, val);
                         }
 
                             double val = va_arg(argptr, double);
                             ::sprintf(szScratch, s_szFlags, val);
                         }
 

-                        APPEND_STR(szScratch);
+                        {
+                            const wxMB2WXbuf tmp =
+                                wxConvLibc.cMB2WX(szScratch);
+                            APPEND_STR(tmp);
+                        }

 
                         done = TRUE;
                         break;
 
                         done = TRUE;
                         break;


@@ -335,11 +392,13 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax,
                         {
                             void *val = va_arg(argptr, void *);
                             CHECK_PREC
                         {
                             void *val = va_arg(argptr, void *);
                             CHECK_PREC

-                                s_szFlags[flagofs++] = format[n];
+                            s_szFlags[flagofs++] = ch;

                             s_szFlags[flagofs] = '\0';
                             ::sprintf(szScratch, s_szFlags, val);
 
                             s_szFlags[flagofs] = '\0';
                             ::sprintf(szScratch, s_szFlags, val);
 

-                            APPEND_STR(szScratch);
+                            const wxMB2WXbuf tmp =
+                                wxConvLibc.cMB2WX(szScratch);
+                            APPEND_STR(tmp);

 
                             done = TRUE;
                         }
 
                             done = TRUE;
                         }


@@ -356,48 +415,69 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax,
                         break;
 
                     case wxT('s'):
                         break;
 
                     case wxT('s'):

-                        if (ilen == -1) {
-                            // wx extension: we'll let %hs mean non-Unicode strings
+                        if (ilen == -1)
+                        {
+                            // wx extension: we'll let %hs mean non-Unicode
+                            // strings

                             char *val = va_arg(argptr, char *);
 #if wxUSE_UNICODE
                             char *val = va_arg(argptr, char *);
 #if wxUSE_UNICODE

-                            // ASCII->Unicode constructor handles max_width right
+                            // ASCII->Unicode constructor handles max_width
+                            // right

                             wxString s(val, wxConvLibc, max_width);
 #else
                             size_t len = wxSTRING_MAXLEN;
                             wxString s(val, wxConvLibc, max_width);
 #else
                             size_t len = wxSTRING_MAXLEN;

-                            if (val) {
-                                for (len = 0; val[len] && (len<max_width); len++);
-                            } else val = wxT("(null)");
+                            if (val)
+                            {
+                                for ( len = 0;
+                                      val[len] && (len < max_width);
+                                      len++ )
+                                    ;
+                            }
+                            else
+                                val = wxT("(null)");

                             wxString s(val, len);
 #endif
                             if (s.Len() < min_width)
                                 s.Pad(min_width - s.Len(), wxT(' '), adj_left);
 
                             wxString s(val, len);
 #endif
                             if (s.Len() < min_width)
                                 s.Pad(min_width - s.Len(), wxT(' '), adj_left);
 

-                            APPEND_WSTR(s);
-                        } else {
+                            APPEND_STR(s);
+                        }
+                        else
+                        {

                             wxChar *val = va_arg(argptr, wxChar *);
                             size_t len = wxSTRING_MAXLEN;
                             wxChar *val = va_arg(argptr, wxChar *);
                             size_t len = wxSTRING_MAXLEN;

-                            if (val) {
-                                for (len = 0; val[len] && (len<max_width); len++);
-                            } else val = wxT("(null)");
+                            if (val)
+                            {
+                                for ( len = 0;
+                                      val[len] && (len < max_width);
+                                      len++ )
+                                    ;
+                            }
+                            else
+                                val = wxT("(null)");
+

                             wxString s(val, len);
                             if (s.Len() < min_width)
                                 s.Pad(min_width - s.Len(), wxT(' '), adj_left);
 
                             wxString s(val, len);
                             if (s.Len() < min_width)
                                 s.Pad(min_width - s.Len(), wxT(' '), adj_left);
 

-                            APPEND_WSTR(s);
+                            APPEND_STR(s);

                         }
                         done = TRUE;
                         break;
 
                     case wxT('n'):
                         }
                         done = TRUE;
                         break;
 
                     case wxT('n'):

-                        if (ilen == 0) {
+                        if (ilen == 0)
+                        {

                             int *val = va_arg(argptr, int *);
                             *val = lenCur;
                         }
                             int *val = va_arg(argptr, int *);
                             *val = lenCur;
                         }

-                        else if (ilen == -1) {
+                        else if (ilen == -1)
+                        {

                             short int *val = va_arg(argptr, short int *);
                             *val = lenCur;
                         }
                             short int *val = va_arg(argptr, short int *);
                             *val = lenCur;
                         }

-                        else if (ilen >= 1) {
+                        else if (ilen >= 1)
+                        {

                             long int *val = va_arg(argptr, long int *);
                             *val = lenCur;
                         }
                             long int *val = va_arg(argptr, long int *);
                             *val = lenCur;
                         }


@@ -405,23 +485,23 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax,
                         break;
 
                     default:
                         break;
 
                     default:

-                        if (wxIsalpha(format[n]))
-                            // probably some flag not taken care of here yet
-                            s_szFlags[flagofs++] = format[n];
-                        else {
-                            // bad format
-                            APPEND_CH(_T('%')); // just to pass the glibc tst-printf.c
-                            n--;
-                            done = TRUE;
-                        }
+                        // bad format, leave unchanged
+                        APPEND_CH(_T('%'));
+                        APPEND_CH(ch);
+                        done = TRUE;

                         break;
                 }
                         break;
                 }

-            } while (!done);
+            }
+            while (!done);

         }
         else
         {
         }
         else
         {

-            APPEND_CH(format[n]);
+            APPEND_CH(chCur);

         }
         }

+
+        // terminating NUL?
+        if ( !chCur )
+            break;

     }
 
     return lenCur;
     }
 
     return lenCur;


@@ -451,7 +531,7 @@ int WXDLLEXPORT wxSnprintf_(wxChar *buf, size_t len, const wxChar *format, ...)
 // 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
 // ----------------------------------------------------------------------------
 

-#ifndef HAVE_FPUTWC
+#ifdef wxNEED_FPUTWC

 
 int wxFputs(const wchar_t *ws, FILE *stream)
 {
 
 int wxFputs(const wchar_t *ws, FILE *stream)
 {


@@ -467,7 +547,7 @@ int /* not wint_t */ wxPutc(wchar_t wc, FILE *stream)
     return wxFputs(ws, stream);
 }
 
     return wxFputs(ws, stream);
 }
 

-#endif // HAVE_FPUTWC
+#endif // wxNEED_FPUTWC

 
 // 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


@@ -475,21 +555,21 @@ int /* not wint_t */ wxPutc(wchar_t wc, FILE *stream)
 #ifdef wxNEED_WPRINTF
 
 // TODO: implement the scanf() functions
 #ifdef wxNEED_WPRINTF
 
 // TODO: implement the scanf() functions

-int vwscanf(const wchar_t *format, va_list argptr)
+int vwscanf(const wxChar *format, va_list argptr)

 {
     wxFAIL_MSG( _T("TODO") );
 
     return -1;
 }
 
 {
     wxFAIL_MSG( _T("TODO") );
 
     return -1;
 }
 

-int vswscanf(const wchar_t *ws, const wchar_t *format, va_list argptr)
+int vswscanf(const wxChar *ws, const wxChar *format, va_list argptr)

 {
     wxFAIL_MSG( _T("TODO") );
 
     return -1;
 }
 
 {
     wxFAIL_MSG( _T("TODO") );
 
     return -1;
 }
 

-int vfwscanf(FILE *stream, const wchar_t *format, va_list argptr)
+int vfwscanf(FILE *stream, const wxChar *format, va_list argptr)

 {
     wxFAIL_MSG( _T("TODO") );
 
 {
     wxFAIL_MSG( _T("TODO") );
 


@@ -498,7 +578,7 @@ int vfwscanf(FILE *stream, const wchar_t *format, va_list argptr)
 
 #define vswprintf wxVsnprintf_
 
 
 #define vswprintf wxVsnprintf_
 

-int vfwprintf(FILE *stream, const wchar_t *format, va_list argptr)
+int vfwprintf(FILE *stream, const wxChar *format, va_list argptr)

 {
     wxString s;
     int rc = s.PrintfV(format, argptr);
 {
     wxString s;
     int rc = s.PrintfV(format, argptr);


@@ -506,14 +586,14 @@ int vfwprintf(FILE *stream, const wchar_t *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.mb_str()) == -1 )
+        if ( fprintf(stream, "%s", s.mb_str()) == -1 )

             return -1;
     }
 
     return rc;
 }
 
             return -1;
     }
 
     return rc;
 }
 

-int vwprintf(const wchar_t *format, va_list argptr)
+int vwprintf(const wxChar *format, va_list argptr)

 {
     return wxVfprintf(stdout, format, argptr);
 }
 {
     return wxVfprintf(stdout, format, argptr);
 }


@@ -566,7 +646,10 @@ class wxFormatConverter
 public:
     wxFormatConverter(const wxChar *format);
 
 public:
     wxFormatConverter(const wxChar *format);
 

-    operator const wxChar *() const { return m_fmt.c_str(); }
+    // notice that we only translated the string if m_fmtOrig == NULL (as set
+    // by CopyAllBefore()), otherwise we should simply use the original format
+    operator const wxChar *() const
+        { return m_fmtOrig ? m_fmtOrig : m_fmt.c_str(); }

 
 private:
     // copy another character to the translated format: this function does the
 
 private:
     // copy another character to the translated format: this function does the


@@ -577,7 +660,7 @@ private:
     {
         if ( !m_fmtOrig )
         {
     {
         if ( !m_fmtOrig )
         {

-            // we're translating, d copy
+            // we're translating, do copy

             m_fmt += ch;
         }
         else
             m_fmt += ch;
         }
         else


@@ -737,7 +820,7 @@ wxFormatConverter::wxFormatConverter(const wxChar *format)
 
 #if defined(wxNEED_PRINTF_CONVERSION) || defined(wxNEED_WPRINTF)
 
 
 #if defined(wxNEED_PRINTF_CONVERSION) || defined(wxNEED_WPRINTF)
 

-int wxScanf( const wxChar *format, ... ) ATTRIBUTE_PRINTF_2
+int wxScanf( const wxChar *format, ... )

 {
     va_list argptr;
     va_start(argptr, format);
 {
     va_list argptr;
     va_start(argptr, format);


@@ -749,7 +832,7 @@ int wxScanf( const wxChar *format, ... ) ATTRIBUTE_PRINTF_2
     return ret;
 }
 
     return ret;
 }
 

-int wxSscanf( const wxChar *str, const wxChar *format, ... ) ATTRIBUTE_PRINTF_3
+int wxSscanf( const wxChar *str, const wxChar *format, ... )

 {
     va_list argptr;
     va_start(argptr, format);
 {
     va_list argptr;
     va_start(argptr, format);


@@ -761,7 +844,7 @@ int wxSscanf( const wxChar *str, const wxChar *format, ... ) ATTRIBUTE_PRINTF_3
     return ret;
 }
 
     return ret;
 }
 

-int wxFscanf( FILE *stream, const wxChar *format, ... ) ATTRIBUTE_PRINTF_3
+int wxFscanf( FILE *stream, const wxChar *format, ... )

 {
     va_list argptr;
     va_start(argptr, format);
 {
     va_list argptr;
     va_start(argptr, format);


@@ -773,7 +856,7 @@ int wxFscanf( FILE *stream, const wxChar *format, ... ) ATTRIBUTE_PRINTF_3
     return ret;
 }
 
     return ret;
 }
 

-int wxPrintf( const wxChar *format, ... ) ATTRIBUTE_PRINTF_2
+int wxPrintf( const wxChar *format, ... )

 {
     va_list argptr;
     va_start(argptr, format);
 {
     va_list argptr;
     va_start(argptr, format);


@@ -786,7 +869,7 @@ int wxPrintf( const wxChar *format, ... ) ATTRIBUTE_PRINTF_2
 }
 
 #ifndef wxSnprintf
 }
 
 #ifndef wxSnprintf

-int wxSnprintf( wxChar *str, size_t size, const wxChar *format, ... ) ATTRIBUTE_PRINTF_4
+int wxSnprintf( wxChar *str, size_t size, const wxChar *format, ... )

 {
     va_list argptr;
     va_start(argptr, format);
 {
     va_list argptr;
     va_start(argptr, format);


@@ -799,7 +882,7 @@ int wxSnprintf( wxChar *str, size_t size, const wxChar *format, ... ) ATTRIBUTE_
 }
 #endif // wxSnprintf
 
 }
 #endif // wxSnprintf
 

-int wxSprintf( wxChar *str, const wxChar *format, ... ) ATTRIBUTE_PRINTF_3
+int wxSprintf( wxChar *str, const wxChar *format, ... )

 {
     va_list argptr;
     va_start(argptr, format);
 {
     va_list argptr;
     va_start(argptr, format);


@@ -812,7 +895,7 @@ int wxSprintf( wxChar *str, const wxChar *format, ... ) ATTRIBUTE_PRINTF_3
     return ret;
 }
 
     return ret;
 }
 

-int wxFprintf( FILE *stream, const wxChar *format, ... ) ATTRIBUTE_PRINTF_3
+int wxFprintf( FILE *stream, const wxChar *format, ... )

 {
     va_list argptr;
     va_start( argptr, format );
 {
     va_list argptr;
     va_start( argptr, format );


@@ -881,15 +964,26 @@ WXDLLEXPORT int wxTolower(wxChar ch) { return (wxChar)CharLower((LPTSTR)(ch)); }
 WXDLLEXPORT int wxToupper(wxChar ch) { return (wxChar)CharUpper((LPTSTR)(ch)); }
 #endif
 
 WXDLLEXPORT int wxToupper(wxChar ch) { return (wxChar)CharUpper((LPTSTR)(ch)); }
 #endif
 

-#ifndef wxStrdup
-WXDLLEXPORT wxChar * wxStrdup(const wxChar *psz)
+#ifndef wxStrdupA
+
+WXDLLEXPORT char *wxStrdupA(const char *s)

 {
 {

-  size_t size = (wxStrlen(psz) + 1) * sizeof(wxChar);
-  wxChar *ret = (wxChar *) malloc(size);
-  memcpy(ret, psz, size);
+    return strcpy((char *)malloc(strlen(s) + 1), s);
+}
+
+#endif // wxStrdupA
+
+#ifndef wxStrdupW
+
+WXDLLEXPORT wchar_t * wxStrdupW(const wchar_t *pwz)
+{
+  size_t size = (wxWcslen(pwz) + 1) * sizeof(wchar_t);
+  wchar_t *ret = (wchar_t *) malloc(size);
+  memcpy(ret, pwz, size);

   return ret;
 }
   return ret;
 }

-#endif
+
+#endif // wxStrdupW

 
 #ifndef wxStricmp
 int WXDLLEXPORT wxStricmp(const wxChar *psz1, const wxChar *psz2)
 
 #ifndef wxStricmp
 int WXDLLEXPORT wxStricmp(const wxChar *psz1, const wxChar *psz2)


@@ -919,22 +1013,35 @@ int WXDLLEXPORT wxStrnicmp(const wxChar *s1, const wxChar *s2, size_t n)
 #ifndef wxStrtok
 WXDLLEXPORT wxChar * wxStrtok(wxChar *psz, const wxChar *delim, wxChar **save_ptr)
 {
 #ifndef wxStrtok
 WXDLLEXPORT wxChar * wxStrtok(wxChar *psz, const wxChar *delim, wxChar **save_ptr)
 {

-  if (!psz) psz = *save_ptr;
-  psz += wxStrspn(psz, delim);
-  if (!*psz) {
-    *save_ptr = (wxChar *)NULL;
-    return (wxChar *)NULL;
-  }
-  wxChar *ret = psz;
-  psz = wxStrpbrk(psz, delim);
-  if (!psz) *save_ptr = (wxChar*)NULL;
-  else {
-    *psz = wxT('\0');
-    *save_ptr = psz + 1;
-  }
-  return ret;
+    if (!psz)
+    {
+        psz = *save_ptr;
+        if ( !psz )
+            return NULL;
+    }
+
+    psz += wxStrspn(psz, delim);
+    if (!*psz)
+    {
+        *save_ptr = (wxChar *)NULL;
+        return (wxChar *)NULL;
+    }
+
+    wxChar *ret = psz;
+    psz = wxStrpbrk(psz, delim);
+    if (!psz)
+    {
+        *save_ptr = (wxChar*)NULL;
+    }
+    else
+    {
+        *psz = wxT('\0');
+        *save_ptr = psz + 1;
+    }
+
+    return ret;

 }
 }

-#endif
+#endif // wxStrtok

 
 #ifndef wxSetlocale
 WXDLLEXPORT wxWCharBuffer wxSetlocale(int category, const wxChar *locale)
 
 #ifndef wxSetlocale
 WXDLLEXPORT wxWCharBuffer wxSetlocale(int category, const wxChar *locale)