always return (owned or non-owned, depending on build) wxScopedCharBuffer from utf8_s...

[wxWidgets.git] / interface / wx / string.h

diff --git a/interface/wx/string.h b/interface/wx/string.h
index 3056895ba79d9b87e627a7baa4219b5e74be89a4..1c43722bea617f7329f9629dbc2e21aaebf69e24 100644 (file)
--- a/interface/wx/string.h
+++ b/interface/wx/string.h
@@ -420,12 +420,7 @@ public:
 
         @see wc_str(), c_str(), mb_str()
     */
-    const char* utf8_str() const;
-    
-    /**
-        @overload
-    */
-    const wxCharBuffer utf8_str() const;
+    const wxScopedCharBuffer utf8_str() const;
 
     /**
         Converts the strings contents to the wide character represention
@@ -497,12 +492,7 @@ public:
     /**
         Same as utf8_str().
     */
-    const char* ToUTF8() const;
-
-    /**
-        @overload
-    */
-    const wxCharBuffer ToUTF8() const;
+    const wxScopedCharBuffer ToUTF8() const;
 
     //@}