fixing reentrancy which happened in tests, bringing client coordinates origins in...

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

diff --git a/samples/typetest/typetest.cpp b/samples/typetest/typetest.cpp
index 8a22895fc148998b38b22c728366d0d5707c20bd..0f3a339c0befd89683d3b73697dcb349cf228e8b 100644 (file)
--- a/samples/typetest/typetest.cpp
+++ b/samples/typetest/typetest.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:       wxWindows license
+// Licence:     wxWindows licence

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


@@ -25,8 +25,8 @@
 
 #include "typetest.h"
 
 
 #include "typetest.h"
 

-#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__)
-#include "mondrian.xpm"
+#ifndef wxHAS_IMAGES_IN_RESOURCES
+    #include "../sample.xpm"

 #endif
 
 #ifdef new
 #endif
 
 #ifdef new


@@ -67,44 +67,47 @@ 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"));
+wxString file_name = wxT("test_wx.dat");
+wxString file_name2 = wxString(wxT("test_wx2.dat"));

 
 bool MyApp::OnInit()
 {
 
 bool MyApp::OnInit()
 {

+    if ( !wxApp::OnInit() )
+        return false;
+

     // Create the main frame window
     // Create the main frame window

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

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

-    frame->SetIcon(wxICON(mondrian));
+    frame->SetIcon(wxICON(sample));

 
     // Make a menubar
     wxMenu *file_menu = new wxMenu;
 
 
     // Make a menubar
     wxMenu *file_menu = new wxMenu;
 

-    file_menu->Append(TYPES_ABOUT, _T("&About"));
+    file_menu->Append(TYPES_ABOUT, wxT("&About"));

     file_menu->AppendSeparator();
     file_menu->AppendSeparator();

-    file_menu->Append(TYPES_QUIT, _T("E&xit\tAlt-X"));
+    file_menu->Append(TYPES_QUIT, wxT("E&xit\tAlt-X"));

 
     wxMenu *test_menu = new wxMenu;
 
     wxMenu *test_menu = new wxMenu;

-    test_menu->Append(TYPES_VARIANT, _T("&Variant test"));
-    test_menu->Append(TYPES_BYTEORDER, _T("&Byteorder test"));
+    test_menu->Append(TYPES_VARIANT, wxT("&Variant test"));
+    test_menu->Append(TYPES_BYTEORDER, wxT("&Byteorder test"));

 #if wxUSE_UNICODE
 #if wxUSE_UNICODE

-    test_menu->Append(TYPES_UNICODE, _T("&Unicode test"));
+    test_menu->Append(TYPES_UNICODE, wxT("&Unicode test"));

 #endif // wxUSE_UNICODE
 #endif // wxUSE_UNICODE

-    test_menu->Append(TYPES_STREAM, _T("&Stream test"));
-    test_menu->Append(TYPES_STREAM2, _T("&Stream seek test"));
-    test_menu->Append(TYPES_STREAM3, _T("&Stream error test"));
-    test_menu->Append(TYPES_STREAM4, _T("&Stream buffer test"));
-    test_menu->Append(TYPES_STREAM5, _T("&Stream peek test"));
-    test_menu->Append(TYPES_STREAM6, _T("&Stream ungetch test"));
-    test_menu->Append(TYPES_STREAM7, _T("&Stream ungetch test for a buffered stream"));
+    test_menu->Append(TYPES_STREAM, wxT("&Stream test"));
+    test_menu->Append(TYPES_STREAM2, wxT("&Stream seek test"));
+    test_menu->Append(TYPES_STREAM3, wxT("&Stream error test"));
+    test_menu->Append(TYPES_STREAM4, wxT("&Stream buffer test"));
+    test_menu->Append(TYPES_STREAM5, wxT("&Stream peek test"));
+    test_menu->Append(TYPES_STREAM6, wxT("&Stream ungetch test"));
+    test_menu->Append(TYPES_STREAM7, wxT("&Stream ungetch test for a buffered stream"));

     test_menu->AppendSeparator();
     test_menu->AppendSeparator();

-    test_menu->Append(TYPES_MIME, _T("&MIME database test"));
+    test_menu->Append(TYPES_MIME, wxT("&MIME database test"));

 
     wxMenuBar *menu_bar = new wxMenuBar;
 
     wxMenuBar *menu_bar = new wxMenuBar;

-    menu_bar->Append(file_menu, _T("&File"));
-    menu_bar->Append(test_menu, _T("&Tests"));
+    menu_bar->Append(file_menu, wxT("&File"));
+    menu_bar->Append(test_menu, wxT("&Tests"));

     frame->SetMenuBar(menu_bar);
 
     m_textCtrl = new wxTextCtrl(frame, wxID_ANY, wxEmptyString,
     frame->SetMenuBar(menu_bar);
 
     m_textCtrl = new wxTextCtrl(frame, wxID_ANY, wxEmptyString,


@@ -113,8 +116,6 @@ bool MyApp::OnInit()
     // Show the frame
     frame->Show(true);
 
     // Show the frame
     frame->Show(true);
 

-    SetTopWindow(frame);
-

     return true;
 }
 
     return true;
 }
 


@@ -123,9 +124,9 @@ void MyApp::DoStreamDemo(wxCommandEvent& WXUNUSED(event))
     wxTextCtrl& textCtrl = * GetTextCtrl();
 
     textCtrl.Clear();
     wxTextCtrl& textCtrl = * GetTextCtrl();
 
     textCtrl.Clear();

-    textCtrl << _T("\nTest fstream vs. wxFileStream:\n\n");
+    textCtrl << wxT("\nTest fstream vs. wxFileStream:\n\n");

 
 

-    textCtrl.WriteText( _T("Writing to ofstream and wxFileOutputStream:\n") );
+    textCtrl.WriteText( wxT("Writing to ofstream and wxFileOutputStream:\n") );

 
     wxSTD ofstream std_file_output( "test_std.dat" );
     wxFileOutputStream file_output( file_name );
 
     wxSTD ofstream std_file_output( "test_std.dat" );
     wxFileOutputStream file_output( file_name );


@@ -134,62 +135,64 @@ void MyApp::DoStreamDemo(wxCommandEvent& WXUNUSED(event))
 
     wxString tmp;
     signed int si = 0xFFFFFFFF;
 
     wxString tmp;
     signed int si = 0xFFFFFFFF;

-    tmp.Printf( _T("Signed int: %d\n"), si );
+    tmp.Printf( wxT("Signed int: %d\n"), si );

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

-    text_output << si << _T("\n");
+    text_output << si << wxT("\n");

     std_file_output << si << "\n";
 
     unsigned int ui = 0xFFFFFFFF;
     std_file_output << si << "\n";
 
     unsigned int ui = 0xFFFFFFFF;

-    tmp.Printf( _T("Unsigned int: %u\n"), ui );
+    tmp.Printf( wxT("Unsigned int: %u\n"), ui );

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

-    text_output << ui << _T("\n");
+    text_output << ui << wxT("\n");

     std_file_output << ui << "\n";
 
     double d = 2.01234567890123456789;
     std_file_output << ui << "\n";
 
     double d = 2.01234567890123456789;

-    tmp.Printf( _T("Double: %f\n"), d );
+    tmp.Printf( wxT("Double: %f\n"), d );

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

-    text_output << d << _T("\n");
+    text_output << d << wxT("\n");

     std_file_output << d << "\n";
 
     float f = (float)0.00001;
     std_file_output << d << "\n";
 
     float f = (float)0.00001;

-    tmp.Printf( _T("Float: %f\n"), f );
+    tmp.Printf( wxT("Float: %f\n"), f );

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

-    text_output << f << _T("\n");
+    text_output << f << wxT("\n");

     std_file_output << f << "\n";
 
     std_file_output << f << "\n";
 

-    wxString str( _T("Hello!") );
-    tmp.Printf( _T("String: %s\n"), str.c_str() );
+    wxString str( wxT("Hello!") );
+    tmp.Printf( wxT("String: %s\n"), str.c_str() );

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

-    text_output << str << _T("\n");
+    text_output << str << wxT("\n");

     std_file_output << str.ToAscii() << "\n";
 
     std_file_output << str.ToAscii() << "\n";
 

-    textCtrl.WriteText( _T("\nReading from ifstream:\n") );
+    std_file_output.close();
+
+    textCtrl.WriteText( wxT("\nReading from ifstream:\n") );

 
     wxSTD ifstream std_file_input( "test_std.dat" );
 
     std_file_input >> si;
 
     wxSTD ifstream std_file_input( "test_std.dat" );
 
     std_file_input >> si;

-    tmp.Printf( _T("Signed int: %d\n"), si );
+    tmp.Printf( wxT("Signed int: %d\n"), si );

     textCtrl.WriteText( tmp );
 
     std_file_input >> ui;
     textCtrl.WriteText( tmp );
 
     std_file_input >> ui;

-    tmp.Printf( _T("Unsigned int: %u\n"), ui );
+    tmp.Printf( wxT("Unsigned int: %u\n"), ui );

     textCtrl.WriteText( tmp );
 
     std_file_input >> d;
     textCtrl.WriteText( tmp );
 
     std_file_input >> d;

-    tmp.Printf( _T("Double: %f\n"), d );
+    tmp.Printf( wxT("Double: %f\n"), d );

     textCtrl.WriteText( tmp );
 
     std_file_input >> f;
     textCtrl.WriteText( tmp );
 
     std_file_input >> f;

-    tmp.Printf( _T("Float: %f\n"), f );
+    tmp.Printf( wxT("Float: %f\n"), f );

     textCtrl.WriteText( tmp );
 
     char std_buf[200];
     std_file_input >> std_buf;
     str = wxString::FromAscii(std_buf);
     textCtrl.WriteText( tmp );
 
     char std_buf[200];
     std_file_input >> std_buf;
     str = wxString::FromAscii(std_buf);

-    tmp.Printf( _T("String: %s\n"), str.c_str() );
+    tmp.Printf( wxT("String: %s\n"), str.c_str() );

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

-    textCtrl.WriteText( _T("\nReading from wxFileInputStream:\n") );
+    textCtrl.WriteText( wxT("\nReading from wxFileInputStream:\n") );

 
     buf_output.Sync();
 
 
     buf_output.Sync();
 


@@ -198,75 +201,75 @@ void MyApp::DoStreamDemo(wxCommandEvent& WXUNUSED(event))
     wxTextInputStream text_input( file_input );
 
     text_input >> si;
     wxTextInputStream text_input( file_input );
 
     text_input >> si;

-    tmp.Printf( _T("Signed int: %d\n"), si );
+    tmp.Printf( wxT("Signed int: %d\n"), si );

     textCtrl.WriteText( tmp );
 
     text_input >> ui;
     textCtrl.WriteText( tmp );
 
     text_input >> ui;

-    tmp.Printf( _T("Unsigned int: %u\n"), ui );
+    tmp.Printf( wxT("Unsigned int: %u\n"), ui );

     textCtrl.WriteText( tmp );
 
     text_input >> d;
     textCtrl.WriteText( tmp );
 
     text_input >> d;

-    tmp.Printf( _T("Double: %f\n"), d );
+    tmp.Printf( wxT("Double: %f\n"), d );

     textCtrl.WriteText( tmp );
 
     text_input >> f;
     textCtrl.WriteText( tmp );
 
     text_input >> f;

-    tmp.Printf( _T("Float: %f\n"), f );
+    tmp.Printf( wxT("Float: %f\n"), f );

     textCtrl.WriteText( tmp );
 
     text_input >> str;
     textCtrl.WriteText( tmp );
 
     text_input >> str;

-    tmp.Printf( _T("String: %s\n"), str.c_str() );
+    tmp.Printf( wxT("String: %s\n"), str.c_str() );

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

-    textCtrl << _T("\nTest for wxDataStream:\n\n");
+    textCtrl << wxT("\nTest for wxDataStream:\n\n");

 
 

-    textCtrl.WriteText( _T("Writing to wxDataOutputStream:\n") );
+    textCtrl.WriteText( wxT("Writing to wxDataOutputStream:\n") );

 
     file_output.SeekO( 0 );
     wxDataOutputStream data_output( buf_output );
 
     wxInt16 i16 = (unsigned short)0xFFFF;
 
     file_output.SeekO( 0 );
     wxDataOutputStream data_output( buf_output );
 
     wxInt16 i16 = (unsigned short)0xFFFF;

-    tmp.Printf( _T("Signed int16: %d\n"), (int)i16 );
+    tmp.Printf( wxT("Signed int16: %d\n"), (int)i16 );

     textCtrl.WriteText( tmp );
     data_output.Write16( i16 );
 
     wxUint16 ui16 = 0xFFFF;
     textCtrl.WriteText( tmp );
     data_output.Write16( i16 );
 
     wxUint16 ui16 = 0xFFFF;

-    tmp.Printf( _T("Unsigned int16: %u\n"), (unsigned int) ui16 );
+    tmp.Printf( wxT("Unsigned int16: %u\n"), (unsigned int) ui16 );

     textCtrl.WriteText( tmp );
     data_output.Write16( ui16 );
 
     d = 2.01234567890123456789;
     textCtrl.WriteText( tmp );
     data_output.Write16( ui16 );
 
     d = 2.01234567890123456789;

-    tmp.Printf( _T("Double: %f\n"), d );
+    tmp.Printf( wxT("Double: %f\n"), d );

     textCtrl.WriteText( tmp );
     data_output.WriteDouble( d );
 
     textCtrl.WriteText( tmp );
     data_output.WriteDouble( d );
 

-    str = _T("Hello!");
-    tmp.Printf( _T("String: %s\n"), str.c_str() );
+    str = wxT("Hello!");
+    tmp.Printf( wxT("String: %s\n"), str.c_str() );

     textCtrl.WriteText( tmp );
     data_output.WriteString( str );
 
     buf_output.Sync();
 
     textCtrl.WriteText( tmp );
     data_output.WriteString( str );
 
     buf_output.Sync();
 

-    textCtrl.WriteText( _T("\nReading from wxDataInputStream:\n") );
+    textCtrl.WriteText( wxT("\nReading from wxDataInputStream:\n") );

 
     file_input.SeekI( 0 );
     wxDataInputStream data_input( buf_input );
 
     i16 = data_input.Read16();
 
     file_input.SeekI( 0 );
     wxDataInputStream data_input( buf_input );
 
     i16 = data_input.Read16();

-    tmp.Printf( _T("Signed int16: %d\n"), (int)i16 );
+    tmp.Printf( wxT("Signed int16: %d\n"), (int)i16 );

     textCtrl.WriteText( tmp );
 
     ui16 = data_input.Read16();
     textCtrl.WriteText( tmp );
 
     ui16 = data_input.Read16();

-    tmp.Printf( _T("Unsigned int16: %u\n"), (unsigned int) ui16 );
+    tmp.Printf( wxT("Unsigned int16: %u\n"), (unsigned int) ui16 );

     textCtrl.WriteText( tmp );
 
     d = data_input.ReadDouble();
     textCtrl.WriteText( tmp );
 
     d = data_input.ReadDouble();

-    tmp.Printf( _T("Double: %f\n"), d );
+    tmp.Printf( wxT("Double: %f\n"), d );

     textCtrl.WriteText( tmp );
 
     str = data_input.ReadString();
     textCtrl.WriteText( tmp );
 
     str = data_input.ReadString();

-    tmp.Printf( _T("String: %s\n"), str.c_str() );
+    tmp.Printf( wxT("String: %s\n"), str.c_str() );

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


@@ -275,11 +278,11 @@ void MyApp::DoStreamDemo2(wxCommandEvent& WXUNUSED(event))
     wxTextCtrl& textCtrl = * GetTextCtrl();
 
     textCtrl.Clear();
     wxTextCtrl& textCtrl = * GetTextCtrl();
 
     textCtrl.Clear();

-    textCtrl << _T("\nTesting wxBufferedStream:\n\n");
+    textCtrl << wxT("\nTesting wxBufferedStream:\n\n");

 
     char ch,ch2;
 
 
     char ch,ch2;
 

-    textCtrl.WriteText( _T("Writing number 0 to 9 to buffered wxFileOutputStream:\n\n") );
+    textCtrl.WriteText( wxT("Writing number 0 to 9 to buffered wxFileOutputStream:\n\n") );

 
     wxFileOutputStream file_output( file_name );
     wxBufferedOutputStream buf_output( file_output );
 
     wxFileOutputStream file_output( file_name );
     wxBufferedOutputStream buf_output( file_output );


@@ -291,12 +294,12 @@ void MyApp::DoStreamDemo2(wxCommandEvent& WXUNUSED(event))
     for (ch2 = 0; ch2 < 10; ch2++)
     {
         file_input.Read( &ch, 1 );
     for (ch2 = 0; ch2 < 10; ch2++)
     {
         file_input.Read( &ch, 1 );

-        textCtrl.WriteText( (wxChar)(ch + _T('0')) );
+        textCtrl.WriteText( (wxChar)(ch + wxT('0')) );

     }
     }

-    textCtrl.WriteText( _T("\n\n\n") );
+    textCtrl.WriteText( wxT("\n\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") );
+    textCtrl.WriteText( wxT("Writing number 0 to 9 to buffered wxFileOutputStream, then\n") );
+    textCtrl.WriteText( wxT("seeking back to #3 and writing 0:\n\n") );

 
     wxFileOutputStream file_output2( file_name2 );
     wxBufferedOutputStream buf_output2( file_output2 );
 
     wxFileOutputStream file_output2( file_name2 );
     wxBufferedOutputStream buf_output2( file_output2 );


@@ -311,9 +314,9 @@ void MyApp::DoStreamDemo2(wxCommandEvent& WXUNUSED(event))
     for (ch2 = 0; ch2 < 10; ch2++)
     {
         file_input2.Read( &ch, 1 );
     for (ch2 = 0; ch2 < 10; ch2++)
     {
         file_input2.Read( &ch, 1 );

-        textCtrl.WriteText( (wxChar)(ch + _T('0')) );
+        textCtrl.WriteText( (wxChar)(ch + wxT('0')) );

     }
     }

-    textCtrl.WriteText( _T("\n\n\n") );
+    textCtrl.WriteText( wxT("\n\n\n") );

 
     // now append 2000 bytes to file (bigger than buffer)
     buf_output2.SeekO( 0, wxFromEnd );
 
     // now append 2000 bytes to file (bigger than buffer)
     buf_output2.SeekO( 0, wxFromEnd );


@@ -322,23 +325,23 @@ void MyApp::DoStreamDemo2(wxCommandEvent& WXUNUSED(event))
        buf_output2.Write( &ch, 1 );
     buf_output2.Sync();
 
        buf_output2.Write( &ch, 1 );
     buf_output2.Sync();
 

-    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( wxT("Reading number 0 to 9 from buffered wxFileInputStream, then\n") );
+    textCtrl.WriteText( wxT("seeking back to #3 and reading the 0:\n\n") );

 
     wxFileInputStream file_input3( file_name2 );
     wxBufferedInputStream buf_input3( file_input3 );
     for (ch2 = 0; ch2 < 10; ch2++)
     {
         buf_input3.Read( &ch, 1 );
 
     wxFileInputStream file_input3( file_name2 );
     wxBufferedInputStream buf_input3( file_input3 );
     for (ch2 = 0; ch2 < 10; ch2++)
     {
         buf_input3.Read( &ch, 1 );

-        textCtrl.WriteText( (wxChar)(ch + _T('0')) );
+        textCtrl.WriteText( (wxChar)(ch + wxT('0')) );

     }
     for (int j = 0; j < 2000; j++)
        buf_input3.Read( &ch, 1 );
     }
     for (int j = 0; j < 2000; j++)
        buf_input3.Read( &ch, 1 );

-    textCtrl.WriteText( _T("\n") );
+    textCtrl.WriteText( wxT("\n") );

     buf_input3.SeekI( 3 );
     buf_input3.Read( &ch, 1 );
     buf_input3.SeekI( 3 );
     buf_input3.Read( &ch, 1 );

-    textCtrl.WriteText( (wxChar)(ch + _T('0')) );
-    textCtrl.WriteText( _T("\n\n\n") );
+    textCtrl.WriteText( (wxChar)(ch + wxT('0')) );
+    textCtrl.WriteText( wxT("\n\n\n") );

 
 }
 
 
 }
 


