Remove SetPageTitle and GetPageTitle and make GetCurrentTitle actually return the...

[wxWidgets.git] / include / wx / wxcrt.h

diff --git a/include/wx/wxcrt.h b/include/wx/wxcrt.h
index ca5c694e667a3628dcc3235c7da77e41de371db5..2c5dd24b505fa97de4d0ef04330c7453c9b4f91a 100644 (file)
--- a/include/wx/wxcrt.h
+++ b/include/wx/wxcrt.h
@@ -13,9 +13,6 @@
 #ifndef _WX_WXCRT_H_
 #define _WX_WXCRT_H_
 
 #ifndef _WX_WXCRT_H_
 #define _WX_WXCRT_H_
 

-// NB: User code should include wx/crt.h instead of including this
-//     header directly.
-

 #include "wx/wxcrtbase.h"
 #include "wx/string.h"
 
 #include "wx/wxcrtbase.h"
 #include "wx/string.h"
 


@@ -33,8 +30,8 @@
 /* checks whether the passed in pointer is NULL and if the string is empty */
 inline bool wxIsEmpty(const char *s) { return !s || !*s; }
 inline bool wxIsEmpty(const wchar_t *s) { return !s || !*s; }
 /* checks whether the passed in pointer is NULL and if the string is empty */
 inline bool wxIsEmpty(const char *s) { return !s || !*s; }
 inline bool wxIsEmpty(const wchar_t *s) { return !s || !*s; }

-inline bool wxIsEmpty(const wxCharBuffer& s) { return wxIsEmpty(s.data()); }
-inline bool wxIsEmpty(const wxWCharBuffer& s) { return wxIsEmpty(s.data()); }
+inline bool wxIsEmpty(const wxScopedCharBuffer& s) { return wxIsEmpty(s.data()); }
+inline bool wxIsEmpty(const wxScopedWCharBuffer& s) { return wxIsEmpty(s.data()); }

 inline bool wxIsEmpty(const wxString& s) { return s.empty(); }
 inline bool wxIsEmpty(const wxCStrData& s) { return s.AsString().empty(); }
 
 inline bool wxIsEmpty(const wxString& s) { return s.empty(); }
 inline bool wxIsEmpty(const wxCStrData& s) { return s.AsString().empty(); }
 


@@ -42,26 +39,16 @@ inline bool wxIsEmpty(const wxCStrData& s) { return s.AsString().empty(); }
 
 /* multibyte to wide char conversion functions and macros */
 
 
 /* multibyte to wide char conversion functions and macros */
 

-#if wxUSE_WCHAR_T
-    /* multibyte<->widechar conversion */
-    WXDLLIMPEXP_BASE size_t wxMB2WC(wchar_t *buf, const char *psz, size_t n);
-    WXDLLIMPEXP_BASE size_t wxWC2MB(char *buf, const wchar_t *psz, size_t n);
-
-    #if wxUSE_UNICODE
-        #define wxMB2WX wxMB2WC
-        #define wxWX2MB wxWC2MB
-        #define wxWC2WX wxStrncpy
-        #define wxWX2WC wxStrncpy
-    #else
-        #define wxMB2WX wxStrncpy
-        #define wxWX2MB wxStrncpy
-        #define wxWC2WX wxWC2MB
-        #define wxWX2WC wxMB2WC
-    #endif
-#else /* !wxUSE_UNICODE */
-    /* No wxUSE_WCHAR_T: we have to do something (JACS) */
-    #define wxMB2WC wxStrncpy
-    #define wxWC2MB wxStrncpy
+/* multibyte<->widechar conversion */
+WXDLLIMPEXP_BASE size_t wxMB2WC(wchar_t *buf, const char *psz, size_t n);
+WXDLLIMPEXP_BASE size_t wxWC2MB(char *buf, const wchar_t *psz, size_t n);
+
+#if wxUSE_UNICODE
+    #define wxMB2WX wxMB2WC
+    #define wxWX2MB wxWC2MB
+    #define wxWC2WX wxStrncpy
+    #define wxWX2WC wxStrncpy
+#else

     #define wxMB2WX wxStrncpy
     #define wxWX2MB wxStrncpy
     #define wxWC2WX wxWC2MB
     #define wxMB2WX wxStrncpy
     #define wxWX2MB wxStrncpy
     #define wxWC2WX wxWC2MB


@@ -85,7 +72,7 @@ inline bool wxIsEmpty(const wxCStrData& s) { return s.AsString().empty(); }
         for(;l && *s != c;--l, ++s) {}
 
         if(l)
         for(;l && *s != c;--l, ++s) {}
 
         if(l)

-            return (wxChar*)s;
+            return const_cast<wxChar*>(s);

         return NULL;
     }
 
         return NULL;
     }
 


@@ -161,7 +148,7 @@ inline char* wxTmemset(char* szOut, const char cIn, size_t len)
 //     wxSetlocale(category, NULL) -- which is a common thing to do -- would be
 //     ambiguous
 WXDLLIMPEXP_BASE char* wxSetlocale(int category, const char *locale);
 //     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)
+inline char* wxSetlocale(int category, const wxScopedCharBuffer& locale)

     { return wxSetlocale(category, locale.data()); }
 inline char* wxSetlocale(int category, const wxString& locale)
     { return wxSetlocale(category, locale.mb_str()); }
     { return wxSetlocale(category, locale.data()); }
 inline char* wxSetlocale(int category, const wxString& locale)
     { return wxSetlocale(category, locale.mb_str()); }


@@ -176,27 +163,46 @@ inline char* wxSetlocale(int category, const wxCStrData& locale)
 // NB: these are defined in wxcrtbase.h, see the comment there
 // inline size_t wxStrlen(const char *s) { return s ? strlen(s) : 0; }
 // inline size_t wxStrlen(const wchar_t *s) { return s ? wxCRT_Strlen_(s) : 0; }
 // NB: these are defined in wxcrtbase.h, see the comment there
 // inline size_t wxStrlen(const char *s) { return s ? strlen(s) : 0; }
 // inline size_t wxStrlen(const wchar_t *s) { return s ? wxCRT_Strlen_(s) : 0; }

