revert last change (r48897)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48908 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-09-23 00:14:18 +00:00
parent 13f06c1bf0
commit 8cb1060f1e

View File

@@ -240,14 +240,14 @@ int /* not wint_t */ wxCRT_FputcW(wchar_t wc, FILE *stream)
#ifdef wxNEED_WPRINTF #ifdef wxNEED_WPRINTF
// TODO: implement the scanf() functions // TODO: implement the scanf() functions
int vwscanf(const wchar_t *format, va_list argptr) static int vwscanf(const wchar_t *format, va_list argptr)
{ {
wxFAIL_MSG( _T("TODO") ); wxFAIL_MSG( _T("TODO") );
return -1; return -1;
} }
int vswscanf(const wchar_t *ws, const wchar_t *format, va_list argptr) static int vswscanf(const wchar_t *ws, const wchar_t *format, va_list argptr)
{ {
// The best we can do without proper Unicode support in glibc is to // The best we can do without proper Unicode support in glibc is to
// convert the strings into MB representation and run ANSI version // convert the strings into MB representation and run ANSI version
@@ -262,7 +262,7 @@ int vswscanf(const wchar_t *ws, const wchar_t *format, va_list argptr)
return vsscanf(wxConvLibc.cWX2MB(ws), wxConvLibc.cWX2MB(format), argptr); return vsscanf(wxConvLibc.cWX2MB(ws), wxConvLibc.cWX2MB(format), argptr);
} }
int vfwscanf(FILE *stream, const wchar_t *format, va_list argptr) static int vfwscanf(FILE *stream, const wchar_t *format, va_list argptr)
{ {
wxFAIL_MSG( _T("TODO") ); wxFAIL_MSG( _T("TODO") );
@@ -271,7 +271,7 @@ int vfwscanf(FILE *stream, const wchar_t *format, va_list argptr)
#define vswprintf wxCRT_VsnprintfW #define vswprintf wxCRT_VsnprintfW
int vfwprintf(FILE *stream, const wchar_t *format, va_list argptr) static int vfwprintf(FILE *stream, const wchar_t *format, va_list argptr)
{ {
wxString s; wxString s;
int rc = s.PrintfV(format, argptr); int rc = s.PrintfV(format, argptr);
@@ -286,7 +286,7 @@ int vfwprintf(FILE *stream, const wchar_t *format, va_list argptr)
return rc; return rc;
} }
int vwprintf(const wchar_t *format, va_list argptr) static int vwprintf(const wchar_t *format, va_list argptr)
{ {
return wxCRT_VfprintfW(stdout, format, argptr); return wxCRT_VfprintfW(stdout, format, argptr);
} }