fixed mouse input handling in wxUniv: the static boxes ust be transparent

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

diff --git a/samples/typetest/typetest.cpp b/samples/typetest/typetest.cpp
index 639e063fdbc35afcd74e84511a78303f5a5065fd..8f6ef265dcec558284e92e41bf2eeb942680ec32 100644 (file)
--- a/samples/typetest/typetest.cpp
+++ b/samples/typetest/typetest.cpp
@@ -31,10 +31,14 @@
 
 #include "typetest.h"
 
 
 #include "typetest.h"
 

-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__)

 #include "mondrian.xpm"
 #endif
 
 #include "mondrian.xpm"
 #endif
 

+#ifdef new
+#undef new
+#endif
+

 #include "wx/ioswrap.h"
 
 #if wxUSE_IOSTREAMH
 #include "wx/ioswrap.h"
 
 #if wxUSE_IOSTREAMH


@@ -46,6 +50,7 @@
 #include "wx/wfstream.h"
 #include "wx/datstrm.h"
 #include "wx/txtstrm.h"
 #include "wx/wfstream.h"
 #include "wx/datstrm.h"
 #include "wx/txtstrm.h"

+#include "wx/mstream.h"

 
 // Create a new application object
 IMPLEMENT_APP    (MyApp)
 
 // Create a new application object
 IMPLEMENT_APP    (MyApp)


@@ -53,17 +58,20 @@ IMPLEMENT_APP    (MyApp)
 IMPLEMENT_DYNAMIC_CLASS    (MyApp, wxApp)
 
 BEGIN_EVENT_TABLE(MyApp, wxApp)
 IMPLEMENT_DYNAMIC_CLASS    (MyApp, wxApp)
 
 BEGIN_EVENT_TABLE(MyApp, wxApp)

+#if wxUSE_TIMEDATE

     EVT_MENU(TYPES_DATE,      MyApp::DoDateDemo)
     EVT_MENU(TYPES_TIME,      MyApp::DoTimeDemo)
     EVT_MENU(TYPES_DATE,      MyApp::DoDateDemo)
     EVT_MENU(TYPES_TIME,      MyApp::DoTimeDemo)

+#endif // wxUSE_TIMEDATE

     EVT_MENU(TYPES_VARIANT,   MyApp::DoVariantDemo)
     EVT_MENU(TYPES_BYTEORDER, MyApp::DoByteOrderDemo)
 #if wxUSE_UNICODE
     EVT_MENU(TYPES_UNICODE,   MyApp::DoUnicodeDemo)
     EVT_MENU(TYPES_VARIANT,   MyApp::DoVariantDemo)
     EVT_MENU(TYPES_BYTEORDER, MyApp::DoByteOrderDemo)
 #if wxUSE_UNICODE
     EVT_MENU(TYPES_UNICODE,   MyApp::DoUnicodeDemo)

-#endif
+#endif // wxUSE_UNICODE

     EVT_MENU(TYPES_STREAM, MyApp::DoStreamDemo)
     EVT_MENU(TYPES_STREAM2, MyApp::DoStreamDemo2)
     EVT_MENU(TYPES_STREAM3, MyApp::DoStreamDemo3)
     EVT_MENU(TYPES_STREAM4, MyApp::DoStreamDemo4)
     EVT_MENU(TYPES_STREAM, MyApp::DoStreamDemo)
     EVT_MENU(TYPES_STREAM2, MyApp::DoStreamDemo2)
     EVT_MENU(TYPES_STREAM3, MyApp::DoStreamDemo3)
     EVT_MENU(TYPES_STREAM4, MyApp::DoStreamDemo4)

+    EVT_MENU(TYPES_STREAM5, MyApp::DoStreamDemo5)

     EVT_MENU(TYPES_MIME, MyApp::DoMIMEDemo)
 END_EVENT_TABLE()
 
     EVT_MENU(TYPES_MIME, MyApp::DoMIMEDemo)
 END_EVENT_TABLE()
 


@@ -84,17 +92,20 @@ bool MyApp::OnInit()
     file_menu->Append(TYPES_QUIT, "E&xit\tAlt-X");
 
     wxMenu *test_menu = new wxMenu;
     file_menu->Append(TYPES_QUIT, "E&xit\tAlt-X");
 
     wxMenu *test_menu = new wxMenu;