-inline size_t wxStrlen(const wxCharBuffer& s) { return wxStrlen(s.data()); }
-inline size_t wxStrlen(const wxWCharBuffer& s) { return wxStrlen(s.data()); }
+inline size_t wxStrlen(const wxScopedCharBuffer& s) { return wxStrlen(s.data()); }
+inline size_t wxStrlen(const wxScopedWCharBuffer& s) { return wxStrlen(s.data()); }

 inline size_t wxStrlen(const wxString& s) { return s.length(); }
 inline size_t wxStrlen(const wxCStrData& s) { return s.AsString().length(); }
 
 // this is a function new in 2.9 so we don't care about backwards compatibility and
 inline size_t wxStrlen(const wxString& s) { return s.length(); }
 inline size_t wxStrlen(const wxCStrData& s) { return s.AsString().length(); }
 
 // this is a function new in 2.9 so we don't care about backwards compatibility and

-// so don't need to support wchar_t/char overloads
-#if defined(wxCRT_StrnlenA) && defined(wxCRT_StrnlenW)
+// so don't need to support wxScopedCharBuffer/wxScopedWCharBuffer overloads
+#if defined(wxCRT_StrnlenA)

 inline size_t wxStrnlen(const char *str, size_t maxlen) { return wxCRT_StrnlenA(str, maxlen); }
 inline size_t wxStrnlen(const char *str, size_t maxlen) { return wxCRT_StrnlenA(str, maxlen); }

+#else
+inline size_t wxStrnlen(const char *str, size_t maxlen)
+{
+    size_t n;
+    for ( n = 0; n < maxlen; n++ )
+        if ( !str[n] )
+            break;
+
+    return n;
+}
+#endif
+
+#if defined(wxCRT_StrnlenW)

 inline size_t wxStrnlen(const wchar_t *str, size_t maxlen) { return wxCRT_StrnlenW(str, maxlen); }
 #else
 inline size_t wxStrnlen(const wchar_t *str, size_t maxlen) { return wxCRT_StrnlenW(str, maxlen); }
 #else

-// use unsafer wxStrlen:
-inline size_t wxStrnlen(const char *str, size_t maxlen) { return wxCRT_StrlenA(str); wxUnusedVar(maxlen); }
-inline size_t wxStrnlen(const wchar_t *str, size_t maxlen) { return wxCRT_StrlenW(str); wxUnusedVar(maxlen); }
+inline size_t wxStrnlen(const wchar_t *str, size_t maxlen)
+{
+    size_t n;
+    for ( n = 0; n < maxlen; n++ )
+        if ( !str[n] )
+            break;
+
+    return n;
+}

 #endif
 
 // NB: these are defined in wxcrtbase.h, see the comment there
 // inline char* wxStrdup(const char *s) { return wxStrdupA(s); }
 // inline wchar_t* wxStrdup(const wchar_t *s) { return wxStrdupW(s); }
 #endif
 
 // NB: these are defined in wxcrtbase.h, see the comment there
 // inline char* wxStrdup(const char *s) { return wxStrdupA(s); }
 // inline wchar_t* wxStrdup(const wchar_t *s) { return wxStrdupW(s); }

-inline char* wxStrdup(const wxCharBuffer& s) { return wxStrdup(s.data()); }
-inline wchar_t* wxStrdup(const wxWCharBuffer& s) { return wxStrdup(s.data()); }
+inline char* wxStrdup(const wxScopedCharBuffer& s) { return wxStrdup(s.data()); }
+inline wchar_t* wxStrdup(const wxScopedWCharBuffer& s) { return wxStrdup(s.data()); }

 inline char* wxStrdup(const wxString& s) { return wxStrdup(s.mb_str()); }
 inline char* wxStrdup(const wxCStrData& s) { return wxStrdup(s.AsCharBuf()); }
 
 inline char* wxStrdup(const wxString& s) { return wxStrdup(s.mb_str()); }
 inline char* wxStrdup(const wxCStrData& s) { return wxStrdup(s.AsCharBuf()); }
 


@@ -208,13 +214,13 @@ inline char *wxStrcpy(char *dest, const wxString& src)
     { return wxCRT_StrcpyA(dest, src.mb_str()); }
 inline char *wxStrcpy(char *dest, const wxCStrData& src)
     { return wxCRT_StrcpyA(dest, src.AsCharBuf()); }
     { return wxCRT_StrcpyA(dest, src.mb_str()); }
 inline char *wxStrcpy(char *dest, const wxCStrData& src)
     { return wxCRT_StrcpyA(dest, src.AsCharBuf()); }

-inline char *wxStrcpy(char *dest, const wxCharBuffer& src)
+inline char *wxStrcpy(char *dest, const wxScopedCharBuffer& src)

     { return wxCRT_StrcpyA(dest, src.data()); }
 inline wchar_t *wxStrcpy(wchar_t *dest, const wxString& src)
     { return wxCRT_StrcpyW(dest, src.wc_str()); }
 inline wchar_t *wxStrcpy(wchar_t *dest, const wxCStrData& src)
     { return wxCRT_StrcpyW(dest, src.AsWCharBuf()); }
     { return wxCRT_StrcpyA(dest, src.data()); }
 inline wchar_t *wxStrcpy(wchar_t *dest, const wxString& src)
     { return wxCRT_StrcpyW(dest, src.wc_str()); }
 inline wchar_t *wxStrcpy(wchar_t *dest, const wxCStrData& src)
     { return wxCRT_StrcpyW(dest, src.AsWCharBuf()); }

-inline wchar_t *wxStrcpy(wchar_t *dest, const wxWCharBuffer& src)
+inline wchar_t *wxStrcpy(wchar_t *dest, const wxScopedWCharBuffer& src)

     { return wxCRT_StrcpyW(dest, src.data()); }
 inline char *wxStrcpy(char *dest, const wchar_t *src)
     { return wxCRT_StrcpyA(dest, wxConvLibc.cWC2MB(src)); }
     { return wxCRT_StrcpyW(dest, src.data()); }
 inline char *wxStrcpy(char *dest, const wchar_t *src)
     { return wxCRT_StrcpyA(dest, wxConvLibc.cWC2MB(src)); }


@@ -229,13 +235,13 @@ inline char *wxStrncpy(char *dest, const wxString& src, size_t n)
     { return wxCRT_StrncpyA(dest, src.mb_str(), n); }
 inline char *wxStrncpy(char *dest, const wxCStrData& src, size_t n)
     { return wxCRT_StrncpyA(dest, src.AsCharBuf(), n); }
     { return wxCRT_StrncpyA(dest, src.mb_str(), n); }
 inline char *wxStrncpy(char *dest, const wxCStrData& src, size_t n)
     { return wxCRT_StrncpyA(dest, src.AsCharBuf(), n); }

