X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/329e86bfdedacf2736fa77eea1ae171c3c732355..a2d541ca9c552d1a30ba75970968a7a220f4955a:/samples/typetest/typetest.cpp

diff --git a/samples/typetest/typetest.cpp b/samples/typetest/typetest.cpp
index 3cc3dc4d83..c214ccb1a9 100644
--- 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 and Markus Holzem
-// Licence:   	wxWindows license
+// Licence:       wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -27,13 +27,18 @@
 #include "wx/time.h"
 #include "wx/date.h"
 #include "wx/variant.h"
+#include "wx/mimetype.h"
 
 #include "typetest.h"
 
-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__)
 #include "mondrian.xpm"
 #endif
 
+#ifdef new
+#undef new
+#endif
+
 #include "wx/ioswrap.h"
 
 #if wxUSE_IOSTREAMH
@@ -44,265 +49,975 @@
 
 #include "wx/wfstream.h"
 #include "wx/datstrm.h"
-
+#include "wx/txtstrm.h"
+#include "wx/mstream.h"
 
 // Create a new application object
-IMPLEMENT_APP	(MyApp)
+IMPLEMENT_APP    (MyApp)
 
-IMPLEMENT_DYNAMIC_CLASS	(MyApp, wxApp)
+IMPLEMENT_DYNAMIC_CLASS    (MyApp, wxApp)
 
 BEGIN_EVENT_TABLE(MyApp, wxApp)
-	EVT_MENU(TYPES_DATE,      MyApp::DoDateDemo)
-	EVT_MENU(TYPES_TIME,      MyApp::DoTimeDemo)
-	EVT_MENU(TYPES_VARIANT,   MyApp::DoVariantDemo)
-	EVT_MENU(TYPES_BYTEORDER, MyApp::DoByteOrderDemo)
+#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
-	EVT_MENU(TYPES_STREAM, MyApp::DoStreamDemo)
+    EVT_MENU(TYPES_UNICODE,   MyApp::DoUnicodeDemo)
+#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_STREAM6, MyApp::DoStreamDemo6)
+    EVT_MENU(TYPES_STREAM7, MyApp::DoStreamDemo7)
+    EVT_MENU(TYPES_MIME, MyApp::DoMIMEDemo)
 END_EVENT_TABLE()
 
