compilation fix for recent commit

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

diff --git a/samples/typetest/typetest.cpp b/samples/typetest/typetest.cpp
index de36b2c3ed746243af793e7d39f1f991ff06c56d..347d1d7bab04ef7345938fcfd1a1b50a085cb544 100644 (file)
--- a/samples/typetest/typetest.cpp
+++ b/samples/typetest/typetest.cpp
@@ -31,10 +31,14 @@
 
 #include "typetest.h"
 
-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
 #include "mondrian.xpm"
 #endif
 
+#ifdef new
+#undef new
+#endif
+
 #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/mstream.h"
 
 // Create a new application object
 IMPLEMENT_APP    (MyApp)
@@ -53,16 +58,20 @@ IMPLEMENT_APP    (MyApp)
 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)
+#endif // wxUSE_TIMEDATE
     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_STREAM5, MyApp::DoStreamDemo5)
     EVT_MENU(TYPES_MIME, MyApp::DoMIMEDemo)
 END_EVENT_TABLE()
 
@@ -83,16 +92,20 @@ bool MyApp::OnInit()
     file_menu->Append(TYPES_QUIT, "E&xit\tAlt-X");
 
     wxMenu *test_menu = new wxMenu;
+#if wxUSE_TIMEDATE
     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");
-#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_STREAM5, "&Stream peek test");
     test_menu->AppendSeparator();
     test_menu->Append(TYPES_MIME, "&MIME database test");
 
@@ -120,8 +133,8 @@ void MyApp::DoStreamDemo(wxCommandEvent& WXUNUSED(event))
 
     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 );
 
@@ -155,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( "\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 );
@@ -176,17 +189,21 @@ void MyApp::DoStreamDemo(wxCommandEvent& WXUNUSED(event))
     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 );
+#endif
 
     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( buf_input );
+    wxTextInputStream text_input( file_input );
 
     text_input >> si;
     tmp.Printf( _T("Signed int: %d\n"), si );
@@ -209,6 +226,7 @@ void MyApp::DoStreamDemo(wxCommandEvent& WXUNUSED(event))
     textCtrl.WriteText( tmp );
 
 
+
     textCtrl << "\nTest for wxDataStream:\n\n";
 
     textCtrl.WriteText( "Writing to wxDataOutputStream:\n" );
@@ -216,7 +234,7 @@ void MyApp::DoStreamDemo(wxCommandEvent& WXUNUSED(event))
     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 );
@@ -271,24 +289,24 @@ void MyApp::DoStreamDemo2(wxCommandEvent& WXUNUSED(event))
 
     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();
     
-    wxFileInputStream file_input( "test_wx.dat" );
+    wxFileInputStream file_input( wxString("test_wx.dat") );
     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" );
 
-    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 );
@@ -297,11 +315,11 @@ void MyApp::DoStreamDemo2(wxCommandEvent& WXUNUSED(event))
     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 );
-       textCtrl.WriteText( (char)(ch + '0') );
+        textCtrl.WriteText( (wxChar)(ch + '0') );
     }
     textCtrl.WriteText( "\n\n\n" );
     
@@ -315,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" );
 
-    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 );
-       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 );
-    textCtrl.WriteText( (char)(ch + '0') );
+    textCtrl.WriteText( (wxChar)(ch + '0') );
     textCtrl.WriteText( "\n\n\n" );
     
 }
@@ -343,7 +361,7 @@ void MyApp::DoStreamDemo3(wxCommandEvent& WXUNUSED(event))
 
     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 );
 
@@ -351,21 +369,21 @@ void MyApp::DoStreamDemo3(wxCommandEvent& WXUNUSED(event))
     
     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 );
-       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" );
     
@@ -373,25 +391,25 @@ void MyApp::DoStreamDemo3(wxCommandEvent& WXUNUSED(event))
     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( (char)(ch + '0') );
+    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;
+        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" );
 
@@ -400,21 +418,21 @@ void MyApp::DoStreamDemo3(wxCommandEvent& WXUNUSED(event))
     
     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 );
-       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" );
     
@@ -422,25 +440,25 @@ void MyApp::DoStreamDemo3(wxCommandEvent& WXUNUSED(event))
     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( (char)(ch + '0') );
+    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;
+        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" );
 