-inline char *wxStrncpy(char *dest, const wxCharBuffer& src, size_t n)
+inline char *wxStrncpy(char *dest, const wxScopedCharBuffer& src, size_t n)

     { return wxCRT_StrncpyA(dest, src.data(), n); }
 inline wchar_t *wxStrncpy(wchar_t *dest, const wxString& src, size_t n)
     { return wxCRT_StrncpyW(dest, src.wc_str(), n); }
 inline wchar_t *wxStrncpy(wchar_t *dest, const wxCStrData& src, size_t n)
     { return wxCRT_StrncpyW(dest, src.AsWCharBuf(), n); }
     { return wxCRT_StrncpyA(dest, src.data(), n); }
 inline wchar_t *wxStrncpy(wchar_t *dest, const wxString& src, size_t n)
     { return wxCRT_StrncpyW(dest, src.wc_str(), n); }
 inline wchar_t *wxStrncpy(wchar_t *dest, const wxCStrData& src, size_t n)
     { return wxCRT_StrncpyW(dest, src.AsWCharBuf(), n); }

-inline wchar_t *wxStrncpy(wchar_t *dest, const wxWCharBuffer& src, size_t n)
+inline wchar_t *wxStrncpy(wchar_t *dest, const wxScopedWCharBuffer& src, size_t n)

     { return wxCRT_StrncpyW(dest, src.data(), n); }
 inline char *wxStrncpy(char *dest, const wchar_t *src, size_t n)
     { return wxCRT_StrncpyA(dest, wxConvLibc.cWC2MB(src), n); }
     { return wxCRT_StrncpyW(dest, src.data(), n); }
 inline char *wxStrncpy(char *dest, const wchar_t *src, size_t n)
     { return wxCRT_StrncpyA(dest, wxConvLibc.cWC2MB(src), n); }


@@ -280,13 +286,13 @@ inline char *wxStrcat(char *dest, const wxString& src)
     { return wxCRT_StrcatA(dest, src.mb_str()); }
 inline char *wxStrcat(char *dest, const wxCStrData& src)
     { return wxCRT_StrcatA(dest, src.AsCharBuf()); }
     { return wxCRT_StrcatA(dest, src.mb_str()); }
 inline char *wxStrcat(char *dest, const wxCStrData& src)
     { return wxCRT_StrcatA(dest, src.AsCharBuf()); }

-inline char *wxStrcat(char *dest, const wxCharBuffer& src)
+inline char *wxStrcat(char *dest, const wxScopedCharBuffer& src)

     { return wxCRT_StrcatA(dest, src.data()); }
 inline wchar_t *wxStrcat(wchar_t *dest, const wxString& src)
     { return wxCRT_StrcatW(dest, src.wc_str()); }
 inline wchar_t *wxStrcat(wchar_t *dest, const wxCStrData& src)
     { return wxCRT_StrcatW(dest, src.AsWCharBuf()); }
     { return wxCRT_StrcatA(dest, src.data()); }
 inline wchar_t *wxStrcat(wchar_t *dest, const wxString& src)
     { return wxCRT_StrcatW(dest, src.wc_str()); }
 inline wchar_t *wxStrcat(wchar_t *dest, const wxCStrData& src)
     { return wxCRT_StrcatW(dest, src.AsWCharBuf()); }

-inline wchar_t *wxStrcat(wchar_t *dest, const wxWCharBuffer& src)
+inline wchar_t *wxStrcat(wchar_t *dest, const wxScopedWCharBuffer& src)

     { return wxCRT_StrcatW(dest, src.data()); }
 inline char *wxStrcat(char *dest, const wchar_t *src)
     { return wxCRT_StrcatA(dest, wxConvLibc.cWC2MB(src)); }
     { return wxCRT_StrcatW(dest, src.data()); }
 inline char *wxStrcat(char *dest, const wchar_t *src)
     { return wxCRT_StrcatA(dest, wxConvLibc.cWC2MB(src)); }


@@ -301,13 +307,13 @@ inline char *wxStrncat(char *dest, const wxString& src, size_t n)
     { return wxCRT_StrncatA(dest, src.mb_str(), n); }
 inline char *wxStrncat(char *dest, const wxCStrData& src, size_t n)
     { return wxCRT_StrncatA(dest, src.AsCharBuf(), n); }
     { return wxCRT_StrncatA(dest, src.mb_str(), n); }
 inline char *wxStrncat(char *dest, const wxCStrData& src, size_t n)
     { return wxCRT_StrncatA(dest, src.AsCharBuf(), n); }

-inline char *wxStrncat(char *dest, const wxCharBuffer& src, size_t n)
+inline char *wxStrncat(char *dest, const wxScopedCharBuffer& src, size_t n)

     { return wxCRT_StrncatA(dest, src.data(), n); }
 inline wchar_t *wxStrncat(wchar_t *dest, const wxString& src, size_t n)
     { return wxCRT_StrncatW(dest, src.wc_str(), n); }
 inline wchar_t *wxStrncat(wchar_t *dest, const wxCStrData& src, size_t n)
     { return wxCRT_StrncatW(dest, src.AsWCharBuf(), n); }
     { return wxCRT_StrncatA(dest, src.data(), n); }
 inline wchar_t *wxStrncat(wchar_t *dest, const wxString& src, size_t n)
     { return wxCRT_StrncatW(dest, src.wc_str(), n); }
 inline wchar_t *wxStrncat(wchar_t *dest, const wxCStrData& src, size_t n)
     { return wxCRT_StrncatW(dest, src.AsWCharBuf(), n); }

-inline wchar_t *wxStrncat(wchar_t *dest, const wxWCharBuffer& src, size_t n)
+inline wchar_t *wxStrncat(wchar_t *dest, const wxScopedWCharBuffer& src, size_t n)

     { return wxCRT_StrncatW(dest, src.data(), n); }
 inline char *wxStrncat(char *dest, const wchar_t *src, size_t n)
     { return wxCRT_StrncatA(dest, wxConvLibc.cWC2MB(src), n); }
     { return wxCRT_StrncatW(dest, src.data(), n); }
 inline char *wxStrncat(char *dest, const wchar_t *src, size_t n)
     { return wxCRT_StrncatA(dest, wxConvLibc.cWC2MB(src), n); }