+#if wxUSE_TIMEDATE

     test_menu->Append(TYPES_DATE, "&Date test");
     test_menu->Append(TYPES_DATE, "&Date test");

+#endif // wxUSE_TIMEDATE

     test_menu->Append(TYPES_TIME, "&Time test");
     test_menu->Append(TYPES_VARIANT, "&Variant test");
     test_menu->Append(TYPES_BYTEORDER, "&Byteorder test");
 #if wxUSE_UNICODE
     test_menu->Append(TYPES_UNICODE, "&Unicode test");
     test_menu->Append(TYPES_TIME, "&Time test");
     test_menu->Append(TYPES_VARIANT, "&Variant test");
     test_menu->Append(TYPES_BYTEORDER, "&Byteorder test");
 #if wxUSE_UNICODE
     test_menu->Append(TYPES_UNICODE, "&Unicode test");

-#endif
+#endif // wxUSE_UNICODE

     test_menu->Append(TYPES_STREAM, "&Stream test");
     test_menu->Append(TYPES_STREAM2, "&Stream seek test");
     test_menu->Append(TYPES_STREAM3, "&Stream error test");
     test_menu->Append(TYPES_STREAM4, "&Stream buffer test");
     test_menu->Append(TYPES_STREAM, "&Stream test");
     test_menu->Append(TYPES_STREAM2, "&Stream seek test");
     test_menu->Append(TYPES_STREAM3, "&Stream error test");
     test_menu->Append(TYPES_STREAM4, "&Stream buffer test");

+    test_menu->Append(TYPES_STREAM5, "&Stream peek test");

     test_menu->AppendSeparator();
     test_menu->Append(TYPES_MIME, "&MIME database test");
 
     test_menu->AppendSeparator();
     test_menu->Append(TYPES_MIME, "&MIME database test");
 


@@ -122,8 +133,8 @@ void MyApp::DoStreamDemo(wxCommandEvent& WXUNUSED(event))
 
     textCtrl.WriteText( "Writing to ofstream and wxFileOutputStream:\n" );
 
 
     textCtrl.WriteText( "Writing to ofstream and wxFileOutputStream:\n" );
 

-    ofstream std_file_output( "test_std.dat" );
-    wxFileOutputStream file_output( "test_wx.dat" );
+    wxSTD ofstream std_file_output( "test_std.dat" );
+    wxFileOutputStream file_output( wxString("test_wx.dat") );

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


@@ -157,10 +168,10 @@ void MyApp::DoStreamDemo(wxCommandEvent& WXUNUSED(event))
     textCtrl.WriteText( tmp );
     text_output << str << "\n";
     std_file_output << str.c_str() << "\n";
     textCtrl.WriteText( tmp );
     text_output << str << "\n";
     std_file_output << str.c_str() << "\n";

-
+    

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

-    ifstream std_file_input( "test_std.dat" );
+    wxSTD ifstream std_file_input( "test_std.dat" );

 
     std_file_input >> si;
     tmp.Printf( _T("Signed int: %d\n"), si );
 
     std_file_input >> si;
     tmp.Printf( _T("Signed int: %d\n"), si );


@@ -178,15 +189,19 @@ 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 );
 

-    std_file_input >> str;
-    tmp.Printf( _T("String: %s\n"), str.c_str() );
+    // Why doesn't this work?
+#if 0
+    char std_buf[200];
+    std_file_input >> std_buf;
+    tmp.Printf( _T("String: %s\n"), std_buf );

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

+#endif

 
     textCtrl.WriteText( "\nReading from wxFileInputStream:\n" );
 
     buf_output.Sync();
 
 
     textCtrl.WriteText( "\nReading from wxFileInputStream:\n" );
 
     buf_output.Sync();
 

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

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


@@ -211,6 +226,7 @@ void MyApp::DoStreamDemo(wxCommandEvent& WXUNUSED(event))
     textCtrl.WriteText( tmp );
 
 
     textCtrl.WriteText( tmp );
 
 

+

     textCtrl << "\nTest for wxDataStream:\n\n";
 
     textCtrl.WriteText( "Writing to wxDataOutputStream:\n" );
     textCtrl << "\nTest for wxDataStream:\n\n";
 
     textCtrl.WriteText( "Writing to wxDataOutputStream:\n" );


