X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2a1f999fafa4312ccd47b7be65c672c2220fea36..26ee65c723cf55822c540506f064ec11d9b26858:/samples/typetest/typetest.cpp diff --git a/samples/typetest/typetest.cpp b/samples/typetest/typetest.cpp index 38133d498f..1e5ce86779 100644 --- a/samples/typetest/typetest.cpp +++ b/samples/typetest/typetest.cpp @@ -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" @@ -76,6 +72,9 @@ wxString file_name2 = wxString(_T("test_wx2.dat")); bool MyApp::OnInit() { + if ( !wxApp::OnInit() ) + return false; + // Create the main frame window MyFrame *frame = new MyFrame((wxFrame *) NULL, _T("wxWidgets Types Demo"), wxPoint(50, 50), wxSize(450, 340)); @@ -889,7 +888,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 +954,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' + : type.c_str() ) << _T('\n') << _T("\tDescription: ") << ( !desc ? wxEmptyString : desc.c_str() ) - << '\n' + << _T('\n') << _T("\tCommand to open: ") << ( !open ? wxT("no") : open.c_str() ) - << '\n'; + << _T('\n'); delete filetype; }