@@ -333,45 +339,45 @@ inline wchar_t *wxStrncat(wchar_t *dest, const char *src, size_t n)
         { return WX_STR_CALL(crtA, s1, s2); }                                 \
     inline rettype WX_STR_DECL(name, const char *, const wchar_t *)           \
         { return WX_STR_CALL(forString, wxString(s1), wxString(s2)); }        \
         { return WX_STR_CALL(crtA, s1, s2); }                                 \
     inline rettype WX_STR_DECL(name, const char *, const wchar_t *)           \
         { return WX_STR_CALL(forString, wxString(s1), wxString(s2)); }        \

-    inline rettype WX_STR_DECL(name, const char *, const wxCharBuffer&)       \
+    inline rettype WX_STR_DECL(name, const char *, const wxScopedCharBuffer&)       \

         { return WX_STR_CALL(crtA, s1, s2.data()); }                          \
         { return WX_STR_CALL(crtA, s1, s2.data()); }                          \

-    inline rettype WX_STR_DECL(name, const char *, const wxWCharBuffer&)      \
+    inline rettype WX_STR_DECL(name, const char *, const wxScopedWCharBuffer&)      \

         { return WX_STR_CALL(forString, wxString(s1), s2.data()); }           \
                                                                               \
     inline rettype WX_STR_DECL(name, const wchar_t *, const wchar_t *)        \
         { return WX_STR_CALL(crtW, s1, s2); }                                 \
     inline rettype WX_STR_DECL(name, const wchar_t *, const char *)           \
         { return WX_STR_CALL(forString, wxString(s1), wxString(s2)); }        \
         { return WX_STR_CALL(forString, wxString(s1), s2.data()); }           \
                                                                               \
     inline rettype WX_STR_DECL(name, const wchar_t *, const wchar_t *)        \
         { return WX_STR_CALL(crtW, s1, s2); }                                 \
     inline rettype WX_STR_DECL(name, const wchar_t *, const char *)           \
         { return WX_STR_CALL(forString, wxString(s1), wxString(s2)); }        \

-    inline rettype WX_STR_DECL(name, const wchar_t *, const wxWCharBuffer&)   \
+    inline rettype WX_STR_DECL(name, const wchar_t *, const wxScopedWCharBuffer&)   \

         { return WX_STR_CALL(crtW, s1, s2.data()); }                          \
         { return WX_STR_CALL(crtW, s1, s2.data()); }                          \

-    inline rettype WX_STR_DECL(name, const wchar_t *, const wxCharBuffer&)    \
+    inline rettype WX_STR_DECL(name, const wchar_t *, const wxScopedCharBuffer&)    \

         { return WX_STR_CALL(forString, wxString(s1), s2.data()); }           \
                                                                               \
         { return WX_STR_CALL(forString, wxString(s1), s2.data()); }           \
                                                                               \

-    inline rettype WX_STR_DECL(name, const wxCharBuffer&, const char *)       \
+    inline rettype WX_STR_DECL(name, const wxScopedCharBuffer&, const char *)       \

         { return WX_STR_CALL(crtA, s1.data(), s2); }                          \
         { return WX_STR_CALL(crtA, s1.data(), s2); }                          \

-    inline rettype WX_STR_DECL(name, const wxCharBuffer&, const wchar_t *)    \
+    inline rettype WX_STR_DECL(name, const wxScopedCharBuffer&, const wchar_t *)    \

         { return WX_STR_CALL(forString, wxString(s1), wxString(s2)); }        \
         { return WX_STR_CALL(forString, wxString(s1), wxString(s2)); }        \

-    inline rettype WX_STR_DECL(name, const wxCharBuffer&, const wxCharBuffer&)\
+    inline rettype WX_STR_DECL(name, const wxScopedCharBuffer&, const wxScopedCharBuffer&)\

         { return WX_STR_CALL(crtA, s1.data(), s2.data()); }                   \
         { return WX_STR_CALL(crtA, s1.data(), s2.data()); }                   \

-    inline rettype WX_STR_DECL(name, const wxCharBuffer&, const wxWCharBuffer&)   \
+    inline rettype WX_STR_DECL(name, const wxScopedCharBuffer&, const wxScopedWCharBuffer&)   \

         { return WX_STR_CALL(forString, wxString(s1), wxString(s2)); }        \
                                                                               \
         { return WX_STR_CALL(forString, wxString(s1), wxString(s2)); }        \
                                                                               \

-    inline rettype WX_STR_DECL(name, const wxWCharBuffer&, const wchar_t *)   \
+    inline rettype WX_STR_DECL(name, const wxScopedWCharBuffer&, const wchar_t *)   \

         { return WX_STR_CALL(crtW, s1.data(), s2); }                          \
         { return WX_STR_CALL(crtW, s1.data(), s2); }                          \

-    inline rettype WX_STR_DECL(name, const wxWCharBuffer&, const char *)      \
+    inline rettype WX_STR_DECL(name, const wxScopedWCharBuffer&, const char *)      \

         { return WX_STR_CALL(forString, wxString(s1), wxString(s2)); }        \
         { return WX_STR_CALL(forString, wxString(s1), wxString(s2)); }        \

-    inline rettype WX_STR_DECL(name, const wxWCharBuffer&, const wxWCharBuffer&)  \
+    inline rettype WX_STR_DECL(name, const wxScopedWCharBuffer&, const wxScopedWCharBuffer&)  \

         { return WX_STR_CALL(crtW, s1.data(), s2.data()); }                   \
         { return WX_STR_CALL(crtW, s1.data(), s2.data()); }                   \

-    inline rettype WX_STR_DECL(name, const wxWCharBuffer&, const wxCharBuffer&)   \
+    inline rettype WX_STR_DECL(name, const wxScopedWCharBuffer&, const wxScopedCharBuffer&)   \

         { return WX_STR_CALL(forString, wxString(s1), wxString(s2)); }        \
                                                                               \
     inline rettype WX_STR_DECL(name, const wxString&, const char*)            \
         { return WX_STR_CALL(forString, s1, s2); }                            \
     inline rettype WX_STR_DECL(name, const wxString&, const wchar_t*)         \
         { return WX_STR_CALL(forString, s1, s2); }                            \
         { return WX_STR_CALL(forString, wxString(s1), wxString(s2)); }        \
                                                                               \
     inline rettype WX_STR_DECL(name, const wxString&, const char*)            \
         { return WX_STR_CALL(forString, s1, s2); }                            \
     inline rettype WX_STR_DECL(name, const wxString&, const wchar_t*)         \
         { return WX_STR_CALL(forString, s1, s2); }                            \