@@ -347,11 +350,11 @@ void MyApp::DoStreamDemo3(wxCommandEvent& WXUNUSED(event))
     wxTextCtrl& textCtrl = * GetTextCtrl();
 
     textCtrl.Clear();
     wxTextCtrl& textCtrl = * GetTextCtrl();
 
     textCtrl.Clear();

-    textCtrl << _T("\nTesting wxFileInputStream's and wxFFileInputStream's error handling:\n\n");
+    textCtrl << wxT("\nTesting wxFileInputStream's and wxFFileInputStream's error handling:\n\n");

 
     char ch,ch2;
 
 
     char ch,ch2;
 

-    textCtrl.WriteText( _T("Writing number 0 to 9 to wxFileOutputStream:\n\n") );
+    textCtrl.WriteText( wxT("Writing number 0 to 9 to wxFileOutputStream:\n\n") );

 
     wxFileOutputStream file_output( file_name );
     for (ch = 0; ch < 10; ch++)
 
     wxFileOutputStream file_output( file_name );
     for (ch = 0; ch < 10; ch++)


@@ -359,147 +362,147 @@ void MyApp::DoStreamDemo3(wxCommandEvent& WXUNUSED(event))
 
     // Testing wxFileInputStream
 
 
     // Testing wxFileInputStream
 

