No real changes, just refactor wxControlContainer code a little.

[wxWidgets.git] / src / common / ustring.cpp

diff --git a/src/common/ustring.cpp b/src/common/ustring.cpp
index 9a6897122a6dfeea2c8d7cf94329b1ede2ab3a0c..1da0c9256a5a63334941179f76256cf1f2d5722e 100644 (file)
--- a/src/common/ustring.cpp
+++ b/src/common/ustring.cpp
@@ -399,7 +399,7 @@ wxUString &wxUString::assignFromCString( const char* str )
     if (!str)
         return assign( wxUString() );
 
-    wxWCharBuffer buffer = wxConvLibc.cMB2WC( str );
+    wxScopedWCharBuffer buffer = wxConvLibc.cMB2WC( str );
 
     return assign( buffer );
 }
@@ -409,12 +409,12 @@ wxUString &wxUString::assignFromCString( const char* str, const wxMBConv &conv )
     if (!str)
         return assign( wxUString() );
 
-    wxWCharBuffer buffer = conv.cMB2WC( str );
+    wxScopedWCharBuffer buffer = conv.cMB2WC( str );
 
     return assign( buffer );
 }
 
-wxCharBuffer wxUString::utf8_str() const
+wxScopedCharBuffer wxUString::utf8_str() const
 {
     size_type utf8_length = 0;
     const wxChar32 *ptr = data();
@@ -488,13 +488,10 @@ wxCharBuffer wxUString::utf8_str() const
         }
     }
 
-    wxPrintf( "utf8_str %s len %d\n", result, wxStrlen( result.data() ) );
-    wxPrintf( "utf8_str %s len %d\n", result, wxStrlen( result.data() ) );
-
     return result;
 }
 
-wxU16CharBuffer wxUString::utf16_str() const
+wxScopedU16CharBuffer wxUString::utf16_str() const
 {
     size_type utf16_length = 0;
     const wxChar32 *ptr = data();