-bool MyApp::OnInit(void)
+bool MyApp::OnInit()
 {
-  // Create the main frame window
-  MyFrame *frame = new MyFrame((wxFrame *) NULL, "wxWindows Types Demo",
-      wxPoint(50, 50), wxSize(450, 340));
-
-  // Give it an icon
-  frame->SetIcon(wxICON(mondrian));
-
-  // Make a menubar
-  wxMenu *file_menu = new wxMenu;
-
-  file_menu->Append(TYPES_ABOUT, "&About");
-  file_menu->AppendSeparator();
-  file_menu->Append(TYPES_DATE, "&Date test");
-  file_menu->Append(TYPES_TIME, "&Time test");
-  file_menu->Append(TYPES_VARIANT, "&Variant test");
-  file_menu->Append(TYPES_BYTEORDER, "&Byteorder test");
+    // Create the main frame window
+    MyFrame *frame = new MyFrame((wxFrame *) NULL, "wxWindows Types Demo",
+                                 wxPoint(50, 50), wxSize(450, 340));
+
+    // Give it an icon
+    frame->SetIcon(wxICON(mondrian));
+
+    // Make a menubar
+    wxMenu *file_menu = new wxMenu;
+
+    file_menu->Append(TYPES_ABOUT, "&About");
+    file_menu->AppendSeparator();
+    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
-  file_menu->Append(TYPES_UNICODE, "&Unicode test");
-#endif
-  file_menu->Append(TYPES_STREAM, "&Stream test");
-  file_menu->AppendSeparator();
-  file_menu->Append(TYPES_QUIT, "E&xit");
-  wxMenuBar *menu_bar = new wxMenuBar;
-  menu_bar->Append(file_menu, "&File");
-  frame->SetMenuBar(menu_bar);
-
-  m_textCtrl = new wxTextCtrl(frame, -1, "", wxPoint(0, 0), wxDefaultSize, wxTE_MULTILINE);
-
-  // Show the frame
-  frame->Show(TRUE);
-  
-  SetTopWindow(frame);
-
-  return TRUE;
+    test_menu->Append(TYPES_UNICODE, "&Unicode test");
+#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->Append(TYPES_STREAM6, "&Stream ungetch test");
+    test_menu->Append(TYPES_STREAM7, "&Stream ungetch test for a buffered stream");
+    test_menu->AppendSeparator();
+    test_menu->Append(TYPES_MIME, "&MIME database test");
+
+    wxMenuBar *menu_bar = new wxMenuBar;
+    menu_bar->Append(file_menu, "&File");
+    menu_bar->Append(test_menu, "&Tests");
+    frame->SetMenuBar(menu_bar);
+
+    m_textCtrl = new wxTextCtrl(frame, -1, "", wxPoint(0, 0), wxDefaultSize, wxTE_MULTILINE);
+
+    // Show the frame
+    frame->Show(TRUE);
+
+    SetTopWindow(frame);
+
+    return TRUE;
 }
 
 void MyApp::DoStreamDemo(wxCommandEvent& WXUNUSED(event))
 {
     wxTextCtrl& textCtrl = * GetTextCtrl();
-    
+
     textCtrl.Clear();
-    textCtrl << "\nTest fstream vs. wxFileStream:\n\n";
+    textCtrl << _T("\nTest fstream vs. wxFileStream:\n\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 );
 
     wxString tmp;
     signed int si = 0xFFFFFFFF;
-    tmp.Printf( "Signed int: %d\n", si );
+    tmp.Printf( _T("Signed int: %d\n"), si );
     textCtrl.WriteText( tmp );
-    file_output << si << "\n";
+    text_output << si << "\n";
     std_file_output << si << "\n";
-    
+
     unsigned int ui = 0xFFFFFFFF;
-    tmp.Printf( "Unsigned int: %u\n", ui );
+    tmp.Printf( _T("Unsigned int: %u\n"), ui );
     textCtrl.WriteText( tmp );
-    file_output << ui << "\n";
+    text_output << ui << "\n";
     std_file_output << ui << "\n";
-    
+
     double d = 2.01234567890123456789;
-    tmp.Printf( "Double: %f\n", d );
+    tmp.Printf( _T("Double: %f\n"), d );
     textCtrl.WriteText( tmp );
-    file_output << d << "\n";
+    text_output << d << "\n";
     std_file_output << d << "\n";
-    
-    float f = 0.00001;
-    tmp.Printf( "Float: %f\n", f );
+
+    float f = (float)0.00001;
+    tmp.Printf( _T("Float: %f\n"), f );
     textCtrl.WriteText( tmp );
-    file_output << f << "\n";
+    text_output << f << "\n";
     std_file_output << f << "\n";
-    
-    wxString str( "Hello!" );
-    tmp.Printf( "String: %s\n", str.c_str() );
+
+    wxString str( _T("Hello!") );
+    tmp.Printf( _T("String: %s\n"), str.c_str() );
     textCtrl.WriteText( tmp );
-    file_output << str << "\n";
+    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( "Signed int: %d\n", si );
+    tmp.Printf( _T("Signed int: %d\n"), si );
     textCtrl.WriteText( tmp );
-    
+
     std_file_input >> ui;
-    tmp.Printf( "Unsigned int: %u\n", ui );
+    tmp.Printf( _T("Unsigned int: %u\n"), ui );
     textCtrl.WriteText( tmp );
-    
+
     std_file_input >> d;
-    tmp.Printf( "Double: %f\n", d );
+    tmp.Printf( _T("Double: %f\n"), d );
     textCtrl.WriteText( tmp );
-    
+
     std_file_input >> f;
-    tmp.Printf( "Float: %f\n", f );
+    tmp.Printf( _T("Float: %f\n"), f );
     textCtrl.WriteText( tmp );
-    
-    std_file_input >> str;
-    tmp.Printf( "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" );
 
-    file_output.OutputStreamBuffer()->FlushBuffer();
-    
-    wxFileInputStream file_input( "test_wx.dat" );
-    
-    file_input >> si;
-    tmp.Printf( "Signed int: %d\n", si );
+    buf_output.Sync();
+
+    wxFileInputStream file_input( wxString("test_wx.dat") );
+    wxBufferedInputStream buf_input( file_input );
+    wxTextInputStream text_input( file_input );
+
+    text_input >> si;
+    tmp.Printf( _T("Signed int: %d\n"), si );
     textCtrl.WriteText( tmp );
-    
-    file_input >> ui;
-    tmp.Printf( "Unsigned int: %u\n", ui );
+
+    text_input >> ui;
+    tmp.Printf( _T("Unsigned int: %u\n"), ui );
     textCtrl.WriteText( tmp );
-    
-    file_input >> d;
-    tmp.Printf( "Double: %f\n", d );
+
+    text_input >> d;
+    tmp.Printf( _T("Double: %f\n"), d );
     textCtrl.WriteText( tmp );
-    
-    file_input >> f;
-    tmp.Printf( "Float: %f\n", f );
+
+    text_input >> f;
+    tmp.Printf( _T("Float: %f\n"), f );
     textCtrl.WriteText( tmp );
-    
-    file_input >> str;
-    tmp.Printf( "String: %s\n", str.c_str() );
+
+    text_input >> str;
+    tmp.Printf( _T("String: %s\n"), str.c_str() );
     textCtrl.WriteText( tmp );
-    
+
+
 
     textCtrl << "\nTest for wxDataStream:\n\n";
 
     textCtrl.WriteText( "Writing to wxDataOutputStream:\n" );
-    
+
     file_output.SeekO( 0 );
-    wxDataOutputStream data_output( file_output );
+    wxDataOutputStream data_output( buf_output );
 
-    wxInt16 i16 = 0xFFFF;
-    tmp.Printf( "Signed int16: %d\n", (int)i16 );
+    wxInt16 i16 = (unsigned short)0xFFFF;
+    tmp.Printf( _T("Signed int16: %d\n"), (int)i16 );
     textCtrl.WriteText( tmp );
     data_output.Write16( i16 );
-    
+
     wxUint16 ui16 = 0xFFFF;
-    tmp.Printf( "Unsigned int16: %u\n", (unsigned int) ui16 );
+    tmp.Printf( _T("Unsigned int16: %u\n"), (unsigned int) ui16 );
     textCtrl.WriteText( tmp );
     data_output.Write16( ui16 );
-    
+
     d = 2.01234567890123456789;
-    tmp.Printf( "Double: %f\n", d );
+    tmp.Printf( _T("Double: %f\n"), d );
     textCtrl.WriteText( tmp );
     data_output.WriteDouble( d );
-    
+
     str = "Hello!";
-    tmp.Printf( "String: %s\n", str.c_str() );
+    tmp.Printf( _T("String: %s\n"), str.c_str() );
     textCtrl.WriteText( tmp );
     data_output.WriteString( str );
-    
-    file_output.OutputStreamBuffer()->FlushBuffer();
-    
+
+    buf_output.Sync();
+
     textCtrl.WriteText( "\nReading from wxDataInputStream:\n" );
-    
+
     file_input.SeekI( 0 );
-    wxDataInputStream data_input( file_input );
+    wxDataInputStream data_input( buf_input );
 
     i16 = data_input.Read16();
-    tmp.Printf( "Signed int16: %d\n", (int)i16 );
+    tmp.Printf( _T("Signed int16: %d\n"), (int)i16 );
     textCtrl.WriteText( tmp );
-    
+
     ui16 = data_input.Read16();
-    tmp.Printf( "Unsigned int16: %u\n", (unsigned int) ui16 );
+    tmp.Printf( _T("Unsigned int16: %u\n"), (unsigned int) ui16 );
     textCtrl.WriteText( tmp );
 
     d = data_input.ReadDouble();
-    tmp.Printf( "Double: %f\n", d );
+    tmp.Printf( _T("Double: %f\n"), d );
     textCtrl.WriteText( tmp );
-    
+
     str = data_input.ReadString();
-    tmp.Printf( "String: %s\n", str.c_str() );
+    tmp.Printf( _T("String: %s\n"), str.c_str() );
     textCtrl.WriteText( tmp );
 }
 
+void MyApp::DoStreamDemo2(wxCommandEvent& WXUNUSED(event))
+{
+    wxTextCtrl& textCtrl = * GetTextCtrl();
+
+    textCtrl.Clear();
+    textCtrl << _T("\nTesting wxBufferedStream:\n\n");
+
+    char ch,ch2;
+
+    textCtrl.WriteText( "Writing number 0 to 9 to buffered wxFileOutputStream:\n\n" );
+
+    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( wxString("test_wx.dat") );
+    for (ch2 = 0; ch2 < 10; ch2++)
+    {
+        file_input.Read( &ch, 1 );
+        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 0:\n\n" );
+
+    wxFileOutputStream file_output2( wxString("test_wx2.dat") );
+    wxBufferedOutputStream buf_output2( file_output2 );
+    for (ch = 0; ch < 10; ch++)
+        buf_output2.Write( &ch, 1 );
+    buf_output2.SeekO( 3 );
+    ch = 0;
+    buf_output2.Write( &ch, 1 );
+    buf_output2.Sync();
+    
+    wxFileInputStream file_input2( wxString("test_wx2.dat") );
+    for (ch2 = 0; ch2 < 10; ch2++)
+    {
+        file_input2.Read( &ch, 1 );
+        textCtrl.WriteText( (wxChar)(ch + '0') );
+    }
+    textCtrl.WriteText( "\n\n\n" );
+    
+    // now append 2000 bytes to file (bigger than buffer)
+    buf_output2.SeekO( 0, wxFromEnd );
+    ch = 1;
+    for (int i = 0; i < 2000; i++)
+       buf_output2.Write( &ch, 1 );
+    buf_output2.Sync();
+    
+    textCtrl.WriteText( "Reading number 0 to 9 from buffered wxFileInputStream, then\n" );
+    textCtrl.WriteText( "seeking back to #3 and reading the 0:\n\n" );
+
+    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( (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( (wxChar)(ch + '0') );
+    textCtrl.WriteText( "\n\n\n" );
+    
+}
+
+void MyApp::DoStreamDemo3(wxCommandEvent& WXUNUSED(event))
+{
+    wxTextCtrl& textCtrl = * GetTextCtrl();
+
+    textCtrl.Clear();
+    textCtrl << "\nTesting wxFileInputStream's and wxFFileInputStream's error handling:\n\n";
+
+    char ch,ch2;
+
+    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 );
+
+    // Testing wxFileInputStream
+    
+    textCtrl.WriteText( "Reading 0 to 10 to wxFileInputStream:\n\n" );
+
+    wxFileInputStream file_input( wxString("test_wx.dat") );
+    for (ch2 = 0; ch2 < 11; ch2++)
+    {
+        file_input.Read( &ch, 1 );
+        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( "Seeking to 0;  stream.LastError() returns: " );
+    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;
+    }
+    textCtrl.WriteText( "\n" );
+    
+    file_input.Read( &ch, 1 );
+    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\n" );
+
+    
+    // Testing wxFFileInputStream
+    
+    textCtrl.WriteText( "Reading 0 to 10 to wxFFileInputStream:\n\n" );
+
+    wxFFileInputStream ffile_input( wxString("test_wx.dat") );
+    for (ch2 = 0; ch2 < 11; ch2++)
+    {
+        ffile_input.Read( &ch, 1 );
+        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( "Seeking to 0;  stream.LastError() returns: " );
+    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;
+    }
+    textCtrl.WriteText( "\n" );
+    
+    ffile_input.Read( &ch, 1 );
+    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\n" );
+
+    // Testing wxFFileInputStream
+    
+    textCtrl.WriteText( "Reading 0 to 10 to buffered wxFFileInputStream:\n\n" );
+
+    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( (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( "Seeking to 0;  stream.LastError() returns: " );
+    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;
+    }
+    textCtrl.WriteText( "\n" );
+    
+    buf_input.Read( &ch, 1 );
+    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;
+    }
+}
+
+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 );
+}
+
+void MyApp::DoStreamDemo6(wxCommandEvent& WXUNUSED(event))
+{
+    wxTextCtrl& textCtrl = * GetTextCtrl();
+
+    textCtrl.Clear();
+    textCtrl.WriteText( "\nTesting Ungetch():\n\n" );
+    
+    char ch = 0;
+    size_t pos = 0;
+    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();
+    
+    textCtrl.WriteText( "Reading char from wxFileInputStream:\n\n" );
+
+    wxFileInputStream file_input( wxString("test_wx.dat") );
+    
+    ch = file_input.GetC();
+    pos = file_input.TellI();
+    str.Printf( wxT("Read char: %d. Now at position %d\n\n"), (int) ch, (int) pos );
+    textCtrl.WriteText( str );
+    
+    textCtrl.WriteText( "Reading another char from wxFileInputStream:\n\n" );
+
+    ch = file_input.GetC();
+    pos = file_input.TellI();
+    str.Printf( wxT("Read char: %d. Now at position %d\n\n"), (int) ch, (int) pos );
+    textCtrl.WriteText( str );
+    
+    textCtrl.WriteText( "Reading yet another char from wxFileInputStream:\n\n" );
+
+    ch = file_input.GetC();
+    pos = file_input.TellI();
+    str.Printf( wxT("Read char: %d. Now at position %d\n\n"), (int) ch, (int) pos );
+    textCtrl.WriteText( str );
+    
+    textCtrl.WriteText( "Now calling Ungetch( 5 ) from wxFileInputStream...\n\n" );
+
+    file_input.Ungetch( 5 );
+    pos = file_input.TellI();
+    str.Printf( wxT("Now at position %d\n\n"), (int) pos );
+    textCtrl.WriteText( str );
+    
+    textCtrl.WriteText( "Reading char from wxFileInputStream:\n\n" );
+
+    ch = file_input.GetC();
+    pos = file_input.TellI();
+    str.Printf( wxT("Read char: %d. Now at position %d\n\n"), (int) ch, (int) pos );
+    textCtrl.WriteText( str );
+    
+    textCtrl.WriteText( "Reading another char from wxFileInputStream:\n\n" );
+
+    ch = file_input.GetC();
+    pos = file_input.TellI();
+    str.Printf( wxT("Read char: %d. Now at position %d\n\n"), (int) ch, (int) pos );
+    textCtrl.WriteText( str );
+    
+    textCtrl.WriteText( "Now calling Ungetch( 5 ) from wxFileInputStream again...\n\n" );
+
+    file_input.Ungetch( 5 );
+    pos = file_input.TellI();
+    str.Printf( wxT("Now at position %d\n\n"), (int) pos );
+    textCtrl.WriteText( str );
+    
+    textCtrl.WriteText( "Seeking to pos 3 in wxFileInputStream. This invalidates the writeback buffer.\n\n" );
+    
+    file_input.SeekI( 3 );
+
+    ch = file_input.GetC();
+    pos = file_input.TellI();
+    str.Printf( wxT("Read char: %d. Now at position %d\n\n"), (int) ch, (int) pos );
+    textCtrl.WriteText( str );
+}
+
+void MyApp::DoStreamDemo7(wxCommandEvent& WXUNUSED(event))
+{
+    wxTextCtrl& textCtrl = * GetTextCtrl();
+
+    textCtrl.Clear();
+    textCtrl.WriteText( "\nTesting Ungetch() in buffered input stream:\n\n" );
+    
+    char ch = 0;
+    size_t pos = 0;
+    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();
+    
+    textCtrl.WriteText( "Reading char from wxBufferedInputStream via wxFileInputStream:\n\n" );
+
+    wxFileInputStream file_input( wxString("test_wx.dat") );
+    wxBufferedInputStream buf_input( file_input );
+    
+    ch = buf_input.GetC();
+    pos = buf_input.TellI();
+    str.Printf( wxT("Read char: %d. Now at position %d\n\n"), (int) ch, (int) pos );
+    textCtrl.WriteText( str );
+    
+    textCtrl.WriteText( "Reading another char from wxBufferedInputStream:\n\n" );
+
+    ch = buf_input.GetC();
+    pos = buf_input.TellI();
+    str.Printf( wxT("Read char: %d. Now at position %d\n\n"), (int) ch, (int) pos );
+    textCtrl.WriteText( str );
+    
+    textCtrl.WriteText( "Reading yet another char from wxBufferedInputStream:\n\n" );
+
+    ch = buf_input.GetC();
+    pos = buf_input.TellI();
+    str.Printf( wxT("Read char: %d. Now at position %d\n\n"), (int) ch, (int) pos );
+    textCtrl.WriteText( str );
+    
+    textCtrl.WriteText( "Now calling Ungetch( 5 ) from wxBufferedInputStream...\n\n" );
+
+    buf_input.Ungetch( 5 );
+    pos = buf_input.TellI();
+    str.Printf( wxT("Now at position %d\n\n"), (int) pos );
+    textCtrl.WriteText( str );
+    
+    textCtrl.WriteText( "Reading char from wxBufferedInputStream:\n\n" );
+
+    ch = buf_input.GetC();
+    pos = buf_input.TellI();
+    str.Printf( wxT("Read char: %d. Now at position %d\n\n"), (int) ch, (int) pos );
+    textCtrl.WriteText( str );
+    
+    textCtrl.WriteText( "Reading another char from wxBufferedInputStream:\n\n" );
+
+    ch = buf_input.GetC();
+    pos = buf_input.TellI();
+    str.Printf( wxT("Read char: %d. Now at position %d\n\n"), (int) ch, (int) pos );
+    textCtrl.WriteText( str );
+    
+    textCtrl.WriteText( "Now calling Ungetch( 5 ) from wxBufferedInputStream again...\n\n" );
+
+    buf_input.Ungetch( 5 );
+    pos = buf_input.TellI();
+    str.Printf( wxT("Now at position %d\n\n"), (int) pos );
+    textCtrl.WriteText( str );
+    
+    textCtrl.WriteText( "Seeking to pos 3 in wxBufferedInputStream. This invalidates the writeback buffer.\n\n" );
+    
+    buf_input.SeekI( 3 );
+
+    ch = buf_input.GetC();
+    pos = buf_input.TellI();
+    str.Printf( wxT("Read char: %d. Now at position %d\n\n"), (int) ch, (int) pos );
+    textCtrl.WriteText( str );
+}
+
 #if wxUSE_UNICODE
 void MyApp::DoUnicodeDemo(wxCommandEvent& WXUNUSED(event))
 {
     wxTextCtrl& textCtrl = * GetTextCtrl();
-    
+
     textCtrl.Clear();
     textCtrl << "\nTest wchar_t to char (Unicode to ANSI/Multibyte) converions:";
 
     wxString str;
     str = _T("Robert Röbling\n");
-    
+
     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() );
-    
+
 }
 #endif
 