-    textCtrl.WriteText( _T("Reading 0 to 10 to wxFileInputStream:\n\n") );
+    textCtrl.WriteText( wxT("Reading 0 to 10 to wxFileInputStream:\n\n") );

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

-        textCtrl.WriteText( _T("Value read: ") );
+        textCtrl.WriteText( wxT("Value read: ") );

         textCtrl.WriteText( (wxChar)(ch + '0') );
         textCtrl.WriteText( (wxChar)(ch + '0') );

-        textCtrl.WriteText( _T(";  stream.GetLastError() returns: ") );
+        textCtrl.WriteText( wxT(";  stream.GetLastError() returns: ") );

         switch (file_input.GetLastError())
         {
         switch (file_input.GetLastError())
         {

-            case wxSTREAM_NO_ERROR:      textCtrl.WriteText( _T("wxSTREAM_NO_ERROR\n") ); break;
-            case wxSTREAM_EOF:          textCtrl.WriteText( _T("wxSTREAM_EOF\n") ); break;
-            case wxSTREAM_READ_ERROR:   textCtrl.WriteText( _T("wxSTREAM_READ_ERROR\n") ); break;
-            case wxSTREAM_WRITE_ERROR:  textCtrl.WriteText( _T("wxSTREAM_WRITE_ERROR\n") ); break;
-            default: textCtrl.WriteText( _T("Huh?\n") ); break;
+            case wxSTREAM_NO_ERROR:      textCtrl.WriteText( wxT("wxSTREAM_NO_ERROR\n") ); break;
+            case wxSTREAM_EOF:          textCtrl.WriteText( wxT("wxSTREAM_EOF\n") ); break;
+            case wxSTREAM_READ_ERROR:   textCtrl.WriteText( wxT("wxSTREAM_READ_ERROR\n") ); break;
+            case wxSTREAM_WRITE_ERROR:  textCtrl.WriteText( wxT("wxSTREAM_WRITE_ERROR\n") ); break;
+            default: textCtrl.WriteText( wxT("Huh?\n") ); break;

         }
     }
         }
     }

-    textCtrl.WriteText( _T("\n") );
+    textCtrl.WriteText( wxT("\n") );

 
 

-    textCtrl.WriteText( _T("Seeking to 0;  stream.GetLastError() returns: ") );
+    textCtrl.WriteText( wxT("Seeking to 0;  stream.GetLastError() returns: ") );

     file_input.SeekI( 0 );
     switch (file_input.GetLastError())
     {
     file_input.SeekI( 0 );
     switch (file_input.GetLastError())
     {

-        case wxSTREAM_NO_ERROR:      textCtrl.WriteText( _T("wxSTREAM_NO_ERROR\n") ); break;
-        case wxSTREAM_EOF:          textCtrl.WriteText( _T("wxSTREAM_EOF\n") ); break;
-        case wxSTREAM_READ_ERROR:   textCtrl.WriteText( _T("wxSTREAM_READ_ERROR\n") ); break;
-        case wxSTREAM_WRITE_ERROR:  textCtrl.WriteText( _T("wxSTREAM_WRITE_ERROR\n") ); break;
-        default: textCtrl.WriteText( _T("Huh?\n") ); break;
+        case wxSTREAM_NO_ERROR:      textCtrl.WriteText( wxT("wxSTREAM_NO_ERROR\n") ); break;
+        case wxSTREAM_EOF:          textCtrl.WriteText( wxT("wxSTREAM_EOF\n") ); break;
+        case wxSTREAM_READ_ERROR:   textCtrl.WriteText( wxT("wxSTREAM_READ_ERROR\n") ); break;
+        case wxSTREAM_WRITE_ERROR:  textCtrl.WriteText( wxT("wxSTREAM_WRITE_ERROR\n") ); break;
+        default: textCtrl.WriteText( wxT("Huh?\n") ); break;

     }
     }

-    textCtrl.WriteText( _T("\n") );
+    textCtrl.WriteText( wxT("\n") );

 
     file_input.Read( &ch, 1 );
 
     file_input.Read( &ch, 1 );

-    textCtrl.WriteText( _T("Value read: ") );
-    textCtrl.WriteText( (wxChar)(ch + _T('0')) );
-    textCtrl.WriteText( _T(";  stream.GetLastError() returns: ") );
+    textCtrl.WriteText( wxT("Value read: ") );
+    textCtrl.WriteText( (wxChar)(ch + wxT('0')) );
+    textCtrl.WriteText( wxT(";  stream.GetLastError() returns: ") );

     switch (file_input.GetLastError())
     {
     switch (file_input.GetLastError())
     {

-        case wxSTREAM_NO_ERROR:      textCtrl.WriteText( _T("wxSTREAM_NO_ERROR\n") ); break;
-        case wxSTREAM_EOF:          textCtrl.WriteText( _T("wxSTREAM_EOF\n") ); break;
-        case wxSTREAM_READ_ERROR:   textCtrl.WriteText( _T("wxSTREAM_READ_ERROR\n") ); break;
-        case wxSTREAM_WRITE_ERROR:  textCtrl.WriteText( _T("wxSTREAM_WRITE_ERROR\n") ); break;
-        default: textCtrl.WriteText( _T("Huh?\n") ); break;
+        case wxSTREAM_NO_ERROR:      textCtrl.WriteText( wxT("wxSTREAM_NO_ERROR\n") ); break;
+        case wxSTREAM_EOF:          textCtrl.WriteText( wxT("wxSTREAM_EOF\n") ); break;
+        case wxSTREAM_READ_ERROR:   textCtrl.WriteText( wxT("wxSTREAM_READ_ERROR\n") ); break;
+        case wxSTREAM_WRITE_ERROR:  textCtrl.WriteText( wxT("wxSTREAM_WRITE_ERROR\n") ); break;
+        default: textCtrl.WriteText( wxT("Huh?\n") ); break;

     }
     }

-    textCtrl.WriteText( _T("\n\n") );
+    textCtrl.WriteText( wxT("\n\n") );

 
 
     // Testing wxFFileInputStream
 
 
 
     // Testing wxFFileInputStream
 

-    textCtrl.WriteText( _T("Reading 0 to 10 to wxFFileInputStream:\n\n") );
+    textCtrl.WriteText( wxT("Reading 0 to 10 to wxFFileInputStream:\n\n") );

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

-        textCtrl.WriteText( _T("Value read: ") );
+        textCtrl.WriteText( wxT("Value read: ") );

         textCtrl.WriteText( (wxChar)(ch + '0') );
         textCtrl.WriteText( (wxChar)(ch + '0') );

-        textCtrl.WriteText( _T(";  stream.GetLastError() returns: ") );
+        textCtrl.WriteText( wxT(";  stream.GetLastError() returns: ") );

         switch (ffile_input.GetLastError())
         {
         switch (ffile_input.GetLastError())
         {

-            case wxSTREAM_NO_ERROR:      textCtrl.WriteText( _T("wxSTREAM_NO_ERROR\n") ); break;
-            case wxSTREAM_EOF:          textCtrl.WriteText( _T("wxSTREAM_EOF\n") ); break;
-            case wxSTREAM_READ_ERROR:   textCtrl.WriteText( _T("wxSTREAM_READ_ERROR\n") ); break;
-            case wxSTREAM_WRITE_ERROR:  textCtrl.WriteText( _T("wxSTREAM_WRITE_ERROR\n") ); break;
-            default: textCtrl.WriteText( _T("Huh?\n") ); break;
+            case wxSTREAM_NO_ERROR:      textCtrl.WriteText( wxT("wxSTREAM_NO_ERROR\n") ); break;
+            case wxSTREAM_EOF:          textCtrl.WriteText( wxT("wxSTREAM_EOF\n") ); break;
+            case wxSTREAM_READ_ERROR:   textCtrl.WriteText( wxT("wxSTREAM_READ_ERROR\n") ); break;
+            case wxSTREAM_WRITE_ERROR:  textCtrl.WriteText( wxT("wxSTREAM_WRITE_ERROR\n") ); break;
+            default: textCtrl.WriteText( wxT("Huh?\n") ); break;

         }
     }
         }
     }

