Misc validity fixes to samples/xrc/rc/*.xrc.

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

diff --git a/src/common/ustring.cpp b/src/common/ustring.cpp
index 1c23bf0da79f421f098b68402097ddd86c9e1589..ab70ce5ae2d62032a398b6bcff7bf2f69ad5efae 100644 (file)
--- a/src/common/ustring.cpp
+++ b/src/common/ustring.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxUString class
 // Author:      Robert Roebling
 // Created:     2008-07-25
 // Purpose:     wxUString class
 // Author:      Robert Roebling
 // Created:     2008-07-25

-// RCS-ID:      $Id:$

 // Copyright:   (c) 2008 Robert Roebling
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2008 Robert Roebling
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -399,7 +398,7 @@ wxUString &wxUString::assignFromCString( const char* str )
     if (!str)
         return assign( wxUString() );
 
     if (!str)
         return assign( wxUString() );
 

-    wxWCharBuffer buffer = wxConvLibc.cMB2WC( str );
+    wxScopedWCharBuffer buffer = wxConvLibc.cMB2WC( str );

 
     return assign( buffer );
 }
 
     return assign( buffer );
 }


@@ -409,12 +408,12 @@ wxUString &wxUString::assignFromCString( const char* str, const wxMBConv &conv )
     if (!str)
         return assign( wxUString() );
 
     if (!str)
         return assign( wxUString() );
 

-    wxWCharBuffer buffer = conv.cMB2WC( str );
+    wxScopedWCharBuffer buffer = conv.cMB2WC( str );

 
     return assign( buffer );
 }
 
 
     return assign( buffer );
 }
 

-wxCharBuffer wxUString::utf8_str() const
+wxScopedCharBuffer wxUString::utf8_str() const

 {
     size_type utf8_length = 0;
     const wxChar32 *ptr = data();
 {
     size_type utf8_length = 0;
     const wxChar32 *ptr = data();


@@ -488,13 +487,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;
 }
 
     return result;
 }
 

-wxU16CharBuffer wxUString::utf16_str() const
+wxScopedU16CharBuffer wxUString::utf16_str() const

 {
     size_type utf16_length = 0;
     const wxChar32 *ptr = data();
 {
     size_type utf16_length = 0;
     const wxChar32 *ptr = data();