-    inline rettype WX_STR_DECL(name, const wxString&, const wxCharBuffer&)    \
+    inline rettype WX_STR_DECL(name, const wxString&, const wxScopedCharBuffer&)    \

         { return WX_STR_CALL(forString, s1, s2); }                            \
         { return WX_STR_CALL(forString, s1, s2); }                            \

-    inline rettype WX_STR_DECL(name, const wxString&, const wxWCharBuffer&)   \
+    inline rettype WX_STR_DECL(name, const wxString&, const wxScopedWCharBuffer&)   \

         { return WX_STR_CALL(forString, s1, s2); }                            \
     inline rettype WX_STR_DECL(name, const wxString&, const wxString&)        \
         { return WX_STR_CALL(forString, s1, s2); }                            \
         { return WX_STR_CALL(forString, s1, s2); }                            \
     inline rettype WX_STR_DECL(name, const wxString&, const wxString&)        \
         { return WX_STR_CALL(forString, s1, s2); }                            \


@@ -382,9 +388,9 @@ inline wchar_t *wxStrncat(wchar_t *dest, const char *src, size_t n)
         { return WX_STR_CALL(forString, s1.AsString(), s2); }                 \
     inline rettype WX_STR_DECL(name, const wxCStrData&, const wchar_t*)       \
         { return WX_STR_CALL(forString, s1.AsString(), s2); }                 \
         { return WX_STR_CALL(forString, s1.AsString(), s2); }                 \
     inline rettype WX_STR_DECL(name, const wxCStrData&, const wchar_t*)       \
         { return WX_STR_CALL(forString, s1.AsString(), s2); }                 \

-    inline rettype WX_STR_DECL(name, const wxCStrData&, const wxCharBuffer&)  \
+    inline rettype WX_STR_DECL(name, const wxCStrData&, const wxScopedCharBuffer&)  \

         { return WX_STR_CALL(forString, s1.AsString(), s2); }                 \
         { return WX_STR_CALL(forString, s1.AsString(), s2); }                 \

-    inline rettype WX_STR_DECL(name, const wxCStrData&, const wxWCharBuffer&) \
+    inline rettype WX_STR_DECL(name, const wxCStrData&, const wxScopedWCharBuffer&) \

         { return WX_STR_CALL(forString, s1.AsString(), s2); }                 \
     inline rettype WX_STR_DECL(name, const wxCStrData&, const wxString&)      \
         { return WX_STR_CALL(forString, s1.AsString(), s2); }                 \
         { return WX_STR_CALL(forString, s1.AsString(), s2); }                 \
     inline rettype WX_STR_DECL(name, const wxCStrData&, const wxString&)      \
         { return WX_STR_CALL(forString, s1.AsString(), s2); }                 \


@@ -406,14 +412,14 @@ inline wchar_t *wxStrncat(wchar_t *dest, const char *src, size_t n)
     inline int WX_STR_DECL(name, const wchar_t *, const wxString&)            \
         { return -WX_STR_CALL(forString, s2, s1); }                           \
                                                                               \
     inline int WX_STR_DECL(name, const wchar_t *, const wxString&)            \
         { return -WX_STR_CALL(forString, s2, s1); }                           \
                                                                               \

-    inline int WX_STR_DECL(name, const wxCharBuffer&, const wxCStrData&)      \
+    inline int WX_STR_DECL(name, const wxScopedCharBuffer&, const wxCStrData&)      \

         { return -WX_STR_CALL(forString, s2.AsString(), s1.data()); }         \
         { return -WX_STR_CALL(forString, s2.AsString(), s1.data()); }         \

-    inline int WX_STR_DECL(name, const wxCharBuffer&, const wxString&)        \
+    inline int WX_STR_DECL(name, const wxScopedCharBuffer&, const wxString&)        \

         { return -WX_STR_CALL(forString, s2, s1.data()); }                    \
                                                                               \
         { return -WX_STR_CALL(forString, s2, s1.data()); }                    \
                                                                               \

-    inline int WX_STR_DECL(name, const wxWCharBuffer&, const wxCStrData&)     \
+    inline int WX_STR_DECL(name, const wxScopedWCharBuffer&, const wxCStrData&)     \

         { return -WX_STR_CALL(forString, s2.AsString(), s1.data()); }         \
         { return -WX_STR_CALL(forString, s2.AsString(), s1.data()); }         \

-    inline int WX_STR_DECL(name, const wxWCharBuffer&, const wxString&)       \
+    inline int WX_STR_DECL(name, const wxScopedWCharBuffer&, const wxString&)       \

         { return -WX_STR_CALL(forString, s2, s1.data()); }
 
 
         { return -WX_STR_CALL(forString, s2, s1.data()); }
 
 


@@ -433,14 +439,14 @@ inline wchar_t *wxStrncat(wchar_t *dest, const char *src, size_t n)
     inline rettype WX_STR_DECL(name, const wchar_t *, const wxString&)        \
         { return WX_STR_CALL(crtW, s1, s2.wc_str()); }                        \
                                                                               \
     inline rettype WX_STR_DECL(name, const wchar_t *, const wxString&)        \
         { return WX_STR_CALL(crtW, s1, s2.wc_str()); }                        \
                                                                               \

-    inline rettype WX_STR_DECL(name, const wxCharBuffer&, const wxCStrData&)  \
+    inline rettype WX_STR_DECL(name, const wxScopedCharBuffer&, const wxCStrData&)  \

         { return WX_STR_CALL(crtA, s1.data(), s2.AsCharBuf()); }              \
         { return WX_STR_CALL(crtA, s1.data(), s2.AsCharBuf()); }              \

-    inline rettype WX_STR_DECL(name, const wxCharBuffer&, const wxString&)    \
+    inline rettype WX_STR_DECL(name, const wxScopedCharBuffer&, const wxString&)    \

         { return WX_STR_CALL(crtA, s1.data(), s2.mb_str()); }                 \
                                                                               \
         { return WX_STR_CALL(crtA, s1.data(), s2.mb_str()); }                 \
                                                                               \