+void MyApp::DoMIMEDemo(wxCommandEvent& WXUNUSED(event))
+{
+    static wxString s_defaultExt = "xyz";
+
+    wxString ext = wxGetTextFromUser("Enter a file extension: ",
+                                     "MIME database test",
+                                     s_defaultExt);
+    if ( !!ext )
+    {
+        s_defaultExt = ext;
+
+        // init MIME database if not done yet
+        if ( !m_mimeDatabase )
+        {
+            m_mimeDatabase = new wxMimeTypesManager;
+
+            static const wxFileTypeInfo fallbacks[] =
+            {
+                wxFileTypeInfo("application/xyz",
+                               "XyZ %s",
+                               "XyZ -p %s",
+                               "The one and only XYZ format file",
+                               "xyz", "123", NULL),
+                wxFileTypeInfo("text/html",
+                               "lynx %s",
+                               "lynx -dump %s | lpr",
+                               "HTML document (from fallback)",
+                               "htm", "html", NULL),
+
+                // must terminate the table with this!
+                wxFileTypeInfo()
+            };
+
+            m_mimeDatabase->AddFallbacks(fallbacks);
+        }
+
+        wxTextCtrl& textCtrl = * GetTextCtrl();
+
+        wxFileType *filetype = m_mimeDatabase->GetFileTypeFromExtension(ext);
+        if ( !filetype )
+        {
+            textCtrl << "Unknown extension '" << ext << "'\n";
+        }
+        else
+        {
+            wxString type, desc, open;
+            filetype->GetMimeType(&type);
+            filetype->GetDescription(&desc);
+
+            wxString filename = "filename";
+            filename << "." << ext;
+            wxFileType::MessageParameters params(filename, type);
+            filetype->GetOpenCommand(&open, params);
+
+            textCtrl << "MIME information about extension '" << ext << "'\n"
+                     << "\tMIME type: " << ( !type ? wxT("unknown")
+                                                   : type.c_str() ) << '\n'
+                     << "\tDescription: " << ( !desc ? wxT("") : desc.c_str() )
+                        << '\n'
+                     << "\tCommand to open: " << ( !open ? wxT("no") : open.c_str() )
+                        << '\n';
+
+            delete filetype;
+        }
+    }
+    //else: cancelled by user
+}
+
 void MyApp::DoByteOrderDemo(wxCommandEvent& WXUNUSED(event))
 {
     wxTextCtrl& textCtrl = * GetTextCtrl();
 
     textCtrl.Clear();
     textCtrl << "\nTest byte order macros:\n\n";
-    
+
     if (wxBYTE_ORDER == wxLITTLE_ENDIAN)
         textCtrl << "This is a little endian system.\n\n";
-    else    
+    else
         textCtrl << "This is a big endian system.\n\n";
-	
+
     wxString text;
-    
+
     wxInt32 var = 0xF1F2F3F4;
     text = "";
     text.Printf( _T("Value of wxInt32 is now: %#x.\n\n"), var );
     textCtrl.WriteText( text );
-    
+
     text = "";
     text.Printf( _T("Value of swapped wxInt32 is: %#x.\n\n"), wxINT32_SWAP_ALWAYS( var ) );
     textCtrl.WriteText( text );
-    
+
     text = "";
     text.Printf( _T("Value of wxInt32 swapped on little endian is: %#x.\n\n"), wxINT32_SWAP_ON_LE( var ) );
     textCtrl.WriteText( text );
-    
+
     text = "";
     text.Printf( _T("Value of wxInt32 swapped on big endian is: %#x.\n\n"), wxINT32_SWAP_ON_BE( var ) );
     textCtrl.WriteText( text );
 }
 