-    textCtrl.WriteText( _T("\n") );
+    textCtrl.WriteText( wxT("\n") );

 
 

-    textCtrl.WriteText( _T("Seeking to 0;  stream.GetLastError() returns: ") );
+    textCtrl.WriteText( wxT("Seeking to 0;  stream.GetLastError() returns: ") );

     ffile_input.SeekI( 0 );
     switch (ffile_input.GetLastError())
     {
     ffile_input.SeekI( 0 );
     switch (ffile_input.GetLastError())
     {

-        case wxSTREAM_NO_ERROR:      textCtrl.WriteText( _T("wxSTREAM_NO_ERROR\n") ); break;
-        case wxSTREAM_EOF:          textCtrl.WriteText( _T("wxSTREAM_EOF\n") ); break;
-        case wxSTREAM_READ_ERROR:   textCtrl.WriteText( _T("wxSTREAM_READ_ERROR\n") ); break;
-        case wxSTREAM_WRITE_ERROR:  textCtrl.WriteText( _T("wxSTREAM_WRITE_ERROR\n") ); break;
-        default: textCtrl.WriteText( _T("Huh?\n") ); break;
+        case wxSTREAM_NO_ERROR:      textCtrl.WriteText( wxT("wxSTREAM_NO_ERROR\n") ); break;
+        case wxSTREAM_EOF:          textCtrl.WriteText( wxT("wxSTREAM_EOF\n") ); break;
+        case wxSTREAM_READ_ERROR:   textCtrl.WriteText( wxT("wxSTREAM_READ_ERROR\n") ); break;
+        case wxSTREAM_WRITE_ERROR:  textCtrl.WriteText( wxT("wxSTREAM_WRITE_ERROR\n") ); break;
+        default: textCtrl.WriteText( wxT("Huh?\n") ); break;

     }
     }

-    textCtrl.WriteText( _T("\n") );
+    textCtrl.WriteText( wxT("\n") );

 
     ffile_input.Read( &ch, 1 );
 
     ffile_input.Read( &ch, 1 );

-    textCtrl.WriteText( _T("Value read: ") );
+    textCtrl.WriteText( wxT("Value read: ") );

     textCtrl.WriteText( (wxChar)(ch + '0') );
     textCtrl.WriteText( (wxChar)(ch + '0') );

-    textCtrl.WriteText( _T(";  stream.GetLastError() returns: ") );
+    textCtrl.WriteText( wxT(";  stream.GetLastError() returns: ") );

     switch (ffile_input.GetLastError())
     {
     switch (ffile_input.GetLastError())
     {

-        case wxSTREAM_NO_ERROR:      textCtrl.WriteText( _T("wxSTREAM_NO_ERROR\n") ); break;
-        case wxSTREAM_EOF:          textCtrl.WriteText( _T("wxSTREAM_EOF\n") ); break;
-        case wxSTREAM_READ_ERROR:   textCtrl.WriteText( _T("wxSTREAM_READ_ERROR\n") ); break;
-        case wxSTREAM_WRITE_ERROR:  textCtrl.WriteText( _T("wxSTREAM_WRITE_ERROR\n") ); break;
-        default: textCtrl.WriteText( _T("Huh?\n") ); break;
+        case wxSTREAM_NO_ERROR:      textCtrl.WriteText( wxT("wxSTREAM_NO_ERROR\n") ); break;
+        case wxSTREAM_EOF:          textCtrl.WriteText( wxT("wxSTREAM_EOF\n") ); break;
+        case wxSTREAM_READ_ERROR:   textCtrl.WriteText( wxT("wxSTREAM_READ_ERROR\n") ); break;
+        case wxSTREAM_WRITE_ERROR:  textCtrl.WriteText( wxT("wxSTREAM_WRITE_ERROR\n") ); break;
+        default: textCtrl.WriteText( wxT("Huh?\n") ); break;

     }
     }

-    textCtrl.WriteText( _T("\n\n") );
+    textCtrl.WriteText( wxT("\n\n") );

 
     // Testing wxFFileInputStream
 
 
     // Testing wxFFileInputStream
 

-    textCtrl.WriteText( _T("Reading 0 to 10 to buffered wxFFileInputStream:\n\n") );
+    textCtrl.WriteText( wxT("Reading 0 to 10 to buffered wxFFileInputStream:\n\n") );

 
     wxFFileInputStream ffile_input2( file_name );
     wxBufferedInputStream buf_input( ffile_input2 );
     for (ch2 = 0; ch2 < 11; ch2++)
     {
         buf_input.Read( &ch, 1 );
 
     wxFFileInputStream ffile_input2( file_name );
     wxBufferedInputStream buf_input( ffile_input2 );
     for (ch2 = 0; ch2 < 11; ch2++)
     {
         buf_input.Read( &ch, 1 );

-        textCtrl.WriteText( _T("Value read: ") );
+        textCtrl.WriteText( wxT("Value read: ") );

         textCtrl.WriteText( (wxChar)(ch + '0') );
         textCtrl.WriteText( (wxChar)(ch + '0') );

-        textCtrl.WriteText( _T(";  stream.GetLastError() returns: ") );
+        textCtrl.WriteText( wxT(";  stream.GetLastError() returns: ") );

         switch (buf_input.GetLastError())
         {
         switch (buf_input.GetLastError())
         {

-            case wxSTREAM_NO_ERROR:      textCtrl.WriteText( _T("wxSTREAM_NO_ERROR\n") ); break;
-            case wxSTREAM_EOF:          textCtrl.WriteText( _T("wxSTREAM_EOF\n") ); break;
-            case wxSTREAM_READ_ERROR:   textCtrl.WriteText( _T("wxSTREAM_READ_ERROR\n") ); break;
-            case wxSTREAM_WRITE_ERROR:  textCtrl.WriteText( _T("wxSTREAM_WRITE_ERROR\n") ); break;
-            default: textCtrl.WriteText( _T("Huh?\n") ); break;
+            case wxSTREAM_NO_ERROR:      textCtrl.WriteText( wxT("wxSTREAM_NO_ERROR\n") ); break;
+            case wxSTREAM_EOF:          textCtrl.WriteText( wxT("wxSTREAM_EOF\n") ); break;
+            case wxSTREAM_READ_ERROR:   textCtrl.WriteText( wxT("wxSTREAM_READ_ERROR\n") ); break;
+            case wxSTREAM_WRITE_ERROR:  textCtrl.WriteText( wxT("wxSTREAM_WRITE_ERROR\n") ); break;
+            default: textCtrl.WriteText( wxT("Huh?\n") ); break;

         }
     }
         }
     }

-    textCtrl.WriteText( _T("\n") );
+    textCtrl.WriteText( wxT("\n") );

 
 

-    textCtrl.WriteText( _T("Seeking to 0;  stream.GetLastError() returns: ") );
+    textCtrl.WriteText( wxT("Seeking to 0;  stream.GetLastError() returns: ") );

     buf_input.SeekI( 0 );
     switch (buf_input.GetLastError())
     {
     buf_input.SeekI( 0 );
     switch (buf_input.GetLastError())
     {

-        case wxSTREAM_NO_ERROR:      textCtrl.WriteText( _T("wxSTREAM_NO_ERROR\n") ); break;
-        case wxSTREAM_EOF:          textCtrl.WriteText( _T("wxSTREAM_EOF\n") ); break;
-        case wxSTREAM_READ_ERROR:   textCtrl.WriteText( _T("wxSTREAM_READ_ERROR\n") ); break;
-        case wxSTREAM_WRITE_ERROR:  textCtrl.WriteText( _T("wxSTREAM_WRITE_ERROR\n") ); break;
-        default: textCtrl.WriteText( _T("Huh?\n") ); break;
+        case wxSTREAM_NO_ERROR:      textCtrl.WriteText( wxT("wxSTREAM_NO_ERROR\n") ); break;
+        case wxSTREAM_EOF:          textCtrl.WriteText( wxT("wxSTREAM_EOF\n") ); break;
+        case wxSTREAM_READ_ERROR:   textCtrl.WriteText( wxT("wxSTREAM_READ_ERROR\n") ); break;
+        case wxSTREAM_WRITE_ERROR:  textCtrl.WriteText( wxT("wxSTREAM_WRITE_ERROR\n") ); break;
+        default: textCtrl.WriteText( wxT("Huh?\n") ); break;

     }
     }

-    textCtrl.WriteText( _T("\n") );
+    textCtrl.WriteText( wxT("\n") );

 
     buf_input.Read( &ch, 1 );
 
     buf_input.Read( &ch, 1 );

-    textCtrl.WriteText( _T("Value read: ") );
+    textCtrl.WriteText( wxT("Value read: ") );

     textCtrl.WriteText( (wxChar)(ch + '0') );
     textCtrl.WriteText( (wxChar)(ch + '0') );

-    textCtrl.WriteText( _T(";  stream.GetLastError() returns: ") );
+    textCtrl.WriteText( wxT(";  stream.GetLastError() returns: ") );

     switch (buf_input.GetLastError())
     {
     switch (buf_input.GetLastError())
     {

-        case wxSTREAM_NO_ERROR:      textCtrl.WriteText( _T("wxSTREAM_NO_ERROR\n") ); break;
-        case wxSTREAM_EOF:          textCtrl.WriteText( _T("wxSTREAM_EOF\n") ); break;
-        case wxSTREAM_READ_ERROR:   textCtrl.WriteText( _T("wxSTREAM_READ_ERROR\n") ); break;
-        case wxSTREAM_WRITE_ERROR:  textCtrl.WriteText( _T("wxSTREAM_WRITE_ERROR\n") ); break;
-        default: textCtrl.WriteText( _T("Huh?\n") ); break;
+        case wxSTREAM_NO_ERROR:      textCtrl.WriteText( wxT("wxSTREAM_NO_ERROR\n") ); break;
+        case wxSTREAM_EOF:          textCtrl.WriteText( wxT("wxSTREAM_EOF\n") ); break;
+        case wxSTREAM_READ_ERROR:   textCtrl.WriteText( wxT("wxSTREAM_READ_ERROR\n") ); break;
+        case wxSTREAM_WRITE_ERROR:  textCtrl.WriteText( wxT("wxSTREAM_WRITE_ERROR\n") ); break;
+        default: textCtrl.WriteText( wxT("Huh?\n") ); break;

     }
 }
 
     }
 }
 


