X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3a3dde0d44c43bc70a1e9791381ada04b4953a5d..1663c65500c557d53e94493b7cf59331852c064d:/include/wx/wxcrt.h

diff --git a/include/wx/wxcrt.h b/include/wx/wxcrt.h
index 6d4abb3dbe..f8a5f592d4 100644
--- a/include/wx/wxcrt.h
+++ b/include/wx/wxcrt.h
@@ -414,18 +414,38 @@ inline int wxStricmp_String(const wxString& s1, const T& s2)
     { return s1.CmpNoCase(s2); }
 WX_STRCMP_FUNC(wxStricmp, wxCRT_StricmpA, wxCRT_StricmpW, wxStricmp_String)
 
+
+// GCC 3.3 has 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<T>()), so we have to forward-declare the template
+// and implement it below WX_STRCMP_FUNC. OTOH, this fails to compile with VC6,
+// so we do it for GCC only.
+// The same is needed for HP CXX on OpenVMS 
+#if defined( __GNUG__ ) || defined( __VMS )
+template<typename T>
+inline int wxStrcoll_String(const wxString& s1, const T& s2);
+WX_STRCMP_FUNC(wxStrcoll, wxCRT_StrcollA, wxCRT_StrcollW, wxStrcoll_String)
+#endif // __GNUG__ or __VMS
+
 template<typename T>
 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<wxWCharBuffer>:
+    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( __GNUG__ ) && !defined( __VMS )
+// this is exactly the same WX_STRCMP_FUNC line as above wxStrcoll_String<>
 WX_STRCMP_FUNC(wxStrcoll, wxCRT_StrcollA, wxCRT_StrcollW, wxStrcoll_String)
+#endif
+
 
 template<typename T>
 inline int wxStrspn_String(const wxString& s1, const T& s2)
@@ -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<typename T>
 inline const T* wxStrchr(const wxCharTypeBuffer<T>& s, T c)
     { return wxStrchr(s.data(), c); }
 template<typename T>
 inline const T* wxStrrchr(const wxCharTypeBuffer<T>& s, T c)
     { return wxStrrchr(s.data(), c); }
+template<typename T>
+inline const T* wxStrchr(const wxCharTypeBuffer<T>& s, const wxUniChar& c)
+    { return wxStrchr(s.data(), (T)c); }
+template<typename T>
+inline const T* wxStrrchr(const wxCharTypeBuffer<T>& s, const wxUniChar& c)
+    { return wxStrrchr(s.data(), (T)c); }
+template<typename T>
+inline const T* wxStrchr(const wxCharTypeBuffer<T>& s, const wxUniCharRef& c)
+    { return wxStrchr(s.data(), (T)c); }
+template<typename T>
+inline const T* wxStrrchr(const wxCharTypeBuffer<T>& 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 <typename S, typename T>
+inline const T *wxStrpbrk(const S& s, const wxCharTypeBuffer<T>& accept)
+    { return wxStrpbrk(s, accept.data()); }
 
 
 /* inlined non-const versions */