+#if wxUSE_TIMEDATE
+
 void MyApp::DoTimeDemo(wxCommandEvent& WXUNUSED(event))
 {
     wxTextCtrl& textCtrl = * GetTextCtrl();
@@ -342,7 +1057,6 @@ void MyApp::DoDateDemo(wxCommandEvent& WXUNUSED(event))
     a = a - 25;
     textCtrl << a.FormatDate(wxEUROPEAN) << "  (European)\n";
 
-    
     // Using subtraction of two date objects
     wxDate a1 = wxString("7/13/1991");
     wxDate a2 = a1 + 14;
@@ -455,6 +1169,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();
@@ -477,6 +1193,12 @@ void MyApp::DoVariantDemo(wxCommandEvent& WXUNUSED(event) )
     // Implicit conversion
     long l = var1;
 
+    // suppress compile warnings about unused variables
+    if ( l < v )
+    {
+        ;
+    }
+
     wxStringList stringList;
     stringList.Add(_T("one")); stringList.Add(_T("two")); stringList.Add(_T("three"));
     var1 = stringList;
@@ -498,8 +1220,8 @@ void MyApp::DoVariantDemo(wxCommandEvent& WXUNUSED(event) )
 }
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
-	EVT_MENU(TYPES_QUIT, MyFrame::OnQuit)
-	EVT_MENU(TYPES_ABOUT, MyFrame::OnAbout)
+    EVT_MENU(TYPES_QUIT, MyFrame::OnQuit)
+    EVT_MENU(TYPES_ABOUT, MyFrame::OnAbout)
 END_EVENT_TABLE()
 
 // My frame constructor
@@ -516,7 +1238,7 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) )
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
 {
   wxMessageDialog dialog(this, "Tests various wxWindows types",
-  	"About Types", wxYES_NO|wxCANCEL);
+      "About Types", wxYES_NO|wxCANCEL);
 
   dialog.ShowModal();
 }