compate charset names case-insensitively in GetEncodingFromName()

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

diff --git a/samples/typetest/typetest.cpp b/samples/typetest/typetest.cpp
index 695f8fec2b1a0f1e523639ac80497023a25ca8f4..20c0db5d2ece13f31a8d39f829f34c8cac536d1f 100644 (file)
--- a/samples/typetest/typetest.cpp
+++ b/samples/typetest/typetest.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        typetest.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        typetest.cpp

-// Purpose:     Types wxWindows sample
+// Purpose:     Types wxWidgets sample

 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98


@@ -71,10 +71,13 @@ 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

-    MyFrame *frame = new MyFrame((wxFrame *) NULL, _T("wxWindows Types Demo"),
+    MyFrame *frame = new MyFrame((wxFrame *) NULL, _T("wxWidgets Types Demo"),

                                  wxPoint(50, 50), wxSize(450, 340));
 
     // Give it an icon
                                  wxPoint(50, 50), wxSize(450, 340));
 
     // Give it an icon


@@ -129,7 +132,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 );
 


@@ -138,31 +141,31 @@ void MyApp::DoStreamDemo(wxCommandEvent& WXUNUSED(event))
     tmp.Printf( _T("Signed int: %d\n"), si );
     textCtrl.WriteText( tmp );
     text_output << si << _T("\n");
     tmp.Printf( _T("Signed int: %d\n"), si );
     textCtrl.WriteText( tmp );
     text_output << si << _T("\n");

-    std_file_output << si << _T("\n");
+    std_file_output << si << "\n";

 
     unsigned int ui = 0xFFFFFFFF;
     tmp.Printf( _T("Unsigned int: %u\n"), ui );
     textCtrl.WriteText( tmp );
     text_output << ui << _T("\n");
 
     unsigned int ui = 0xFFFFFFFF;
     tmp.Printf( _T("Unsigned int: %u\n"), ui );
     textCtrl.WriteText( tmp );
     text_output << ui << _T("\n");

-    std_file_output << ui << _T("\n");
+    std_file_output << ui << "\n";

 
     double d = 2.01234567890123456789;
     tmp.Printf( _T("Double: %f\n"), d );
     textCtrl.WriteText( tmp );
     text_output << d << _T("\n");
 
     double d = 2.01234567890123456789;
     tmp.Printf( _T("Double: %f\n"), d );
     textCtrl.WriteText( tmp );
     text_output << d << _T("\n");

-    std_file_output << d << _T("\n");
+    std_file_output << d << "\n";

 
     float f = (float)0.00001;
     tmp.Printf( _T("Float: %f\n"), f );
     textCtrl.WriteText( tmp );
     text_output << f << _T("\n");
 
     float f = (float)0.00001;
     tmp.Printf( _T("Float: %f\n"), f );
     textCtrl.WriteText( tmp );
     text_output << f << _T("\n");

-    std_file_output << f << _T("\n");
+    std_file_output << f << "\n";

 
     wxString str( _T("Hello!") );
     tmp.Printf( _T("String: %s\n"), str.c_str() );
     textCtrl.WriteText( tmp );
     text_output << str << _T("\n");
 
     wxString str( _T("Hello!") );
     tmp.Printf( _T("String: %s\n"), str.c_str() );
     textCtrl.WriteText( tmp );
     text_output << str << _T("\n");

-    std_file_output << str.c_str() << _T("\n");
+    std_file_output << str.ToAscii() << "\n";

 
     textCtrl.WriteText( _T("\nReading from ifstream:\n") );
 
 
     textCtrl.WriteText( _T("\nReading from ifstream:\n") );
 


@@ -184,19 +187,17 @@ void MyApp::DoStreamDemo(wxCommandEvent& WXUNUSED(event))
     tmp.Printf( _T("Float: %f\n"), f );
     textCtrl.WriteText( tmp );
 
     tmp.Printf( _T("Float: %f\n"), f );
     textCtrl.WriteText( tmp );
 

-    // Why doesn't this work?
-#if 0

     char std_buf[200];
     std_file_input >> std_buf;
     char std_buf[200];
     std_file_input >> std_buf;

-    tmp.Printf( _T("String: %s\n"), std_buf );
+    str = wxString::FromAscii(std_buf);
+    tmp.Printf( _T("String: %s\n"), str.c_str() );

     textCtrl.WriteText( tmp );
     textCtrl.WriteText( tmp );

-#endif

 
     textCtrl.WriteText( _T("\nReading from wxFileInputStream:\n") );
 
     buf_output.Sync();
 
 
     textCtrl.WriteText( _T("\nReading from wxFileInputStream:\n") );
 
     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 );
 


@@ -284,13 +285,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 );


@@ -301,7 +302,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 );


@@ -310,7 +311,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 );


@@ -328,7 +329,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++)
     {


@@ -356,7 +357,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 );
 


@@ -364,7 +365,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 );


@@ -413,7 +414,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 );


@@ -461,7 +462,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++)
     {


@@ -518,7 +519,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;


@@ -527,7 +528,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: ") );


@@ -657,13 +658,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 );


@@ -732,7 +733,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 );
 


@@ -740,52 +741,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 );
 


@@ -794,7 +795,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 );
 }


@@ -811,7 +812,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 );
 


@@ -819,53 +820,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 );
 


@@ -874,7 +875,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 );
 }


@@ -954,13 +955,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;
         }


@@ -1027,9 +1028,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();


@@ -1077,7 +1078,7 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) )
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
 {
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
 {

-    wxMessageDialog dialog(this, _T("Tests various wxWindows types"),
+    wxMessageDialog dialog(this, _T("Tests various wxWidgets types"),

         _T("About Types"), wxYES_NO|wxCANCEL);
 
     dialog.ShowModal();
         _T("About Types"), wxYES_NO|wxCANCEL);
 
     dialog.ShowModal();