@@ -218,7 +234,7 @@ void MyApp::DoStreamDemo(wxCommandEvent& WXUNUSED(event))
     file_output.SeekO( 0 );
     wxDataOutputStream data_output( buf_output );
 
     file_output.SeekO( 0 );
     wxDataOutputStream data_output( buf_output );
 

-    wxInt16 i16 = (short)0xFFFF;
+    wxInt16 i16 = (unsigned short)0xFFFF;

     tmp.Printf( _T("Signed int16: %d\n"), (int)i16 );
     textCtrl.WriteText( tmp );
     data_output.Write16( i16 );
     tmp.Printf( _T("Signed int16: %d\n"), (int)i16 );
     textCtrl.WriteText( tmp );
     data_output.Write16( i16 );


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

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

     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( "test_wx.dat" );
+    wxFileInputStream file_input( wxString("test_wx.dat") );

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

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

     }
     textCtrl.WriteText( "\n\n\n" );
     
     textCtrl.WriteText( "Writing number 0 to 9 to buffered wxFileOutputStream, then\n" );
     textCtrl.WriteText( "seeking back to #3 and writing 3:\n\n" );
 
     }
     textCtrl.WriteText( "\n\n\n" );
     
     textCtrl.WriteText( "Writing number 0 to 9 to buffered wxFileOutputStream, then\n" );
     textCtrl.WriteText( "seeking back to #3 and writing 3:\n\n" );
 

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

     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 );


@@ -299,11 +315,11 @@ 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( "test_wx2.dat" );
+    wxFileInputStream file_input2( wxString("test_wx2.dat") );

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

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

     }
     textCtrl.WriteText( "\n\n\n" );
     
     }
     textCtrl.WriteText( "\n\n\n" );
     


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

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

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

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

     }
     for (int j = 0; j < 2000; j++)
        buf_input3.Read( &ch, 1 );
     textCtrl.WriteText( "\n" );
     buf_input3.SeekI( 3 );
     buf_input3.Read( &ch, 1 );
     }
     for (int j = 0; j < 2000; j++)
        buf_input3.Read( &ch, 1 );
     textCtrl.WriteText( "\n" );
     buf_input3.SeekI( 3 );
     buf_input3.Read( &ch, 1 );

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

     textCtrl.WriteText( "\n\n\n" );
     
 }
     textCtrl.WriteText( "\n\n\n" );
     
 }


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

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

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


@@ -353,21 +369,21 @@ void MyApp::DoStreamDemo3(wxCommandEvent& WXUNUSED(event))
     
     textCtrl.WriteText( "Reading 0 to 10 to wxFileInputStream:\n\n" );
 
     
     textCtrl.WriteText( "Reading 0 to 10 to wxFileInputStream:\n\n" );
 

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

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

-       textCtrl.WriteText( "Value read: " );
-       textCtrl.WriteText( (char)(ch + '0') );
-       textCtrl.WriteText( ";  stream.LastError() returns: " );
-       switch (file_input.LastError())
-       {
-           case wxSTREAM_NOERROR:      textCtrl.WriteText( "wxSTREAM_NOERROR\n" ); break;
-           case wxSTREAM_EOF:          textCtrl.WriteText( "wxSTREAM_EOF\n" ); break;
-           case wxSTREAM_READ_ERROR:   textCtrl.WriteText( "wxSTREAM_READ_ERROR\n" ); break;
-           case wxSTREAM_WRITE_ERROR:  textCtrl.WriteText( "wxSTREAM_WRITE_ERROR\n" ); break;
-           default: textCtrl.WriteText( "Huh?\n" ); break;
-       }
+        textCtrl.WriteText( "Value read: " );
+        textCtrl.WriteText( (wxChar)(ch + '0') );
+        textCtrl.WriteText( ";  stream.LastError() returns: " );
+        switch (file_input.LastError())
+        {
+            case wxSTREAM_NOERROR:      textCtrl.WriteText( "wxSTREAM_NOERROR\n" ); break;
+            case wxSTREAM_EOF:          textCtrl.WriteText( "wxSTREAM_EOF\n" ); break;
+            case wxSTREAM_READ_ERROR:   textCtrl.WriteText( "wxSTREAM_READ_ERROR\n" ); break;
+            case wxSTREAM_WRITE_ERROR:  textCtrl.WriteText( "wxSTREAM_WRITE_ERROR\n" ); break;
+            default: textCtrl.WriteText( "Huh?\n" ); break;
+        }

     }
     textCtrl.WriteText( "\n" );
     
     }
     textCtrl.WriteText( "\n" );
     


