X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/be5a51fb592f3fa2ba38ac6cd1e488d6d806058c..f4f5d5697dc5e34a5582061dbd857d1cd4326f91:/samples/docview/docview.cpp?ds=sidebyside diff --git a/samples/docview/docview.cpp b/samples/docview/docview.cpp index 6f1a381317..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 @@ -48,7 +44,7 @@ MyFrame *frame = (MyFrame *) NULL; // In single window mode, don't have any child windows; use // main window. -bool singleWindowMode = FALSE; +bool singleWindowMode = false; IMPLEMENT_APP(MyApp) @@ -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. @@ -67,7 +66,7 @@ bool MyApp::OnInit(void) { if (wxStrcmp(argv[1], _T("-single")) == 0) { - singleWindowMode = TRUE; + singleWindowMode = true; } } @@ -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,12 +93,12 @@ 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 } //// Create the main frame window - frame = new MyFrame(m_docManager, (wxFrame *) NULL, -1, _T("DocView Demo"), wxPoint(0, 0), wxSize(500, 400), wxDEFAULT_FRAME_STYLE); + frame = new MyFrame(m_docManager, (wxFrame *) NULL, wxID_ANY, _T("DocView Demo"), wxPoint(0, 0), wxSize(500, 400), wxDEFAULT_FRAME_STYLE); //// Give it an icon (this is ignored in MDI mode: uses resources) #ifdef __WXMSW__ @@ -155,10 +154,10 @@ bool MyApp::OnInit(void) frame->SetMenuBar(menu_bar); frame->Centre(wxBOTH); - frame->Show(TRUE); + frame->Show(true); SetTopWindow(frame); - return TRUE; + return true; } int MyApp::OnExit(void) @@ -176,7 +175,7 @@ int MyApp::OnExit(void) wxFrame *MyApp::CreateChildFrame(wxDocument *doc, wxView *view, bool isCanvas) { //// Make a child frame - wxDocChildFrame *subframe = new wxDocChildFrame(doc, view, GetMainFrame(), -1, _T("Child Frame"), + wxDocChildFrame *subframe = new wxDocChildFrame(doc, view, GetMainFrame(), wxID_ANY, _T("Child Frame"), wxPoint(10, 10), wxSize(300, 300), wxDEFAULT_FRAME_STYLE); #ifdef __WXMSW__