X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/16882c9e3724a9cd381c072cc2a2d39e5c247e0d..d298f18ffb4bd0bd758b10f34c9e01cd119d1365:/src/common/wxcrt.cpp diff --git a/src/common/wxcrt.cpp b/src/common/wxcrt.cpp index 9dbdc1b392..dc51b48e41 100644 --- a/src/common/wxcrt.cpp +++ b/src/common/wxcrt.cpp @@ -29,6 +29,16 @@ #include #include #include +#include + +#ifdef __SGI__ + // wide character functions are declared in std namespace under IRIX + using namespace std; + + // and this one is only declared if __c99 is defined which is not the case + // for C++ builds, so declare it ourselves + extern "C" int vswscanf(const wchar_t *, const wchar_t *, va_list); +#endif #ifndef __WXPALMOS5__ #ifndef __WXWINCE__ @@ -65,13 +75,12 @@ using namespace std ; #endif #if defined(__DARWIN__) - #include "wx/osx/core/cfref.h" - #include - #include "wx/osx/core/cfstring.h" + #include "wx/osx/core/cfref.h" + #include + #include "wx/osx/core/cfstring.h" #include #endif -#if wxUSE_WCHAR_T WXDLLIMPEXP_BASE size_t wxMB2WC(wchar_t *buf, const char *psz, size_t n) { // assume that we have mbsrtowcs() too if we have wcsrtombs() @@ -99,9 +108,9 @@ WXDLLIMPEXP_BASE size_t wxMB2WC(wchar_t *buf, const char *psz, size_t n) // support it (the only currently known example being Metrowerks, see // wx/crt.h) we don't use its mbstowcs() at all #ifdef HAVE_WCSRTOMBS - return mbsrtowcs((wchar_t *) NULL, &psz, 0, &mbstate); + return mbsrtowcs(NULL, &psz, 0, &mbstate); #else - return wxMbstowcs((wchar_t *) NULL, psz, 0); + return wxMbstowcs(NULL, psz, 0); #endif } @@ -126,12 +135,11 @@ WXDLLIMPEXP_BASE size_t wxWC2MB(char *buf, const wchar_t *pwz, size_t n) } #ifdef HAVE_WCSRTOMBS - return wcsrtombs((char *) NULL, &pwz, 0, &mbstate); + return wcsrtombs(NULL, &pwz, 0, &mbstate); #else - return wxWcstombs((char *) NULL, pwz, 0); + return wxWcstombs(NULL, pwz, 0); #endif } -#endif // wxUSE_WCHAR_T char* wxSetlocale(int category, const char *locale) { @@ -255,14 +263,14 @@ int /* not wint_t */ wxCRT_FputcW(wchar_t wc, FILE *stream) // TODO: implement the scanf() functions static int vwscanf(const wchar_t *format, va_list argptr) { - wxFAIL_MSG( _T("TODO") ); + wxFAIL_MSG( wxT("TODO") ); return -1; } static int vfwscanf(FILE *stream, const wchar_t *format, va_list argptr) { - wxFAIL_MSG( _T("TODO") ); + wxFAIL_MSG( wxT("TODO") ); return -1; } @@ -299,12 +307,12 @@ static int vswscanf(const wchar_t *ws, const wchar_t *format, va_list argptr) // 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") ); + wxCHECK_MSG( wxStrstr(format, wxT("%s")) == NULL, -1, + wxT("incomplete vswscanf implementation doesn't allow %s") ); + wxCHECK_MSG( wxStrstr(format, wxT("%c")) == NULL, -1, + wxT("incomplete vswscanf implementation doesn't allow %c") ); - return vsscanf(wx_static_cast(const char*, wxConvLibc.cWX2MB(ws)), + return vsscanf(static_cast(wxConvLibc.cWX2MB(ws)), wxConvLibc.cWX2MB(format), argptr); } #endif @@ -578,13 +586,20 @@ namespace #if !wxUSE_UTF8_LOCALE_ONLY int ConvertStringToBuf(const wxString& s, char *out, size_t outsize) { - const wxWX2WCbuf buf = s.wc_str(); + const wxCharBuffer buf(s.mb_str()); - size_t len = wxConvLibc.FromWChar(out, outsize, buf); - if ( len != wxCONV_FAILED ) - return len-1; - else - return wxConvLibc.FromWChar(NULL, 0, buf); + const size_t len = buf.length(); + if ( outsize > len ) + { + memcpy(out, buf, (len+1) * sizeof(char)); + } + else // not enough space + { + memcpy(out, buf, (outsize-1) * sizeof(char)); + out[outsize-1] = '\0'; + } + + return len; } #endif // !wxUSE_UTF8_LOCALE_ONLY @@ -643,13 +658,13 @@ int wxVsprintf(wchar_t *str, const wxString& format, va_list argptr) #if wxUSE_UNICODE_WCHAR #ifdef __DMC__ /* -This fails with a bug similar to +This fails with a bug similar to http://www.digitalmars.com/pnews/read.php?server=news.digitalmars.com&group=c++.beta&artnum=680 in DMC 8.49 and 8.50 I don't see it being used in the wxWidgets sources at present (oct 2007) CE */ #pragma message ( "warning ::::: wxVsprintf(wchar_t *str, const wxString& format, va_list argptr) not yet implemented" ) - wxFAIL_MSG( _T("TODO") ); + wxFAIL_MSG( wxT("TODO") ); return -1; #else @@ -725,7 +740,6 @@ int wxVsnprintf(wchar_t *str, size_t size, const wxString& format, va_list argpt } #endif // wxUSE_UNICODE -#if wxUSE_WCHAR_T // ---------------------------------------------------------------------------- // ctype.h stuff (currently unused) @@ -797,17 +811,17 @@ WXDLLIMPEXP_BASE wchar_t * wxCRT_StrdupW(const wchar_t *pwz) #endif // wxCRT_StrdupW #ifndef wxWCHAR_T_IS_WXCHAR16 -size_t wxStrlen(const wxChar16 *s ) -{ - if (!s) return 0; - size_t i=0; - while (*s!=0) { ++i; ++s; }; +size_t wxStrlen(const wxChar16 *s ) +{ + if (!s) return 0; + size_t i=0; + while (*s!=0) { ++i; ++s; }; return i; } wxChar16* wxStrdup(const wxChar16* s) -{ - size_t size = (wxStrlen(s) + 1) * sizeof(wxChar16); +{ + size_t size = (wxStrlen(s) + 1) * sizeof(wxChar16); wxChar16 *ret = (wxChar16*) malloc(size); memcpy(ret, s, size); return ret; @@ -815,17 +829,17 @@ wxChar16* wxStrdup(const wxChar16* s) #endif #ifndef wxWCHAR_T_IS_WXCHAR32 -size_t wxStrlen(const wxChar32 *s ) -{ - if (!s) return 0; - size_t i=0; - while (*s!=0) { ++i; ++s; }; +size_t wxStrlen(const wxChar32 *s ) +{ + if (!s) return 0; + size_t i=0; + while (*s!=0) { ++i; ++s; }; return i; } wxChar32* wxStrdup(const wxChar32* s) -{ - size_t size = (wxStrlen(s) + 1) * sizeof(wxChar32); +{ + size_t size = (wxStrlen(s) + 1) * sizeof(wxChar32); wxChar32 *ret = (wxChar32*) malloc(size); memcpy(ret, s, size); return ret; @@ -911,7 +925,7 @@ WXDLLIMPEXP_BASE wchar_t* wxCRT_GetenvW(const wchar_t *name) // 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((wchar_t*)NULL); + static wxWCharBuffer value; value = wxConvLibc.cMB2WC(getenv(wxConvLibc.cWC2MB(name))); return value.data(); } @@ -943,8 +957,6 @@ wxCRT_StrftimeW(wchar_t *s, size_t maxsize, const wchar_t *fmt, const struct tm } #endif // !wxCRT_StrftimeW -#endif // wxUSE_WCHAR_T - #ifdef wxLongLong_t template static wxULongLong_t @@ -1099,7 +1111,7 @@ wxULongLong_t wxCRT_StrtoullW(const wchar_t* nptr, wchar_t** endptr, int base) #endif // wxLongLong_t // ---------------------------------------------------------------------------- -// functions which we may need even if !wxUSE_WCHAR_T +// strtok() functions // ---------------------------------------------------------------------------- template @@ -1115,15 +1127,15 @@ static T *wxCRT_DoStrtok(T *psz, const T *delim, T **save_ptr) psz += wxStrspn(psz, delim); if (!*psz) { - *save_ptr = (T *)NULL; - return (T *)NULL; + *save_ptr = NULL; + return NULL; } T *ret = psz; psz = wxStrpbrk(psz, delim); if (!psz) { - *save_ptr = (T*)NULL; + *save_ptr = NULL; } else { @@ -1222,7 +1234,7 @@ void wxUpdateLocaleIsUtf8() #if wxUSE_UTF8_LOCALE_ONLY if ( !wxIsLocaleUtf8() ) { - wxLogFatalError(_T("This program requires UTF-8 locale to run.")); + wxLogFatalError(wxT("This program requires UTF-8 locale to run.")); } #else // !wxUSE_UTF8_LOCALE_ONLY wxLocaleIsUtf8 = wxIsLocaleUtf8(); @@ -1246,9 +1258,11 @@ void wxUpdateLocaleIsUtf8() int wxPuts(const wxString& s) { + // under IRIX putws() takes a non-const argument so use wchar_str() instead + // of wc_str() CALL_ANSI_OR_UNICODE(return, wxCRT_PutsA(s.mb_str()), - wxCRT_PutsW(s.wc_str())); + wxCRT_PutsW(s.wchar_str())); } int wxFputs(const wxString& s, FILE *stream) @@ -1311,15 +1325,15 @@ int wxVsscanf(const char *str, const char *format, va_list ap) int wxVsscanf(const wchar_t *str, const wchar_t *format, va_list ap) { return wxCRT_VsscanfW(str, format, ap); } int wxVsscanf(const wxCharBuffer& str, const char *format, va_list ap) - { return wxCRT_VsscanfA(wx_static_cast(const char*, str), format, ap); } + { return wxCRT_VsscanfA(static_cast(str), format, ap); } int wxVsscanf(const wxWCharBuffer& str, const wchar_t *format, va_list ap) { return wxCRT_VsscanfW(str, format, ap); } int wxVsscanf(const wxString& str, const char *format, va_list ap) - { return wxCRT_VsscanfA(wx_static_cast(const char*, str.mb_str()), format, ap); } + { return wxCRT_VsscanfA(static_cast(str.mb_str()), format, ap); } int wxVsscanf(const wxString& str, const wchar_t *format, va_list ap) { return wxCRT_VsscanfW(str.wc_str(), format, ap); } int wxVsscanf(const wxCStrData& str, const char *format, va_list ap) - { return wxCRT_VsscanfA(wx_static_cast(const char*, str.AsCharBuf()), format, ap); } + { return wxCRT_VsscanfA(static_cast(str.AsCharBuf()), format, ap); } int wxVsscanf(const wxCStrData& str, const wchar_t *format, va_list ap) { return wxCRT_VsscanfW(str.AsWCharBuf(), format, ap); } #endif // HAVE_NO_VSSCANF