X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/863110af35cd0ee2db1893eeb5cc35c5bbbba4c8..b8bafcaad8c0a94d2a7e09d28fe7df540fb551f5:/samples/typetest/typetest.cpp diff --git a/samples/typetest/typetest.cpp b/samples/typetest/typetest.cpp index e9102078d4..0550ca1a00 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 @@ -74,7 +74,7 @@ END_EVENT_TABLE() 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 +108,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)) @@ -137,31 +138,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,13 +184,11 @@ 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( _T("\nReading from wxFileInputStream:\n") ); @@ -727,7 +726,6 @@ 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") ); @@ -743,7 +741,7 @@ void MyApp::DoStreamDemo6(wxCommandEvent& WXUNUSED(event)) wxFileInputStream file_input( wxString(_T("test_wx.dat")) ); ch = file_input.GetC(); - pos = file_input.TellI(); + size_t pos = file_input.TellI(); str.Printf( wxT("Read char: %d. Now at position %d\n\n"), (int) ch, (int) pos ); textCtrl.WriteText( str ); @@ -807,7 +805,6 @@ 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") ); @@ -824,7 +821,7 @@ void MyApp::DoStreamDemo7(wxCommandEvent& WXUNUSED(event)) wxBufferedInputStream buf_input( file_input ); ch = buf_input.GetC(); - pos = buf_input.TellI(); + size_t pos = buf_input.TellI(); str.Printf( wxT("Read char: %d. Now at position %d\n\n"), (int) ch, (int) pos ); textCtrl.WriteText( str ); @@ -958,7 +955,7 @@ void MyApp::DoMIMEDemo(wxCommandEvent& WXUNUSED(event)) 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() ) + << _T("\tDescription: ") << ( !desc ? wxEmptyString : desc.c_str() ) << '\n' << _T("\tCommand to open: ") << ( !open ? wxT("no") : open.c_str() ) << '\n'; @@ -976,27 +973,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,10 +1022,8 @@ 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")); @@ -1051,10 +1047,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 +1064,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(); }