-    inline rettype WX_STR_DECL(name, const wxWCharBuffer&, const wxCStrData&) \
+    inline rettype WX_STR_DECL(name, const wxScopedWCharBuffer&, const wxCStrData&) \

         { return WX_STR_CALL(crtW, s1.data(), s2.AsWCharBuf()); }             \
         { return WX_STR_CALL(crtW, s1.data(), s2.AsWCharBuf()); }             \

-    inline rettype WX_STR_DECL(name, const wxWCharBuffer&, const wxString&)   \
+    inline rettype WX_STR_DECL(name, const wxScopedWCharBuffer&, const wxString&)   \

         { return WX_STR_CALL(crtW, s1.data(), s2.wc_str()); }
 
 template<typename T>
         { return WX_STR_CALL(crtW, s1.data(), s2.wc_str()); }
 
 template<typename T>


@@ -455,17 +461,21 @@ WX_STRCMP_FUNC(wxStricmp, wxCRT_StricmpA, wxCRT_StricmpW, wxStricmp_String)
 
 #if defined(wxCRT_StrcollA) && defined(wxCRT_StrcollW)
 
 
 #if defined(wxCRT_StrcollA) && defined(wxCRT_StrcollW)
 

-// GCC 3.3 and other compilers have a bug that causes it to fail compilation if
+// GCC 3.4 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<T>()), 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.
 // 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 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))
+#if !(defined(__VISUALC__) || wxCHECK_GCC_VERSION(3,5)) || defined(__clang__)
+    #define wxNEEDS_DECL_BEFORE_TEMPLATE
+#endif
+
+#ifdef wxNEEDS_DECL_BEFORE_TEMPLATE

 template<typename T>
 inline int wxStrcoll_String(const wxString& s1, const T& s2);
 WX_STRCMP_FUNC(wxStrcoll, wxCRT_StrcollA, wxCRT_StrcollW, wxStrcoll_String)
 template<typename T>
 inline int wxStrcoll_String(const wxString& s1, const T& s2);
 WX_STRCMP_FUNC(wxStrcoll, wxCRT_StrcollA, wxCRT_StrcollW, wxStrcoll_String)

-#endif // !__VISUALC__
+#endif // wxNEEDS_DECL_BEFORE_TEMPLATE

 
 template<typename T>
 inline int wxStrcoll_String(const wxString& s1, const T& s2)
 
 template<typename T>
 inline int wxStrcoll_String(const wxString& s1, const T& s2)


@@ -474,15 +484,16 @@ inline int wxStrcoll_String(const wxString& s1, const T& s2)
     // NB: strcoll() doesn't work correctly on UTF-8 strings, so we have to use
     //     wc_str() even if wxUSE_UNICODE_UTF8; the (const wchar_t*) cast is
     //     there just as optimization to avoid going through
     // NB: strcoll() doesn't work correctly on UTF-8 strings, so we have to use
     //     wc_str() even if wxUSE_UNICODE_UTF8; the (const wchar_t*) cast is
     //     there just as optimization to avoid going through

-    //     wxStrcoll<wxWCharBuffer>:
+    //     wxStrcoll<wxScopedWCharBuffer>:

     return wxStrcoll((const wchar_t*)s1.wc_str(), s2);
 #else
     return wxStrcoll((const char*)s1.mb_str(), s2);
 #endif
 }
 
     return wxStrcoll((const wchar_t*)s1.wc_str(), s2);
 #else
     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<>
+#ifndef wxNEEDS_DECL_BEFORE_TEMPLATE
+// this is exactly the same WX_STRCMP_FUNC line as above, insde the
+// wxNEEDS_DECL_BEFORE_TEMPLATE case

 WX_STRCMP_FUNC(wxStrcoll, wxCRT_StrcollA, wxCRT_StrcollW, wxStrcoll_String)
 #endif
 
 WX_STRCMP_FUNC(wxStrcoll, wxCRT_StrcollA, wxCRT_StrcollW, wxStrcoll_String)
 #endif
 


@@ -532,7 +543,7 @@ inline size_t wxStrxfrm(char *dest, const char *src, size_t n)
 inline size_t wxStrxfrm(wchar_t *dest, const wchar_t *src, size_t n)
     { return wxCRT_StrxfrmW(dest, src, n); }
 template<typename T>
 inline size_t wxStrxfrm(wchar_t *dest, const wchar_t *src, size_t n)
     { return wxCRT_StrxfrmW(dest, src, n); }
 template<typename T>

-inline size_t wxStrxfrm(T *dest, const wxCharTypeBuffer<T>& src, size_t n)
+inline size_t wxStrxfrm(T *dest, const wxScopedCharTypeBuffer<T>& src, size_t n)

     { return wxStrxfrm(dest, src.data(), n); }
 inline size_t wxStrxfrm(char *dest, const wxString& src, size_t n)
     { return wxCRT_StrxfrmA(dest, src.mb_str(), n); }
     { return wxStrxfrm(dest, src.data(), n); }
 inline size_t wxStrxfrm(char *dest, const wxString& src, size_t n)
     { return wxCRT_StrxfrmA(dest, src.mb_str(), n); }


@@ -550,7 +561,7 @@ inline char *wxStrtok(char *str, const char *delim, char **saveptr)
 inline wchar_t *wxStrtok(wchar_t *str, const wchar_t *delim, wchar_t **saveptr)
     { return wxCRT_StrtokW(str, delim, saveptr); }
 template<typename T>
 inline wchar_t *wxStrtok(wchar_t *str, const wchar_t *delim, wchar_t **saveptr)
     { return wxCRT_StrtokW(str, delim, saveptr); }
 template<typename T>

-inline T *wxStrtok(T *str, const wxCharTypeBuffer<T>& delim, T **saveptr)
+inline T *wxStrtok(T *str, const wxScopedCharTypeBuffer<T>& delim, T **saveptr)

     { return wxStrtok(str, delim.data(), saveptr); }
 inline char *wxStrtok(char *str, const wxCStrData& delim, char **saveptr)
     { return wxCRT_StrtokA(str, delim.AsCharBuf(), saveptr); }
     { return wxStrtok(str, delim.data(), saveptr); }
 inline char *wxStrtok(char *str, const wxCStrData& delim, char **saveptr)
     { return wxCRT_StrtokA(str, delim.AsCharBuf(), saveptr); }


