Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

[wxWidgets.git] / tests / streams / sstream.cpp

diff --git a/tests/streams/sstream.cpp b/tests/streams/sstream.cpp
index a6d78901831985fe4a41bd0d34a67d8f4628011f..3d65dd7eae8566376a1bd310f04fbcdc7019617c 100644 (file)
--- a/tests/streams/sstream.cpp
+++ b/tests/streams/sstream.cpp
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // RCS-ID:      $Id$
 // Copyright:   (c) 2004 Vadim Zeitlin
 // Author:      Vadim Zeitlin
 // RCS-ID:      $Id$
 // Copyright:   (c) 2004 Vadim Zeitlin

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx/wx.h".
 ///////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx/wx.h".


@@ -80,7 +80,7 @@ strStream::strStream()
     m_str.reserve(LEN);
     for ( size_t n = 0; n < LEN; n++ )
     {
     m_str.reserve(LEN);
     for ( size_t n = 0; n < LEN; n++ )
     {

-        m_str += wxChar(_T('A') + n % (_T('Z') - _T('A') + 1));
+        m_str += wxChar(wxT('A') + n % (wxT('Z') - wxT('A') + 1));

     }
 }
 
     }
 }
 


@@ -106,14 +106,8 @@ void strStream::CheckString(const wxString& text)
 {
     wxStringOutputStream sos;
 
 {
     wxStringOutputStream sos;
 

-    size_t len = text.length();
-#if wxUSE_UNICODE
-    const wxCharBuffer textMB(wxConvLibc.cWC2MB(text.wc_str(), len + 1, &len));
-#else
-    const char *textMB = text.c_str();
-#endif
-
-    sos.Write(textMB, len);
+    const wxCharBuffer buf(text.To8BitData());
+    sos.Write(buf, buf.length());

 
     CPPUNIT_ASSERT_EQUAL( text, sos.GetString() );
 }
 
     CPPUNIT_ASSERT_EQUAL( text, sos.GetString() );
 }