@@ -448,22 +466,22 @@ void MyApp::DoStreamDemo3(wxCommandEvent& WXUNUSED(event))
     
     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 );
-       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" );
     
@@ -471,27 +489,240 @@ void MyApp::DoStreamDemo3(wxCommandEvent& WXUNUSED(event))
     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( (char)(ch + '0') );
+    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;
+        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;
+    }
+}
+
+void MyApp::DoStreamDemo4(wxCommandEvent& WXUNUSED(event))
+{
+    wxTextCtrl& textCtrl = * GetTextCtrl();
+
+    wxString msg;
+    
+    textCtrl.Clear();
+    textCtrl << "\nTesting wxStreamBuffer:\n\n";
+
+    // bigger than buffer
+    textCtrl.WriteText( "Writing 2000x 1 to wxFileOutputStream.\n\n" );
+
+    wxFileOutputStream file_output( wxString("test_wx.dat") );
+    for (int i = 0; i < 2000; i++)
+    {
+        char ch = 1;
+        file_output.Write( &ch, 1 );
+    }
+
+    textCtrl.WriteText( "Opening with a buffered wxFileInputStream:\n\n" );
+
+    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;
+        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( 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( "\n\n" );
+    
+
+    textCtrl.WriteText( "Seeking to position 300:\n\n" );
+
+    buf_input.SeekI( 300 );
+    
+    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;
+    }
+    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( "\n\n" );
+    
+
+    char buf[2000];
+
+    textCtrl.WriteText( "Reading 500 bytes:\n\n" );
+
+    buf_input.Read( buf, 500 );
+    
+    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;
+    }
+    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( "\n\n" );
+    
+    textCtrl.WriteText( "Reading another 500 bytes:\n\n" );
+
+    buf_input.Read( buf, 500 );
+    
+    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;
+    }
+    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( "\n\n" );
+
+    textCtrl.WriteText( "Reading another 500 bytes:\n\n" );
+
+    buf_input.Read( buf, 500 );
+    
+    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;
     }
+    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( "\n\n" );
+
+    textCtrl.WriteText( "Reading another 500 bytes:\n\n" );
 
+    buf_input.Read( buf, 500 );
+    
+    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;
+    }
+    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( "\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
@@ -508,11 +739,11 @@ void MyApp::DoUnicodeDemo(wxCommandEvent& WXUNUSED(event))
     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() );
-
+#endif
     printf( "\n\nConversion with wxConvLibc:\n" );
     wxConvCurrent = &wxConvLibc;
     printf( (const char*) str.mbc_str() );
@@ -575,11 +806,11 @@ void MyApp::DoMIMEDemo(wxCommandEvent& WXUNUSED(event))
             filetype->GetOpenCommand(&open, params);
 
             textCtrl << "MIME information about extension '" << ext << "'\n"
-                     << "\tMIME type: " << ( !type ? "unknown"
+                     << "\tMIME type: " << ( !type ? wxT("unknown")
                                                    : type.c_str() ) << '\n'
-                     << "\tDescription: " << ( !desc ? "" : desc.c_str() )
+                     << "\tDescription: " << ( !desc ? wxT("") : desc.c_str() )
                         << '\n'
-                     << "\tCommand to open: " << ( !open ? "no" : open.c_str() )
+                     << "\tCommand to open: " << ( !open ? wxT("no") : open.c_str() )
                         << '\n';
 
             delete filetype;
@@ -620,6 +851,8 @@ void MyApp::DoByteOrderDemo(wxCommandEvent& WXUNUSED(event))
     textCtrl.WriteText( text );
 }
 
+#if wxUSE_TIMEDATE
+
 void MyApp::DoTimeDemo(wxCommandEvent& WXUNUSED(event))
 {
     wxTextCtrl& textCtrl = * GetTextCtrl();
@@ -771,6 +1004,8 @@ void MyApp::DoDateDemo(wxCommandEvent& WXUNUSED(event))
     textCtrl << "The last date of this year is " << v4.GetYearEnd() << "\n";
 }
 
+#endif // wxUSE_TIMEDATE
+
 void MyApp::DoVariantDemo(wxCommandEvent& WXUNUSED(event) )
 {
     wxTextCtrl& textCtrl = * GetTextCtrl();