X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2f6c54eb076d760cbb6fb15e899f15fbbd575850..c4e2838090992384911a6a6aa44cac985d79a555:/samples/typetest/typetest.cpp diff --git a/samples/typetest/typetest.cpp b/samples/typetest/typetest.cpp index 75e68a09bb..983961312d 100644 --- a/samples/typetest/typetest.cpp +++ b/samples/typetest/typetest.cpp @@ -1,11 +1,11 @@ ///////////////////////////////////////////////////////////////////////////// // Name: typetest.cpp -// Purpose: Types wxWindows sample +// Purpose: Types wxWidgets sample // Author: Julian Smart // Modified by: // Created: 04/01/98 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem +// Copyright: (c) Julian Smart // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// @@ -24,14 +24,12 @@ #include "wx/wx.h" #endif -#include "wx/time.h" -#include "wx/date.h" #include "wx/variant.h" #include "wx/mimetype.h" #include "typetest.h" -#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) +#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) #include "mondrian.xpm" #endif @@ -58,10 +56,6 @@ 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 @@ -77,10 +71,13 @@ BEGIN_EVENT_TABLE(MyApp, wxApp) EVT_MENU(TYPES_MIME, MyApp::DoMIMEDemo) END_EVENT_TABLE() +wxString file_name = _T("test_wx.dat"); +wxString file_name2 = wxString(_T("test_wx2.dat")); + bool MyApp::OnInit() { // Create the main frame window - MyFrame *frame = new MyFrame((wxFrame *) NULL, "wxWindows Types Demo", + MyFrame *frame = new MyFrame((wxFrame *) NULL, _T("wxWidgets Types Demo"), wxPoint(50, 50), wxSize(450, 340)); // Give it an icon @@ -89,43 +86,40 @@ bool MyApp::OnInit() // Make a menubar wxMenu *file_menu = new wxMenu; - file_menu->Append(TYPES_ABOUT, "&About"); + file_menu->Append(TYPES_ABOUT, _T("&About")); file_menu->AppendSeparator(); - file_menu->Append(TYPES_QUIT, "E&xit\tAlt-X"); + file_menu->Append(TYPES_QUIT, _T("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"); + test_menu->Append(TYPES_VARIANT, _T("&Variant test")); + test_menu->Append(TYPES_BYTEORDER, _T("&Byteorder test")); #if wxUSE_UNICODE - test_menu->Append(TYPES_UNICODE, "&Unicode test"); + test_menu->Append(TYPES_UNICODE, _T("&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->Append(TYPES_STREAM, _T("&Stream test")); + test_menu->Append(TYPES_STREAM2, _T("&Stream seek test")); + test_menu->Append(TYPES_STREAM3, _T("&Stream error test")); + test_menu->Append(TYPES_STREAM4, _T("&Stream buffer test")); + test_menu->Append(TYPES_STREAM5, _T("&Stream peek test")); + test_menu->Append(TYPES_STREAM6, _T("&Stream ungetch test")); + test_menu->Append(TYPES_STREAM7, _T("&Stream ungetch test for a buffered stream")); test_menu->AppendSeparator(); - test_menu->Append(TYPES_MIME, "&MIME database test"); + test_menu->Append(TYPES_MIME, _T("&MIME database test")); wxMenuBar *menu_bar = new wxMenuBar; - menu_bar->Append(file_menu, "&File"); - menu_bar->Append(test_menu, "&Tests"); + menu_bar->Append(file_menu, _T("&File")); + menu_bar->Append(test_menu, _T("&Tests")); frame->SetMenuBar(menu_bar); - m_textCtrl = new wxTextCtrl(frame, -1, "", wxPoint(0, 0), wxDefaultSize, wxTE_MULTILINE); + m_textCtrl = new wxTextCtrl(frame, wxID_ANY, wxEmptyString, + wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE); // Show the frame - frame->Show(TRUE); + frame->Show(true); SetTopWindow(frame); - return TRUE; + return true; } void MyApp::DoStreamDemo(wxCommandEvent& WXUNUSED(event)) @@ -135,10 +129,10 @@ void MyApp::DoStreamDemo(wxCommandEvent& WXUNUSED(event)) textCtrl.Clear(); textCtrl << _T("\nTest fstream vs. wxFileStream:\n\n"); - textCtrl.WriteText( "Writing to ofstream and wxFileOutputStream:\n" ); + textCtrl.WriteText( _T("Writing to ofstream and wxFileOutputStream:\n") ); wxSTD ofstream std_file_output( "test_std.dat" ); - wxFileOutputStream file_output( wxString("test_wx.dat") ); + wxFileOutputStream file_output( file_name ); wxBufferedOutputStream buf_output( file_output ); wxTextOutputStream text_output( buf_output ); @@ -146,34 +140,34 @@ void MyApp::DoStreamDemo(wxCommandEvent& WXUNUSED(event)) signed int si = 0xFFFFFFFF; tmp.Printf( _T("Signed int: %d\n"), si ); textCtrl.WriteText( tmp ); - text_output << si << "\n"; + text_output << si << _T("\n"); std_file_output << si << "\n"; unsigned int ui = 0xFFFFFFFF; tmp.Printf( _T("Unsigned int: %u\n"), ui ); textCtrl.WriteText( tmp ); - text_output << ui << "\n"; + text_output << ui << _T("\n"); std_file_output << ui << "\n"; double d = 2.01234567890123456789; tmp.Printf( _T("Double: %f\n"), d ); textCtrl.WriteText( tmp ); - text_output << d << "\n"; + text_output << d << _T("\n"); std_file_output << d << "\n"; float f = (float)0.00001; tmp.Printf( _T("Float: %f\n"), f ); textCtrl.WriteText( tmp ); - text_output << f << "\n"; + text_output << f << _T("\n"); std_file_output << f << "\n"; wxString str( _T("Hello!") ); tmp.Printf( _T("String: %s\n"), str.c_str() ); textCtrl.WriteText( tmp ); - text_output << str << "\n"; - std_file_output << str.c_str() << "\n"; - - textCtrl.WriteText( "\nReading from ifstream:\n" ); + text_output << str << _T("\n"); + std_file_output << str.ToAscii() << "\n"; + + textCtrl.WriteText( _T("\nReading from ifstream:\n") ); wxSTD ifstream std_file_input( "test_std.dat" ); @@ -193,19 +187,17 @@ void MyApp::DoStreamDemo(wxCommandEvent& WXUNUSED(event)) tmp.Printf( _T("Float: %f\n"), f ); textCtrl.WriteText( tmp ); - // Why doesn't this work? -#if 0 char std_buf[200]; std_file_input >> std_buf; - tmp.Printf( _T("String: %s\n"), std_buf ); + str.FromAscii(std_buf); + tmp.Printf( _T("String: %s\n"), str.c_str() ); textCtrl.WriteText( tmp ); -#endif - textCtrl.WriteText( "\nReading from wxFileInputStream:\n" ); + textCtrl.WriteText( _T("\nReading from wxFileInputStream:\n") ); buf_output.Sync(); - wxFileInputStream file_input( wxString("test_wx.dat") ); + wxFileInputStream file_input( file_name ); wxBufferedInputStream buf_input( file_input ); wxTextInputStream text_input( file_input ); @@ -231,9 +223,9 @@ void MyApp::DoStreamDemo(wxCommandEvent& WXUNUSED(event)) - textCtrl << "\nTest for wxDataStream:\n\n"; + textCtrl << _T("\nTest for wxDataStream:\n\n"); - textCtrl.WriteText( "Writing to wxDataOutputStream:\n" ); + textCtrl.WriteText( _T("Writing to wxDataOutputStream:\n") ); file_output.SeekO( 0 ); wxDataOutputStream data_output( buf_output ); @@ -253,14 +245,14 @@ void MyApp::DoStreamDemo(wxCommandEvent& WXUNUSED(event)) textCtrl.WriteText( tmp ); data_output.WriteDouble( d ); - str = "Hello!"; + str = _T("Hello!"); tmp.Printf( _T("String: %s\n"), str.c_str() ); textCtrl.WriteText( tmp ); data_output.WriteString( str ); buf_output.Sync(); - textCtrl.WriteText( "\nReading from wxDataInputStream:\n" ); + textCtrl.WriteText( _T("\nReading from wxDataInputStream:\n") ); file_input.SeekI( 0 ); wxDataInputStream data_input( buf_input ); @@ -291,26 +283,26 @@ void MyApp::DoStreamDemo2(wxCommandEvent& WXUNUSED(event)) char ch,ch2; - textCtrl.WriteText( "Writing number 0 to 9 to buffered wxFileOutputStream:\n\n" ); + textCtrl.WriteText( _T("Writing number 0 to 9 to buffered wxFileOutputStream:\n\n") ); - wxFileOutputStream file_output( wxString("test_wx.dat") ); + wxFileOutputStream file_output( file_name ); 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") ); + + wxFileInputStream file_input( file_name ); for (ch2 = 0; ch2 < 10; ch2++) { file_input.Read( &ch, 1 ); - textCtrl.WriteText( (wxChar)(ch + '0') ); + textCtrl.WriteText( (wxChar)(ch + _T('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" ); + textCtrl.WriteText( _T("\n\n\n") ); + + textCtrl.WriteText( _T("Writing number 0 to 9 to buffered wxFileOutputStream, then\n") ); + textCtrl.WriteText( _T("seeking back to #3 and writing 0:\n\n") ); - wxFileOutputStream file_output2( wxString("test_wx2.dat") ); + wxFileOutputStream file_output2( file_name2 ); wxBufferedOutputStream buf_output2( file_output2 ); for (ch = 0; ch < 10; ch++) buf_output2.Write( &ch, 1 ); @@ -318,40 +310,40 @@ void MyApp::DoStreamDemo2(wxCommandEvent& WXUNUSED(event)) ch = 0; buf_output2.Write( &ch, 1 ); buf_output2.Sync(); - - wxFileInputStream file_input2( wxString("test_wx2.dat") ); + + wxFileInputStream file_input2( file_name2 ); for (ch2 = 0; ch2 < 10; ch2++) { file_input2.Read( &ch, 1 ); - textCtrl.WriteText( (wxChar)(ch + '0') ); + textCtrl.WriteText( (wxChar)(ch + _T('0')) ); } - textCtrl.WriteText( "\n\n\n" ); - + textCtrl.WriteText( _T("\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") ); + textCtrl.WriteText( _T("Reading number 0 to 9 from buffered wxFileInputStream, then\n") ); + textCtrl.WriteText( _T("seeking back to #3 and reading the 0:\n\n") ); + + wxFileInputStream file_input3( file_name2 ); wxBufferedInputStream buf_input3( file_input3 ); for (ch2 = 0; ch2 < 10; ch2++) { buf_input3.Read( &ch, 1 ); - textCtrl.WriteText( (wxChar)(ch + '0') ); + textCtrl.WriteText( (wxChar)(ch + _T('0')) ); } for (int j = 0; j < 2000; j++) buf_input3.Read( &ch, 1 ); - textCtrl.WriteText( "\n" ); + textCtrl.WriteText( _T("\n") ); buf_input3.SeekI( 3 ); buf_input3.Read( &ch, 1 ); - textCtrl.WriteText( (wxChar)(ch + '0') ); - textCtrl.WriteText( "\n\n\n" ); - + textCtrl.WriteText( (wxChar)(ch + _T('0')) ); + textCtrl.WriteText( _T("\n\n\n") ); + } void MyApp::DoStreamDemo3(wxCommandEvent& WXUNUSED(event)) @@ -359,159 +351,159 @@ void MyApp::DoStreamDemo3(wxCommandEvent& WXUNUSED(event)) wxTextCtrl& textCtrl = * GetTextCtrl(); textCtrl.Clear(); - textCtrl << "\nTesting wxFileInputStream's and wxFFileInputStream's error handling:\n\n"; + textCtrl << _T("\nTesting wxFileInputStream's and wxFFileInputStream's error handling:\n\n"); char ch,ch2; - textCtrl.WriteText( "Writing number 0 to 9 to wxFileOutputStream:\n\n" ); + textCtrl.WriteText( _T("Writing number 0 to 9 to wxFileOutputStream:\n\n") ); - wxFileOutputStream file_output( wxString("test_wx.dat") ); + wxFileOutputStream file_output( file_name ); 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") ); + textCtrl.WriteText( _T("Reading 0 to 10 to wxFileInputStream:\n\n") ); + + wxFileInputStream file_input( file_name ); for (ch2 = 0; ch2 < 11; ch2++) { file_input.Read( &ch, 1 ); - textCtrl.WriteText( "Value read: " ); + textCtrl.WriteText( _T("Value read: ") ); textCtrl.WriteText( (wxChar)(ch + '0') ); - textCtrl.WriteText( "; stream.LastError() returns: " ); - switch (file_input.LastError()) + textCtrl.WriteText( _T("; stream.GetLastError() returns: ") ); + switch (file_input.GetLastError()) { - 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_NO_ERROR: textCtrl.WriteText( _T("wxSTREAM_NO_ERROR\n") ); break; + case wxSTREAM_EOF: textCtrl.WriteText( _T("wxSTREAM_EOF\n") ); break; + case wxSTREAM_READ_ERROR: textCtrl.WriteText( _T("wxSTREAM_READ_ERROR\n") ); break; + case wxSTREAM_WRITE_ERROR: textCtrl.WriteText( _T("wxSTREAM_WRITE_ERROR\n") ); break; + default: textCtrl.WriteText( _T("Huh?\n") ); break; } } - textCtrl.WriteText( "\n" ); - - textCtrl.WriteText( "Seeking to 0; stream.LastError() returns: " ); + textCtrl.WriteText( _T("\n") ); + + textCtrl.WriteText( _T("Seeking to 0; stream.GetLastError() returns: ") ); file_input.SeekI( 0 ); - switch (file_input.LastError()) + switch (file_input.GetLastError()) { - 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_NO_ERROR: textCtrl.WriteText( _T("wxSTREAM_NO_ERROR\n") ); break; + case wxSTREAM_EOF: textCtrl.WriteText( _T("wxSTREAM_EOF\n") ); break; + case wxSTREAM_READ_ERROR: textCtrl.WriteText( _T("wxSTREAM_READ_ERROR\n") ); break; + case wxSTREAM_WRITE_ERROR: textCtrl.WriteText( _T("wxSTREAM_WRITE_ERROR\n") ); break; + default: textCtrl.WriteText( _T("Huh?\n") ); break; } - textCtrl.WriteText( "\n" ); - + textCtrl.WriteText( _T("\n") ); + file_input.Read( &ch, 1 ); - textCtrl.WriteText( "Value read: " ); - textCtrl.WriteText( (wxChar)(ch + '0') ); - textCtrl.WriteText( "; stream.LastError() returns: " ); - switch (file_input.LastError()) + textCtrl.WriteText( _T("Value read: ") ); + textCtrl.WriteText( (wxChar)(ch + _T('0')) ); + textCtrl.WriteText( _T("; stream.GetLastError() returns: ") ); + switch (file_input.GetLastError()) { - 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_NO_ERROR: textCtrl.WriteText( _T("wxSTREAM_NO_ERROR\n") ); break; + case wxSTREAM_EOF: textCtrl.WriteText( _T("wxSTREAM_EOF\n") ); break; + case wxSTREAM_READ_ERROR: textCtrl.WriteText( _T("wxSTREAM_READ_ERROR\n") ); break; + case wxSTREAM_WRITE_ERROR: textCtrl.WriteText( _T("wxSTREAM_WRITE_ERROR\n") ); break; + default: textCtrl.WriteText( _T("Huh?\n") ); break; } - textCtrl.WriteText( "\n\n" ); + textCtrl.WriteText( _T("\n\n") ); + - // Testing wxFFileInputStream - - textCtrl.WriteText( "Reading 0 to 10 to wxFFileInputStream:\n\n" ); - wxFFileInputStream ffile_input( wxString("test_wx.dat") ); + textCtrl.WriteText( _T("Reading 0 to 10 to wxFFileInputStream:\n\n") ); + + wxFFileInputStream ffile_input( file_name ); for (ch2 = 0; ch2 < 11; ch2++) { ffile_input.Read( &ch, 1 ); - textCtrl.WriteText( "Value read: " ); + textCtrl.WriteText( _T("Value read: ") ); textCtrl.WriteText( (wxChar)(ch + '0') ); - textCtrl.WriteText( "; stream.LastError() returns: " ); - switch (ffile_input.LastError()) + textCtrl.WriteText( _T("; stream.GetLastError() returns: ") ); + switch (ffile_input.GetLastError()) { - 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_NO_ERROR: textCtrl.WriteText( _T("wxSTREAM_NO_ERROR\n") ); break; + case wxSTREAM_EOF: textCtrl.WriteText( _T("wxSTREAM_EOF\n") ); break; + case wxSTREAM_READ_ERROR: textCtrl.WriteText( _T("wxSTREAM_READ_ERROR\n") ); break; + case wxSTREAM_WRITE_ERROR: textCtrl.WriteText( _T("wxSTREAM_WRITE_ERROR\n") ); break; + default: textCtrl.WriteText( _T("Huh?\n") ); break; } } - textCtrl.WriteText( "\n" ); - - textCtrl.WriteText( "Seeking to 0; stream.LastError() returns: " ); + textCtrl.WriteText( _T("\n") ); + + textCtrl.WriteText( _T("Seeking to 0; stream.GetLastError() returns: ") ); ffile_input.SeekI( 0 ); - switch (ffile_input.LastError()) + switch (ffile_input.GetLastError()) { - 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_NO_ERROR: textCtrl.WriteText( _T("wxSTREAM_NO_ERROR\n") ); break; + case wxSTREAM_EOF: textCtrl.WriteText( _T("wxSTREAM_EOF\n") ); break; + case wxSTREAM_READ_ERROR: textCtrl.WriteText( _T("wxSTREAM_READ_ERROR\n") ); break; + case wxSTREAM_WRITE_ERROR: textCtrl.WriteText( _T("wxSTREAM_WRITE_ERROR\n") ); break; + default: textCtrl.WriteText( _T("Huh?\n") ); break; } - textCtrl.WriteText( "\n" ); - + textCtrl.WriteText( _T("\n") ); + ffile_input.Read( &ch, 1 ); - textCtrl.WriteText( "Value read: " ); + textCtrl.WriteText( _T("Value read: ") ); textCtrl.WriteText( (wxChar)(ch + '0') ); - textCtrl.WriteText( "; stream.LastError() returns: " ); - switch (ffile_input.LastError()) + textCtrl.WriteText( _T("; stream.GetLastError() returns: ") ); + switch (ffile_input.GetLastError()) { - 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_NO_ERROR: textCtrl.WriteText( _T("wxSTREAM_NO_ERROR\n") ); break; + case wxSTREAM_EOF: textCtrl.WriteText( _T("wxSTREAM_EOF\n") ); break; + case wxSTREAM_READ_ERROR: textCtrl.WriteText( _T("wxSTREAM_READ_ERROR\n") ); break; + case wxSTREAM_WRITE_ERROR: textCtrl.WriteText( _T("wxSTREAM_WRITE_ERROR\n") ); break; + default: textCtrl.WriteText( _T("Huh?\n") ); break; } - textCtrl.WriteText( "\n\n" ); + textCtrl.WriteText( _T("\n\n") ); // Testing wxFFileInputStream - - textCtrl.WriteText( "Reading 0 to 10 to buffered wxFFileInputStream:\n\n" ); - wxFFileInputStream ffile_input2( wxString("test_wx.dat") ); + textCtrl.WriteText( _T("Reading 0 to 10 to buffered wxFFileInputStream:\n\n") ); + + wxFFileInputStream ffile_input2( file_name ); wxBufferedInputStream buf_input( ffile_input2 ); for (ch2 = 0; ch2 < 11; ch2++) { buf_input.Read( &ch, 1 ); - textCtrl.WriteText( "Value read: " ); + textCtrl.WriteText( _T("Value read: ") ); textCtrl.WriteText( (wxChar)(ch + '0') ); - textCtrl.WriteText( "; stream.LastError() returns: " ); - switch (buf_input.LastError()) + textCtrl.WriteText( _T("; stream.GetLastError() returns: ") ); + switch (buf_input.GetLastError()) { - 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_NO_ERROR: textCtrl.WriteText( _T("wxSTREAM_NO_ERROR\n") ); break; + case wxSTREAM_EOF: textCtrl.WriteText( _T("wxSTREAM_EOF\n") ); break; + case wxSTREAM_READ_ERROR: textCtrl.WriteText( _T("wxSTREAM_READ_ERROR\n") ); break; + case wxSTREAM_WRITE_ERROR: textCtrl.WriteText( _T("wxSTREAM_WRITE_ERROR\n") ); break; + default: textCtrl.WriteText( _T("Huh?\n") ); break; } } - textCtrl.WriteText( "\n" ); - - textCtrl.WriteText( "Seeking to 0; stream.LastError() returns: " ); + textCtrl.WriteText( _T("\n") ); + + textCtrl.WriteText( _T("Seeking to 0; stream.GetLastError() returns: ") ); buf_input.SeekI( 0 ); - switch (buf_input.LastError()) + switch (buf_input.GetLastError()) { - 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_NO_ERROR: textCtrl.WriteText( _T("wxSTREAM_NO_ERROR\n") ); break; + case wxSTREAM_EOF: textCtrl.WriteText( _T("wxSTREAM_EOF\n") ); break; + case wxSTREAM_READ_ERROR: textCtrl.WriteText( _T("wxSTREAM_READ_ERROR\n") ); break; + case wxSTREAM_WRITE_ERROR: textCtrl.WriteText( _T("wxSTREAM_WRITE_ERROR\n") ); break; + default: textCtrl.WriteText( _T("Huh?\n") ); break; } - textCtrl.WriteText( "\n" ); - + textCtrl.WriteText( _T("\n") ); + buf_input.Read( &ch, 1 ); - textCtrl.WriteText( "Value read: " ); + textCtrl.WriteText( _T("Value read: ") ); textCtrl.WriteText( (wxChar)(ch + '0') ); - textCtrl.WriteText( "; stream.LastError() returns: " ); - switch (buf_input.LastError()) + textCtrl.WriteText( _T("; stream.GetLastError() returns: ") ); + switch (buf_input.GetLastError()) { - 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_NO_ERROR: textCtrl.WriteText( _T("wxSTREAM_NO_ERROR\n") ); break; + case wxSTREAM_EOF: textCtrl.WriteText( _T("wxSTREAM_EOF\n") ); break; + case wxSTREAM_READ_ERROR: textCtrl.WriteText( _T("wxSTREAM_READ_ERROR\n") ); break; + case wxSTREAM_WRITE_ERROR: textCtrl.WriteText( _T("wxSTREAM_WRITE_ERROR\n") ); break; + default: textCtrl.WriteText( _T("Huh?\n") ); break; } } @@ -520,138 +512,138 @@ void MyApp::DoStreamDemo4(wxCommandEvent& WXUNUSED(event)) wxTextCtrl& textCtrl = * GetTextCtrl(); wxString msg; - + textCtrl.Clear(); - textCtrl << "\nTesting wxStreamBuffer:\n\n"; + textCtrl << _T("\nTesting wxStreamBuffer:\n\n"); // bigger than buffer - textCtrl.WriteText( "Writing 2000x 1 to wxFileOutputStream.\n\n" ); + textCtrl.WriteText( _T("Writing 2000x 1 to wxFileOutputStream.\n\n") ); - wxFileOutputStream file_output( wxString("test_wx.dat") ); + wxFileOutputStream file_output( file_name ); for (int i = 0; i < 2000; i++) { char ch = 1; file_output.Write( &ch, 1 ); } - textCtrl.WriteText( "Opening with a buffered wxFileInputStream:\n\n" ); + textCtrl.WriteText( _T("Opening with a buffered wxFileInputStream:\n\n") ); - wxFileInputStream file_input( wxString("test_wx.dat") ); + wxFileInputStream file_input( file_name ); wxBufferedInputStream buf_input( file_input ); - - textCtrl.WriteText( "wxBufferedInputStream.LastError() returns: " ); - switch (buf_input.LastError()) + + textCtrl.WriteText( _T("wxBufferedInputStream.GetLastError() returns: ") ); + switch (buf_input.GetLastError()) { - 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_NO_ERROR: textCtrl.WriteText( _T("wxSTREAM_NO_ERROR\n") ); break; + case wxSTREAM_EOF: textCtrl.WriteText( _T("wxSTREAM_EOF\n") ); break; + case wxSTREAM_READ_ERROR: textCtrl.WriteText( _T("wxSTREAM_READ_ERROR\n") ); break; + case wxSTREAM_WRITE_ERROR: textCtrl.WriteText( _T("wxSTREAM_WRITE_ERROR\n") ); break; + default: textCtrl.WriteText( _T("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( _T("\n\n") ); + - textCtrl.WriteText( "Seeking to position 300:\n\n" ); + textCtrl.WriteText( _T("Seeking to position 300:\n\n") ); buf_input.SeekI( 300 ); - - textCtrl.WriteText( "wxBufferedInputStream.LastError() returns: " ); - switch (buf_input.LastError()) + + textCtrl.WriteText( _T("wxBufferedInputStream.GetLastError() returns: ") ); + switch (buf_input.GetLastError()) { - 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_NO_ERROR: textCtrl.WriteText( _T("wxSTREAM_NO_ERROR\n") ); break; + case wxSTREAM_EOF: textCtrl.WriteText( _T("wxSTREAM_EOF\n") ); break; + case wxSTREAM_READ_ERROR: textCtrl.WriteText( _T("wxSTREAM_READ_ERROR\n") ); break; + case wxSTREAM_WRITE_ERROR: textCtrl.WriteText( _T("wxSTREAM_WRITE_ERROR\n") ); break; + default: textCtrl.WriteText( _T("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( _T("\n\n") ); + char buf[2000]; - textCtrl.WriteText( "Reading 500 bytes:\n\n" ); + textCtrl.WriteText( _T("Reading 500 bytes:\n\n") ); buf_input.Read( buf, 500 ); - - textCtrl.WriteText( "wxBufferedInputStream.LastError() returns: " ); - switch (buf_input.LastError()) + + textCtrl.WriteText( _T("wxBufferedInputStream.GetLastError() returns: ") ); + switch (buf_input.GetLastError()) { - 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_NO_ERROR: textCtrl.WriteText( _T("wxSTREAM_NO_ERROR\n") ); break; + case wxSTREAM_EOF: textCtrl.WriteText( _T("wxSTREAM_EOF\n") ); break; + case wxSTREAM_READ_ERROR: textCtrl.WriteText( _T("wxSTREAM_READ_ERROR\n") ); break; + case wxSTREAM_WRITE_ERROR: textCtrl.WriteText( _T("wxSTREAM_WRITE_ERROR\n") ); break; + default: textCtrl.WriteText( _T("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" ); + textCtrl.WriteText( _T("\n\n") ); + + textCtrl.WriteText( _T("Reading another 500 bytes:\n\n") ); buf_input.Read( buf, 500 ); - - textCtrl.WriteText( "wxBufferedInputStream.LastError() returns: " ); - switch (buf_input.LastError()) + + textCtrl.WriteText( _T("wxBufferedInputStream.GetLastError() returns: ") ); + switch (buf_input.GetLastError()) { - 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_NO_ERROR: textCtrl.WriteText( _T("wxSTREAM_NO_ERROR\n") ); break; + case wxSTREAM_EOF: textCtrl.WriteText( _T("wxSTREAM_EOF\n") ); break; + case wxSTREAM_READ_ERROR: textCtrl.WriteText( _T("wxSTREAM_READ_ERROR\n") ); break; + case wxSTREAM_WRITE_ERROR: textCtrl.WriteText( _T("wxSTREAM_WRITE_ERROR\n") ); break; + default: textCtrl.WriteText( _T("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( _T("\n\n") ); - textCtrl.WriteText( "Reading another 500 bytes:\n\n" ); + textCtrl.WriteText( _T("Reading another 500 bytes:\n\n") ); buf_input.Read( buf, 500 ); - - textCtrl.WriteText( "wxBufferedInputStream.LastError() returns: " ); - switch (buf_input.LastError()) + + textCtrl.WriteText( _T("wxBufferedInputStream.GetLastError() returns: ") ); + switch (buf_input.GetLastError()) { - 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_NO_ERROR: textCtrl.WriteText( _T("wxSTREAM_NO_ERROR\n") ); break; + case wxSTREAM_EOF: textCtrl.WriteText( _T("wxSTREAM_EOF\n") ); break; + case wxSTREAM_READ_ERROR: textCtrl.WriteText( _T("wxSTREAM_READ_ERROR\n") ); break; + case wxSTREAM_WRITE_ERROR: textCtrl.WriteText( _T("wxSTREAM_WRITE_ERROR\n") ); break; + default: textCtrl.WriteText( _T("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( _T("\n\n") ); - textCtrl.WriteText( "Reading another 500 bytes:\n\n" ); + textCtrl.WriteText( _T("Reading another 500 bytes:\n\n") ); buf_input.Read( buf, 500 ); - - textCtrl.WriteText( "wxBufferedInputStream.LastError() returns: " ); - switch (buf_input.LastError()) + + textCtrl.WriteText( _T("wxBufferedInputStream.GetLastError() returns: ") ); + switch (buf_input.GetLastError()) { - 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_NO_ERROR: textCtrl.WriteText( _T("wxSTREAM_NO_ERROR\n") ); break; + case wxSTREAM_EOF: textCtrl.WriteText( _T("wxSTREAM_EOF\n") ); break; + case wxSTREAM_READ_ERROR: textCtrl.WriteText( _T("wxSTREAM_READ_ERROR\n") ); break; + case wxSTREAM_WRITE_ERROR: textCtrl.WriteText( _T("wxSTREAM_WRITE_ERROR\n") ); break; + default: textCtrl.WriteText( _T("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( _T("\n\n") ); } void MyApp::DoStreamDemo5(wxCommandEvent& WXUNUSED(event)) @@ -659,71 +651,71 @@ void MyApp::DoStreamDemo5(wxCommandEvent& WXUNUSED(event)) wxTextCtrl& textCtrl = * GetTextCtrl(); textCtrl.Clear(); - textCtrl << "\nTesting wxFileInputStream's Peek():\n\n"; + textCtrl << _T("\nTesting wxFileInputStream's Peek():\n\n"); char ch; wxString str; - textCtrl.WriteText( "Writing number 0 to 9 to wxFileOutputStream:\n\n" ); + textCtrl.WriteText( _T("Writing number 0 to 9 to wxFileOutputStream:\n\n") ); - wxFileOutputStream file_output( wxString("test_wx.dat") ); + wxFileOutputStream file_output( file_name ); for (ch = 0; ch < 10; ch++) file_output.Write( &ch, 1 ); - + file_output.Sync(); - - wxFileInputStream file_input( wxString("test_wx.dat") ); - + + wxFileInputStream file_input( file_name ); + 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"; - + + + textCtrl << _T("\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 ); @@ -734,77 +726,76 @@ void MyApp::DoStreamDemo6(wxCommandEvent& WXUNUSED(event)) wxTextCtrl& textCtrl = * GetTextCtrl(); textCtrl.Clear(); - textCtrl.WriteText( "\nTesting Ungetch():\n\n" ); - + textCtrl.WriteText( _T("\nTesting Ungetch():\n\n") ); + char ch = 0; - size_t pos = 0; wxString str; - textCtrl.WriteText( "Writing number 0 to 9 to wxFileOutputStream...\n\n" ); + textCtrl.WriteText( _T("Writing number 0 to 9 to wxFileOutputStream...\n\n") ); - wxFileOutputStream file_output( wxString("test_wx.dat") ); + wxFileOutputStream file_output( file_name ); 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") ); - + textCtrl.WriteText( _T("Reading char from wxFileInputStream:\n\n") ); + + wxFileInputStream file_input( file_name ); + ch = file_input.GetC(); - pos = file_input.TellI(); + size_t pos = (size_t)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" ); + + textCtrl.WriteText( _T("Reading another char from wxFileInputStream:\n\n") ); ch = file_input.GetC(); - pos = file_input.TellI(); + pos = (size_t)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" ); + + textCtrl.WriteText( _T("Reading yet another char from wxFileInputStream:\n\n") ); ch = file_input.GetC(); - pos = file_input.TellI(); + pos = (size_t)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" ); + + textCtrl.WriteText( _T("Now calling Ungetch( 5 ) from wxFileInputStream...\n\n") ); file_input.Ungetch( 5 ); - pos = file_input.TellI(); + pos = (size_t)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" ); + + textCtrl.WriteText( _T("Reading char from wxFileInputStream:\n\n") ); ch = file_input.GetC(); - pos = file_input.TellI(); + pos = (size_t)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" ); + + textCtrl.WriteText( _T("Reading another char from wxFileInputStream:\n\n") ); ch = file_input.GetC(); - pos = file_input.TellI(); + pos = (size_t)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" ); + + textCtrl.WriteText( _T("Now calling Ungetch( 5 ) from wxFileInputStream again...\n\n") ); file_input.Ungetch( 5 ); - pos = file_input.TellI(); + pos = (size_t)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" ); - + + textCtrl.WriteText( _T("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(); + pos = (size_t)file_input.TellI(); str.Printf( wxT("Read char: %d. Now at position %d\n\n"), (int) ch, (int) pos ); textCtrl.WriteText( str ); } @@ -814,78 +805,77 @@ void MyApp::DoStreamDemo7(wxCommandEvent& WXUNUSED(event)) wxTextCtrl& textCtrl = * GetTextCtrl(); textCtrl.Clear(); - textCtrl.WriteText( "\nTesting Ungetch() in buffered input stream:\n\n" ); - + textCtrl.WriteText( _T("\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" ); + textCtrl.WriteText( _T("Writing number 0 to 9 to wxFileOutputStream...\n\n") ); - wxFileOutputStream file_output( wxString("test_wx.dat") ); + wxFileOutputStream file_output( file_name ); 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") ); + textCtrl.WriteText( _T("Reading char from wxBufferedInputStream via wxFileInputStream:\n\n") ); + + wxFileInputStream file_input( file_name ); wxBufferedInputStream buf_input( file_input ); - + ch = buf_input.GetC(); - pos = buf_input.TellI(); + size_t pos = (size_t)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" ); + + textCtrl.WriteText( _T("Reading another char from wxBufferedInputStream:\n\n") ); ch = buf_input.GetC(); - pos = buf_input.TellI(); + pos = (size_t)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" ); + + textCtrl.WriteText( _T("Reading yet another char from wxBufferedInputStream:\n\n") ); ch = buf_input.GetC(); - pos = buf_input.TellI(); + pos = (size_t)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" ); + + textCtrl.WriteText( _T("Now calling Ungetch( 5 ) from wxBufferedInputStream...\n\n") ); buf_input.Ungetch( 5 ); - pos = buf_input.TellI(); + pos = (size_t)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" ); + + textCtrl.WriteText( _T("Reading char from wxBufferedInputStream:\n\n") ); ch = buf_input.GetC(); - pos = buf_input.TellI(); + pos = (size_t)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" ); + + textCtrl.WriteText( _T("Reading another char from wxBufferedInputStream:\n\n") ); ch = buf_input.GetC(); - pos = buf_input.TellI(); + pos = (size_t)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" ); + + textCtrl.WriteText( _T("Now calling Ungetch( 5 ) from wxBufferedInputStream again...\n\n") ); buf_input.Ungetch( 5 ); - pos = buf_input.TellI(); + pos = (size_t)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" ); - + + textCtrl.WriteText( _T("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(); + pos = (size_t)buf_input.TellI(); str.Printf( wxT("Read char: %d. Now at position %d\n\n"), (int) ch, (int) pos ); textCtrl.WriteText( str ); } @@ -896,7 +886,7 @@ void MyApp::DoUnicodeDemo(wxCommandEvent& WXUNUSED(event)) wxTextCtrl& textCtrl = * GetTextCtrl(); textCtrl.Clear(); - textCtrl << "\nTest wchar_t to char (Unicode to ANSI/Multibyte) converions:"; + textCtrl << _T("\nTest wchar_t to char (Unicode to ANSI/Multibyte) converions:"); wxString str; str = _T("Robert Röbling\n"); @@ -904,11 +894,6 @@ 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() ); @@ -918,10 +903,10 @@ void MyApp::DoUnicodeDemo(wxCommandEvent& WXUNUSED(event)) void MyApp::DoMIMEDemo(wxCommandEvent& WXUNUSED(event)) { - static wxString s_defaultExt = "xyz"; + static wxString s_defaultExt = _T("xyz"); - wxString ext = wxGetTextFromUser("Enter a file extension: ", - "MIME database test", + wxString ext = wxGetTextFromUser(_T("Enter a file extension: "), + _T("MIME database test"), s_defaultExt); if ( !!ext ) { @@ -934,16 +919,16 @@ void MyApp::DoMIMEDemo(wxCommandEvent& WXUNUSED(event)) 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), + wxFileTypeInfo(_T("application/xyz"), + _T("XyZ %s"), + _T("XyZ -p %s"), + _T("The one and only XYZ format file"), + _T("xyz"), _T("123"), NULL), + wxFileTypeInfo(_T("text/html"), + _T("lynx %s"), + _T("lynx -dump %s | lpr"), + _T("HTML document (from fallback)"), + _T("htm"), _T("html"), NULL), // must terminate the table with this! wxFileTypeInfo() @@ -957,7 +942,7 @@ void MyApp::DoMIMEDemo(wxCommandEvent& WXUNUSED(event)) wxFileType *filetype = m_mimeDatabase->GetFileTypeFromExtension(ext); if ( !filetype ) { - textCtrl << "Unknown extension '" << ext << "'\n"; + textCtrl << _T("Unknown extension '") << ext << _T("'\n"); } else { @@ -965,17 +950,17 @@ void MyApp::DoMIMEDemo(wxCommandEvent& WXUNUSED(event)) filetype->GetMimeType(&type); filetype->GetDescription(&desc); - wxString filename = "filename"; - filename << "." << ext; + wxString filename = _T("filename"); + filename << _T(".") << ext; wxFileType::MessageParameters params(filename, type); filetype->GetOpenCommand(&open, params); - textCtrl << "MIME information about extension '" << ext << "'\n" - << "\tMIME type: " << ( !type ? wxT("unknown") + textCtrl << _T("MIME information about extension '") << ext << _T("'\n") + << _T("\tMIME type: ") << ( !type ? wxT("unknown") : type.c_str() ) << '\n' - << "\tDescription: " << ( !desc ? wxT("") : desc.c_str() ) + << _T("\tDescription: ") << ( !desc ? wxEmptyString : desc.c_str() ) << '\n' - << "\tCommand to open: " << ( !open ? wxT("no") : open.c_str() ) + << _T("\tCommand to open: ") << ( !open ? wxT("no") : open.c_str() ) << '\n'; delete filetype; @@ -989,233 +974,89 @@ void MyApp::DoByteOrderDemo(wxCommandEvent& WXUNUSED(event)) wxTextCtrl& textCtrl = * GetTextCtrl(); textCtrl.Clear(); - textCtrl << "\nTest byte order macros:\n\n"; + textCtrl << _T("\nTest byte order macros:\n\n"); - if (wxBYTE_ORDER == wxLITTLE_ENDIAN) - textCtrl << "This is a little endian system.\n\n"; - else - textCtrl << "This is a big endian system.\n\n"; + #if wxBYTE_ORDER == wxLITTLE_ENDIAN + textCtrl << _T("This is a little endian system.\n\n"); + #else + textCtrl << _T("This is a big endian system.\n\n"); + #endif wxString text; wxInt32 var = 0xF1F2F3F4; - text = ""; + text = wxEmptyString; text.Printf( _T("Value of wxInt32 is now: %#x.\n\n"), var ); textCtrl.WriteText( text ); - text = ""; + text = wxEmptyString; text.Printf( _T("Value of swapped wxInt32 is: %#x.\n\n"), wxINT32_SWAP_ALWAYS( var ) ); textCtrl.WriteText( text ); - text = ""; + text = wxEmptyString; text.Printf( _T("Value of wxInt32 swapped on little endian is: %#x.\n\n"), wxINT32_SWAP_ON_LE( var ) ); textCtrl.WriteText( text ); - text = ""; + text = wxEmptyString; 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(); - - textCtrl.Clear(); - textCtrl << "\nTest class wxTime:\n"; - wxTime now; - textCtrl << "It is now " << (wxString) now << "\n"; -} - -void MyApp::DoDateDemo(wxCommandEvent& WXUNUSED(event)) -{ - wxTextCtrl& textCtrl = * GetTextCtrl(); - - textCtrl.Clear(); - textCtrl << "\nTest class wxDate" << "\n"; - - // Various versions of the constructors - // and various output - - wxDate x(10,20,1962); - - textCtrl << x.FormatDate(wxFULL) << " (full)\n"; - - // constuctor with a string, just printing the day of the week - wxDate y("8/8/1988"); - - textCtrl << y.FormatDate(wxDAY) << " (just day)\n"; - - // constructor with a julian - wxDate z( 2450000L ); - textCtrl << z.FormatDate(wxFULL) << " (full)\n"; - - // using date addition and subtraction - wxDate a = x + 10; - textCtrl << a.FormatDate(wxFULL) << " (full)\n"; - 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; - textCtrl << (a1-a2) << "\n"; - textCtrl << (a2+=10) << "\n"; - - a1++; - textCtrl << "Tomorrow= " << a1.FormatDate(wxFULL) << "\n"; - - wxDate tmpDate1("08/01/1991"); - wxDate tmpDate2("07/14/1991"); - textCtrl << "a1 (7-14-91) < 8-01-91 ? ==> " << ((a1 < tmpDate1) ? "TRUE" : "FALSE") << "\n"; - textCtrl << "a1 (7-14-91) > 8-01-91 ? ==> " << ((a1 > tmpDate1) ? "TRUE" : "FALSE") << "\n"; - textCtrl << "a1 (7-14-91)== 7-14-91 ? ==> " << ((a1==tmpDate2) ? "TRUE" : "FALSE") << "\n"; - - wxDate a3 = a1; - textCtrl << "a1 (7-14-91)== a3 (7-14-91) ? ==> " << ((a1==a3) ? "TRUE" : "FALSE") << "\n"; - wxDate a4 = a1; - textCtrl << "a1 (7-14-91)== a4 (7-15-91) ? ==> " << ((a1==++a4) ? "TRUE" : "FALSE") << "\n"; - - wxDate a5 = wxString("today"); - textCtrl << "Today is: " << a5 << "\n"; - a4 = "TODAY"; - textCtrl << "Today (a4) is: " << a4 << "\n"; - - textCtrl << "Today + 4 is: " << (a4+=4) << "\n"; - a4 = "TODAY"; - textCtrl << "Today - 4 is: " << (a4-=4) << "\n"; - - textCtrl << "=========== Leap Year Test ===========\n"; - a1 = "1/15/1992"; - textCtrl << a1.FormatDate(wxFULL) << " " << ((a1.IsLeapYear()) ? "Leap" : "non-Leap"); - textCtrl << " " << "day of year: " << a1.GetDayOfYear() << "\n"; - - a1 = "2/16/1993"; - textCtrl << a1.FormatDate(wxFULL) << " " << ((a1.IsLeapYear()) ? "Leap" : "non-Leap"); - textCtrl << " " << "day of year: " << a1.GetDayOfYear() << "\n"; - - textCtrl << "================== string assignment test ====================\n"; - wxString date_string=a1; - textCtrl << "a1 as a string (s/b 2/16/1993) ==> " << date_string << "\n"; - - textCtrl << "================== SetFormat test ============================\n"; - a1.SetFormat(wxFULL); - textCtrl << "a1 (s/b FULL format) ==> " << a1 << "\n"; - a1.SetFormat(wxEUROPEAN); - textCtrl << "a1 (s/b EUROPEAN format) ==> " << a1 << "\n"; - - textCtrl << "================== SetOption test ============================\n"; - textCtrl << "Date abbreviation ON\n"; - - a1.SetOption(wxDATE_ABBR); - a1.SetFormat(wxMONTH); - textCtrl << "a1 (s/b MONTH format) ==> " << a1 << "\n"; - a1.SetFormat(wxDAY); - textCtrl << "a1 (s/b DAY format) ==> " << a1 << "\n"; - a1.SetFormat(wxFULL); - textCtrl << "a1 (s/b FULL format) ==> " << a1 << "\n"; - a1.SetFormat(wxEUROPEAN); - textCtrl << "a1 (s/b EUROPEAN format) ==> " << a1 << "\n"; - textCtrl << "Century suppression ON\n"; - a1.SetOption(wxNO_CENTURY); - a1.SetFormat(wxMDY); - textCtrl << "a1 (s/b MDY format) ==> " << a1 << "\n"; - textCtrl << "Century suppression OFF\n"; - a1.SetOption(wxNO_CENTURY,FALSE); - textCtrl << "a1 (s/b MDY format) ==> " << a1 << "\n"; - textCtrl << "Century suppression ON\n"; - a1.SetOption(wxNO_CENTURY); - textCtrl << "a1 (s/b MDY format) ==> " << a1 << "\n"; - a1.SetFormat(wxFULL); - textCtrl << "a1 (s/b FULL format) ==> " << a1 << "\n"; - - textCtrl << "\n=============== Version 4.0 Enhancement Test =================\n"; - - wxDate v4("11/26/1966"); - textCtrl << "\n---------- Set Stuff -----------\n"; - textCtrl << "First, 'Set' to today..." << "\n"; - textCtrl << "Before 'Set' => " << v4 << "\n"; - textCtrl << "After 'Set' => " << v4.Set() << "\n\n"; - - textCtrl << "Set to 11/26/66 => " << v4.Set(11,26,1966) << "\n"; - textCtrl << "Current Julian => " << v4.GetJulianDate() << "\n"; - textCtrl << "Set to Julian 2450000L => " << v4.Set(2450000L) << "\n"; - textCtrl << "See! => " << v4.GetJulianDate() << "\n"; - - textCtrl << "---------- Add Stuff -----------\n"; - textCtrl << "Start => " << v4 << "\n"; - textCtrl << "Add 4 Weeks => " << v4.AddWeeks(4) << "\n"; - textCtrl << "Sub 1 Month => " << v4.AddMonths(-1) << "\n"; - textCtrl << "Add 2 Years => " << v4.AddYears(2) << "\n"; - - textCtrl << "---------- Misc Stuff -----------\n"; - textCtrl << "The date aboves' day of the month is => " << v4.GetDay() << "\n"; - textCtrl << "There are " << v4.GetDaysInMonth() << " days in this month.\n"; - textCtrl << "The first day of this month lands on " << v4.GetFirstDayOfMonth() << "\n"; - textCtrl << "This day happens to be " << v4.GetDayOfWeekName() << "\n"; - textCtrl << "the " << v4.GetDayOfWeek() << " day of the week," << "\n"; - textCtrl << "on the " << v4.GetWeekOfYear() << " week of the year," << "\n"; - textCtrl << "on the " << v4.GetWeekOfMonth() << " week of the month, " << "\n"; - textCtrl << "(which is " << v4.GetMonthName() << ")\n"; - textCtrl << "the "<< v4.GetMonth() << "th month in the year.\n"; - textCtrl << "The year alone is " << v4.GetYear() << "\n"; - - textCtrl << "---------- First and Last Stuff -----------\n"; - v4.Set(); - textCtrl << "The first date of this month is " << v4.GetMonthStart() << "\n"; - textCtrl << "The last date of this month is " << v4.GetMonthEnd() << "\n"; - textCtrl << "The first date of this year is " << v4.GetYearStart() << "\n"; - textCtrl << "The last date of this year is " << v4.GetYearEnd() << "\n"; -} - -#endif // wxUSE_TIMEDATE - void MyApp::DoVariantDemo(wxCommandEvent& WXUNUSED(event) ) { wxTextCtrl& textCtrl = * GetTextCtrl(); - wxVariant var1 = "String value"; - textCtrl << "var1 = " << var1.MakeString() << "\n"; + wxVariant var1 = _T("String value"); + textCtrl << _T("var1 = ") << var1.MakeString() << _T("\n"); // Conversion wxString str = var1.MakeString(); var1 = 123.456; - textCtrl << "var1 = " << var1.GetReal() << "\n"; + textCtrl << _T("var1 = ") << var1.GetReal() << _T("\n"); // Implicit conversion double v = var1; var1 = 9876L; - textCtrl << "var1 = " << var1.GetLong() << "\n"; + textCtrl << _T("var1 = ") << var1.GetLong() << _T("\n"); // Implicit conversion long l = var1; // suppress compile warnings about unused variables - if ( l < v ) - { - ; - } + wxUnusedVar(l); + wxUnusedVar(v); wxStringList stringList; stringList.Add(_T("one")); stringList.Add(_T("two")); stringList.Add(_T("three")); var1 = stringList; - textCtrl << "var1 = " << var1.MakeString() << "\n"; + textCtrl << _T("var1 = ") << var1.MakeString() << _T("\n"); var1.ClearList(); var1.Append(wxVariant(1.2345)); - var1.Append(wxVariant("hello")); + var1.Append(wxVariant(_T("hello"))); var1.Append(wxVariant(54321L)); - textCtrl << "var1 = " << var1.MakeString() << "\n"; + textCtrl << _T("var1 = ") << var1.MakeString() << _T("\n"); size_t n = var1.GetCount(); size_t i; for (i = (size_t) 0; i < n; i++) { - textCtrl << "var1[" << (int) i << "] (type " << var1[i].GetType() << ") = " << var1[i].MakeString() << "\n"; + textCtrl << _T("var1[") << (int) i << _T("] (type ") << var1[i].GetType() << _T(") = ") << var1[i].MakeString() << _T("\n"); + } + + var1 = wxVariant(new wxFont(wxSystemSettings::GetFont(wxSYS_OEM_FIXED_FONT))); + textCtrl << _T("var1 = (wxfont)\""); + wxFont* font = wxGetVariantCast(var1,wxFont); + if (font) + { + textCtrl << font->GetNativeFontInfoDesc() << _T("\"\n"); + } + else + { + textCtrl << _T("(null)\"\n"); } } @@ -1226,21 +1067,21 @@ END_EVENT_TABLE() // My frame constructor MyFrame::MyFrame(wxFrame *parent, const wxString& title, - const wxPoint& pos, const wxSize& size): - wxFrame(parent, -1, title, pos, size) + const wxPoint& pos, const wxSize& size) + : wxFrame(parent, wxID_ANY, title, pos, size) {} void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) ) { - Close(TRUE); + Close(true); } void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) ) { - wxMessageDialog dialog(this, "Tests various wxWindows types", - "About Types", wxYES_NO|wxCANCEL); + wxMessageDialog dialog(this, _T("Tests various wxWidgets types"), + _T("About Types"), wxYES_NO|wxCANCEL); - dialog.ShowModal(); + dialog.ShowModal(); }