@@ -375,25 +391,25 @@ void MyApp::DoStreamDemo3(wxCommandEvent& WXUNUSED(event))
     file_input.SeekI( 0 );
     switch (file_input.LastError())
     {
     file_input.SeekI( 0 );
     switch (file_input.LastError())
     {

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

     }
     textCtrl.WriteText( "\n" );
     
     file_input.Read( &ch, 1 );
     textCtrl.WriteText( "Value read: " );
     }
     textCtrl.WriteText( "\n" );
     
     file_input.Read( &ch, 1 );
     textCtrl.WriteText( "Value read: " );

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

     textCtrl.WriteText( ";  stream.LastError() returns: " );
     switch (file_input.LastError())
     {
     textCtrl.WriteText( ";  stream.LastError() returns: " );
     switch (file_input.LastError())
     {

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

     }
     textCtrl.WriteText( "\n\n" );
 
     }
     textCtrl.WriteText( "\n\n" );
 


@@ -402,21 +418,21 @@ void MyApp::DoStreamDemo3(wxCommandEvent& WXUNUSED(event))
     
     textCtrl.WriteText( "Reading 0 to 10 to wxFFileInputStream:\n\n" );
 
     
     textCtrl.WriteText( "Reading 0 to 10 to wxFFileInputStream:\n\n" );
 

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

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

-       textCtrl.WriteText( "Value read: " );
-       textCtrl.WriteText( (char)(ch + '0') );
-       textCtrl.WriteText( ";  stream.LastError() returns: " );
-       switch (ffile_input.LastError())
-       {
-           case wxSTREAM_NOERROR:      textCtrl.WriteText( "wxSTREAM_NOERROR\n" ); break;
-           case wxSTREAM_EOF:          textCtrl.WriteText( "wxSTREAM_EOF\n" ); break;
-           case wxSTREAM_READ_ERROR:   textCtrl.WriteText( "wxSTREAM_READ_ERROR\n" ); break;
-           case wxSTREAM_WRITE_ERROR:  textCtrl.WriteText( "wxSTREAM_WRITE_ERROR\n" ); break;
-           default: textCtrl.WriteText( "Huh?\n" ); break;
-       }
+        textCtrl.WriteText( "Value read: " );
+        textCtrl.WriteText( (wxChar)(ch + '0') );
+        textCtrl.WriteText( ";  stream.LastError() returns: " );
+        switch (ffile_input.LastError())
+        {
+            case wxSTREAM_NOERROR:      textCtrl.WriteText( "wxSTREAM_NOERROR\n" ); break;
+            case wxSTREAM_EOF:          textCtrl.WriteText( "wxSTREAM_EOF\n" ); break;
+            case wxSTREAM_READ_ERROR:   textCtrl.WriteText( "wxSTREAM_READ_ERROR\n" ); break;
+            case wxSTREAM_WRITE_ERROR:  textCtrl.WriteText( "wxSTREAM_WRITE_ERROR\n" ); break;
+            default: textCtrl.WriteText( "Huh?\n" ); break;
+           }

     }
     textCtrl.WriteText( "\n" );
     
     }
     textCtrl.WriteText( "\n" );
     


@@ -424,25 +440,25 @@ void MyApp::DoStreamDemo3(wxCommandEvent& WXUNUSED(event))
     ffile_input.SeekI( 0 );
     switch (ffile_input.LastError())
     {
     ffile_input.SeekI( 0 );
     switch (ffile_input.LastError())
     {

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

     }
     textCtrl.WriteText( "\n" );
     
     ffile_input.Read( &ch, 1 );
     textCtrl.WriteText( "Value read: " );
     }
     textCtrl.WriteText( "\n" );
     
     ffile_input.Read( &ch, 1 );
     textCtrl.WriteText( "Value read: " );

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

     textCtrl.WriteText( ";  stream.LastError() returns: " );
     switch (ffile_input.LastError())
     {
     textCtrl.WriteText( ";  stream.LastError() returns: " );
     switch (ffile_input.LastError())
     {

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

     }
     textCtrl.WriteText( "\n\n" );
 
     }
     textCtrl.WriteText( "\n\n" );
 


