fixed the bug with the order of 2 size events when the scrollbar[s] (dis)appear in...

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

diff --git a/samples/typetest/typetest.cpp b/samples/typetest/typetest.cpp
index 4e86e887694539d47e4b7a9903dee21bc1592d0c..b7be53b1a244cd1e3c8b0258bdb61c837a81d6b1 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
@@ -291,7 +295,7 @@ void MyApp::DoStreamDemo2(wxCommandEvent& WXUNUSED(event))
     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" );
     
@@ -311,7 +315,7 @@ void MyApp::DoStreamDemo2(wxCommandEvent& WXUNUSED(event))
     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" );
     
@@ -330,14 +334,14 @@ void MyApp::DoStreamDemo2(wxCommandEvent& WXUNUSED(event))
     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" );
     
 }
@@ -366,7 +370,7 @@ void MyApp::DoStreamDemo3(wxCommandEvent& WXUNUSED(event))
     {
         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())
         {
@@ -393,7 +397,7 @@ void MyApp::DoStreamDemo3(wxCommandEvent& WXUNUSED(event))
     
     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())
     {
@@ -415,7 +419,7 @@ void MyApp::DoStreamDemo3(wxCommandEvent& WXUNUSED(event))
     {
         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())
         {
@@ -442,7 +446,7 @@ void MyApp::DoStreamDemo3(wxCommandEvent& WXUNUSED(event))
     
     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())
     {
@@ -464,7 +468,7 @@ void MyApp::DoStreamDemo3(wxCommandEvent& WXUNUSED(event))
     {
         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())
         {
@@ -491,7 +495,7 @@ void MyApp::DoStreamDemo3(wxCommandEvent& WXUNUSED(event))
     
     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())
     {
@@ -536,9 +540,9 @@ void MyApp::DoStreamDemo4(wxCommandEvent& WXUNUSED(event))
         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 );
-    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" );
     
@@ -556,9 +560,9 @@ void MyApp::DoStreamDemo4(wxCommandEvent& WXUNUSED(event))
         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 );
-    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" );
     
@@ -578,9 +582,9 @@ void MyApp::DoStreamDemo4(wxCommandEvent& WXUNUSED(event))
         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 );
-    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" );
     
@@ -597,9 +601,9 @@ void MyApp::DoStreamDemo4(wxCommandEvent& WXUNUSED(event))
         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 );
-    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" );
 
@@ -616,9 +620,9 @@ void MyApp::DoStreamDemo4(wxCommandEvent& WXUNUSED(event))
         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 );
-    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" );
 
@@ -635,9 +639,9 @@ void MyApp::DoStreamDemo4(wxCommandEvent& WXUNUSED(event))
         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 );
-    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" );
 }
@@ -663,27 +667,27 @@ void MyApp::DoStreamDemo5(wxCommandEvent& WXUNUSED(event))
     wxFileInputStream file_input( wxString("test_wx.dat") );
     
     ch = file_input.Peek();
-    str.Printf( "First char peeked: %d\n", (int) ch );
+    str.Printf( wxT("First char peeked: %d\n"), (int) ch );
     textCtrl.WriteText( str );
     
     ch = file_input.GetC();
-    str.Printf( "First char read: %d\n", (int) ch );
+    str.Printf( wxT("First char read: %d\n"), (int) ch );
     textCtrl.WriteText( str );
     
     ch = file_input.Peek();
-    str.Printf( "Second char peeked: %d\n", (int) ch );
+    str.Printf( wxT("Second char peeked: %d\n"), (int) ch );
     textCtrl.WriteText( str );
     
     ch = file_input.GetC();
-    str.Printf( "Second char read: %d\n", (int) ch );
+    str.Printf( wxT("Second char read: %d\n"), (int) ch );
     textCtrl.WriteText( str );
     
     ch = file_input.Peek();
-    str.Printf( "Third char peeked: %d\n", (int) ch );
+    str.Printf( wxT("Third char peeked: %d\n"), (int) ch );
     textCtrl.WriteText( str );
     
     ch = file_input.GetC();
-    str.Printf( "Third char read: %d\n", (int) ch );
+    str.Printf( wxT("Third char read: %d\n"), (int) ch );
     textCtrl.WriteText( str );
     
     
@@ -693,27 +697,27 @@ void MyApp::DoStreamDemo5(wxCommandEvent& WXUNUSED(event))
     wxMemoryInputStream input( buf, 10 );
     
     ch = input.Peek();
-    str.Printf( "First char peeked: %d\n", (int) ch );
+    str.Printf( wxT("First char peeked: %d\n"), (int) ch );
     textCtrl.WriteText( str );
     
     ch = input.GetC();
-    str.Printf( "First char read: %d\n", (int) ch );
+    str.Printf( wxT("First char read: %d\n"), (int) ch );
     textCtrl.WriteText( str );
     
     ch = input.Peek();
-    str.Printf( "Second char peeked: %d\n", (int) ch );
+    str.Printf( wxT("Second char peeked: %d\n"), (int) ch );
     textCtrl.WriteText( str );
     
     ch = input.GetC();
-    str.Printf( "Second char read: %d\n", (int) ch );
+    str.Printf( wxT("Second char read: %d\n"), (int) ch );
     textCtrl.WriteText( str );
     
     ch = input.Peek();
-    str.Printf( "Third char peeked: %d\n", (int) ch );
+    str.Printf( wxT("Third char peeked: %d\n"), (int) ch );
     textCtrl.WriteText( str );
     
     ch = input.GetC();
-    str.Printf( "Third char read: %d\n", (int) ch );
+    str.Printf( wxT("Third char read: %d\n"), (int) ch );
     textCtrl.WriteText( str );
 }
 
@@ -731,11 +735,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() );
@@ -798,11 +802,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;