@@ -595,39 +606,39 @@ 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); }
     { 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 char *wxStrchr(const char *s, const wxUniChar& uc)
+    { char c; return uc.GetAsChar(&c) ? wxCRT_StrchrA(s, c) : NULL; }

 inline const wchar_t *wxStrchr(const wchar_t *s, const wxUniChar& c)
     { return wxCRT_StrchrW(s, (wchar_t)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 char *wxStrrchr(const char *s, const wxUniChar& uc)
+    { char c; return uc.GetAsChar(&c) ? wxCRT_StrrchrA(s, c) : NULL; }

 inline const wchar_t *wxStrrchr(const wchar_t *s, const wxUniChar& c)
     { return wxCRT_StrrchrW(s, (wchar_t)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 char *wxStrchr(const char *s, const wxUniCharRef& uc)
+    { char c; return uc.GetAsChar(&c) ? wxCRT_StrchrA(s, c) : NULL; }

 inline const wchar_t *wxStrchr(const wchar_t *s, const wxUniCharRef& c)
     { return wxCRT_StrchrW(s, (wchar_t)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 char *wxStrrchr(const char *s, const wxUniCharRef& uc)
+    { char c; return uc.GetAsChar(&c) ? wxCRT_StrrchrA(s, c) : NULL; }

 inline const wchar_t *wxStrrchr(const wchar_t *s, const wxUniCharRef& c)
     { return wxCRT_StrrchrW(s, (wchar_t)c); }
 template<typename T>
 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)
+inline const T* wxStrchr(const wxScopedCharTypeBuffer<T>& s, T c)

     { return wxStrchr(s.data(), c); }
 template<typename T>
     { return wxStrchr(s.data(), c); }
 template<typename T>

-inline const T* wxStrrchr(const wxCharTypeBuffer<T>& s, T c)
+inline const T* wxStrrchr(const wxScopedCharTypeBuffer<T>& s, T c)

     { return wxStrrchr(s.data(), c); }
 template<typename T>
     { return wxStrrchr(s.data(), c); }
 template<typename T>

-inline const T* wxStrchr(const wxCharTypeBuffer<T>& s, const wxUniChar& c)
+inline const T* wxStrchr(const wxScopedCharTypeBuffer<T>& s, const wxUniChar& c)

     { return wxStrchr(s.data(), (T)c); }
 template<typename T>
     { return wxStrchr(s.data(), (T)c); }
 template<typename T>

-inline const T* wxStrrchr(const wxCharTypeBuffer<T>& s, const wxUniChar& c)
+inline const T* wxStrrchr(const wxScopedCharTypeBuffer<T>& s, const wxUniChar& c)

     { return wxStrrchr(s.data(), (T)c); }
 template<typename T>
     { return wxStrrchr(s.data(), (T)c); }
 template<typename T>

-inline const T* wxStrchr(const wxCharTypeBuffer<T>& s, const wxUniCharRef& c)
+inline const T* wxStrchr(const wxScopedCharTypeBuffer<T>& s, const wxUniCharRef& c)

     { return wxStrchr(s.data(), (T)c); }
 template<typename T>
     { return wxStrchr(s.data(), (T)c); }
 template<typename T>

-inline const T* wxStrrchr(const wxCharTypeBuffer<T>& s, const wxUniCharRef& c)
+inline const T* wxStrrchr(const wxScopedCharTypeBuffer<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
     { 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


@@ -639,14 +650,14 @@ 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); }
     { 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 char* wxStrchr(const wxString& s, const wxUniChar& uc)
+    { char c; return uc.GetAsChar(&c) ? wxCRT_StrchrA(s.c_str(), c) : NULL; }
+inline const char* wxStrrchr(const wxString& s, const wxUniChar& uc)
+    { char c; return uc.GetAsChar(&c) ? wxCRT_StrrchrA(s.c_str(), c) : NULL; }
+inline const char* wxStrchr(const wxString& s, const wxUniCharRef& uc)
+    { char c; return uc.GetAsChar(&c) ? wxCRT_StrchrA(s.c_str(), c) : NULL; }
+inline const char* wxStrrchr(const wxString& s, const wxUniCharRef& uc)
+    { char c; return uc.GetAsChar(&c) ? wxCRT_StrrchrA(s.c_str(), c) : NULL; }

 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)
 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)


@@ -659,14 +670,14 @@ 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); }
     { 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 char* wxStrchr(const wxCStrData& s, const wxUniChar& uc)
+    { char c; return uc.GetAsChar(&c) ? wxCRT_StrchrA(s, c) : NULL; }
+inline const char* wxStrrchr(const wxCStrData& s, const wxUniChar& uc)
+    { char c; return uc.GetAsChar(&c) ? wxCRT_StrrchrA(s, c) : NULL; }
+inline const char* wxStrchr(const wxCStrData& s, const wxUniCharRef& uc)
+    { char c; return uc.GetAsChar(&c) ? wxCRT_StrchrA(s, c) : NULL; }
+inline const char* wxStrrchr(const wxCStrData& s, const wxUniCharRef& uc)
+    { char c; return uc.GetAsChar(&c) ? wxCRT_StrrchrA(s, c) : NULL; }

 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)
 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)


@@ -701,37 +712,37 @@ inline const wchar_t *wxStrpbrk(const wxCStrData& s, const wchar_t *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 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)
+inline const T *wxStrpbrk(const S& s, const wxScopedCharTypeBuffer<T>& accept)

     { return wxStrpbrk(s, accept.data()); }
 
 
 /* inlined non-const versions */
     { return wxStrpbrk(s, accept.data()); }
 
 
 /* inlined non-const versions */

-inline char *wxStrstr(char *haystack, const char *needle)
-    { return (char *)wxStrstr((const char *)haystack, needle); }
-inline wchar_t *wxStrstr(wchar_t *haystack, const wchar_t *needle)
-    { return (wchar_t *)wxStrstr((const wchar_t *)haystack, needle); }
-inline char *wxStrstr(char *haystack, const wxString& needle)
-    { return (char *)wxStrstr((const char *)haystack, needle); }
-inline wchar_t *wxStrstr(wchar_t *haystack, const wxString& needle)
-    { return (wchar_t *)wxStrstr((const wchar_t *)haystack, needle); }
-
-inline char * wxStrchr(char *s, char c)
-    { return (char *)wxStrchr((const char *)s, c); }
-inline char * wxStrrchr(char *s, char c)
-    { return (char *)wxStrrchr((const char *)s, c); }
-inline wchar_t * wxStrchr(wchar_t *s, wchar_t c)
+template <typename T>
+inline char *wxStrstr(char *haystack, T needle)
+    { return const_cast<char*>(wxStrstr(const_cast<const char*>(haystack), needle)); }
+template <typename T>
+inline wchar_t *wxStrstr(wchar_t *haystack, T needle)
+    { return const_cast<wchar_t*>(wxStrstr(const_cast<const wchar_t*>(haystack), needle)); }
+
+template <typename T>
+inline char * wxStrchr(char *s, T c)
+    { return const_cast<char*>(wxStrchr(const_cast<const char*>(s), c)); }
+template <typename T>
+inline wchar_t * wxStrchr(wchar_t *s, T c)

     { return (wchar_t *)wxStrchr((const wchar_t *)s, c); }
     { return (wchar_t *)wxStrchr((const wchar_t *)s, c); }

-inline wchar_t * wxStrrchr(wchar_t *s, wchar_t c)
-    { return (wchar_t *)wxStrrchr((const wchar_t *)s, c); }
+template <typename T>
+inline char * wxStrrchr(char *s, T c)
+    { return const_cast<char*>(wxStrrchr(const_cast<const char*>(s), c)); }
+template <typename T>
+inline wchar_t * wxStrrchr(wchar_t *s, T c)
+    { return const_cast<wchar_t*>(wxStrrchr(const_cast<const wchar_t*>(s), c)); }

 
 

-inline char * wxStrpbrk(char *s, const char *accept)
-    { return (char *)wxStrpbrk((const char *)s, accept); }
-inline wchar_t * wxStrpbrk(wchar_t *s, const wchar_t *accept)
-    { return (wchar_t *)wxStrpbrk((const wchar_t *)s, accept); }
-inline char * wxStrpbrk(char *s, const wxString& accept)
-    { return (char *)wxStrpbrk((const char *)s, accept); }
-inline wchar_t * wxStrpbrk(wchar_t *s, const wxString& accept)
-    { return (wchar_t *)wxStrpbrk((const wchar_t *)s, accept); }
+template <typename T>
+inline char * wxStrpbrk(char *s, T accept)
+    { return const_cast<char*>(wxStrpbrk(const_cast<const char*>(s), accept)); }
+template <typename T>
+inline wchar_t * wxStrpbrk(wchar_t *s, T accept)
+    { return const_cast<wchar_t*>(wxStrpbrk(const_cast<const wchar_t*>(s), accept)); }

 
 
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------


@@ -804,7 +815,7 @@ inline double wxStrtod(const char *nptr, char **endptr)
 inline double wxStrtod(const wchar_t *nptr, wchar_t **endptr)
     { return wxCRT_StrtodW(nptr, endptr); }
 template<typename T>
 inline double wxStrtod(const wchar_t *nptr, wchar_t **endptr)
     { return wxCRT_StrtodW(nptr, endptr); }
 template<typename T>

-inline double wxStrtod(const wxCharTypeBuffer<T>& nptr, T **endptr)
+inline double wxStrtod(const wxScopedCharTypeBuffer<T>& nptr, T **endptr)

     { return wxStrtod(nptr.data(), endptr); }
 
 // We implement wxStrto*() like this so that the code compiles when NULL is
     { return wxStrtod(nptr.data(), endptr); }
 
 // We implement wxStrto*() like this so that the code compiles when NULL is


@@ -868,7 +879,7 @@ inline double wxStrtod(const wxCStrData& nptr, T endptr)
     inline rettype name(const wchar_t *nptr, wchar_t **endptr, int base)      \
         { return implW(nptr, endptr, base); }                                 \
     template<typename T>                                                      \
     inline rettype name(const wchar_t *nptr, wchar_t **endptr, int base)      \
         { return implW(nptr, endptr, base); }                                 \
     template<typename T>                                                      \

-    inline rettype name(const wxCharTypeBuffer<T>& nptr, T **endptr, int base)\
+    inline rettype name(const wxScopedCharTypeBuffer<T>& nptr, T **endptr, int)\

         { return name(nptr.data(), endptr); }                                 \
     template<typename T>                                                      \
     inline rettype name(const wxString& nptr, T endptr, int base)             \
         { return name(nptr.data(), endptr); }                                 \
     template<typename T>                                                      \
     inline rettype name(const wxString& nptr, T endptr, int base)             \


@@ -914,8 +925,8 @@ 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()); }
 inline char* wxGetenv(const wxCStrData& name) { return wxCRT_GetenvA(name.AsCharBuf()); }
 inline wchar_t* wxGetenv(const wchar_t *name) { return wxCRT_GetenvW(name); }
 inline char* wxGetenv(const wxString& name) { return wxCRT_GetenvA(name.mb_str()); }
 inline char* wxGetenv(const wxCStrData& name) { return wxCRT_GetenvA(name.AsCharBuf()); }

-inline char* wxGetenv(const wxCharBuffer& name) { return wxCRT_GetenvA(name.data()); }
-inline wchar_t* wxGetenv(const wxWCharBuffer& name) { return wxCRT_GetenvW(name.data()); }
+inline char* wxGetenv(const wxScopedCharBuffer& name) { return wxCRT_GetenvA(name.data()); }
+inline wchar_t* wxGetenv(const wxScopedWCharBuffer& name) { return wxCRT_GetenvW(name.data()); }

 
 // ----------------------------------------------------------------------------
 //                            time.h functions
 
 // ----------------------------------------------------------------------------
 //                            time.h functions


@@ -971,4 +982,6 @@ wxDEPRECATED( inline int wxIsctrl(const wxUniChar& c) );
 inline int wxIsctrl(const wxUniChar& c) { return wxIscntrl(c); }
 #endif // WXWIN_COMPATIBILITY_2_8
 
 inline int wxIsctrl(const wxUniChar& c) { return wxIscntrl(c); }
 #endif // WXWIN_COMPATIBILITY_2_8
 

+inline bool wxIsascii(const wxUniChar& c) { return c.IsAscii(); }
+

 #endif /* _WX_WXCRT_H_ */
 #endif /* _WX_WXCRT_H_ */