allow adjusting the combo button size (patch 1489452)

[wxWidgets.git] / samples / typetest / typetest.cpp

diff --git a/samples/typetest/typetest.cpp b/samples/typetest/typetest.cpp
index 0550ca1a00d06599e1749dcf12abcad2a700edf8..8a22895fc148998b38b22c728366d0d5707c20bd 100644 (file)
--- a/samples/typetest/typetest.cpp
+++ b/samples/typetest/typetest.cpp
@@ -9,10 +9,6 @@
 // Licence:       wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:       wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "typetest.h"
-#endif
-

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


@@ -71,6 +67,9 @@ BEGIN_EVENT_TABLE(MyApp, wxApp)
     EVT_MENU(TYPES_MIME, MyApp::DoMIMEDemo)
 END_EVENT_TABLE()
 
     EVT_MENU(TYPES_MIME, MyApp::DoMIMEDemo)
 END_EVENT_TABLE()
 

+wxString file_name = _T("test_wx.dat");
+wxString file_name2 = wxString(_T("test_wx2.dat"));
+

 bool MyApp::OnInit()
 {
     // Create the main frame window
 bool MyApp::OnInit()
 {
     // Create the main frame window


@@ -129,7 +128,7 @@ void MyApp::DoStreamDemo(wxCommandEvent& WXUNUSED(event))
     textCtrl.WriteText( _T("Writing to ofstream and wxFileOutputStream:\n") );
 
     wxSTD ofstream std_file_output( "test_std.dat" );
     textCtrl.WriteText( _T("Writing to ofstream and wxFileOutputStream:\n") );
 
     wxSTD ofstream std_file_output( "test_std.dat" );

-    wxFileOutputStream file_output( wxString(_T("test_wx.dat")) );
+    wxFileOutputStream file_output( file_name );

     wxBufferedOutputStream buf_output( file_output );
     wxTextOutputStream text_output( buf_output );
 
     wxBufferedOutputStream buf_output( file_output );
     wxTextOutputStream text_output( buf_output );
 


@@ -186,7 +185,7 @@ void MyApp::DoStreamDemo(wxCommandEvent& WXUNUSED(event))
 
     char std_buf[200];
     std_file_input >> std_buf;
 
     char std_buf[200];
     std_file_input >> std_buf;

-    str.FromAscii(std_buf);
+    str = wxString::FromAscii(std_buf);

     tmp.Printf( _T("String: %s\n"), str.c_str() );
     textCtrl.WriteText( tmp );
 
     tmp.Printf( _T("String: %s\n"), str.c_str() );
     textCtrl.WriteText( tmp );
 


@@ -194,7 +193,7 @@ void MyApp::DoStreamDemo(wxCommandEvent& WXUNUSED(event))
 
     buf_output.Sync();
 
 
     buf_output.Sync();
 

-    wxFileInputStream file_input( wxString(_T("test_wx.dat")) );
+    wxFileInputStream file_input( file_name );

     wxBufferedInputStream buf_input( file_input );
     wxTextInputStream text_input( file_input );
 
     wxBufferedInputStream buf_input( file_input );
     wxTextInputStream text_input( file_input );
 


@@ -282,13 +281,13 @@ void MyApp::DoStreamDemo2(wxCommandEvent& WXUNUSED(event))
 
     textCtrl.WriteText( _T("Writing number 0 to 9 to buffered wxFileOutputStream:\n\n") );
 
 
     textCtrl.WriteText( _T("Writing number 0 to 9 to buffered wxFileOutputStream:\n\n") );
 

-    wxFileOutputStream file_output( wxString(_T("test_wx.dat")) );
+    wxFileOutputStream file_output( file_name );

     wxBufferedOutputStream buf_output( file_output );
     for (ch = 0; ch < 10; ch++)
         buf_output.Write( &ch, 1 );
     buf_output.Sync();
 
     wxBufferedOutputStream buf_output( file_output );
     for (ch = 0; ch < 10; ch++)
         buf_output.Write( &ch, 1 );
     buf_output.Sync();
 

-    wxFileInputStream file_input( wxString(_T("test_wx.dat")) );
+    wxFileInputStream file_input( file_name );

     for (ch2 = 0; ch2 < 10; ch2++)
     {
         file_input.Read( &ch, 1 );
     for (ch2 = 0; ch2 < 10; ch2++)
     {
         file_input.Read( &ch, 1 );


@@ -299,7 +298,7 @@ void MyApp::DoStreamDemo2(wxCommandEvent& WXUNUSED(event))
     textCtrl.WriteText( _T("Writing number 0 to 9 to buffered wxFileOutputStream, then\n") );
     textCtrl.WriteText( _T("seeking back to #3 and writing 0:\n\n") );
 
     textCtrl.WriteText( _T("Writing number 0 to 9 to buffered wxFileOutputStream, then\n") );
     textCtrl.WriteText( _T("seeking back to #3 and writing 0:\n\n") );
 

-    wxFileOutputStream file_output2( wxString(_T("test_wx2.dat")) );
+    wxFileOutputStream file_output2( file_name2 );

     wxBufferedOutputStream buf_output2( file_output2 );
     for (ch = 0; ch < 10; ch++)
         buf_output2.Write( &ch, 1 );
     wxBufferedOutputStream buf_output2( file_output2 );
     for (ch = 0; ch < 10; ch++)
         buf_output2.Write( &ch, 1 );


@@ -308,7 +307,7 @@ void MyApp::DoStreamDemo2(wxCommandEvent& WXUNUSED(event))
     buf_output2.Write( &ch, 1 );
     buf_output2.Sync();
 
     buf_output2.Write( &ch, 1 );
     buf_output2.Sync();
 

-    wxFileInputStream file_input2( wxString(_T("test_wx2.dat")) );
+    wxFileInputStream file_input2( file_name2 );

     for (ch2 = 0; ch2 < 10; ch2++)
     {
         file_input2.Read( &ch, 1 );
     for (ch2 = 0; ch2 < 10; ch2++)
     {
         file_input2.Read( &ch, 1 );


@@ -326,7 +325,7 @@ void MyApp::DoStreamDemo2(wxCommandEvent& WXUNUSED(event))
     textCtrl.WriteText( _T("Reading number 0 to 9 from buffered wxFileInputStream, then\n") );
     textCtrl.WriteText( _T("seeking back to #3 and reading the 0:\n\n") );
 
     textCtrl.WriteText( _T("Reading number 0 to 9 from buffered wxFileInputStream, then\n") );
     textCtrl.WriteText( _T("seeking back to #3 and reading the 0:\n\n") );
 

-    wxFileInputStream file_input3( wxString(_T("test_wx2.dat")) );
+    wxFileInputStream file_input3( file_name2 );

     wxBufferedInputStream buf_input3( file_input3 );
     for (ch2 = 0; ch2 < 10; ch2++)
     {
     wxBufferedInputStream buf_input3( file_input3 );
     for (ch2 = 0; ch2 < 10; ch2++)
     {


@@ -354,7 +353,7 @@ void MyApp::DoStreamDemo3(wxCommandEvent& WXUNUSED(event))
 
     textCtrl.WriteText( _T("Writing number 0 to 9 to wxFileOutputStream:\n\n") );
 
 
     textCtrl.WriteText( _T("Writing number 0 to 9 to wxFileOutputStream:\n\n") );
 

-    wxFileOutputStream file_output( wxString(_T("test_wx.dat")) );
+    wxFileOutputStream file_output( file_name );

     for (ch = 0; ch < 10; ch++)
         file_output.Write( &ch, 1 );
 
     for (ch = 0; ch < 10; ch++)
         file_output.Write( &ch, 1 );
 


@@ -362,7 +361,7 @@ void MyApp::DoStreamDemo3(wxCommandEvent& WXUNUSED(event))
 
     textCtrl.WriteText( _T("Reading 0 to 10 to wxFileInputStream:\n\n") );
 
 
     textCtrl.WriteText( _T("Reading 0 to 10 to wxFileInputStream:\n\n") );
 

-    wxFileInputStream file_input( wxString(_T("test_wx.dat")) );
+    wxFileInputStream file_input( file_name );

     for (ch2 = 0; ch2 < 11; ch2++)
     {
         file_input.Read( &ch, 1 );
     for (ch2 = 0; ch2 < 11; ch2++)
     {
         file_input.Read( &ch, 1 );


@@ -411,7 +410,7 @@ void MyApp::DoStreamDemo3(wxCommandEvent& WXUNUSED(event))
 
     textCtrl.WriteText( _T("Reading 0 to 10 to wxFFileInputStream:\n\n") );
 
 
     textCtrl.WriteText( _T("Reading 0 to 10 to wxFFileInputStream:\n\n") );
 

-    wxFFileInputStream ffile_input( wxString(_T("test_wx.dat")) );
+    wxFFileInputStream ffile_input( file_name );

     for (ch2 = 0; ch2 < 11; ch2++)
     {
         ffile_input.Read( &ch, 1 );
     for (ch2 = 0; ch2 < 11; ch2++)
     {
         ffile_input.Read( &ch, 1 );


@@ -459,7 +458,7 @@ void MyApp::DoStreamDemo3(wxCommandEvent& WXUNUSED(event))
 
     textCtrl.WriteText( _T("Reading 0 to 10 to buffered wxFFileInputStream:\n\n") );
 
 
     textCtrl.WriteText( _T("Reading 0 to 10 to buffered wxFFileInputStream:\n\n") );
 

-    wxFFileInputStream ffile_input2( wxString(_T("test_wx.dat")) );
+    wxFFileInputStream ffile_input2( file_name );

     wxBufferedInputStream buf_input( ffile_input2 );
     for (ch2 = 0; ch2 < 11; ch2++)
     {
     wxBufferedInputStream buf_input( ffile_input2 );
     for (ch2 = 0; ch2 < 11; ch2++)
     {


@@ -516,7 +515,7 @@ void MyApp::DoStreamDemo4(wxCommandEvent& WXUNUSED(event))
     // bigger than buffer
     textCtrl.WriteText( _T("Writing 2000x 1 to wxFileOutputStream.\n\n") );
 
     // bigger than buffer
     textCtrl.WriteText( _T("Writing 2000x 1 to wxFileOutputStream.\n\n") );
 

-    wxFileOutputStream file_output( wxString(_T("test_wx.dat")) );
+    wxFileOutputStream file_output( file_name );

     for (int i = 0; i < 2000; i++)
     {
         char ch = 1;
     for (int i = 0; i < 2000; i++)
     {
         char ch = 1;


@@ -525,7 +524,7 @@ void MyApp::DoStreamDemo4(wxCommandEvent& WXUNUSED(event))
 
     textCtrl.WriteText( _T("Opening with a buffered wxFileInputStream:\n\n") );
 
 
     textCtrl.WriteText( _T("Opening with a buffered wxFileInputStream:\n\n") );
 

-    wxFileInputStream file_input( wxString(_T("test_wx.dat")) );
+    wxFileInputStream file_input( file_name );

     wxBufferedInputStream buf_input( file_input );
 
     textCtrl.WriteText( _T("wxBufferedInputStream.GetLastError() returns: ") );
     wxBufferedInputStream buf_input( file_input );
 
     textCtrl.WriteText( _T("wxBufferedInputStream.GetLastError() returns: ") );


@@ -655,13 +654,13 @@ void MyApp::DoStreamDemo5(wxCommandEvent& WXUNUSED(event))
 
     textCtrl.WriteText( _T("Writing number 0 to 9 to wxFileOutputStream:\n\n") );
 
 
     textCtrl.WriteText( _T("Writing number 0 to 9 to wxFileOutputStream:\n\n") );
 

-    wxFileOutputStream file_output( wxString(_T("test_wx.dat")) );
+    wxFileOutputStream file_output( file_name );

     for (ch = 0; ch < 10; ch++)
         file_output.Write( &ch, 1 );
 
     file_output.Sync();
 
     for (ch = 0; ch < 10; ch++)
         file_output.Write( &ch, 1 );
 
     file_output.Sync();
 

-    wxFileInputStream file_input( wxString(_T("test_wx.dat")) );
+    wxFileInputStream file_input( file_name );

 
     ch = file_input.Peek();
     str.Printf( wxT("First char peeked: %d\n"), (int) ch );
 
     ch = file_input.Peek();
     str.Printf( wxT("First char peeked: %d\n"), (int) ch );


@@ -730,7 +729,7 @@ void MyApp::DoStreamDemo6(wxCommandEvent& WXUNUSED(event))
 
     textCtrl.WriteText( _T("Writing number 0 to 9 to wxFileOutputStream...\n\n") );
 
 
     textCtrl.WriteText( _T("Writing number 0 to 9 to wxFileOutputStream...\n\n") );
 

-    wxFileOutputStream file_output( wxString(_T("test_wx.dat")) );
+    wxFileOutputStream file_output( file_name );

     for (ch = 0; ch < 10; ch++)
         file_output.Write( &ch, 1 );
 
     for (ch = 0; ch < 10; ch++)
         file_output.Write( &ch, 1 );
 


@@ -738,52 +737,52 @@ void MyApp::DoStreamDemo6(wxCommandEvent& WXUNUSED(event))
 
     textCtrl.WriteText( _T("Reading char from wxFileInputStream:\n\n") );
 
 
     textCtrl.WriteText( _T("Reading char from wxFileInputStream:\n\n") );
 

-    wxFileInputStream file_input( wxString(_T("test_wx.dat")) );
+    wxFileInputStream file_input( file_name );

 
     ch = file_input.GetC();
 
     ch = file_input.GetC();

-    size_t pos = file_input.TellI();
+    size_t pos = (size_t)file_input.TellI();

     str.Printf( wxT("Read char: %d. Now at position %d\n\n"), (int) ch, (int) pos );
     textCtrl.WriteText( str );
 
     textCtrl.WriteText( _T("Reading another char from wxFileInputStream:\n\n") );
 
     ch = file_input.GetC();
     str.Printf( wxT("Read char: %d. Now at position %d\n\n"), (int) ch, (int) pos );
     textCtrl.WriteText( str );
 
     textCtrl.WriteText( _T("Reading another char from wxFileInputStream:\n\n") );
 
     ch = file_input.GetC();

-    pos = file_input.TellI();
+    pos = (size_t)file_input.TellI();

     str.Printf( wxT("Read char: %d. Now at position %d\n\n"), (int) ch, (int) pos );
     textCtrl.WriteText( str );
 
     textCtrl.WriteText( _T("Reading yet another char from wxFileInputStream:\n\n") );
 
     ch = file_input.GetC();
     str.Printf( wxT("Read char: %d. Now at position %d\n\n"), (int) ch, (int) pos );
     textCtrl.WriteText( str );
 
     textCtrl.WriteText( _T("Reading yet another char from wxFileInputStream:\n\n") );
 
     ch = file_input.GetC();

-    pos = file_input.TellI();
+    pos = (size_t)file_input.TellI();

     str.Printf( wxT("Read char: %d. Now at position %d\n\n"), (int) ch, (int) pos );
     textCtrl.WriteText( str );
 
     textCtrl.WriteText( _T("Now calling Ungetch( 5 ) from wxFileInputStream...\n\n") );
 
     file_input.Ungetch( 5 );
     str.Printf( wxT("Read char: %d. Now at position %d\n\n"), (int) ch, (int) pos );
     textCtrl.WriteText( str );
 
     textCtrl.WriteText( _T("Now calling Ungetch( 5 ) from wxFileInputStream...\n\n") );
 
     file_input.Ungetch( 5 );

-    pos = file_input.TellI();
+    pos = (size_t)file_input.TellI();

     str.Printf( wxT("Now at position %d\n\n"), (int) pos );
     textCtrl.WriteText( str );
 
     textCtrl.WriteText( _T("Reading char from wxFileInputStream:\n\n") );
 
     ch = file_input.GetC();
     str.Printf( wxT("Now at position %d\n\n"), (int) pos );
     textCtrl.WriteText( str );
 
     textCtrl.WriteText( _T("Reading char from wxFileInputStream:\n\n") );
 
     ch = file_input.GetC();

-    pos = file_input.TellI();
+    pos = (size_t)file_input.TellI();

     str.Printf( wxT("Read char: %d. Now at position %d\n\n"), (int) ch, (int) pos );
     textCtrl.WriteText( str );
 
     textCtrl.WriteText( _T("Reading another char from wxFileInputStream:\n\n") );
 
     ch = file_input.GetC();
     str.Printf( wxT("Read char: %d. Now at position %d\n\n"), (int) ch, (int) pos );
     textCtrl.WriteText( str );
 
     textCtrl.WriteText( _T("Reading another char from wxFileInputStream:\n\n") );
 
     ch = file_input.GetC();

-    pos = file_input.TellI();
+    pos = (size_t)file_input.TellI();

     str.Printf( wxT("Read char: %d. Now at position %d\n\n"), (int) ch, (int) pos );
     textCtrl.WriteText( str );
 
     textCtrl.WriteText( _T("Now calling Ungetch( 5 ) from wxFileInputStream again...\n\n") );
 
     file_input.Ungetch( 5 );
     str.Printf( wxT("Read char: %d. Now at position %d\n\n"), (int) ch, (int) pos );
     textCtrl.WriteText( str );
 
     textCtrl.WriteText( _T("Now calling Ungetch( 5 ) from wxFileInputStream again...\n\n") );
 
     file_input.Ungetch( 5 );

-    pos = file_input.TellI();
+    pos = (size_t)file_input.TellI();

     str.Printf( wxT("Now at position %d\n\n"), (int) pos );
     textCtrl.WriteText( str );
 
     str.Printf( wxT("Now at position %d\n\n"), (int) pos );
     textCtrl.WriteText( str );
 


@@ -792,7 +791,7 @@ void MyApp::DoStreamDemo6(wxCommandEvent& WXUNUSED(event))
     file_input.SeekI( 3 );
 
     ch = file_input.GetC();
     file_input.SeekI( 3 );
 
     ch = file_input.GetC();

-    pos = file_input.TellI();
+    pos = (size_t)file_input.TellI();

     str.Printf( wxT("Read char: %d. Now at position %d\n\n"), (int) ch, (int) pos );
     textCtrl.WriteText( str );
 }
     str.Printf( wxT("Read char: %d. Now at position %d\n\n"), (int) ch, (int) pos );
     textCtrl.WriteText( str );
 }


@@ -809,7 +808,7 @@ void MyApp::DoStreamDemo7(wxCommandEvent& WXUNUSED(event))
 
     textCtrl.WriteText( _T("Writing number 0 to 9 to wxFileOutputStream...\n\n") );
 
 
     textCtrl.WriteText( _T("Writing number 0 to 9 to wxFileOutputStream...\n\n") );
 

-    wxFileOutputStream file_output( wxString(_T("test_wx.dat")) );
+    wxFileOutputStream file_output( file_name );

     for (ch = 0; ch < 10; ch++)
         file_output.Write( &ch, 1 );
 
     for (ch = 0; ch < 10; ch++)
         file_output.Write( &ch, 1 );
 


@@ -817,53 +816,53 @@ void MyApp::DoStreamDemo7(wxCommandEvent& WXUNUSED(event))
 
     textCtrl.WriteText( _T("Reading char from wxBufferedInputStream via wxFileInputStream:\n\n") );
 
 
     textCtrl.WriteText( _T("Reading char from wxBufferedInputStream via wxFileInputStream:\n\n") );
 

-    wxFileInputStream file_input( wxString(_T("test_wx.dat")) );
+    wxFileInputStream file_input( file_name );

     wxBufferedInputStream buf_input( file_input );
 
     ch = buf_input.GetC();
     wxBufferedInputStream buf_input( file_input );
 
     ch = buf_input.GetC();

-    size_t pos = buf_input.TellI();
+    size_t pos = (size_t)buf_input.TellI();

     str.Printf( wxT("Read char: %d. Now at position %d\n\n"), (int) ch, (int) pos );
     textCtrl.WriteText( str );
 
     textCtrl.WriteText( _T("Reading another char from wxBufferedInputStream:\n\n") );
 
     ch = buf_input.GetC();
     str.Printf( wxT("Read char: %d. Now at position %d\n\n"), (int) ch, (int) pos );
     textCtrl.WriteText( str );
 
     textCtrl.WriteText( _T("Reading another char from wxBufferedInputStream:\n\n") );
 
     ch = buf_input.GetC();

-    pos = buf_input.TellI();
+    pos = (size_t)buf_input.TellI();

     str.Printf( wxT("Read char: %d. Now at position %d\n\n"), (int) ch, (int) pos );
     textCtrl.WriteText( str );
 
     textCtrl.WriteText( _T("Reading yet another char from wxBufferedInputStream:\n\n") );
 
     ch = buf_input.GetC();
     str.Printf( wxT("Read char: %d. Now at position %d\n\n"), (int) ch, (int) pos );
     textCtrl.WriteText( str );
 
     textCtrl.WriteText( _T("Reading yet another char from wxBufferedInputStream:\n\n") );
 
     ch = buf_input.GetC();

-    pos = buf_input.TellI();
+    pos = (size_t)buf_input.TellI();

     str.Printf( wxT("Read char: %d. Now at position %d\n\n"), (int) ch, (int) pos );
     textCtrl.WriteText( str );
 
     textCtrl.WriteText( _T("Now calling Ungetch( 5 ) from wxBufferedInputStream...\n\n") );
 
     buf_input.Ungetch( 5 );
     str.Printf( wxT("Read char: %d. Now at position %d\n\n"), (int) ch, (int) pos );
     textCtrl.WriteText( str );
 
     textCtrl.WriteText( _T("Now calling Ungetch( 5 ) from wxBufferedInputStream...\n\n") );
 
     buf_input.Ungetch( 5 );

-    pos = buf_input.TellI();
+    pos = (size_t)buf_input.TellI();

     str.Printf( wxT("Now at position %d\n\n"), (int) pos );
     textCtrl.WriteText( str );
 
     textCtrl.WriteText( _T("Reading char from wxBufferedInputStream:\n\n") );
 
     ch = buf_input.GetC();
     str.Printf( wxT("Now at position %d\n\n"), (int) pos );
     textCtrl.WriteText( str );
 
     textCtrl.WriteText( _T("Reading char from wxBufferedInputStream:\n\n") );
 
     ch = buf_input.GetC();

-    pos = buf_input.TellI();
+    pos = (size_t)buf_input.TellI();

     str.Printf( wxT("Read char: %d. Now at position %d\n\n"), (int) ch, (int) pos );
     textCtrl.WriteText( str );
 
     textCtrl.WriteText( _T("Reading another char from wxBufferedInputStream:\n\n") );
 
     ch = buf_input.GetC();
     str.Printf( wxT("Read char: %d. Now at position %d\n\n"), (int) ch, (int) pos );
     textCtrl.WriteText( str );
 
     textCtrl.WriteText( _T("Reading another char from wxBufferedInputStream:\n\n") );
 
     ch = buf_input.GetC();

-    pos = buf_input.TellI();
+    pos = (size_t)buf_input.TellI();

     str.Printf( wxT("Read char: %d. Now at position %d\n\n"), (int) ch, (int) pos );
     textCtrl.WriteText( str );
 
     textCtrl.WriteText( _T("Now calling Ungetch( 5 ) from wxBufferedInputStream again...\n\n") );
 
     buf_input.Ungetch( 5 );
     str.Printf( wxT("Read char: %d. Now at position %d\n\n"), (int) ch, (int) pos );
     textCtrl.WriteText( str );
 
     textCtrl.WriteText( _T("Now calling Ungetch( 5 ) from wxBufferedInputStream again...\n\n") );
 
     buf_input.Ungetch( 5 );

-    pos = buf_input.TellI();
+    pos = (size_t)buf_input.TellI();

     str.Printf( wxT("Now at position %d\n\n"), (int) pos );
     textCtrl.WriteText( str );
 
     str.Printf( wxT("Now at position %d\n\n"), (int) pos );
     textCtrl.WriteText( str );
 


@@ -872,7 +871,7 @@ void MyApp::DoStreamDemo7(wxCommandEvent& WXUNUSED(event))
     buf_input.SeekI( 3 );
 
     ch = buf_input.GetC();
     buf_input.SeekI( 3 );
 
     ch = buf_input.GetC();

-    pos = buf_input.TellI();
+    pos = (size_t)buf_input.TellI();

     str.Printf( wxT("Read char: %d. Now at position %d\n\n"), (int) ch, (int) pos );
     textCtrl.WriteText( str );
 }
     str.Printf( wxT("Read char: %d. Now at position %d\n\n"), (int) ch, (int) pos );
     textCtrl.WriteText( str );
 }


@@ -886,7 +885,7 @@ void MyApp::DoUnicodeDemo(wxCommandEvent& WXUNUSED(event))
     textCtrl << _T("\nTest wchar_t to char (Unicode to ANSI/Multibyte) converions:");
 
     wxString str;
     textCtrl << _T("\nTest wchar_t to char (Unicode to ANSI/Multibyte) converions:");
 
     wxString str;

-    str = _T("Robert Röbling\n");
+    str = _T("Robert R\366bling\n");

 
     printf( "\n\nConversion with wxConvLocal:\n" );
     wxConvCurrent = &wxConvLocal;
 
     printf( "\n\nConversion with wxConvLocal:\n" );
     wxConvCurrent = &wxConvLocal;


@@ -952,13 +951,13 @@ void MyApp::DoMIMEDemo(wxCommandEvent& WXUNUSED(event))
             wxFileType::MessageParameters params(filename, type);
             filetype->GetOpenCommand(&open, params);
 
             wxFileType::MessageParameters params(filename, type);
             filetype->GetOpenCommand(&open, params);
 

-            textCtrl << _T("MIME information about extension '") << ext << _T("'\n")
+            textCtrl << _T("MIME information about extension '") << ext << _T('\n')

                      << _T("\tMIME type: ") << ( !type ? wxT("unknown")
                      << _T("\tMIME type: ") << ( !type ? wxT("unknown")

-                                                   : type.c_str() ) << '\n'
+                                                   : type.c_str() ) << _T('\n')

                      << _T("\tDescription: ") << ( !desc ? wxEmptyString : desc.c_str() )
                      << _T("\tDescription: ") << ( !desc ? wxEmptyString : desc.c_str() )

-                        << '\n'
+                        << _T('\n')

                      << _T("\tCommand to open: ") << ( !open ? wxT("no") : open.c_str() )
                      << _T("\tCommand to open: ") << ( !open ? wxT("no") : open.c_str() )

-                        << '\n';
+                        << _T('\n');

 
             delete filetype;
         }
 
             delete filetype;
         }


@@ -1025,9 +1024,9 @@ void MyApp::DoVariantDemo(wxCommandEvent& WXUNUSED(event) )
     wxUnusedVar(l);
     wxUnusedVar(v);
 
     wxUnusedVar(l);
     wxUnusedVar(v);
 

-    wxStringList stringList;
-    stringList.Add(_T("one")); stringList.Add(_T("two")); stringList.Add(_T("three"));
-    var1 = stringList;
+    wxArrayString stringArray;
+    stringArray.Add(_T("one")); stringArray.Add(_T("two")); stringArray.Add(_T("three"));
+    var1 = stringArray;

     textCtrl << _T("var1 = ") << var1.MakeString() << _T("\n");
 
     var1.ClearList();
     textCtrl << _T("var1 = ") << var1.MakeString() << _T("\n");
 
     var1.ClearList();