@@ -450,22 +466,22 @@ void MyApp::DoStreamDemo3(wxCommandEvent& WXUNUSED(event))
     
     textCtrl.WriteText( "Reading 0 to 10 to buffered wxFFileInputStream:\n\n" );
 
     
     textCtrl.WriteText( "Reading 0 to 10 to buffered wxFFileInputStream:\n\n" );
 

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

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

-       textCtrl.WriteText( "Value read: " );
-       textCtrl.WriteText( (char)(ch + '0') );
-       textCtrl.WriteText( ";  stream.LastError() returns: " );
-       switch (buf_input.LastError())
-       {
-           case wxSTREAM_NOERROR:      textCtrl.WriteText( "wxSTREAM_NOERROR\n" ); break;
-           case wxSTREAM_EOF:          textCtrl.WriteText( "wxSTREAM_EOF\n" ); break;
-           case wxSTREAM_READ_ERROR:   textCtrl.WriteText( "wxSTREAM_READ_ERROR\n" ); break;
-           case wxSTREAM_WRITE_ERROR:  textCtrl.WriteText( "wxSTREAM_WRITE_ERROR\n" ); break;
-           default: textCtrl.WriteText( "Huh?\n" ); break;
-       }
+        textCtrl.WriteText( "Value read: " );
+        textCtrl.WriteText( (wxChar)(ch + '0') );
+        textCtrl.WriteText( ";  stream.LastError() returns: " );
+        switch (buf_input.LastError())
+        {
+            case wxSTREAM_NOERROR:      textCtrl.WriteText( "wxSTREAM_NOERROR\n" ); break;
+            case wxSTREAM_EOF:          textCtrl.WriteText( "wxSTREAM_EOF\n" ); break;
+            case wxSTREAM_READ_ERROR:   textCtrl.WriteText( "wxSTREAM_READ_ERROR\n" ); break;
+            case wxSTREAM_WRITE_ERROR:  textCtrl.WriteText( "wxSTREAM_WRITE_ERROR\n" ); break;
+            default: textCtrl.WriteText( "Huh?\n" ); break;
+        }

     }
     textCtrl.WriteText( "\n" );
     
     }
     textCtrl.WriteText( "\n" );
     


@@ -473,25 +489,25 @@ void MyApp::DoStreamDemo3(wxCommandEvent& WXUNUSED(event))
     buf_input.SeekI( 0 );
     switch (buf_input.LastError())
     {
     buf_input.SeekI( 0 );
     switch (buf_input.LastError())
     {

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

     }
     textCtrl.WriteText( "\n" );
     
     buf_input.Read( &ch, 1 );
     textCtrl.WriteText( "Value read: " );
     }
     textCtrl.WriteText( "\n" );
     
     buf_input.Read( &ch, 1 );
     textCtrl.WriteText( "Value read: " );

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

     textCtrl.WriteText( ";  stream.LastError() returns: " );
     switch (buf_input.LastError())
     {
     textCtrl.WriteText( ";  stream.LastError() returns: " );
     switch (buf_input.LastError())
     {

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

     }
 }
 
     }
 }
 


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

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

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


@@ -516,21 +532,21 @@ void MyApp::DoStreamDemo4(wxCommandEvent& WXUNUSED(event))
 
     textCtrl.WriteText( "Opening with a buffered wxFileInputStream:\n\n" );
 
 
     textCtrl.WriteText( "Opening with a buffered wxFileInputStream:\n\n" );
 

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

     wxBufferedInputStream buf_input( file_input );
     
     textCtrl.WriteText( "wxBufferedInputStream.LastError() returns: " );
     switch (buf_input.LastError())
     {
         case wxSTREAM_NOERROR:      textCtrl.WriteText( "wxSTREAM_NOERROR\n" ); break;
     wxBufferedInputStream buf_input( file_input );
     
     textCtrl.WriteText( "wxBufferedInputStream.LastError() returns: " );
     switch (buf_input.LastError())
     {
         case wxSTREAM_NOERROR:      textCtrl.WriteText( "wxSTREAM_NOERROR\n" ); break;

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

     }
     }

-    msg.Printf( "wxBufferedInputStream.LastRead() returns: %d\n", (int)buf_input.LastRead() );
+    msg.Printf( wxT("wxBufferedInputStream.LastRead() returns: %d\n"), (int)buf_input.LastRead() );

     textCtrl.WriteText( msg );
     textCtrl.WriteText( msg );

