X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/98c627a498e0bfbdc8cbf69c5cd52ca68904c2e1..6fbf4a60fe7d1b293fabb200d43f4b8945fb522b:/src/common/docview.cpp diff --git a/src/common/docview.cpp b/src/common/docview.cpp index 38dd2f9363..bd6fa67c3d 100644 --- a/src/common/docview.cpp +++ b/src/common/docview.cpp @@ -133,16 +133,16 @@ static wxString FindExtension(const wxChar *path) wxDocument::wxDocument(wxDocument *parent) { - m_documentModified = FALSE; + m_documentModified = false; m_documentParent = parent; m_documentTemplate = (wxDocTemplate *) NULL; m_commandProcessor = (wxCommandProcessor*) NULL; - m_savedYet = FALSE; + m_savedYet = false; } bool wxDocument::DeleteContents() { - return TRUE; + return true; } wxDocument::~wxDocument() @@ -166,7 +166,7 @@ bool wxDocument::Close() if (OnSaveModified()) return OnCloseDocument(); else - return FALSE; + return false; } bool wxDocument::OnCloseDocument() @@ -174,8 +174,8 @@ bool wxDocument::OnCloseDocument() // Tell all views that we're about to close NotifyClosing(); DeleteContents(); - Modify(FALSE); - return TRUE; + Modify(false); + return true; } // Note that this implicitly deletes the document when the last view is @@ -183,27 +183,45 @@ bool wxDocument::OnCloseDocument() bool wxDocument::DeleteAllViews() { wxDocManager* manager = GetDocumentManager(); - wxList::iterator it, en; - for ( it = m_documentViews.begin(), en = m_documentViews.end(); - it != en; - ) + // first check if all views agree to be closed + const wxList::iterator end = m_documentViews.end(); + for ( wxList::iterator i = m_documentViews.begin(); i != end; ++i ) { - wxView *view = (wxView *)*it; - if (!view->Close()) - return FALSE; + wxView *view = (wxView *)*i; + if ( !view->Close() ) + return false; + } - wxList::iterator next = it; ++next; + // all views agreed to close, now do close them + if ( m_documentViews.empty() ) + { + // normally the document would be implicitly deleted when the last view + // is, but if don't have any views, do it here instead + if ( manager && manager->GetDocuments().Member(this) ) + delete this; + } + else // have views + { + // as we delete elements we iterate over, don't use the usual "from + // begin to end" loop + for ( ;; ) + { + wxView *view = (wxView *)*m_documentViews.begin(); + + bool isLastOne = m_documentViews.size() == 1; + + // this always deletes the node implicitly and if this is the last + // view also deletes this object itself (also implicitly, great), + // so we can't test for m_documentViews.empty() after calling this! + delete view; - delete view; // Deletes node implicitly - it = next; + if ( isLastOne ) + break; + } } - // If we haven't yet deleted the document (for example - // if there were no views) then delete it. - if (manager && manager->GetDocuments().Member(this)) - delete this; - return TRUE; + return true; } wxView *wxDocument::GetFirstView() const @@ -221,25 +239,25 @@ wxDocManager *wxDocument::GetDocumentManager() const bool wxDocument::OnNewDocument() { if (!OnSaveModified()) - return FALSE; + return false; - if (OnCloseDocument()==FALSE) return FALSE; + if (OnCloseDocument()==false) return false; DeleteContents(); - Modify(FALSE); - SetDocumentSaved(FALSE); + Modify(false); + SetDocumentSaved(false); wxString name; GetDocumentManager()->MakeDefaultName(name); SetTitle(name); - SetFilename(name, TRUE); + SetFilename(name, true); - return TRUE; + return true; } bool wxDocument::Save() { if (!IsModified() && m_savedYet) - return TRUE; + return true; if ( m_documentFile.empty() || !m_savedYet ) return SaveAs(); @@ -251,7 +269,7 @@ bool wxDocument::SaveAs() { wxDocTemplate *docTemplate = GetDocumentTemplate(); if (!docTemplate) - return FALSE; + return false; #if defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXMAC__) wxString filter = docTemplate->GetDescription() + wxT(" (") + docTemplate->GetFileFilter() + wxT(")|") + docTemplate->GetFileFilter(); @@ -265,15 +283,15 @@ bool wxDocument::SaveAs() while (node) { wxDocTemplate *t = (wxDocTemplate*) node->GetData(); - + if (t->IsVisible() && t != docTemplate && t->GetViewClassInfo() == docTemplate->GetViewClassInfo() && t->GetDocClassInfo() == docTemplate->GetDocClassInfo()) { // add a '|' to separate this filter from the previous one - if ( !filter.IsEmpty() ) + if ( !filter.empty() ) filter << wxT('|'); - + filter << t->GetDescription() << wxT(" (") << t->GetFileFilter() << wxT(") |") << t->GetFileFilter(); } @@ -292,14 +310,14 @@ bool wxDocument::SaveAs() wxSAVE | wxOVERWRITE_PROMPT, GetDocumentWindow()); - if (tmp.IsEmpty()) - return FALSE; + if (tmp.empty()) + return false; wxString fileName(tmp); wxString path, name, ext; wxSplitPath(fileName, & path, & name, & ext); - if (ext.IsEmpty() || ext == wxT("")) + if (ext.empty()) { fileName += wxT("."); fileName += docTemplate->GetDefaultExtension(); @@ -319,7 +337,7 @@ bool wxDocument::SaveAs() // Files that were not saved correctly are not added to the FileHistory. if (!OnSaveDocument(m_documentFile)) - return FALSE; + return false; // A file that doesn't use the default extension of its document template cannot be opened // via the FileHistory, so we do not add it. @@ -332,93 +350,42 @@ bool wxDocument::SaveAs() // The user will probably not be able to open the file again, so // we could warn about the wrong file-extension here. } - return TRUE; + return true; } bool wxDocument::OnSaveDocument(const wxString& file) { if ( !file ) - return FALSE; + return false; - wxString msgTitle; - if (wxTheApp->GetAppName() != wxT("")) - msgTitle = wxTheApp->GetAppName(); - else - msgTitle = wxString(_("File error")); + if ( !DoSaveDocument(file) ) + return false; -#if wxUSE_STD_IOSTREAM - wxSTD ofstream store(file.mb_str()); - if (store.fail() || store.bad()) -#else - wxFileOutputStream store(file); - if (store.GetLastError() != wxSTREAM_NO_ERROR) -#endif - { - (void)wxMessageBox(_("Sorry, could not open this file for saving."), msgTitle, wxOK | wxICON_EXCLAMATION, - GetDocumentWindow()); - // Saving error - return FALSE; - } - if (!SaveObject(store)) - { - (void)wxMessageBox(_("Sorry, could not save this file."), msgTitle, wxOK | wxICON_EXCLAMATION, - GetDocumentWindow()); - // Saving error - return FALSE; - } - Modify(FALSE); + Modify(false); SetFilename(file); - SetDocumentSaved(TRUE); + SetDocumentSaved(true); #ifdef __WXMAC__ wxFileName fn(file) ; fn.MacSetDefaultTypeAndCreator() ; #endif - return TRUE; + return true; } bool wxDocument::OnOpenDocument(const wxString& file) { if (!OnSaveModified()) - return FALSE; + return false; - wxString msgTitle; - if (wxTheApp->GetAppName() != wxT("")) - msgTitle = wxTheApp->GetAppName(); - else - msgTitle = wxString(_("File error")); + if ( !DoOpenDocument(file) ) + return false; -#if wxUSE_STD_IOSTREAM - wxSTD ifstream store(file.mb_str()); - if (store.fail() || store.bad()) -#else - wxFileInputStream store(file); - if (store.GetLastError() != wxSTREAM_NO_ERROR) -#endif - { - (void)wxMessageBox(_("Sorry, could not open this file."), msgTitle, wxOK|wxICON_EXCLAMATION, - GetDocumentWindow()); - return FALSE; - } -#if wxUSE_STD_IOSTREAM - LoadObject(store); - if ( !store && !store.eof() ) -#else - int res = LoadObject(store).GetLastError(); - if ((res != wxSTREAM_NO_ERROR) && - (res != wxSTREAM_EOF)) -#endif - { - (void)wxMessageBox(_("Sorry, could not open this file."), msgTitle, wxOK|wxICON_EXCLAMATION, - GetDocumentWindow()); - return FALSE; - } - SetFilename(file, TRUE); - Modify(FALSE); - m_savedYet = TRUE; + SetFilename(file, true); + Modify(false); + m_savedYet = true; UpdateAllViews(); - return TRUE; + return true; } #if wxUSE_STD_IOSTREAM @@ -441,27 +408,27 @@ wxOutputStream& wxDocument::SaveObject(wxOutputStream& stream) bool wxDocument::Revert() { - return FALSE; + return false; } // Get title, or filename if no title, else unnamed bool wxDocument::GetPrintableName(wxString& buf) const { - if (m_documentTitle != wxT("")) + if (!m_documentTitle.empty()) { buf = m_documentTitle; - return TRUE; + return true; } - else if (m_documentFile != wxT("")) + else if (!m_documentFile.empty()) { buf = wxFileNameFromPath(m_documentFile); - return TRUE; + return true; } else { buf = _("unnamed"); - return TRUE; + return true; } } @@ -479,7 +446,7 @@ wxCommandProcessor *wxDocument::OnCreateCommandProcessor() return new wxCommandProcessor; } -// TRUE if safe to close +// true if safe to close bool wxDocument::OnSaveModified() { if (IsModified()) @@ -488,7 +455,7 @@ bool wxDocument::OnSaveModified() GetPrintableName(title); wxString msgTitle; - if (wxTheApp->GetAppName() != wxT("")) + if (!wxTheApp->GetAppName().empty()) msgTitle = wxTheApp->GetAppName(); else msgTitle = wxString(_("Warning")); @@ -501,20 +468,20 @@ bool wxDocument::OnSaveModified() GetDocumentWindow()); if (res == wxNO) { - Modify(FALSE); - return TRUE; + Modify(false); + return true; } else if (res == wxYES) return Save(); else if (res == wxCANCEL) - return FALSE; + return false; } - return TRUE; + return true; } bool wxDocument::Draw(wxDC& WXUNUSED(context)) { - return TRUE; + return true; } bool wxDocument::AddView(wxView *view) @@ -524,22 +491,22 @@ bool wxDocument::AddView(wxView *view) m_documentViews.Append(view); OnChangedViewList(); } - return TRUE; + return true; } bool wxDocument::RemoveView(wxView *view) { (void)m_documentViews.DeleteObject(view); OnChangedViewList(); - return TRUE; + return true; } bool wxDocument::OnCreate(const wxString& WXUNUSED(path), long flags) { if (GetDocumentTemplate()->CreateView(this, flags)) - return TRUE; + return true; else - return FALSE; + return false; } // Called after a view is added or removed. @@ -595,6 +562,63 @@ void wxDocument::SetFilename(const wxString& filename, bool notifyViews) } } +bool wxDocument::DoSaveDocument(const wxString& file) +{ + wxString msgTitle; + if (!wxTheApp->GetAppName().empty()) + msgTitle = wxTheApp->GetAppName(); + else + msgTitle = wxString(_("File error")); + +#if wxUSE_STD_IOSTREAM + wxSTD ofstream store(file.mb_str(), wxSTD ios::binary); + if (store.fail() || store.bad()) +#else + wxFileOutputStream store(file); + if (store.GetLastError() != wxSTREAM_NO_ERROR) +#endif + { + (void)wxMessageBox(_("Sorry, could not open this file for saving."), msgTitle, wxOK | wxICON_EXCLAMATION, + GetDocumentWindow()); + // Saving error + return false; + } + if (!SaveObject(store)) + { + (void)wxMessageBox(_("Sorry, could not save this file."), msgTitle, wxOK | wxICON_EXCLAMATION, + GetDocumentWindow()); + // Saving error + return false; + } + + return true; +} + +bool wxDocument::DoOpenDocument(const wxString& file) +{ +#if wxUSE_STD_IOSTREAM + wxSTD ifstream store(file.mb_str(), wxSTD ios::binary); + if (!store.fail() && !store.bad()) +#else + wxFileInputStream store(file); + if (store.GetLastError() == wxSTREAM_NO_ERROR) +#endif + { +#if wxUSE_STD_IOSTREAM + LoadObject(store); + if ( !!store || store.eof() ) +#else + int res = LoadObject(store).GetLastError(); + if ( res == wxSTREAM_NO_ERROR || res == wxSTREAM_EOF ) +#endif + return true; + } + + wxLogError(_("Sorry, could not open this file.")); + return false; +} + + // ---------------------------------------------------------------------------- // Document view // ---------------------------------------------------------------------------- @@ -608,7 +632,7 @@ wxView::wxView() wxView::~wxView() { - GetDocumentManager()->ActivateView(this, FALSE); + GetDocumentManager()->ActivateView(this, false); m_viewDocument->RemoveView(this); } @@ -618,7 +642,7 @@ bool wxView::ProcessEvent(wxEvent& event) if ( !GetDocument() || !GetDocument()->ProcessEvent(event) ) return wxEvtHandler::ProcessEvent(event); - return TRUE; + return true; } void wxView::OnActivateView(bool WXUNUSED(activate), wxView *WXUNUSED(activeView), wxView *WXUNUSED(deactiveView)) @@ -656,9 +680,9 @@ void wxView::SetDocument(wxDocument *doc) bool wxView::Close(bool deleteWindow) { if (OnClose(deleteWindow)) - return TRUE; + return true; else - return FALSE; + return false; } void wxView::Activate(bool activate) @@ -672,7 +696,7 @@ void wxView::Activate(bool activate) bool wxView::OnClose(bool WXUNUSED(deleteWindow)) { - return GetDocument() ? GetDocument()->Close() : TRUE; + return GetDocument() ? GetDocument()->Close() : true; } #if wxUSE_PRINTING_ARCHITECTURE @@ -719,10 +743,10 @@ wxDocTemplate::~wxDocTemplate() // Tries to dynamically construct an object of the right class. wxDocument *wxDocTemplate::CreateDocument(const wxString& path, long flags) { - if (!m_docClassInfo) + wxDocument *doc = DoCreateDocument(); + if ( doc == NULL ) return (wxDocument *) NULL; - wxDocument *doc = (wxDocument *)m_docClassInfo->CreateObject(); - + if (InitDocument(doc, path, flags)) { return doc; @@ -752,9 +776,10 @@ bool wxDocTemplate::InitDocument(wxDocument* doc, const wxString& path, long fla wxView *wxDocTemplate::CreateView(wxDocument *doc, long flags) { - if (!m_viewClassInfo) + wxView *view = DoCreateView(); + if ( view == NULL ) return (wxView *) NULL; - wxView *view = (wxView *)m_viewClassInfo->CreateObject(); + view->SetDocument(doc); if (view->OnCreate(doc, flags)) { @@ -774,6 +799,22 @@ bool wxDocTemplate::FileMatchesTemplate(const wxString& path) return GetDefaultExtension().IsSameAs(FindExtension(path)); } +wxDocument *wxDocTemplate::DoCreateDocument() +{ + if (!m_docClassInfo) + return (wxDocument *) NULL; + + return (wxDocument *)m_docClassInfo->CreateObject(); +} + +wxView *wxDocTemplate::DoCreateView() +{ + if (!m_viewClassInfo) + return (wxView *) NULL; + + return (wxView *)m_viewClassInfo->CreateObject(); +} + // ---------------------------------------------------------------------------- // wxDocManager // ---------------------------------------------------------------------------- @@ -801,11 +842,9 @@ BEGIN_EVENT_TABLE(wxDocManager, wxEvtHandler) #if wxUSE_PRINTING_ARCHITECTURE EVT_MENU(wxID_PRINT, wxDocManager::OnPrint) - EVT_MENU(wxID_PRINT_SETUP, wxDocManager::OnPrintSetup) EVT_MENU(wxID_PREVIEW, wxDocManager::OnPreview) EVT_UPDATE_UI(wxID_PRINT, wxDocManager::OnUpdatePrint) - EVT_UPDATE_UI(wxID_PRINT_SETUP, wxDocManager::OnUpdatePrintSetup) EVT_UPDATE_UI(wxID_PREVIEW, wxDocManager::OnUpdatePreview) #endif END_EVENT_TABLE() @@ -845,9 +884,9 @@ bool wxDocManager::CloseDocument(wxDocument* doc, bool force) if (m_docs.Member(doc)) delete doc; - return TRUE; + return true; } - return FALSE; + return false; } bool wxDocManager::CloseDocuments(bool force) @@ -857,22 +896,24 @@ bool wxDocManager::CloseDocuments(bool force) { wxDocument *doc = (wxDocument *)node->GetData(); wxList::compatibility_iterator next = node->GetNext(); - + if (!CloseDocument(doc, force)) - return FALSE; + return false; // This assumes that documents are not connected in // any way, i.e. deleting one document does NOT // delete another. node = next; } - return TRUE; + return true; } bool wxDocManager::Clear(bool force) { if (!CloseDocuments(force)) - return FALSE; + return false; + + m_currentView = NULL; wxList::compatibility_iterator node = m_templates.GetFirst(); while (node) @@ -882,13 +923,13 @@ bool wxDocManager::Clear(bool force) delete templ; node = next; } - return TRUE; + return true; } bool wxDocManager::Initialize() { m_fileHistory = OnCreateFileHistory(); - return TRUE; + return true; } wxFileHistory *wxDocManager::OnCreateFileHistory() @@ -911,17 +952,17 @@ void wxDocManager::OnFileClose(wxCommandEvent& WXUNUSED(event)) void wxDocManager::OnFileCloseAll(wxCommandEvent& WXUNUSED(event)) { - CloseDocuments(FALSE); + CloseDocuments(false); } void wxDocManager::OnFileNew(wxCommandEvent& WXUNUSED(event)) { - CreateDocument( wxT(""), wxDOC_NEW ); + CreateDocument( wxEmptyString, wxDOC_NEW ); } void wxDocManager::OnFileOpen(wxCommandEvent& WXUNUSED(event)) { - if ( !CreateDocument( wxT(""), 0) ) + if ( !CreateDocument( wxEmptyString, 0) ) { OnOpenFileFailure(); } @@ -962,29 +1003,13 @@ void wxDocManager::OnPrint(wxCommandEvent& WXUNUSED(event)) if (printout) { wxPrinter printer; - printer.Print(view->GetFrame(), printout, TRUE); + printer.Print(view->GetFrame(), printout, true); delete printout; } #endif // wxUSE_PRINTING_ARCHITECTURE } -void wxDocManager::OnPrintSetup(wxCommandEvent& WXUNUSED(event)) -{ -#if wxUSE_PRINTING_ARCHITECTURE - wxWindow *parentWin = wxTheApp->GetTopWindow(); - wxView *view = GetCurrentView(); - if (view) - parentWin = view->GetFrame(); - - wxPrintDialogData data; - - wxPrintDialog printerDialog(parentWin, &data); - printerDialog.GetPrintDialogData().SetSetupDialog(TRUE); - printerDialog.ShowModal(); -#endif // wxUSE_PRINTING_ARCHITECTURE -} - void wxDocManager::OnPreview(wxCommandEvent& WXUNUSED(event)) { #if wxUSE_PRINTING_ARCHITECTURE @@ -1008,7 +1033,7 @@ void wxDocManager::OnPreview(wxCommandEvent& WXUNUSED(event)) wxPoint(100, 100), wxSize(600, 650)); frame->Centre(wxBOTH); frame->Initialize(); - frame->Show(TRUE); + frame->Show(true); } #endif // wxUSE_PRINTING_ARCHITECTURE } @@ -1039,7 +1064,7 @@ void wxDocManager::OnRedo(wxCommandEvent& event) void wxDocManager::OnUpdateFileOpen(wxUpdateUIEvent& event) { - event.Enable( TRUE ); + event.Enable( true ); } void wxDocManager::OnUpdateFileClose(wxUpdateUIEvent& event) @@ -1056,7 +1081,7 @@ void wxDocManager::OnUpdateFileRevert(wxUpdateUIEvent& event) void wxDocManager::OnUpdateFileNew(wxUpdateUIEvent& event) { - event.Enable( TRUE ); + event.Enable( true ); } void wxDocManager::OnUpdateFileSave(wxUpdateUIEvent& event) @@ -1075,7 +1100,7 @@ void wxDocManager::OnUpdateUndo(wxUpdateUIEvent& event) { wxDocument *doc = GetCurrentDocument(); if (!doc) - event.Enable(FALSE); + event.Enable(false); else if (!doc->GetCommandProcessor()) event.Skip(); else @@ -1089,7 +1114,7 @@ void wxDocManager::OnUpdateRedo(wxUpdateUIEvent& event) { wxDocument *doc = GetCurrentDocument(); if (!doc) - event.Enable(FALSE); + event.Enable(false); else if (!doc->GetCommandProcessor()) event.Skip(); else @@ -1105,11 +1130,6 @@ void wxDocManager::OnUpdatePrint(wxUpdateUIEvent& event) event.Enable( (doc != (wxDocument*) NULL) ); } -void wxDocManager::OnUpdatePrintSetup(wxUpdateUIEvent& event) -{ - event.Enable( TRUE ); -} - void wxDocManager::OnUpdatePreview(wxUpdateUIEvent& event) { wxDocument *doc = GetCurrentDocument(); @@ -1135,7 +1155,7 @@ bool wxDocManager::ProcessEvent(wxEvent& event) if (view) { if (view->ProcessEvent(event)) - return TRUE; + return true; } return wxEvtHandler::ProcessEvent(event); } @@ -1177,7 +1197,7 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags) { if (docToClose) { - if (!CloseDocument(docToClose, FALSE)) + if (!CloseDocument(docToClose, false)) { delete[] templates; return NULL; @@ -1192,7 +1212,12 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags) { newDoc->SetDocumentName(temp->GetDocumentName()); newDoc->SetDocumentTemplate(temp); - newDoc->OnNewDocument(); + if (!newDoc->OnNewDocument() ) + { + // Document is implicitly deleted by DeleteAllViews + newDoc->DeleteAllViews(); + return NULL; + } } return newDoc; } @@ -1203,7 +1228,7 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags) { if (docToClose) { - if (!CloseDocument(docToClose, FALSE)) + if (!CloseDocument(docToClose, false)) { return NULL; } @@ -1215,7 +1240,12 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags) { newDoc->SetDocumentName(temp->GetDocumentName()); newDoc->SetDocumentTemplate(temp); - newDoc->OnNewDocument(); + if (!newDoc->OnNewDocument() ) + { + // Document is implicitly deleted by DeleteAllViews + newDoc->DeleteAllViews(); + return NULL; + } } return newDoc; } @@ -1226,9 +1256,7 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags) // Existing document wxDocTemplate *temp; - wxString path2(wxT("")); - if (path != wxT("")) - path2 = path; + wxString path2 = path; if (flags & wxDOC_SILENT) { @@ -1251,12 +1279,34 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags) { if (docToClose) { - if (!CloseDocument(docToClose, FALSE)) + if (!CloseDocument(docToClose, false)) { return NULL; } } + //see if this file is already open + for (size_t i = 0; i < GetDocuments().GetCount(); ++i) + { + wxDocument* currentDoc = (wxDocument*)(GetDocuments().Item(i)->GetData()); +#ifdef __WXMSW__ + //file paths are case-insensitive on Windows + if (path2.CmpNoCase(currentDoc->GetFilename()) == 0) +#else + if (path2.Cmp(currentDoc->GetFilename()) == 0) +#endif + { + //file already open. Just activate it and return + if (currentDoc->GetFirstView()) + { + ActivateView(currentDoc->GetFirstView(), true); + if (currentDoc->GetDocumentWindow()) + currentDoc->GetDocumentWindow()->SetFocus(); + return currentDoc; + } + } + } + wxDocument *newDoc = temp->CreateDocument(path2, flags); if (newDoc) { @@ -1333,7 +1383,7 @@ void wxDocManager::DeleteTemplate(wxDocTemplate *WXUNUSED(temp), long WXUNUSED(f // Not yet implemented bool wxDocManager::FlushDoc(wxDocument *WXUNUSED(doc)) { - return FALSE; + return false; } wxDocument *wxDocManager::GetCurrentDocument() const @@ -1351,7 +1401,7 @@ bool wxDocManager::MakeDefaultName(wxString& name) name.Printf(_("unnamed%d"), m_defaultDocumentNameCounter); m_defaultDocumentNameCounter++; - return TRUE; + return true; } // Make a frame title (override this to do something different) @@ -1510,7 +1560,7 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates, if (templates[i]->IsVisible()) { // add a '|' to separate this filter from the previous one - if ( !descrBuf.IsEmpty() ) + if ( !descrBuf.empty() ) descrBuf << wxT('|'); descrBuf << templates[i]->GetDescription() @@ -1528,19 +1578,19 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates, wxString pathTmp = wxFileSelectorEx(_("Select a file"), m_lastDirectory, - wxT(""), + wxEmptyString, &FilterIndex, descrBuf, 0, parent); wxDocTemplate *theTemplate = (wxDocTemplate *)NULL; - if (!pathTmp.IsEmpty()) + if (!pathTmp.empty()) { if (!wxFileExists(pathTmp)) { wxString msgTitle; - if (!wxTheApp->GetAppName().IsEmpty()) + if (!wxTheApp->GetAppName().empty()) msgTitle = wxTheApp->GetAppName(); else msgTitle = wxString(_("File error")); @@ -1548,7 +1598,7 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates, (void)wxMessageBox(_("Sorry, could not open this file."), msgTitle, wxOK | wxICON_EXCLAMATION, parent); - path = wxT(""); + path = wxEmptyString; return (wxDocTemplate *) NULL; } m_lastDirectory = wxPathOnly(pathTmp); @@ -1572,7 +1622,7 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates, } else { - path = wxT(""); + path = wxEmptyString; } return theTemplate; @@ -1591,14 +1641,14 @@ wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates, if (templates[i]->IsVisible()) { int j; - bool want = TRUE; + bool want = true; for (j = 0; j < n; j++) { //filter out NOT unique documents + view combinations if ( templates[i]->m_docTypeName == data[j]->m_docTypeName && templates[i]->m_viewTypeName == data[j]->m_viewTypeName ) - want = FALSE; + want = false; } if ( want ) @@ -1613,7 +1663,7 @@ wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates, if (sort) { - strings.Sort(wxStringSortAscending); + strings.Sort(); // ascending sort // Yes, this will be slow, but template lists // are typically short. int j; @@ -1673,12 +1723,12 @@ wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates, if ( templ->IsVisible() && !templ->GetViewName().empty() ) { int j; - bool want = TRUE; + bool want = true; for (j = 0; j < n; j++) { //filter out NOT unique views if ( templates[i]->m_viewTypeName == data[j]->m_viewTypeName ) - want = FALSE; + want = false; } if ( want ) @@ -1692,7 +1742,7 @@ wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates, if (sort) { - strings.Sort(wxStringSortAscending); + strings.Sort(); // ascending sort // Yes, this will be slow, but template lists // are typically short. int j; @@ -1803,15 +1853,11 @@ wxDocChildFrame::wxDocChildFrame(wxDocument *doc, view->SetFrame(this); } -wxDocChildFrame::~wxDocChildFrame() -{ -} - // Extend event processing to search the view's event table bool wxDocChildFrame::ProcessEvent(wxEvent& event) { if (m_childView) - m_childView->Activate(TRUE); + m_childView->Activate(true); if ( !m_childView || ! m_childView->ProcessEvent(event) ) { @@ -1819,10 +1865,10 @@ bool wxDocChildFrame::ProcessEvent(wxEvent& event) if (!event.IsKindOf(CLASSINFO(wxCommandEvent)) || !GetParent() || !GetParent()->ProcessEvent(event)) return wxEvtHandler::ProcessEvent(event); else - return TRUE; + return true; } else - return TRUE; + return true; } void wxDocChildFrame::OnActivate(wxActivateEvent& event) @@ -1838,12 +1884,12 @@ void wxDocChildFrame::OnCloseWindow(wxCloseEvent& event) if (m_childView) { bool ans = event.CanVeto() - ? m_childView->Close(FALSE) // FALSE means don't delete associated window - : TRUE; // Must delete. + ? m_childView->Close(false) // false means don't delete associated window + : true; // Must delete. if (ans) { - m_childView->Activate(FALSE); + m_childView->Activate(false); delete m_childView; m_childView = (wxView *) NULL; m_childDocument = (wxDocument *) NULL; @@ -1889,7 +1935,7 @@ void wxDocParentFrame::OnMRUFile(wxCommandEvent& event) { int n = event.GetId() - wxID_FILE1; // the index in MRU list wxString filename(m_docManager->GetHistoryFile(n)); - if ( !filename.IsEmpty() ) + if ( !filename.empty() ) { // verify that the file exists before doing anything else if ( wxFile::Exists(filename) ) @@ -1923,7 +1969,7 @@ bool wxDocParentFrame::ProcessEvent(wxEvent& event) if (!m_docManager || !m_docManager->ProcessEvent(event)) return wxEvtHandler::ProcessEvent(event); else - return TRUE; + return true; } // Define the behaviour for the frame closing @@ -1982,7 +2028,7 @@ bool wxDocPrintout::OnPrintPage(int WXUNUSED(page)) { m_printoutView->OnDraw(dc); } - return TRUE; + return true; } bool wxDocPrintout::HasPage(int pageNum) @@ -1993,9 +2039,9 @@ bool wxDocPrintout::HasPage(int pageNum) bool wxDocPrintout::OnBeginDocument(int startPage, int endPage) { if (!wxPrintout::OnBeginDocument(startPage, endPage)) - return FALSE; + return false; - return TRUE; + return true; } void wxDocPrintout::GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int *selPageTo) @@ -2119,6 +2165,8 @@ void wxFileHistory::AddFileToHistory(const wxString& file) pathInMenu = m_fileHistory[i]; } + // we need to quote '&' characters which are used for mnemonics + pathInMenu.Replace(_T("&"), _T("&&")); wxString buf; buf.Printf(s_MRUEntryFormat, i + 1, pathInMenu.c_str()); wxList::compatibility_iterator node = m_fileMenus.GetFirst(); @@ -2221,12 +2269,12 @@ void wxFileHistory::Load(wxConfigBase& config) wxString buf; buf.Printf(wxT("file%d"), (int)m_fileHistoryN+1); wxString historyFile; - while ((m_fileHistoryN < m_fileMaxFiles) && config.Read(buf, &historyFile) && (historyFile != wxT(""))) + while ((m_fileHistoryN < m_fileMaxFiles) && config.Read(buf, &historyFile) && (!historyFile.empty())) { m_fileHistory[m_fileHistoryN] = MYcopystring((const wxChar*) historyFile); m_fileHistoryN ++; buf.Printf(wxT("file%d"), (int)m_fileHistoryN+1); - historyFile = wxT(""); + historyFile = wxEmptyString; } AddFilesToMenu(); } @@ -2307,7 +2355,7 @@ bool wxTransferFileToStream(const wxString& filename, wxSTD ostream& stream) { wxFFile file(filename, _T("rb")); if ( !file.IsOpened() ) - return FALSE; + return false; char buf[4096]; @@ -2316,22 +2364,22 @@ bool wxTransferFileToStream(const wxString& filename, wxSTD ostream& stream) { nRead = file.Read(buf, WXSIZEOF(buf)); if ( file.Error() ) - return FALSE; + return false; stream.write(buf, nRead); if ( !stream ) - return FALSE; + return false; } while ( !file.Eof() ); - return TRUE; + return true; } bool wxTransferStreamToFile(wxSTD istream& stream, const wxString& filename) { wxFFile file(filename, _T("wb")); if ( !file.IsOpened() ) - return FALSE; + return false; char buf[4096]; do @@ -2340,12 +2388,12 @@ bool wxTransferStreamToFile(wxSTD istream& stream, const wxString& filename) if ( !stream.bad() ) // fail may be set on EOF, don't use operator!() { if ( !file.Write(buf, stream.gcount()) ) - return FALSE; + return false; } } while ( !stream.eof() ); - return TRUE; + return true; } #else // !wxUSE_STD_IOSTREAM @@ -2354,7 +2402,7 @@ bool wxTransferFileToStream(const wxString& filename, wxOutputStream& stream) { wxFFile file(filename, _T("rb")); if ( !file.IsOpened() ) - return FALSE; + return false; char buf[4096]; @@ -2363,22 +2411,22 @@ bool wxTransferFileToStream(const wxString& filename, wxOutputStream& stream) { nRead = file.Read(buf, WXSIZEOF(buf)); if ( file.Error() ) - return FALSE; + return false; stream.Write(buf, nRead); if ( !stream ) - return FALSE; + return false; } while ( !file.Eof() ); - return TRUE; + return true; } bool wxTransferStreamToFile(wxInputStream& stream, const wxString& filename) { wxFFile file(filename, _T("wb")); if ( !file.IsOpened() ) - return FALSE; + return false; char buf[4096]; do @@ -2387,11 +2435,11 @@ bool wxTransferStreamToFile(wxInputStream& stream, const wxString& filename) const size_t nRead = stream.LastRead(); if ( !nRead || !file.Write(buf, nRead) ) - return FALSE; + return false; } while ( !stream.Eof() ); - return TRUE; + return true; } #endif // wxUSE_STD_IOSTREAM/!wxUSE_STD_IOSTREAM