@@ -510,10 +513,10 @@ void MyApp::DoStreamDemo4(wxCommandEvent& WXUNUSED(event))
     wxString msg;
 
     textCtrl.Clear();
     wxString msg;
 
     textCtrl.Clear();

-    textCtrl << _T("\nTesting wxStreamBuffer:\n\n");
+    textCtrl << wxT("\nTesting wxStreamBuffer:\n\n");

 
     // bigger than buffer
 
     // bigger than buffer

-    textCtrl.WriteText( _T("Writing 2000x 1 to wxFileOutputStream.\n\n") );
+    textCtrl.WriteText( wxT("Writing 2000x 1 to wxFileOutputStream.\n\n") );

 
     wxFileOutputStream file_output( file_name );
     for (int i = 0; i < 2000; i++)
 
     wxFileOutputStream file_output( file_name );
     for (int i = 0; i < 2000; i++)


@@ -522,124 +525,124 @@ void MyApp::DoStreamDemo4(wxCommandEvent& WXUNUSED(event))
         file_output.Write( &ch, 1 );
     }
 
         file_output.Write( &ch, 1 );
     }
 

-    textCtrl.WriteText( _T("Opening with a buffered wxFileInputStream:\n\n") );
+    textCtrl.WriteText( wxT("Opening with a buffered wxFileInputStream:\n\n") );

 
     wxFileInputStream file_input( file_name );
     wxBufferedInputStream buf_input( file_input );
 
 
     wxFileInputStream file_input( file_name );
     wxBufferedInputStream buf_input( file_input );
 

-    textCtrl.WriteText( _T("wxBufferedInputStream.GetLastError() returns: ") );
+    textCtrl.WriteText( wxT("wxBufferedInputStream.GetLastError() returns: ") );

     switch (buf_input.GetLastError())
     {
     switch (buf_input.GetLastError())
     {

-        case wxSTREAM_NO_ERROR:      textCtrl.WriteText( _T("wxSTREAM_NO_ERROR\n") ); break;
-        case wxSTREAM_EOF:          textCtrl.WriteText( _T("wxSTREAM_EOF\n") ); break;
-        case wxSTREAM_READ_ERROR:   textCtrl.WriteText( _T("wxSTREAM_READ_ERROR\n") ); break;
-        case wxSTREAM_WRITE_ERROR:  textCtrl.WriteText( _T("wxSTREAM_WRITE_ERROR\n") ); break;
-        default: textCtrl.WriteText( _T("Huh?\n") ); break;
+        case wxSTREAM_NO_ERROR:      textCtrl.WriteText( wxT("wxSTREAM_NO_ERROR\n") ); break;
+        case wxSTREAM_EOF:          textCtrl.WriteText( wxT("wxSTREAM_EOF\n") ); break;
+        case wxSTREAM_READ_ERROR:   textCtrl.WriteText( wxT("wxSTREAM_READ_ERROR\n") ); break;
+        case wxSTREAM_WRITE_ERROR:  textCtrl.WriteText( wxT("wxSTREAM_WRITE_ERROR\n") ); break;
+        default: textCtrl.WriteText( wxT("Huh?\n") ); break;

     }
     msg.Printf( wxT("wxBufferedInputStream.LastRead() returns: %d\n"), (int)buf_input.LastRead() );
     textCtrl.WriteText( msg );
     msg.Printf( wxT("wxBufferedInputStream.TellI() returns: %d\n"), (int)buf_input.TellI() );
     textCtrl.WriteText( msg );
     }
     msg.Printf( wxT("wxBufferedInputStream.LastRead() returns: %d\n"), (int)buf_input.LastRead() );
     textCtrl.WriteText( msg );
     msg.Printf( wxT("wxBufferedInputStream.TellI() returns: %d\n"), (int)buf_input.TellI() );
     textCtrl.WriteText( msg );

-    textCtrl.WriteText( _T("\n\n") );
+    textCtrl.WriteText( wxT("\n\n") );

 
 
 
 

-    textCtrl.WriteText( _T("Seeking to position 300:\n\n") );
+    textCtrl.WriteText( wxT("Seeking to position 300:\n\n") );

 
     buf_input.SeekI( 300 );
 
 
     buf_input.SeekI( 300 );
 

-    textCtrl.WriteText( _T("wxBufferedInputStream.GetLastError() returns: ") );
+    textCtrl.WriteText( wxT("wxBufferedInputStream.GetLastError() returns: ") );

     switch (buf_input.GetLastError())
     {
     switch (buf_input.GetLastError())
     {

-        case wxSTREAM_NO_ERROR:      textCtrl.WriteText( _T("wxSTREAM_NO_ERROR\n") ); break;
-        case wxSTREAM_EOF:          textCtrl.WriteText( _T("wxSTREAM_EOF\n") ); break;
-        case wxSTREAM_READ_ERROR:   textCtrl.WriteText( _T("wxSTREAM_READ_ERROR\n") ); break;
-        case wxSTREAM_WRITE_ERROR:  textCtrl.WriteText( _T("wxSTREAM_WRITE_ERROR\n") ); break;
-        default: textCtrl.WriteText( _T("Huh?\n") ); break;
+        case wxSTREAM_NO_ERROR:      textCtrl.WriteText( wxT("wxSTREAM_NO_ERROR\n") ); break;
+        case wxSTREAM_EOF:          textCtrl.WriteText( wxT("wxSTREAM_EOF\n") ); break;
+        case wxSTREAM_READ_ERROR:   textCtrl.WriteText( wxT("wxSTREAM_READ_ERROR\n") ); break;
+        case wxSTREAM_WRITE_ERROR:  textCtrl.WriteText( wxT("wxSTREAM_WRITE_ERROR\n") ); break;
+        default: textCtrl.WriteText( wxT("Huh?\n") ); break;

     }
     msg.Printf( wxT("wxBufferedInputStream.LastRead() returns: %d\n"), (int)buf_input.LastRead() );
     textCtrl.WriteText( msg );
     msg.Printf( wxT("wxBufferedInputStream.TellI() returns: %d\n"), (int)buf_input.TellI() );
     textCtrl.WriteText( msg );
     }
     msg.Printf( wxT("wxBufferedInputStream.LastRead() returns: %d\n"), (int)buf_input.LastRead() );
     textCtrl.WriteText( msg );
     msg.Printf( wxT("wxBufferedInputStream.TellI() returns: %d\n"), (int)buf_input.TellI() );
     textCtrl.WriteText( msg );

-    textCtrl.WriteText( _T("\n\n") );
+    textCtrl.WriteText( wxT("\n\n") );

 
 
     char buf[2000];
 
 
 
     char buf[2000];
 

-    textCtrl.WriteText( _T("Reading 500 bytes:\n\n") );
+    textCtrl.WriteText( wxT("Reading 500 bytes:\n\n") );

 
     buf_input.Read( buf, 500 );
 
 
     buf_input.Read( buf, 500 );
 

-    textCtrl.WriteText( _T("wxBufferedInputStream.GetLastError() returns: ") );
+    textCtrl.WriteText( wxT("wxBufferedInputStream.GetLastError() returns: ") );

     switch (buf_input.GetLastError())
     {
     switch (buf_input.GetLastError())
     {

-        case wxSTREAM_NO_ERROR:      textCtrl.WriteText( _T("wxSTREAM_NO_ERROR\n") ); break;
-        case wxSTREAM_EOF:          textCtrl.WriteText( _T("wxSTREAM_EOF\n") ); break;
-        case wxSTREAM_READ_ERROR:   textCtrl.WriteText( _T("wxSTREAM_READ_ERROR\n") ); break;
-        case wxSTREAM_WRITE_ERROR:  textCtrl.WriteText( _T("wxSTREAM_WRITE_ERROR\n") ); break;
-        default: textCtrl.WriteText( _T("Huh?\n") ); break;
+        case wxSTREAM_NO_ERROR:      textCtrl.WriteText( wxT("wxSTREAM_NO_ERROR\n") ); break;
+        case wxSTREAM_EOF:          textCtrl.WriteText( wxT("wxSTREAM_EOF\n") ); break;
+        case wxSTREAM_READ_ERROR:   textCtrl.WriteText( wxT("wxSTREAM_READ_ERROR\n") ); break;
+        case wxSTREAM_WRITE_ERROR:  textCtrl.WriteText( wxT("wxSTREAM_WRITE_ERROR\n") ); break;
+        default: textCtrl.WriteText( wxT("Huh?\n") ); break;

     }
     msg.Printf( wxT("wxBufferedInputStream.LastRead() returns: %d\n"), (int)buf_input.LastRead() );
     textCtrl.WriteText( msg );
     msg.Printf( wxT("wxBufferedInputStream.TellI() returns: %d\n"), (int)buf_input.TellI() );
     textCtrl.WriteText( msg );
     }
     msg.Printf( wxT("wxBufferedInputStream.LastRead() returns: %d\n"), (int)buf_input.LastRead() );
     textCtrl.WriteText( msg );
     msg.Printf( wxT("wxBufferedInputStream.TellI() returns: %d\n"), (int)buf_input.TellI() );
     textCtrl.WriteText( msg );

-    textCtrl.WriteText( _T("\n\n") );
+    textCtrl.WriteText( wxT("\n\n") );

 
 

-    textCtrl.WriteText( _T("Reading another 500 bytes:\n\n") );
+    textCtrl.WriteText( wxT("Reading another 500 bytes:\n\n") );

 
     buf_input.Read( buf, 500 );
 
 
     buf_input.Read( buf, 500 );
 

