X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f2aea0d1ce77036b2bee9620e1f9947d62bf0e52..5dd1b7a66948c8e3aaaf4c39ea596957614bce17:/samples/docview/docview.cpp?ds=sidebyside diff --git a/samples/docview/docview.cpp b/samples/docview/docview.cpp index c939e577a1..3a2f1a5582 100644 --- a/samples/docview/docview.cpp +++ b/samples/docview/docview.cpp @@ -9,10 +9,6 @@ // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -// #pragma implementation "docview.h" -#endif - /* * Purpose: Document/view architecture demo for wxWidgets class library * Run with no arguments for multiple top-level windows, -single @@ -59,6 +55,9 @@ MyApp::MyApp(void) bool MyApp::OnInit(void) { + if ( !wxApp::OnInit() ) + return false; + //// Find out if we're: //// multiple window: multiple windows, each view in a separate frame //// single window: one view (within the main frame) and one document at a time, as in Windows Write. @@ -78,7 +77,7 @@ bool MyApp::OnInit(void) (void) new wxDocTemplate(m_docManager, _T("Drawing"), _T("*.drw"), _T(""), _T("drw"), _T("Drawing Doc"), _T("Drawing View"), CLASSINFO(DrawingDocument), CLASSINFO(DrawingView)); #ifdef __WXMAC__ - wxFileName::MacRegisterDefaultTypeAndCreator( "drw" , 'WXMB' , 'WXMA' ) ; + wxFileName::MacRegisterDefaultTypeAndCreator( wxT("drw") , 'WXMB' , 'WXMA' ) ; #endif if (singleWindowMode) @@ -94,7 +93,7 @@ bool MyApp::OnInit(void) (void) new wxDocTemplate(m_docManager, _T("Text"), _T("*.txt;*.text"), _T(""), _T("txt;text"), _T("Text Doc"), _T("Text View"), CLASSINFO(TextEditDocument), CLASSINFO(TextEditView)); #ifdef __WXMAC__ - wxFileName::MacRegisterDefaultTypeAndCreator( "txt" , 'TEXT' , 'WXMA' ) ; + wxFileName::MacRegisterDefaultTypeAndCreator( wxT("txt") , 'TEXT' , 'WXMA' ) ; #endif }