-    msg.Printf( "wxBufferedInputStream.TellI() returns: %d\n", (int)buf_input.TellI() );
+    msg.Printf( wxT("wxBufferedInputStream.TellI() returns: %d\n"), (int)buf_input.TellI() );

     textCtrl.WriteText( msg );
     textCtrl.WriteText( "\n\n" );
     
     textCtrl.WriteText( msg );
     textCtrl.WriteText( "\n\n" );
     


@@ -543,14 +559,14 @@ void MyApp::DoStreamDemo4(wxCommandEvent& WXUNUSED(event))
     switch (buf_input.LastError())
     {
         case wxSTREAM_NOERROR:      textCtrl.WriteText( "wxSTREAM_NOERROR\n" ); break;
     switch (buf_input.LastError())
     {
         case wxSTREAM_NOERROR:      textCtrl.WriteText( "wxSTREAM_NOERROR\n" ); break;

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

     }
     }

-    msg.Printf( "wxBufferedInputStream.LastRead() returns: %d\n", (int)buf_input.LastRead() );
+    msg.Printf( wxT("wxBufferedInputStream.LastRead() returns: %d\n"), (int)buf_input.LastRead() );

     textCtrl.WriteText( msg );
     textCtrl.WriteText( msg );

-    msg.Printf( "wxBufferedInputStream.TellI() returns: %d\n", (int)buf_input.TellI() );
+    msg.Printf( wxT("wxBufferedInputStream.TellI() returns: %d\n"), (int)buf_input.TellI() );

     textCtrl.WriteText( msg );
     textCtrl.WriteText( "\n\n" );
     
     textCtrl.WriteText( msg );
     textCtrl.WriteText( "\n\n" );
     


@@ -565,14 +581,14 @@ void MyApp::DoStreamDemo4(wxCommandEvent& WXUNUSED(event))
     switch (buf_input.LastError())
     {
         case wxSTREAM_NOERROR:      textCtrl.WriteText( "wxSTREAM_NOERROR\n" ); break;
     switch (buf_input.LastError())
     {
         case wxSTREAM_NOERROR:      textCtrl.WriteText( "wxSTREAM_NOERROR\n" ); break;

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

     }
     }

-    msg.Printf( "wxBufferedInputStream.LastRead() returns: %d\n", (int)buf_input.LastRead() );
+    msg.Printf( wxT("wxBufferedInputStream.LastRead() returns: %d\n"), (int)buf_input.LastRead() );

     textCtrl.WriteText( msg );
     textCtrl.WriteText( msg );

-    msg.Printf( "wxBufferedInputStream.TellI() returns: %d\n", (int)buf_input.TellI() );
+    msg.Printf( wxT("wxBufferedInputStream.TellI() returns: %d\n"), (int)buf_input.TellI() );

     textCtrl.WriteText( msg );
     textCtrl.WriteText( "\n\n" );
     
     textCtrl.WriteText( msg );
     textCtrl.WriteText( "\n\n" );
     


@@ -584,14 +600,14 @@ void MyApp::DoStreamDemo4(wxCommandEvent& WXUNUSED(event))
     switch (buf_input.LastError())
     {
         case wxSTREAM_NOERROR:      textCtrl.WriteText( "wxSTREAM_NOERROR\n" ); break;
     switch (buf_input.LastError())
     {
         case wxSTREAM_NOERROR:      textCtrl.WriteText( "wxSTREAM_NOERROR\n" ); break;

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

     }
     }

-    msg.Printf( "wxBufferedInputStream.LastRead() returns: %d\n", (int)buf_input.LastRead() );
+    msg.Printf( wxT("wxBufferedInputStream.LastRead() returns: %d\n"), (int)buf_input.LastRead() );

     textCtrl.WriteText( msg );
     textCtrl.WriteText( msg );

-    msg.Printf( "wxBufferedInputStream.TellI() returns: %d\n", (int)buf_input.TellI() );
+    msg.Printf( wxT("wxBufferedInputStream.TellI() returns: %d\n"), (int)buf_input.TellI() );

     textCtrl.WriteText( msg );
     textCtrl.WriteText( "\n\n" );
 
     textCtrl.WriteText( msg );
     textCtrl.WriteText( "\n\n" );
 