-    textCtrl.WriteText( _T("wxBufferedInputStream.GetLastError() returns: ") );
+    textCtrl.WriteText( wxT("wxBufferedInputStream.GetLastError() returns: ") );

     switch (buf_input.GetLastError())
     {
     switch (buf_input.GetLastError())
     {

-        case wxSTREAM_NO_ERROR:      textCtrl.WriteText( _T("wxSTREAM_NO_ERROR\n") ); break;
-        case wxSTREAM_EOF:          textCtrl.WriteText( _T("wxSTREAM_EOF\n") ); break;
-        case wxSTREAM_READ_ERROR:   textCtrl.WriteText( _T("wxSTREAM_READ_ERROR\n") ); break;
-        case wxSTREAM_WRITE_ERROR:  textCtrl.WriteText( _T("wxSTREAM_WRITE_ERROR\n") ); break;
-        default: textCtrl.WriteText( _T("Huh?\n") ); break;
+        case wxSTREAM_NO_ERROR:      textCtrl.WriteText( wxT("wxSTREAM_NO_ERROR\n") ); break;
+        case wxSTREAM_EOF:          textCtrl.WriteText( wxT("wxSTREAM_EOF\n") ); break;
+        case wxSTREAM_READ_ERROR:   textCtrl.WriteText( wxT("wxSTREAM_READ_ERROR\n") ); break;
+        case wxSTREAM_WRITE_ERROR:  textCtrl.WriteText( wxT("wxSTREAM_WRITE_ERROR\n") ); break;
+        default: textCtrl.WriteText( wxT("Huh?\n") ); break;

     }
     msg.Printf( wxT("wxBufferedInputStream.LastRead() returns: %d\n"), (int)buf_input.LastRead() );
     textCtrl.WriteText( msg );
     msg.Printf( wxT("wxBufferedInputStream.TellI() returns: %d\n"), (int)buf_input.TellI() );
     textCtrl.WriteText( msg );
     }
     msg.Printf( wxT("wxBufferedInputStream.LastRead() returns: %d\n"), (int)buf_input.LastRead() );
     textCtrl.WriteText( msg );
     msg.Printf( wxT("wxBufferedInputStream.TellI() returns: %d\n"), (int)buf_input.TellI() );
     textCtrl.WriteText( msg );

-    textCtrl.WriteText( _T("\n\n") );
+    textCtrl.WriteText( wxT("\n\n") );

 
 

-    textCtrl.WriteText( _T("Reading another 500 bytes:\n\n") );
+    textCtrl.WriteText( wxT("Reading another 500 bytes:\n\n") );

 
     buf_input.Read( buf, 500 );
 
 
     buf_input.Read( buf, 500 );
 

-    textCtrl.WriteText( _T("wxBufferedInputStream.GetLastError() returns: ") );
+    textCtrl.WriteText( wxT("wxBufferedInputStream.GetLastError() returns: ") );

     switch (buf_input.GetLastError())
     {
     switch (buf_input.GetLastError())
     {

-        case wxSTREAM_NO_ERROR:      textCtrl.WriteText( _T("wxSTREAM_NO_ERROR\n") ); break;
-        case wxSTREAM_EOF:          textCtrl.WriteText( _T("wxSTREAM_EOF\n") ); break;
-        case wxSTREAM_READ_ERROR:   textCtrl.WriteText( _T("wxSTREAM_READ_ERROR\n") ); break;
-        case wxSTREAM_WRITE_ERROR:  textCtrl.WriteText( _T("wxSTREAM_WRITE_ERROR\n") ); break;
-        default: textCtrl.WriteText( _T("Huh?\n") ); break;
+        case wxSTREAM_NO_ERROR:      textCtrl.WriteText( wxT("wxSTREAM_NO_ERROR\n") ); break;
+        case wxSTREAM_EOF:          textCtrl.WriteText( wxT("wxSTREAM_EOF\n") ); break;
+        case wxSTREAM_READ_ERROR:   textCtrl.WriteText( wxT("wxSTREAM_READ_ERROR\n") ); break;
+        case wxSTREAM_WRITE_ERROR:  textCtrl.WriteText( wxT("wxSTREAM_WRITE_ERROR\n") ); break;
+        default: textCtrl.WriteText( wxT("Huh?\n") ); break;

     }
     msg.Printf( wxT("wxBufferedInputStream.LastRead() returns: %d\n"), (int)buf_input.LastRead() );
     textCtrl.WriteText( msg );
     msg.Printf( wxT("wxBufferedInputStream.TellI() returns: %d\n"), (int)buf_input.TellI() );
     textCtrl.WriteText( msg );
     }
     msg.Printf( wxT("wxBufferedInputStream.LastRead() returns: %d\n"), (int)buf_input.LastRead() );
     textCtrl.WriteText( msg );
     msg.Printf( wxT("wxBufferedInputStream.TellI() returns: %d\n"), (int)buf_input.TellI() );
     textCtrl.WriteText( msg );

-    textCtrl.WriteText( _T("\n\n") );
+    textCtrl.WriteText( wxT("\n\n") );

 
 

-    textCtrl.WriteText( _T("Reading another 500 bytes:\n\n") );
+    textCtrl.WriteText( wxT("Reading another 500 bytes:\n\n") );

 
     buf_input.Read( buf, 500 );
 
 
     buf_input.Read( buf, 500 );
 

-    textCtrl.WriteText( _T("wxBufferedInputStream.GetLastError() returns: ") );
+    textCtrl.WriteText( wxT("wxBufferedInputStream.GetLastError() returns: ") );

     switch (buf_input.GetLastError())
     {
     switch (buf_input.GetLastError())
     {

-        case wxSTREAM_NO_ERROR:      textCtrl.WriteText( _T("wxSTREAM_NO_ERROR\n") ); break;
-        case wxSTREAM_EOF:          textCtrl.WriteText( _T("wxSTREAM_EOF\n") ); break;
-        case wxSTREAM_READ_ERROR:   textCtrl.WriteText( _T("wxSTREAM_READ_ERROR\n") ); break;
-        case wxSTREAM_WRITE_ERROR:  textCtrl.WriteText( _T("wxSTREAM_WRITE_ERROR\n") ); break;
-        default: textCtrl.WriteText( _T("Huh?\n") ); break;
+        case wxSTREAM_NO_ERROR:      textCtrl.WriteText( wxT("wxSTREAM_NO_ERROR\n") ); break;
+        case wxSTREAM_EOF:          textCtrl.WriteText( wxT("wxSTREAM_EOF\n") ); break;
+        case wxSTREAM_READ_ERROR:   textCtrl.WriteText( wxT("wxSTREAM_READ_ERROR\n") ); break;
+        case wxSTREAM_WRITE_ERROR:  textCtrl.WriteText( wxT("wxSTREAM_WRITE_ERROR\n") ); break;
+        default: textCtrl.WriteText( wxT("Huh?\n") ); break;

     }
     msg.Printf( wxT("wxBufferedInputStream.LastRead() returns: %d\n"), (int)buf_input.LastRead() );
     textCtrl.WriteText( msg );
     msg.Printf( wxT("wxBufferedInputStream.TellI() returns: %d\n"), (int)buf_input.TellI() );
     textCtrl.WriteText( msg );
     }
     msg.Printf( wxT("wxBufferedInputStream.LastRead() returns: %d\n"), (int)buf_input.LastRead() );
     textCtrl.WriteText( msg );
     msg.Printf( wxT("wxBufferedInputStream.TellI() returns: %d\n"), (int)buf_input.TellI() );
     textCtrl.WriteText( msg );

-    textCtrl.WriteText( _T("\n\n") );
+    textCtrl.WriteText( wxT("\n\n") );

 }
 
 void MyApp::DoStreamDemo5(wxCommandEvent& WXUNUSED(event))
 }
 
 void MyApp::DoStreamDemo5(wxCommandEvent& WXUNUSED(event))


@@ -647,12 +650,12 @@ void MyApp::DoStreamDemo5(wxCommandEvent& WXUNUSED(event))
     wxTextCtrl& textCtrl = * GetTextCtrl();
 
     textCtrl.Clear();
     wxTextCtrl& textCtrl = * GetTextCtrl();
 
     textCtrl.Clear();

-    textCtrl << _T("\nTesting wxFileInputStream's Peek():\n\n");
+    textCtrl << wxT("\nTesting wxFileInputStream's Peek():\n\n");

 
     char ch;
     wxString str;
 
 
     char ch;
     wxString str;
 

-    textCtrl.WriteText( _T("Writing number 0 to 9 to wxFileOutputStream:\n\n") );
+    textCtrl.WriteText( wxT("Writing number 0 to 9 to wxFileOutputStream:\n\n") );

 
     wxFileOutputStream file_output( file_name );
     for (ch = 0; ch < 10; ch++)
 
     wxFileOutputStream file_output( file_name );
     for (ch = 0; ch < 10; ch++)


@@ -687,7 +690,7 @@ void MyApp::DoStreamDemo5(wxCommandEvent& WXUNUSED(event))
     textCtrl.WriteText( str );
 
 
     textCtrl.WriteText( str );
 
 

-    textCtrl << _T("\n\n\nTesting wxMemoryInputStream's Peek():\n\n");
+    textCtrl << wxT("\n\n\nTesting wxMemoryInputStream's Peek():\n\n");

 
     char buf[] = { 0,1,2,3,4,5,6,7,8,9,10 };
     wxMemoryInputStream input( buf, 10 );
 
     char buf[] = { 0,1,2,3,4,5,6,7,8,9,10 };
     wxMemoryInputStream input( buf, 10 );


@@ -722,12 +725,12 @@ void MyApp::DoStreamDemo6(wxCommandEvent& WXUNUSED(event))
     wxTextCtrl& textCtrl = * GetTextCtrl();
 
     textCtrl.Clear();
     wxTextCtrl& textCtrl = * GetTextCtrl();
 
     textCtrl.Clear();

