X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/863110af35cd0ee2db1893eeb5cc35c5bbbba4c8..87419e97c6f15a9906de69690e7ba59ec0ffd119:/samples/typetest/typetest.cpp diff --git a/samples/typetest/typetest.cpp b/samples/typetest/typetest.cpp index e9102078d4..8a22895fc1 100644 --- a/samples/typetest/typetest.cpp +++ b/samples/typetest/typetest.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: typetest.cpp -// Purpose: Types wxWindows sample +// Purpose: Types wxWidgets sample // Author: Julian Smart // Modified by: // Created: 04/01/98 @@ -9,10 +9,6 @@ // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "typetest.h" -#endif - // For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" @@ -71,10 +67,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, _T("wxWindows Types Demo"), + MyFrame *frame = new MyFrame((wxFrame *) NULL, _T("wxWidgets Types Demo"), wxPoint(50, 50), wxSize(450, 340)); // Give it an icon @@ -108,14 +107,15 @@ bool MyApp::OnInit() menu_bar->Append(test_menu, _T("&Tests")); frame->SetMenuBar(menu_bar); - m_textCtrl = new wxTextCtrl(frame, -1, _T(""), 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)) @@ -128,7 +128,7 @@ void MyApp::DoStreamDemo(wxCommandEvent& WXUNUSED(event)) textCtrl.WriteText( _T("Writing to ofstream and wxFileOutputStream:\n") ); wxSTD ofstream std_file_output( "test_std.dat" ); - wxFileOutputStream file_output( wxString(_T("test_wx.dat")) ); + wxFileOutputStream file_output( file_name ); wxBufferedOutputStream buf_output( file_output ); wxTextOutputStream text_output( buf_output ); @@ -137,31 +137,31 @@ void MyApp::DoStreamDemo(wxCommandEvent& WXUNUSED(event)) tmp.Printf( _T("Signed int: %d\n"), si ); textCtrl.WriteText( tmp ); text_output << si << _T("\n"); - std_file_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 << _T("\n"); - std_file_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 << _T("\n"); - std_file_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 << _T("\n"); - std_file_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 << _T("\n"); - std_file_output << str.c_str() << _T("\n"); + std_file_output << str.ToAscii() << "\n"; textCtrl.WriteText( _T("\nReading from ifstream:\n") ); @@ -183,19 +183,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 = wxString::FromAscii(std_buf); + tmp.Printf( _T("String: %s\n"), str.c_str() ); textCtrl.WriteText( tmp ); -#endif textCtrl.WriteText( _T("\nReading from wxFileInputStream:\n") ); buf_output.Sync(); - wxFileInputStream file_input( wxString(_T("test_wx.dat")) ); + wxFileInputStream file_input( file_name ); wxBufferedInputStream buf_input( file_input ); wxTextInputStream text_input( file_input ); @@ -283,13 +281,13 @@ void MyApp::DoStreamDemo2(wxCommandEvent& WXUNUSED(event)) textCtrl.WriteText( _T("Writing number 0 to 9 to buffered wxFileOutputStream:\n\n") ); - wxFileOutputStream file_output( wxString(_T("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(_T("test_wx.dat")) ); + wxFileInputStream file_input( file_name ); for (ch2 = 0; ch2 < 10; ch2++) { file_input.Read( &ch, 1 ); @@ -300,7 +298,7 @@ void MyApp::DoStreamDemo2(wxCommandEvent& WXUNUSED(event)) 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(_T("test_wx2.dat")) ); + wxFileOutputStream file_output2( file_name2 ); wxBufferedOutputStream buf_output2( file_output2 ); for (ch = 0; ch < 10; ch++) buf_output2.Write( &ch, 1 ); @@ -309,7 +307,7 @@ void MyApp::DoStreamDemo2(wxCommandEvent& WXUNUSED(event)) buf_output2.Write( &ch, 1 ); buf_output2.Sync(); - wxFileInputStream file_input2( wxString(_T("test_wx2.dat")) ); + wxFileInputStream file_input2( file_name2 ); for (ch2 = 0; ch2 < 10; ch2++) { file_input2.Read( &ch, 1 ); @@ -327,7 +325,7 @@ void MyApp::DoStreamDemo2(wxCommandEvent& WXUNUSED(event)) 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( wxString(_T("test_wx2.dat")) ); + wxFileInputStream file_input3( file_name2 ); wxBufferedInputStream buf_input3( file_input3 ); for (ch2 = 0; ch2 < 10; ch2++) { @@ -355,7 +353,7 @@ void MyApp::DoStreamDemo3(wxCommandEvent& WXUNUSED(event)) textCtrl.WriteText( _T("Writing number 0 to 9 to wxFileOutputStream:\n\n") ); - wxFileOutputStream file_output( wxString(_T("test_wx.dat")) ); + wxFileOutputStream file_output( file_name ); for (ch = 0; ch < 10; ch++) file_output.Write( &ch, 1 ); @@ -363,7 +361,7 @@ void MyApp::DoStreamDemo3(wxCommandEvent& WXUNUSED(event)) textCtrl.WriteText( _T("Reading 0 to 10 to wxFileInputStream:\n\n") ); - wxFileInputStream file_input( wxString(_T("test_wx.dat")) ); + wxFileInputStream file_input( file_name ); for (ch2 = 0; ch2 < 11; ch2++) { file_input.Read( &ch, 1 ); @@ -412,7 +410,7 @@ void MyApp::DoStreamDemo3(wxCommandEvent& WXUNUSED(event)) textCtrl.WriteText( _T("Reading 0 to 10 to wxFFileInputStream:\n\n") ); - wxFFileInputStream ffile_input( wxString(_T("test_wx.dat")) ); + wxFFileInputStream ffile_input( file_name ); for (ch2 = 0; ch2 < 11; ch2++) { ffile_input.Read( &ch, 1 ); @@ -460,7 +458,7 @@ void MyApp::DoStreamDemo3(wxCommandEvent& WXUNUSED(event)) textCtrl.WriteText( _T("Reading 0 to 10 to buffered wxFFileInputStream:\n\n") ); - wxFFileInputStream ffile_input2( wxString(_T("test_wx.dat")) ); + wxFFileInputStream ffile_input2( file_name ); wxBufferedInputStream buf_input( ffile_input2 ); for (ch2 = 0; ch2 < 11; ch2++) { @@ -517,7 +515,7 @@ void MyApp::DoStreamDemo4(wxCommandEvent& WXUNUSED(event)) // bigger than buffer textCtrl.WriteText( _T("Writing 2000x 1 to wxFileOutputStream.\n\n") ); - wxFileOutputStream file_output( wxString(_T("test_wx.dat")) ); + wxFileOutputStream file_output( file_name ); for (int i = 0; i < 2000; i++) { char ch = 1; @@ -526,7 +524,7 @@ void MyApp::DoStreamDemo4(wxCommandEvent& WXUNUSED(event)) textCtrl.WriteText( _T("Opening with a buffered wxFileInputStream:\n\n") ); - wxFileInputStream file_input( wxString(_T("test_wx.dat")) ); + wxFileInputStream file_input( file_name ); wxBufferedInputStream buf_input( file_input ); textCtrl.WriteText( _T("wxBufferedInputStream.GetLastError() returns: ") ); @@ -656,13 +654,13 @@ void MyApp::DoStreamDemo5(wxCommandEvent& WXUNUSED(event)) textCtrl.WriteText( _T("Writing number 0 to 9 to wxFileOutputStream:\n\n") ); - wxFileOutputStream file_output( wxString(_T("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(_T("test_wx.dat")) ); + wxFileInputStream file_input( file_name ); ch = file_input.Peek(); str.Printf( wxT("First char peeked: %d\n"), (int) ch ); @@ -727,12 +725,11 @@ void MyApp::DoStreamDemo6(wxCommandEvent& WXUNUSED(event)) textCtrl.WriteText( _T("\nTesting Ungetch():\n\n") ); char ch = 0; - size_t pos = 0; wxString str; textCtrl.WriteText( _T("Writing number 0 to 9 to wxFileOutputStream...\n\n") ); - wxFileOutputStream file_output( wxString(_T("test_wx.dat")) ); + wxFileOutputStream file_output( file_name ); for (ch = 0; ch < 10; ch++) file_output.Write( &ch, 1 ); @@ -740,52 +737,52 @@ void MyApp::DoStreamDemo6(wxCommandEvent& WXUNUSED(event)) textCtrl.WriteText( _T("Reading char from wxFileInputStream:\n\n") ); - wxFileInputStream file_input( wxString(_T("test_wx.dat")) ); + 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( _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( _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( _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( _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( _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( _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 ); @@ -794,7 +791,7 @@ void MyApp::DoStreamDemo6(wxCommandEvent& WXUNUSED(event)) 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 ); } @@ -807,12 +804,11 @@ void MyApp::DoStreamDemo7(wxCommandEvent& WXUNUSED(event)) textCtrl.WriteText( _T("\nTesting Ungetch() in buffered input stream:\n\n") ); char ch = 0; - size_t pos = 0; wxString str; textCtrl.WriteText( _T("Writing number 0 to 9 to wxFileOutputStream...\n\n") ); - wxFileOutputStream file_output( wxString(_T("test_wx.dat")) ); + wxFileOutputStream file_output( file_name ); for (ch = 0; ch < 10; ch++) file_output.Write( &ch, 1 ); @@ -820,53 +816,53 @@ void MyApp::DoStreamDemo7(wxCommandEvent& WXUNUSED(event)) textCtrl.WriteText( _T("Reading char from wxBufferedInputStream via wxFileInputStream:\n\n") ); - wxFileInputStream file_input( wxString(_T("test_wx.dat")) ); + 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( _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( _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( _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( _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( _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( _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 ); @@ -875,7 +871,7 @@ void MyApp::DoStreamDemo7(wxCommandEvent& WXUNUSED(event)) 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 ); } @@ -889,7 +885,7 @@ void MyApp::DoUnicodeDemo(wxCommandEvent& WXUNUSED(event)) textCtrl << _T("\nTest wchar_t to char (Unicode to ANSI/Multibyte) converions:"); wxString str; - str = _T("Robert Röbling\n"); + str = _T("Robert R\366bling\n"); printf( "\n\nConversion with wxConvLocal:\n" ); wxConvCurrent = &wxConvLocal; @@ -955,13 +951,13 @@ void MyApp::DoMIMEDemo(wxCommandEvent& WXUNUSED(event)) wxFileType::MessageParameters params(filename, type); filetype->GetOpenCommand(&open, params); - textCtrl << _T("MIME information about extension '") << ext << _T("'\n") + textCtrl << _T("MIME information about extension '") << ext << _T('\n') << _T("\tMIME type: ") << ( !type ? wxT("unknown") - : type.c_str() ) << '\n' - << _T("\tDescription: ") << ( !desc ? wxT("") : desc.c_str() ) - << '\n' + : type.c_str() ) << _T('\n') + << _T("\tDescription: ") << ( !desc ? wxEmptyString : desc.c_str() ) + << _T('\n') << _T("\tCommand to open: ") << ( !open ? wxT("no") : open.c_str() ) - << '\n'; + << _T('\n'); delete filetype; } @@ -976,27 +972,28 @@ void MyApp::DoByteOrderDemo(wxCommandEvent& WXUNUSED(event)) textCtrl.Clear(); textCtrl << _T("\nTest byte order macros:\n\n"); - if (wxBYTE_ORDER == wxLITTLE_ENDIAN) + #if wxBYTE_ORDER == wxLITTLE_ENDIAN textCtrl << _T("This is a little endian system.\n\n"); - else + #else textCtrl << _T("This is a big endian system.\n\n"); + #endif wxString text; wxInt32 var = 0xF1F2F3F4; - text = _T(""); + text = wxEmptyString; text.Printf( _T("Value of wxInt32 is now: %#x.\n\n"), var ); textCtrl.WriteText( text ); - text = _T(""); + text = wxEmptyString; text.Printf( _T("Value of swapped wxInt32 is: %#x.\n\n"), wxINT32_SWAP_ALWAYS( var ) ); textCtrl.WriteText( text ); - text = _T(""); + 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 = _T(""); + text = wxEmptyString; text.Printf( _T("Value of wxInt32 swapped on big endian is: %#x.\n\n"), wxINT32_SWAP_ON_BE( var ) ); textCtrl.WriteText( text ); } @@ -1024,14 +1021,12 @@ void MyApp::DoVariantDemo(wxCommandEvent& WXUNUSED(event) ) 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; + wxArrayString stringArray; + stringArray.Add(_T("one")); stringArray.Add(_T("two")); stringArray.Add(_T("three")); + var1 = stringArray; textCtrl << _T("var1 = ") << var1.MakeString() << _T("\n"); var1.ClearList(); @@ -1051,10 +1046,13 @@ void MyApp::DoVariantDemo(wxCommandEvent& WXUNUSED(event) ) 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"); + if (font) + { + textCtrl << font->GetNativeFontInfoDesc() << _T("\"\n"); + } + else + { + textCtrl << _T("(null)\"\n"); } } @@ -1065,21 +1063,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, _T("Tests various wxWindows types"), - _T("About Types"), wxYES_NO|wxCANCEL); + wxMessageDialog dialog(this, _T("Tests various wxWidgets types"), + _T("About Types"), wxYES_NO|wxCANCEL); - dialog.ShowModal(); + dialog.ShowModal(); }