X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/44c44c82a3fe5362bac5cc9536f06eeac52af00c..b63fce942f8d195c42863f28ad41af750273fb47:/src/common/wxchar.cpp diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp index afff852e81..7e6c8f21f4 100644 --- a/src/common/wxchar.cpp +++ b/src/common/wxchar.cpp @@ -47,6 +47,10 @@ #include #endif +#if defined(__MWERKS__) && __MSL__ >= 0x6000 +using namespace std ; +#endif + #if wxUSE_WCHAR_T size_t WXDLLEXPORT wxMB2WC(wchar_t *buf, const char *psz, size_t n) { @@ -848,11 +852,7 @@ int wxFscanf( FILE *stream, const wxChar *format, ... ) { va_list argptr; va_start(argptr, format); -#ifdef __WXMAC__ - int ret = ::vfwscanf(stream, wxFormatConverter(format), argptr); -#else int ret = vfwscanf(stream, wxFormatConverter(format), argptr); -#endif va_end(argptr);