-    textCtrl.WriteText( _T("\nTesting Ungetch():\n\n") );
+    textCtrl.WriteText( wxT("\nTesting Ungetch():\n\n") );

 
     char ch = 0;
     wxString str;
 
 
     char ch = 0;
     wxString str;
 

-    textCtrl.WriteText( _T("Writing number 0 to 9 to wxFileOutputStream...\n\n") );
+    textCtrl.WriteText( wxT("Writing number 0 to 9 to wxFileOutputStream...\n\n") );

 
     wxFileOutputStream file_output( file_name );
     for (ch = 0; ch < 10; ch++)
 
     wxFileOutputStream file_output( file_name );
     for (ch = 0; ch < 10; ch++)


@@ -735,7 +738,7 @@ void MyApp::DoStreamDemo6(wxCommandEvent& WXUNUSED(event))
 
     file_output.Sync();
 
 
     file_output.Sync();
 

-    textCtrl.WriteText( _T("Reading char from wxFileInputStream:\n\n") );
+    textCtrl.WriteText( wxT("Reading char from wxFileInputStream:\n\n") );

 
     wxFileInputStream file_input( file_name );
 
 
     wxFileInputStream file_input( file_name );
 


@@ -744,49 +747,49 @@ void MyApp::DoStreamDemo6(wxCommandEvent& WXUNUSED(event))
     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 );
 

-    textCtrl.WriteText( _T("Reading another char from wxFileInputStream:\n\n") );
+    textCtrl.WriteText( wxT("Reading another char from wxFileInputStream:\n\n") );

 
     ch = file_input.GetC();
     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 );
 
 
     ch = file_input.GetC();
     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") );
+    textCtrl.WriteText( wxT("Reading yet another char from wxFileInputStream:\n\n") );

 
     ch = file_input.GetC();
     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 );
 
 
     ch = file_input.GetC();
     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") );
+    textCtrl.WriteText( wxT("Now calling Ungetch( 5 ) from wxFileInputStream...\n\n") );

 
     file_input.Ungetch( 5 );
     pos = (size_t)file_input.TellI();
     str.Printf( wxT("Now at position %d\n\n"), (int) pos );
     textCtrl.WriteText( str );
 
 
     file_input.Ungetch( 5 );
     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") );
+    textCtrl.WriteText( wxT("Reading char from wxFileInputStream:\n\n") );

 
     ch = file_input.GetC();
     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 );
 
 
     ch = file_input.GetC();
     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") );
+    textCtrl.WriteText( wxT("Reading another char from wxFileInputStream:\n\n") );

 
     ch = file_input.GetC();
     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 );
 
 
     ch = file_input.GetC();
     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") );
+    textCtrl.WriteText( wxT("Now calling Ungetch( 5 ) from wxFileInputStream again...\n\n") );

 
     file_input.Ungetch( 5 );
     pos = (size_t)file_input.TellI();
     str.Printf( wxT("Now at position %d\n\n"), (int) pos );
     textCtrl.WriteText( str );
 
 
     file_input.Ungetch( 5 );
     pos = (size_t)file_input.TellI();
     str.Printf( wxT("Now at position %d\n\n"), (int) pos );
     textCtrl.WriteText( str );
 

-    textCtrl.WriteText( _T("Seeking to pos 3 in wxFileInputStream. This invalidates the writeback buffer.\n\n") );
+    textCtrl.WriteText( wxT("Seeking to pos 3 in wxFileInputStream. This invalidates the writeback buffer.\n\n") );

 
     file_input.SeekI( 3 );
 
 
     file_input.SeekI( 3 );
 


@@ -801,12 +804,12 @@ void MyApp::DoStreamDemo7(wxCommandEvent& WXUNUSED(event))
     wxTextCtrl& textCtrl = * GetTextCtrl();
 
     textCtrl.Clear();
     wxTextCtrl& textCtrl = * GetTextCtrl();
 
     textCtrl.Clear();

-    textCtrl.WriteText( _T("\nTesting Ungetch() in buffered input stream:\n\n") );
+    textCtrl.WriteText( wxT("\nTesting Ungetch() in buffered input stream:\n\n") );

 
     char ch = 0;
     wxString str;
 
 
     char ch = 0;
     wxString str;
 

-    textCtrl.WriteText( _T("Writing number 0 to 9 to wxFileOutputStream...\n\n") );
+    textCtrl.WriteText( wxT("Writing number 0 to 9 to wxFileOutputStream...\n\n") );

 
     wxFileOutputStream file_output( file_name );
     for (ch = 0; ch < 10; ch++)
 
     wxFileOutputStream file_output( file_name );
     for (ch = 0; ch < 10; ch++)


@@ -814,7 +817,7 @@ void MyApp::DoStreamDemo7(wxCommandEvent& WXUNUSED(event))
 
     file_output.Sync();
 
 
     file_output.Sync();
 

-    textCtrl.WriteText( _T("Reading char from wxBufferedInputStream via wxFileInputStream:\n\n") );
+    textCtrl.WriteText( wxT("Reading char from wxBufferedInputStream via wxFileInputStream:\n\n") );

 
     wxFileInputStream file_input( file_name );
     wxBufferedInputStream buf_input( file_input );
 
     wxFileInputStream file_input( file_name );
     wxBufferedInputStream buf_input( file_input );


@@ -824,49 +827,49 @@ void MyApp::DoStreamDemo7(wxCommandEvent& WXUNUSED(event))
     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 );
 

-    textCtrl.WriteText( _T("Reading another char from wxBufferedInputStream:\n\n") );
+    textCtrl.WriteText( wxT("Reading another char from wxBufferedInputStream:\n\n") );

 
     ch = buf_input.GetC();
     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 );
 
 
     ch = buf_input.GetC();
     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") );
+    textCtrl.WriteText( wxT("Reading yet another char from wxBufferedInputStream:\n\n") );

 
     ch = buf_input.GetC();
     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 );
 
 
     ch = buf_input.GetC();
     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") );
+    textCtrl.WriteText( wxT("Now calling Ungetch( 5 ) from wxBufferedInputStream...\n\n") );

 
     buf_input.Ungetch( 5 );
     pos = (size_t)buf_input.TellI();
     str.Printf( wxT("Now at position %d\n\n"), (int) pos );
     textCtrl.WriteText( str );
 
 
     buf_input.Ungetch( 5 );
     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") );
+    textCtrl.WriteText( wxT("Reading char from wxBufferedInputStream:\n\n") );

 
     ch = buf_input.GetC();
     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 );
 
 
     ch = buf_input.GetC();
     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") );
+    textCtrl.WriteText( wxT("Reading another char from wxBufferedInputStream:\n\n") );

 
     ch = buf_input.GetC();
     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 );
 
 
     ch = buf_input.GetC();
     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") );
+    textCtrl.WriteText( wxT("Now calling Ungetch( 5 ) from wxBufferedInputStream again...\n\n") );

 
     buf_input.Ungetch( 5 );
     pos = (size_t)buf_input.TellI();
     str.Printf( wxT("Now at position %d\n\n"), (int) pos );
     textCtrl.WriteText( str );
 
 
     buf_input.Ungetch( 5 );
     pos = (size_t)buf_input.TellI();
     str.Printf( wxT("Now at position %d\n\n"), (int) pos );
     textCtrl.WriteText( str );
 

-    textCtrl.WriteText( _T("Seeking to pos 3 in wxBufferedInputStream. This invalidates the writeback buffer.\n\n") );
+    textCtrl.WriteText( wxT("Seeking to pos 3 in wxBufferedInputStream. This invalidates the writeback buffer.\n\n") );

 
     buf_input.SeekI( 3 );
 
 
     buf_input.SeekI( 3 );
 


@@ -882,27 +885,27 @@ void MyApp::DoUnicodeDemo(wxCommandEvent& WXUNUSED(event))
     wxTextCtrl& textCtrl = * GetTextCtrl();
 
     textCtrl.Clear();
     wxTextCtrl& textCtrl = * GetTextCtrl();
 
     textCtrl.Clear();

-    textCtrl << _T("\nTest wchar_t to char (Unicode to ANSI/Multibyte) converions:");
+    textCtrl << wxT("\nTest wchar_t to char (Unicode to ANSI/Multibyte) converions:");

 
     wxString str;
 
     wxString str;

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

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

-    printf( (const char*) str.mbc_str() );
+    puts( str.mbc_str() );

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

