X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3a3dde0d44c43bc70a1e9791381ada04b4953a5d..b5ec7dd6eebda65b5f430cebf2f92eaddc4f7c9e:/include/wx/wxcrt.h diff --git a/include/wx/wxcrt.h b/include/wx/wxcrt.h index 6d4abb3dbe..433bc954b1 100644 --- a/include/wx/wxcrt.h +++ b/include/wx/wxcrt.h @@ -2,7 +2,7 @@ // Name: wx/wxcrt.h // Purpose: Type-safe ANSI and Unicode builds compatible wrappers for // CRT functions -// Author: Joel Farley, Ove Kåven +// Author: Joel Farley, Ove K�ven // Modified by: Vadim Zeitlin, Robert Roebling, Ron Lee, Vaclav Slavik // Created: 1998/06/12 // RCS-ID: $Id$ @@ -72,9 +72,9 @@ WXDLLIMPEXP_BASE bool wxOKlibc(); /* for internal use */ // (including even MSC) inline them just like we do right in their // headers. // -#if wxUSE_UNICODE - #include //for mem funcs +#include +#if wxUSE_UNICODE //implement our own wmem variants inline wxChar* wxTmemchr(const wxChar* s, wxChar c, size_t l) { @@ -114,27 +114,21 @@ WXDLLIMPEXP_BASE bool wxOKlibc(); /* for internal use */ return szRet; } - - // and trivial wrappers for char* versions: - inline char* wxTmemchr(const char* s, char c, size_t len) - { return (char*)memchr(s, c, len); } - inline int wxTmemcmp(const char* sz1, const char* sz2, size_t len) - { return memcmp(sz1, sz2, len); } - inline char* wxTmemcpy(char* szOut, const char* szIn, size_t len) - { return (char*)memcpy(szOut, szIn, len); } - inline char* wxTmemmove(char* szOut, const char* szIn, size_t len) - { return (char*)memmove(szOut, szIn, len); } - inline char* wxTmemset(char* szOut, const char cIn, size_t len) - { return (char*)memset(szOut, cIn, len); } - -#else /* !wxUSE_UNICODE */ - #define wxTmemchr memchr - #define wxTmemcmp memcmp - #define wxTmemcpy memcpy - #define wxTmemmove memmove - #define wxTmemset memset -#endif /* wxUSE_UNICODE/!wxUSE_UNICODE */ - +#endif /* wxUSE_UNICODE */ + +// provide trivial wrappers for char* versions for both ANSI and Unicode builds +// (notice that these intentionally return "char *" and not "void *" unlike the +// standard memxxx() for symmetry with the wide char versions): +inline char* wxTmemchr(const char* s, char c, size_t len) + { return (char*)memchr(s, c, len); } +inline int wxTmemcmp(const char* sz1, const char* sz2, size_t len) + { return memcmp(sz1, sz2, len); } +inline char* wxTmemcpy(char* szOut, const char* szIn, size_t len) + { return (char*)memcpy(szOut, szIn, len); } +inline char* wxTmemmove(char* szOut, const char* szIn, size_t len) + { return (char*)memmove(szOut, szIn, len); } +inline char* wxTmemset(char* szOut, const char cIn, size_t len) + { return (char*)memset(szOut, cIn, len); } // ============================================================================ @@ -160,7 +154,7 @@ WXDLLIMPEXP_BASE bool wxOKlibc(); /* for internal use */ // ---------------------------------------------------------------------------- // NB: we can't provide const wchar_t* (= wxChar*) overload, because calling -// wxSetlocale(category, NULL) -- which is a common thing to do --would be +// wxSetlocale(category, NULL) -- which is a common thing to do -- would be // ambiguous WXDLLIMPEXP_BASE char* wxSetlocale(int category, const char *locale); inline char* wxSetlocale(int category, const wxCharBuffer& locale) @@ -414,18 +408,40 @@ inline int wxStricmp_String(const wxString& s1, const T& s2) { return s1.CmpNoCase(s2); } WX_STRCMP_FUNC(wxStricmp, wxCRT_StricmpA, wxCRT_StricmpW, wxStricmp_String) +#if defined(wxCRT_StrcollA) && defined(wxCRT_StrcollW) + +// GCC 3.3 and other compilers have a bug that causes it to fail compilation if +// the template's implementation uses overloaded function declared later (see +// the wxStrcoll() call in wxStrcoll_String()), so we have to +// forward-declare the template and implement it below WX_STRCMP_FUNC. OTOH, +// this fails to compile with VC6, so don't do it for VC. It also causes +// problems with GCC visibility in newer GCC versions. +#if !(defined(__VISUALC__) || wxCHECK_GCC_VERSION(3,4)) +template +inline int wxStrcoll_String(const wxString& s1, const T& s2); +WX_STRCMP_FUNC(wxStrcoll, wxCRT_StrcollA, wxCRT_StrcollW, wxStrcoll_String) +#endif // !__VISUALC__ + template inline int wxStrcoll_String(const wxString& s1, const T& s2) { #if wxUSE_UNICODE // NB: strcoll() doesn't work correctly on UTF-8 strings, so we have to use - // wc_str() even if wxUSE_UNICODE_UTF8: - return wxStrcoll(s1.wc_str(), s2); + // wc_str() even if wxUSE_UNICODE_UTF8; the (const wchar_t*) cast is + // there just as optimization to avoid going through + // wxStrcoll: + return wxStrcoll((const wchar_t*)s1.wc_str(), s2); #else - return wxStrcoll(s1.mb_str(), s2); + return wxStrcoll((const char*)s1.mb_str(), s2); #endif } + +#if defined(__VISUALC__) || wxCHECK_GCC_VERSION(3,4) +// this is exactly the same WX_STRCMP_FUNC line as above wxStrcoll_String<> WX_STRCMP_FUNC(wxStrcoll, wxCRT_StrcollA, wxCRT_StrcollW, wxStrcoll_String) +#endif + +#endif // defined(wxCRT_Strcoll[AW]) template inline int wxStrspn_String(const wxString& s1, const T& s2) @@ -464,6 +480,8 @@ WX_STRCMP_FUNC(wxStrnicmp, wxCRT_StrnicmpA, wxCRT_StrnicmpW, wxStrnicmp_String) #undef WX_STR_FUNC #undef WX_STR_FUNC_NO_INVERT +#if defined(wxCRT_StrxfrmA) && defined(wxCRT_StrxfrmW) + inline size_t wxStrxfrm(char *dest, const char *src, size_t n) { return wxCRT_StrxfrmA(dest, src, n); } inline size_t wxStrxfrm(wchar_t *dest, const wchar_t *src, size_t n) @@ -480,6 +498,8 @@ inline size_t wxStrxfrm(char *dest, const wxCStrData& src, size_t n) inline size_t wxStrxfrm(wchar_t *dest, const wxCStrData& src, size_t n) { return wxCRT_StrxfrmW(dest, src.AsWCharBuf(), n); } +#endif // defined(wxCRT_Strxfrm[AW]) + inline char *wxStrtok(char *str, const char *delim, char **saveptr) { return wxCRT_StrtokA(str, delim, saveptr); } inline wchar_t *wxStrtok(wchar_t *str, const wchar_t *delim, wchar_t **saveptr) @@ -530,43 +550,114 @@ inline const char *wxStrrchr(const char *s, char c) { return wxCRT_StrrchrA(s, c); } inline const wchar_t *wxStrrchr(const wchar_t *s, wchar_t c) { return wxCRT_StrrchrW(s, c); } +inline const char *wxStrchr(const char *s, const wxUniChar& c) + { return wxCRT_StrchrA(s, (char)c); } +inline const wchar_t *wxStrchr(const wchar_t *s, const wxUniChar& c) + { return wxCRT_StrchrW(s, (wchar_t)c); } +inline const char *wxStrrchr(const char *s, const wxUniChar& c) + { return wxCRT_StrrchrA(s, (char)c); } +inline const wchar_t *wxStrrchr(const wchar_t *s, const wxUniChar& c) + { return wxCRT_StrrchrW(s, (wchar_t)c); } +inline const char *wxStrchr(const char *s, const wxUniCharRef& c) + { return wxCRT_StrchrA(s, (char)c); } +inline const wchar_t *wxStrchr(const wchar_t *s, const wxUniCharRef& c) + { return wxCRT_StrchrW(s, (wchar_t)c); } +inline const char *wxStrrchr(const char *s, const wxUniCharRef& c) + { return wxCRT_StrrchrA(s, (char)c); } +inline const wchar_t *wxStrrchr(const wchar_t *s, const wxUniCharRef& c) + { return wxCRT_StrrchrW(s, (wchar_t)c); } template inline const T* wxStrchr(const wxCharTypeBuffer& s, T c) { return wxStrchr(s.data(), c); } template inline const T* wxStrrchr(const wxCharTypeBuffer& s, T c) { return wxStrrchr(s.data(), c); } +template +inline const T* wxStrchr(const wxCharTypeBuffer& s, const wxUniChar& c) + { return wxStrchr(s.data(), (T)c); } +template +inline const T* wxStrrchr(const wxCharTypeBuffer& s, const wxUniChar& c) + { return wxStrrchr(s.data(), (T)c); } +template +inline const T* wxStrchr(const wxCharTypeBuffer& s, const wxUniCharRef& c) + { return wxStrchr(s.data(), (T)c); } +template +inline const T* wxStrrchr(const wxCharTypeBuffer& s, const wxUniCharRef& c) + { return wxStrrchr(s.data(), (T)c); } // these functions return char* pointer into the non-temporary conversion buffer // used by c_str()'s implicit conversion to char*, for ANSI build compatibility inline const char* wxStrchr(const wxString& s, char c) { return wxCRT_StrchrA((const char*)s.c_str(), c); } inline const char* wxStrrchr(const wxString& s, char c) { return wxCRT_StrrchrA((const char*)s.c_str(), c); } +inline const char* wxStrchr(const wxString& s, int c) + { return wxCRT_StrchrA((const char*)s.c_str(), c); } +inline const char* wxStrrchr(const wxString& s, int c) + { return wxCRT_StrrchrA((const char*)s.c_str(), c); } +inline const char* wxStrchr(const wxString& s, const wxUniChar& c) + { return wxCRT_StrchrA((const char*)s.c_str(), (char)c); } +inline const char* wxStrrchr(const wxString& s, const wxUniChar& c) + { return wxCRT_StrrchrA((const char*)s.c_str(), (char)c); } +inline const char* wxStrchr(const wxString& s, const wxUniCharRef& c) + { return wxCRT_StrchrA((const char*)s.c_str(), (char)c); } +inline const char* wxStrrchr(const wxString& s, const wxUniCharRef& c) + { return wxCRT_StrrchrA((const char*)s.c_str(), (char)c); } +inline const wchar_t* wxStrchr(const wxString& s, wchar_t c) + { return wxCRT_StrchrW((const wchar_t*)s.c_str(), c); } +inline const wchar_t* wxStrrchr(const wxString& s, wchar_t c) + { return wxCRT_StrrchrW((const wchar_t*)s.c_str(), c); } inline const char* wxStrchr(const wxCStrData& s, char c) - { return wxCRT_StrchrA((const char*)s.AsCharBuf(), c); } + { return wxCRT_StrchrA(s.AsChar(), c); } inline const char* wxStrrchr(const wxCStrData& s, char c) - { return wxCRT_StrrchrA((const char*)s.AsCharBuf(), c); } + { return wxCRT_StrrchrA(s.AsChar(), c); } +inline const char* wxStrchr(const wxCStrData& s, int c) + { return wxCRT_StrchrA(s.AsChar(), c); } +inline const char* wxStrrchr(const wxCStrData& s, int c) + { return wxCRT_StrrchrA(s.AsChar(), c); } +inline const char* wxStrchr(const wxCStrData& s, const wxUniChar& c) + { return wxCRT_StrchrA(s.AsChar(), (char)c); } +inline const char* wxStrrchr(const wxCStrData& s, const wxUniChar& c) + { return wxCRT_StrrchrA(s.AsChar(), (char)c); } +inline const char* wxStrchr(const wxCStrData& s, const wxUniCharRef& c) + { return wxCRT_StrchrA(s.AsChar(), (char)c); } +inline const char* wxStrrchr(const wxCStrData& s, const wxUniCharRef& c) + { return wxCRT_StrrchrA(s.AsChar(), (char)c); } +inline const wchar_t* wxStrchr(const wxCStrData& s, wchar_t c) + { return wxCRT_StrchrW(s.AsWChar(), c); } +inline const wchar_t* wxStrrchr(const wxCStrData& s, wchar_t c) + { return wxCRT_StrrchrW(s.AsWChar(), c); } inline const char *wxStrpbrk(const char *s, const char *accept) { return wxCRT_StrpbrkA(s, accept); } inline const wchar_t *wxStrpbrk(const wchar_t *s, const wchar_t *accept) { return wxCRT_StrpbrkW(s, accept); } -inline const char *wxStrpbrk(const char *s, const wxCharBuffer& accept) - { return wxCRT_StrpbrkA(s, accept.data()); } inline const char *wxStrpbrk(const char *s, const wxString& accept) { return wxCRT_StrpbrkA(s, accept.mb_str()); } inline const char *wxStrpbrk(const char *s, const wxCStrData& accept) { return wxCRT_StrpbrkA(s, accept.AsCharBuf()); } -inline const wchar_t *wxStrpbrk(const wchar_t *s, const wxWCharBuffer& accept) - { return wxCRT_StrpbrkW(s, accept.data()); } inline const wchar_t *wxStrpbrk(const wchar_t *s, const wxString& accept) { return wxCRT_StrpbrkW(s, accept.wc_str()); } inline const wchar_t *wxStrpbrk(const wchar_t *s, const wxCStrData& accept) { return wxCRT_StrpbrkW(s, accept.AsWCharBuf()); } inline const char *wxStrpbrk(const wxString& s, const wxString& accept) { return wxCRT_StrpbrkA(s.c_str(), accept.mb_str()); } +inline const char *wxStrpbrk(const wxString& s, const char *accept) + { return wxCRT_StrpbrkA(s.c_str(), accept); } +inline const wchar_t *wxStrpbrk(const wxString& s, const wchar_t *accept) + { return wxCRT_StrpbrkW(s.wc_str(), accept); } +inline const char *wxStrpbrk(const wxString& s, const wxCStrData& accept) + { return wxCRT_StrpbrkA(s.c_str(), accept.AsCharBuf()); } inline const char *wxStrpbrk(const wxCStrData& s, const wxString& accept) { return wxCRT_StrpbrkA(s.AsChar(), accept.mb_str()); } +inline const char *wxStrpbrk(const wxCStrData& s, const char *accept) + { return wxCRT_StrpbrkA(s.AsChar(), accept); } +inline const wchar_t *wxStrpbrk(const wxCStrData& s, const wchar_t *accept) + { return wxCRT_StrpbrkW(s.AsWChar(), accept); } +inline const char *wxStrpbrk(const wxCStrData& s, const wxCStrData& accept) + { return wxCRT_StrpbrkA(s.AsChar(), accept.AsCharBuf()); } +template +inline const T *wxStrpbrk(const S& s, const wxCharTypeBuffer& accept) + { return wxStrpbrk(s, accept.data()); } /* inlined non-const versions */ @@ -613,13 +704,6 @@ inline int wxRemove(const wxString& path) inline int wxRename(const wxString& oldpath, const wxString& newpath) { return wxCRT_Rename(oldpath.fn_str(), newpath.fn_str()); } -// NB: we don't provide wxString/wxCStrData versions of wxTmpnam, because 's' -// is writable -inline char *wxTmpnam(char *s) - { return wxCRT_TmpnamA(s); } -inline wchar_t *wxTmpnam(wchar_t *s) - { return wxCRT_TmpnamW(s); } - extern WXDLLIMPEXP_BASE int wxPuts(const wxString& s); extern WXDLLIMPEXP_BASE int wxFputs(const wxString& s, FILE *stream); extern WXDLLIMPEXP_BASE void wxPerror(const wxString& s); @@ -688,11 +772,24 @@ inline double wxStrtod(const wxCharTypeBuffer& nptr, T **endptr) // to be ever used, but it still has to compile). template struct wxStrtoxCharType {}; template<> struct wxStrtoxCharType - { typedef const char* Type; }; +{ + typedef const char* Type; + static char** AsPointer(char **p) { return p; } +}; template<> struct wxStrtoxCharType - { typedef const wchar_t* Type; }; +{ + typedef const wchar_t* Type; + static wchar_t** AsPointer(wchar_t **p) { return p; } +}; template<> struct wxStrtoxCharType - { typedef const char* Type; /* this one is never used */ }; +{ + typedef const char* Type; /* this one is never used */ + static char** AsPointer(int WXUNUSED_UNLESS_DEBUG(p)) + { + wxASSERT_MSG( p == 0, "passing non-NULL int is invalid" ); + return NULL; + } +}; template inline double wxStrtod(const wxString& nptr, T endptr) @@ -709,7 +806,9 @@ inline double wxStrtod(const wxString& nptr, T endptr) // note that it is important to use c_str() here and not mb_str() or // wc_str(), because we store the pointer into (possibly converted) // buffer in endptr and so it must be valid even when wxStrtod() returns - return wxStrtod((typename wxStrtoxCharType::Type)nptr.c_str(), endptr); + typedef typename wxStrtoxCharType::Type CharType; + return wxStrtod((CharType)nptr.c_str(), + wxStrtoxCharType::AsPointer(endptr)); } } template @@ -732,8 +831,12 @@ inline double wxStrtod(const wxCStrData& nptr, T endptr) if ( endptr == 0 ) \ return name(nptr.wx_str(), (wxStringCharType**)NULL, base); \ else \ - return name((typename wxStrtoxCharType::Type)nptr.c_str(), \ - endptr, base); \ + { \ + typedef typename wxStrtoxCharType::Type CharType; \ + return name((CharType)nptr.c_str(), \ + wxStrtoxCharType::AsPointer(endptr), \ + base); \ + } \ } \ template \ inline rettype name(const wxCStrData& nptr, T endptr, int base) \ @@ -741,12 +844,17 @@ inline double wxStrtod(const wxCStrData& nptr, T endptr) WX_STRTOX_FUNC(long, wxStrtol, wxCRT_StrtolA, wxCRT_StrtolW) WX_STRTOX_FUNC(unsigned long, wxStrtoul, wxCRT_StrtoulA, wxCRT_StrtoulW) +#ifdef wxLongLong_t WX_STRTOX_FUNC(wxLongLong_t, wxStrtoll, wxCRT_StrtollA, wxCRT_StrtollW) WX_STRTOX_FUNC(wxULongLong_t, wxStrtoull, wxCRT_StrtoullA, wxCRT_StrtoullW) +#endif // wxLongLong_t #undef WX_STRTOX_FUNC +// there is no command interpreter under CE, hence no system() +#ifndef __WXWINCE__ + // mingw32 doesn't provide _tsystem() even though it provides other stdlib.h // functions in their wide versions #ifdef wxCRT_SystemW @@ -755,6 +863,8 @@ inline int wxSystem(const wxString& str) { return wxCRT_SystemW(str.wc_str()); } inline int wxSystem(const wxString& str) { return wxCRT_SystemA(str.mb_str()); } #endif +#endif // !__WXWINCE__/__WXWINCE__ + inline char* wxGetenv(const char *name) { return wxCRT_GetenvA(name); } inline wchar_t* wxGetenv(const wchar_t *name) { return wxCRT_GetenvW(name); } inline char* wxGetenv(const wxString& name) { return wxCRT_GetenvA(name.mb_str()); } @@ -762,7 +872,6 @@ inline char* wxGetenv(const wxCStrData& name) { return wxCRT_GetenvA(name.AsChar inline char* wxGetenv(const wxCharBuffer& name) { return wxCRT_GetenvA(name.data()); } inline wchar_t* wxGetenv(const wxWCharBuffer& name) { return wxCRT_GetenvW(name.data()); } - // ---------------------------------------------------------------------------- // time.h functions // ---------------------------------------------------------------------------- @@ -790,21 +899,20 @@ inline size_t wxStrftime(wchar_t *s, size_t max, // FIXME-UTF8: we'd be better off implementing these ourselves, as the CRT // version is locale-dependent -// FIXME-UTF8: should we return bool from these instead of int? // FIXME-UTF8: these don't work when EOF is passed in because of wxUniChar, // is this OK or not? -inline int wxIsalnum(const wxUniChar& c) { return wxCRT_IsalnumW(c); } -inline int wxIsalpha(const wxUniChar& c) { return wxCRT_IsalphaW(c); } -inline int wxIscntrl(const wxUniChar& c) { return wxCRT_IscntrlW(c); } -inline int wxIsdigit(const wxUniChar& c) { return wxCRT_IsdigitW(c); } -inline int wxIsgraph(const wxUniChar& c) { return wxCRT_IsgraphW(c); } -inline int wxIslower(const wxUniChar& c) { return wxCRT_IslowerW(c); } -inline int wxIsprint(const wxUniChar& c) { return wxCRT_IsprintW(c); } -inline int wxIspunct(const wxUniChar& c) { return wxCRT_IspunctW(c); } -inline int wxIsspace(const wxUniChar& c) { return wxCRT_IsspaceW(c); } -inline int wxIsupper(const wxUniChar& c) { return wxCRT_IsupperW(c); } -inline int wxIsxdigit(const wxUniChar& c) { return wxCRT_IsxdigitW(c); } +inline bool wxIsalnum(const wxUniChar& c) { return wxCRT_IsalnumW(c) != 0; } +inline bool wxIsalpha(const wxUniChar& c) { return wxCRT_IsalphaW(c) != 0; } +inline bool wxIscntrl(const wxUniChar& c) { return wxCRT_IscntrlW(c) != 0; } +inline bool wxIsdigit(const wxUniChar& c) { return wxCRT_IsdigitW(c) != 0; } +inline bool wxIsgraph(const wxUniChar& c) { return wxCRT_IsgraphW(c) != 0; } +inline bool wxIslower(const wxUniChar& c) { return wxCRT_IslowerW(c) != 0; } +inline bool wxIsprint(const wxUniChar& c) { return wxCRT_IsprintW(c) != 0; } +inline bool wxIspunct(const wxUniChar& c) { return wxCRT_IspunctW(c) != 0; } +inline bool wxIsspace(const wxUniChar& c) { return wxCRT_IsspaceW(c) != 0; } +inline bool wxIsupper(const wxUniChar& c) { return wxCRT_IsupperW(c) != 0; } +inline bool wxIsxdigit(const wxUniChar& c) { return wxCRT_IsxdigitW(c) != 0; } inline wxUniChar wxTolower(const wxUniChar& c) { return wxCRT_TolowerW(c); } inline wxUniChar wxToupper(const wxUniChar& c) { return wxCRT_ToupperW(c); }