@@ -603,14 +619,14 @@ void MyApp::DoStreamDemo4(wxCommandEvent& WXUNUSED(event))
     switch (buf_input.LastError())
     {
         case wxSTREAM_NOERROR:      textCtrl.WriteText( "wxSTREAM_NOERROR\n" ); break;
     switch (buf_input.LastError())
     {
         case wxSTREAM_NOERROR:      textCtrl.WriteText( "wxSTREAM_NOERROR\n" ); break;

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

     }
     }

-    msg.Printf( "wxBufferedInputStream.LastRead() returns: %d\n", (int)buf_input.LastRead() );
+    msg.Printf( wxT("wxBufferedInputStream.LastRead() returns: %d\n"), (int)buf_input.LastRead() );

     textCtrl.WriteText( msg );
     textCtrl.WriteText( msg );

-    msg.Printf( "wxBufferedInputStream.TellI() returns: %d\n", (int)buf_input.TellI() );
+    msg.Printf( wxT("wxBufferedInputStream.TellI() returns: %d\n"), (int)buf_input.TellI() );

     textCtrl.WriteText( msg );
     textCtrl.WriteText( "\n\n" );
 
     textCtrl.WriteText( msg );
     textCtrl.WriteText( "\n\n" );
 


@@ -622,18 +638,93 @@ void MyApp::DoStreamDemo4(wxCommandEvent& WXUNUSED(event))
     switch (buf_input.LastError())
     {
         case wxSTREAM_NOERROR:      textCtrl.WriteText( "wxSTREAM_NOERROR\n" ); break;
     switch (buf_input.LastError())
     {
         case wxSTREAM_NOERROR:      textCtrl.WriteText( "wxSTREAM_NOERROR\n" ); break;

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

     }
     }

-    msg.Printf( "wxBufferedInputStream.LastRead() returns: %d\n", (int)buf_input.LastRead() );
+    msg.Printf( wxT("wxBufferedInputStream.LastRead() returns: %d\n"), (int)buf_input.LastRead() );

     textCtrl.WriteText( msg );
     textCtrl.WriteText( msg );

-    msg.Printf( "wxBufferedInputStream.TellI() returns: %d\n", (int)buf_input.TellI() );
+    msg.Printf( wxT("wxBufferedInputStream.TellI() returns: %d\n"), (int)buf_input.TellI() );

     textCtrl.WriteText( msg );
     textCtrl.WriteText( "\n\n" );
 }
 
     textCtrl.WriteText( msg );
     textCtrl.WriteText( "\n\n" );
 }
 

