Added wxFopen to the MSLU code.

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

diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp
index b99c6c7eab048db99aa1cfbc9709f1f3405407a3..793b0b3204ea72173da8aa5c5790d0462dcef915 100644 (file)
--- a/src/common/wxchar.cpp
+++ b/src/common/wxchar.cpp
@@ -53,6 +53,7 @@
 #endif
 
 #if defined(__MWERKS__) && __MSL__ >= 0x6000
+namespace std {}
 using namespace std ;
 #endif
 
@@ -653,9 +654,19 @@ int vwscanf(const wxChar *format, va_list argptr)
 
 int vswscanf(const wxChar *ws, const wxChar *format, va_list argptr)
 {
-    wxFAIL_MSG( _T("TODO") );
-
-    return -1;
+    // The best we can do without proper Unicode support in glibc is to
+    // convert the strings into MB representation and run ANSI version
+    // of the function. This doesn't work with %c and %s because of difference
+    // in size of char and wchar_t, though.
+    
+    wxCHECK_MSG( wxStrstr(format, _T("%s")) == NULL, -1,
+                 _T("incomplete vswscanf implementation doesn't allow %s") );
+    wxCHECK_MSG( wxStrstr(format, _T("%c")) == NULL, -1,
+                 _T("incomplete vswscanf implementation doesn't allow %c") );
+    
+    va_list argcopy;
+    wxVaCopy(argcopy, argptr);
+    return vsscanf(wxConvLibc.cWX2MB(ws), wxConvLibc.cWX2MB(format), argcopy);
 }
 
 int vfwscanf(FILE *stream, const wxChar *format, va_list argptr)
@@ -1481,24 +1492,28 @@ int WXDLLEXPORT wxSystem(const wxChar *psz)
 #endif // wxNEED_WX_STDLIB_H
 
 #ifdef wxNEED_WX_TIME_H
-WXDLLEXPORT size_t   wxStrftime(wxChar *s, size_t max, const wxChar *fmt, const struct tm *tm)
+WXDLLEXPORT size_t
+wxStrftime(wxChar *s, size_t maxsize, const wxChar *fmt, const struct tm *tm)
 {
-    if (!max) return 0;
+    if ( !maxsize )
+        return 0;
 
-    char *buf = (char *)malloc(max);
-    size_t ret = strftime(buf, max, wxConvLocal.cWX2MB(fmt), tm);
-    if (ret)
-    {
-        wxStrcpy(s, wxConvLocal.cMB2WX(buf));
-        free(buf);
-        return wxStrlen(s);
-    }
-    else
-    {
-        free(buf);
-        *s = 0;
+    wxCharBuffer buf(maxsize);
+
+    wxCharBuffer bufFmt(wxConvLocal.cWX2MB(fmt));
+    if ( !bufFmt )
         return 0;
-  }
+
+    size_t ret = strftime(buf.data(), maxsize, bufFmt, tm);
+    if  ( !ret )
+        return 0;
+
+    wxWCharBuffer wbuf = wxConvLocal.cMB2WX(buf);
+    if ( !wbuf )
+        return 0;
+
+    wxStrncpy(s, wbuf, maxsize);
+    return wxStrlen(s);
 }
 #endif // wxNEED_WX_TIME_H