-    printf( (const char*) str.mbc_str() );
+    puts( str.mbc_str() );

 
 }
 #endif
 
 void MyApp::DoMIMEDemo(wxCommandEvent& WXUNUSED(event))
 {
 
 }
 #endif
 
 void MyApp::DoMIMEDemo(wxCommandEvent& WXUNUSED(event))
 {

-    static wxString s_defaultExt = _T("xyz");
+    static wxString s_defaultExt = wxT("xyz");

 
 

-    wxString ext = wxGetTextFromUser(_T("Enter a file extension: "),
-                                     _T("MIME database test"),
+    wxString ext = wxGetTextFromUser(wxT("Enter a file extension: "),
+                                     wxT("MIME database test"),

                                      s_defaultExt);
     if ( !!ext )
     {
                                      s_defaultExt);
     if ( !!ext )
     {


@@ -915,16 +918,16 @@ void MyApp::DoMIMEDemo(wxCommandEvent& WXUNUSED(event))
 
             static const wxFileTypeInfo fallbacks[] =
             {
 
             static const wxFileTypeInfo fallbacks[] =
             {

-                wxFileTypeInfo(_T("application/xyz"),
-                               _T("XyZ %s"),
-                               _T("XyZ -p %s"),
-                               _T("The one and only XYZ format file"),
-                               _T("xyz"), _T("123"), NULL),
-                wxFileTypeInfo(_T("text/html"),
-                               _T("lynx %s"),
-                               _T("lynx -dump %s | lpr"),
-                               _T("HTML document (from fallback)"),
-                               _T("htm"), _T("html"), NULL),
+                wxFileTypeInfo(wxT("application/xyz"),
+                               wxT("XyZ %s"),
+                               wxT("XyZ -p %s"),
+                               wxT("The one and only XYZ format file"),
+                               wxT("xyz"), wxT("123"), wxNullPtr),
+                wxFileTypeInfo(wxT("text/html"),
+                               wxT("lynx %s"),
+                               wxT("lynx -dump %s | lpr"),
+                               wxT("HTML document (from fallback)"),
+                               wxT("htm"), wxT("html"), wxNullPtr),

 
                 // must terminate the table with this!
                 wxFileTypeInfo()
 
                 // must terminate the table with this!
                 wxFileTypeInfo()


@@ -938,7 +941,7 @@ void MyApp::DoMIMEDemo(wxCommandEvent& WXUNUSED(event))
         wxFileType *filetype = m_mimeDatabase->GetFileTypeFromExtension(ext);
         if ( !filetype )
         {
         wxFileType *filetype = m_mimeDatabase->GetFileTypeFromExtension(ext);
         if ( !filetype )
         {

-            textCtrl << _T("Unknown extension '") << ext << _T("'\n");
+            textCtrl << wxT("Unknown extension '") << ext << wxT("'\n");

         }
         else
         {
         }
         else
         {


@@ -946,18 +949,17 @@ void MyApp::DoMIMEDemo(wxCommandEvent& WXUNUSED(event))
             filetype->GetMimeType(&type);
             filetype->GetDescription(&desc);
 
             filetype->GetMimeType(&type);
             filetype->GetDescription(&desc);
 

-            wxString filename = _T("filename");
-            filename << _T(".") << ext;
+            wxString filename = wxT("filename");
+            filename << wxT(".") << ext;

             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')
-                     << _T("\tMIME type: ") << ( !type ? wxT("unknown")
-                                                   : type.c_str() ) << _T('\n')
-                     << _T("\tDescription: ") << ( !desc ? wxEmptyString : desc.c_str() )
-                        << _T('\n')
-                     << _T("\tCommand to open: ") << ( !open ? wxT("no") : open.c_str() )
-                        << _T('\n');
+            textCtrl << wxT("MIME information about extension '") << ext << wxT('\n')
+                     << wxT("\tMIME type: ") << ( !type ? wxString("unknown") : type ) << wxT('\n')
+                     << wxT("\tDescription: ") << ( !desc ? wxString(wxEmptyString) : desc )
+                        << wxT('\n')
+                     << wxT("\tCommand to open: ") << ( !open ? wxString("no") : open )
+                        << wxT('\n');

 
             delete filetype;
         }
 
             delete filetype;
         }


@@ -970,31 +972,31 @@ void MyApp::DoByteOrderDemo(wxCommandEvent& WXUNUSED(event))
     wxTextCtrl& textCtrl = * GetTextCtrl();
 
     textCtrl.Clear();
     wxTextCtrl& textCtrl = * GetTextCtrl();
 
     textCtrl.Clear();

-    textCtrl << _T("\nTest byte order macros:\n\n");
+    textCtrl << wxT("\nTest byte order macros:\n\n");

 
     #if wxBYTE_ORDER == wxLITTLE_ENDIAN
 
     #if wxBYTE_ORDER == wxLITTLE_ENDIAN

-        textCtrl << _T("This is a little endian system.\n\n");
+        textCtrl << wxT("This is a little endian system.\n\n");

     #else
     #else

-        textCtrl << _T("This is a big endian system.\n\n");
+        textCtrl << wxT("This is a big endian system.\n\n");

     #endif
 
     wxString text;
 
     wxInt32 var = 0xF1F2F3F4;
     text = wxEmptyString;
     #endif
 
     wxString text;
 
     wxInt32 var = 0xF1F2F3F4;
     text = wxEmptyString;

-    text.Printf( _T("Value of wxInt32 is now: %#x.\n\n"), var );
+    text.Printf( wxT("Value of wxInt32 is now: %#x.\n\n"), var );

     textCtrl.WriteText( text );
 
     text = wxEmptyString;
     textCtrl.WriteText( text );
 
     text = wxEmptyString;

-    text.Printf( _T("Value of swapped wxInt32 is: %#x.\n\n"), wxINT32_SWAP_ALWAYS( var ) );
+    text.Printf( wxT("Value of swapped wxInt32 is: %#x.\n\n"), wxINT32_SWAP_ALWAYS( var ) );

     textCtrl.WriteText( text );
 
     text = wxEmptyString;
     textCtrl.WriteText( text );
 
     text = wxEmptyString;

-    text.Printf( _T("Value of wxInt32 swapped on little endian is: %#x.\n\n"), wxINT32_SWAP_ON_LE( var ) );
+    text.Printf( wxT("Value of wxInt32 swapped on little endian is: %#x.\n\n"), wxINT32_SWAP_ON_LE( var ) );

     textCtrl.WriteText( text );
 
     text = wxEmptyString;
     textCtrl.WriteText( text );
 
     text = wxEmptyString;

-    text.Printf( _T("Value of wxInt32 swapped on big endian is: %#x.\n\n"), wxINT32_SWAP_ON_BE( var ) );
+    text.Printf( wxT("Value of wxInt32 swapped on big endian is: %#x.\n\n"), wxINT32_SWAP_ON_BE( var ) );

     textCtrl.WriteText( text );
 }
 
     textCtrl.WriteText( text );
 }
 


@@ -1002,20 +1004,20 @@ void MyApp::DoVariantDemo(wxCommandEvent& WXUNUSED(event) )
 {
     wxTextCtrl& textCtrl = * GetTextCtrl();
 
 {
     wxTextCtrl& textCtrl = * GetTextCtrl();
 

-    wxVariant var1 = _T("String value");
-    textCtrl << _T("var1 = ") << var1.MakeString() << _T("\n");
+    wxVariant var1 = wxT("String value");
+    textCtrl << wxT("var1 = ") << var1.MakeString() << wxT("\n");

 
     // Conversion
     wxString str = var1.MakeString();
 
     var1 = 123.456;
 
     // Conversion
     wxString str = var1.MakeString();
 
     var1 = 123.456;

-    textCtrl << _T("var1 = ") << var1.GetReal() << _T("\n");
+    textCtrl << wxT("var1 = ") << var1.GetReal() << wxT("\n");

 
     // Implicit conversion
     double v = var1;
 
     var1 = 9876L;
 
     // Implicit conversion
     double v = var1;
 
     var1 = 9876L;

-    textCtrl << _T("var1 = ") << var1.GetLong() << _T("\n");
+    textCtrl << wxT("var1 = ") << var1.GetLong() << wxT("\n");

 
     // Implicit conversion
     long l = var1;
 
     // Implicit conversion
     long l = var1;


@@ -1025,34 +1027,34 @@ void MyApp::DoVariantDemo(wxCommandEvent& WXUNUSED(event) )
     wxUnusedVar(v);
 
     wxArrayString stringArray;
     wxUnusedVar(v);
 
     wxArrayString stringArray;

-    stringArray.Add(_T("one")); stringArray.Add(_T("two")); stringArray.Add(_T("three"));
+    stringArray.Add(wxT("one")); stringArray.Add(wxT("two")); stringArray.Add(wxT("three"));

     var1 = stringArray;
     var1 = stringArray;

-    textCtrl << _T("var1 = ") << var1.MakeString() << _T("\n");
+    textCtrl << wxT("var1 = ") << var1.MakeString() << wxT("\n");

 
     var1.ClearList();
     var1.Append(wxVariant(1.2345));
 
     var1.ClearList();
     var1.Append(wxVariant(1.2345));

-    var1.Append(wxVariant(_T("hello")));
+    var1.Append(wxVariant(wxT("hello")));

     var1.Append(wxVariant(54321L));
 
     var1.Append(wxVariant(54321L));
 

-    textCtrl << _T("var1 = ") << var1.MakeString() << _T("\n");
+    textCtrl << wxT("var1 = ") << var1.MakeString() << wxT("\n");

 
     size_t n = var1.GetCount();
     size_t i;
     for (i = (size_t) 0; i < n; i++)
     {
 
     size_t n = var1.GetCount();
     size_t i;
     for (i = (size_t) 0; i < n; i++)
     {

-        textCtrl << _T("var1[") << (int) i << _T("] (type ") << var1[i].GetType() << _T(") = ") << var1[i].MakeString() << _T("\n");
+        textCtrl << wxT("var1[") << (int) i << wxT("] (type ") << var1[i].GetType() << wxT(") = ") << var1[i].MakeString() << wxT("\n");

     }
 
     var1 = wxVariant(new wxFont(wxSystemSettings::GetFont(wxSYS_OEM_FIXED_FONT)));
     }
 
     var1 = wxVariant(new wxFont(wxSystemSettings::GetFont(wxSYS_OEM_FIXED_FONT)));

-    textCtrl << _T("var1 = (wxfont)\"");
+    textCtrl << wxT("var1 = (wxfont)\"");

     wxFont* font = wxGetVariantCast(var1,wxFont);
     if (font)
     {
     wxFont* font = wxGetVariantCast(var1,wxFont);
     if (font)
     {

-        textCtrl << font->GetNativeFontInfoDesc() << _T("\"\n");
+        textCtrl << font->GetNativeFontInfoDesc() << wxT("\"\n");

     }
     else
     {
     }
     else
     {

-        textCtrl << _T("(null)\"\n");
+        textCtrl << wxT("(null)\"\n");

     }
 }
 
     }
 }
 


@@ -1074,8 +1076,8 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) )
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
 {
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
 {

-    wxMessageDialog dialog(this, _T("Tests various wxWidgets types"),
-        _T("About Types"), wxYES_NO|wxCANCEL);
+    wxMessageDialog dialog(this, wxT("Tests various wxWidgets types"),
+        wxT("About Types"), wxYES_NO|wxCANCEL);

 
     dialog.ShowModal();
 }
 
     dialog.ShowModal();
 }