X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83661a1347733ddad2a7c264f920658e3095ff13..30827629fa11f6365f69bd2917e1a35d22c35363:/samples/typetest/typetest.cpp

diff --git a/samples/typetest/typetest.cpp b/samples/typetest/typetest.cpp
index bb0e047620..8f6ef265dc 100644
--- a/samples/typetest/typetest.cpp
+++ b/samples/typetest/typetest.cpp
@@ -31,7 +31,7 @@
 
 #include "typetest.h"
 
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__)
 #include "mondrian.xpm"
 #endif
 
@@ -58,13 +58,15 @@ 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)
@@ -90,13 +92,15 @@ 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");
@@ -230,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 );
@@ -295,7 +299,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" );
     
@@ -315,7 +319,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" );
     
@@ -334,14 +338,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" );
     
 }
@@ -370,7 +374,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())
         {
@@ -397,7 +401,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())
     {
@@ -419,7 +423,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())
         {
@@ -446,7 +450,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())
     {
@@ -468,7 +472,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())
         {
@@ -495,7 +499,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())
     {
@@ -540,9 +544,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" );
     
@@ -560,9 +564,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" );
     
@@ -582,9 +586,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" );
     
@@ -601,9 +605,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" );
 
@@ -620,9 +624,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" );
 
@@ -639,9 +643,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" );
 }
@@ -667,27 +671,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 );
     
     
@@ -697,27 +701,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 );
 }
 
@@ -735,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() );
@@ -802,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;
@@ -847,6 +851,8 @@ void MyApp::DoByteOrderDemo(wxCommandEvent& WXUNUSED(event))
     textCtrl.WriteText( text );
 }
 
+#if wxUSE_TIMEDATE
+
 void MyApp::DoTimeDemo(wxCommandEvent& WXUNUSED(event))
 {
     wxTextCtrl& textCtrl = * GetTextCtrl();
@@ -998,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();