+void MyApp::DoStreamDemo5(wxCommandEvent& WXUNUSED(event))
+{
+    wxTextCtrl& textCtrl = * GetTextCtrl();
+
+    textCtrl.Clear();
+    textCtrl << "\nTesting wxFileInputStream's Peek():\n\n";
+
+    char ch;
+    wxString str;
+
+    textCtrl.WriteText( "Writing number 0 to 9 to wxFileOutputStream:\n\n" );
+
+    wxFileOutputStream file_output( wxString("test_wx.dat") );
+    for (ch = 0; ch < 10; ch++)
+        file_output.Write( &ch, 1 );
+        
+    file_output.Sync();
+    
+    wxFileInputStream file_input( wxString("test_wx.dat") );
+    
+    ch = file_input.Peek();
+    str.Printf( wxT("First char peeked: %d\n"), (int) ch );
+    textCtrl.WriteText( str );
+    
+    ch = file_input.GetC();
+    str.Printf( wxT("First char read: %d\n"), (int) ch );
+    textCtrl.WriteText( str );
+    
+    ch = file_input.Peek();
+    str.Printf( wxT("Second char peeked: %d\n"), (int) ch );
+    textCtrl.WriteText( str );
+    
+    ch = file_input.GetC();
+    str.Printf( wxT("Second char read: %d\n"), (int) ch );
+    textCtrl.WriteText( str );
+    
+    ch = file_input.Peek();
+    str.Printf( wxT("Third char peeked: %d\n"), (int) ch );
+    textCtrl.WriteText( str );
+    
+    ch = file_input.GetC();
+    str.Printf( wxT("Third char read: %d\n"), (int) ch );
+    textCtrl.WriteText( str );
+    
+    
+    textCtrl << "\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 );
+    
+    ch = input.Peek();
+    str.Printf( wxT("First char peeked: %d\n"), (int) ch );
+    textCtrl.WriteText( str );
+    
+    ch = input.GetC();
+    str.Printf( wxT("First char read: %d\n"), (int) ch );
+    textCtrl.WriteText( str );
+    
+    ch = input.Peek();
+    str.Printf( wxT("Second char peeked: %d\n"), (int) ch );
+    textCtrl.WriteText( str );
+    
+    ch = input.GetC();
+    str.Printf( wxT("Second char read: %d\n"), (int) ch );
+    textCtrl.WriteText( str );
+    
+    ch = input.Peek();
+    str.Printf( wxT("Third char peeked: %d\n"), (int) ch );
+    textCtrl.WriteText( str );
+    
+    ch = input.GetC();
+    str.Printf( wxT("Third char read: %d\n"), (int) ch );
+    textCtrl.WriteText( str );
+}
+

 #if wxUSE_UNICODE
 void MyApp::DoUnicodeDemo(wxCommandEvent& WXUNUSED(event))
 {
 #if wxUSE_UNICODE
 void MyApp::DoUnicodeDemo(wxCommandEvent& WXUNUSED(event))
 {


@@ -648,11 +739,11 @@ void MyApp::DoUnicodeDemo(wxCommandEvent& WXUNUSED(event))
     printf( "\n\nConversion with wxConvLocal:\n" );
     wxConvCurrent = &wxConvLocal;
     printf( (const char*) str.mbc_str() );
     printf( "\n\nConversion with wxConvLocal:\n" );
     wxConvCurrent = &wxConvLocal;
     printf( (const char*) str.mbc_str() );

-
+#if defined(__WXGTK__)

     printf( "\n\nConversion with wxConvGdk:\n" );
     wxConvCurrent = &wxConvGdk;
     printf( (const char*) str.mbc_str() );
     printf( "\n\nConversion with wxConvGdk:\n" );
     wxConvCurrent = &wxConvGdk;
     printf( (const char*) str.mbc_str() );

-
+#endif

     printf( "\n\nConversion with wxConvLibc:\n" );
     wxConvCurrent = &wxConvLibc;
     printf( (const char*) str.mbc_str() );
     printf( "\n\nConversion with wxConvLibc:\n" );
     wxConvCurrent = &wxConvLibc;
     printf( (const char*) str.mbc_str() );


@@ -715,11 +806,11 @@ void MyApp::DoMIMEDemo(wxCommandEvent& WXUNUSED(event))
             filetype->GetOpenCommand(&open, params);
 
             textCtrl << "MIME information about extension '" << ext << "'\n"
             filetype->GetOpenCommand(&open, params);
 
             textCtrl << "MIME information about extension '" << ext << "'\n"

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

                                                    : type.c_str() ) << '\n'
                                                    : type.c_str() ) << '\n'

-                     << "\tDescription: " << ( !desc ? "" : desc.c_str() )
+                     << "\tDescription: " << ( !desc ? wxT("") : desc.c_str() )

                         << '\n'
                         << '\n'

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

                         << '\n';
 
             delete filetype;
                         << '\n';
 
             delete filetype;


@@ -760,6 +851,8 @@ void MyApp::DoByteOrderDemo(wxCommandEvent& WXUNUSED(event))
     textCtrl.WriteText( text );
 }
 
     textCtrl.WriteText( text );
 }
 

+#if wxUSE_TIMEDATE
+

 void MyApp::DoTimeDemo(wxCommandEvent& WXUNUSED(event))
 {
     wxTextCtrl& textCtrl = * GetTextCtrl();
 void MyApp::DoTimeDemo(wxCommandEvent& WXUNUSED(event))
 {
     wxTextCtrl& textCtrl = * GetTextCtrl();


@@ -911,6 +1004,8 @@ void MyApp::DoDateDemo(wxCommandEvent& WXUNUSED(event))
     textCtrl << "The last date of this year is " << v4.GetYearEnd() << "\n";
 }
 
     textCtrl << "The last date of this year is " << v4.GetYearEnd() << "\n";
 }
 

+#endif // wxUSE_TIMEDATE
+

 void MyApp::DoVariantDemo(wxCommandEvent& WXUNUSED(event) )
 {
     wxTextCtrl& textCtrl = * GetTextCtrl();
 void MyApp::DoVariantDemo(wxCommandEvent& WXUNUSED(event) )
 {
     wxTextCtrl& textCtrl = * GetTextCtrl();