X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..0bbe61b8c18a1795189f0cf73cc61c14a0fb846d:/src/common/docview.cpp diff --git a/src/common/docview.cpp b/src/common/docview.cpp index a9687e0327..d678ca6b54 100644 --- a/src/common/docview.cpp +++ b/src/common/docview.cpp @@ -17,30 +17,31 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "docview.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ - #pragma hdrstop + #pragma hdrstop #endif #if wxUSE_DOC_VIEW_ARCHITECTURE +#include "wx/docview.h" + #ifndef WX_PRECOMP + #include "wx/list.h" #include "wx/string.h" #include "wx/utils.h" #include "wx/app.h" #include "wx/dc.h" #include "wx/dialog.h" #include "wx/menu.h" - #include "wx/list.h" #include "wx/filedlg.h" #include "wx/intl.h" #include "wx/log.h" + #include "wx/msgdlg.h" + #include "wx/mdi.h" + #include "wx/choicdlg.h" #endif #include "wx/ffile.h" @@ -49,34 +50,31 @@ #include "wx/filename.h" #endif -#ifdef __WXGTK__ - #include "wx/mdi.h" -#endif - #if wxUSE_PRINTING_ARCHITECTURE - #include "wx/prntbase.h" - #include "wx/printdlg.h" + #include "wx/prntbase.h" + #include "wx/printdlg.h" #endif -#include "wx/msgdlg.h" -#include "wx/choicdlg.h" -#include "wx/docview.h" #include "wx/confbase.h" #include "wx/file.h" #include "wx/cmdproc.h" +#include "wx/tokenzr.h" +#include "wx/filename.h" #include #include #if wxUSE_STD_IOSTREAM - #include "wx/ioswrap.h" - #if wxUSE_IOSTREAMH - #include - #else - #include - #endif + #include "wx/ioswrap.h" + #include "wx/beforestd.h" + #if wxUSE_IOSTREAMH + #include + #else + #include + #endif + #include "wx/afterstd.h" #else - #include "wx/wfstream.h" + #include "wx/wfstream.h" #endif // ---------------------------------------------------------------------------- @@ -100,7 +98,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxFileHistory, wxObject) // function prototypes // ---------------------------------------------------------------------------- -static inline wxString FindExtension(const wxChar *path); static wxWindow* wxFindSuitableParent(void); // ---------------------------------------------------------------------------- @@ -117,7 +114,7 @@ static const wxChar *s_MRUEntryFormat = wxT("&%d %s"); // local functions // ---------------------------------------------------------------------------- -static wxString FindExtension(const wxChar *path) +static wxString FindExtension(const wxString& path) { wxString ext; wxSplitPath(path, NULL, NULL, &ext); @@ -133,16 +130,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 +163,7 @@ bool wxDocument::Close() if (OnSaveModified()) return OnCloseDocument(); else - return FALSE; + return false; } bool wxDocument::OnCloseDocument() @@ -174,8 +171,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 +180,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(); - delete view; // Deletes node implicitly - it = next; + 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; + + 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 +236,24 @@ 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); + const wxString name = GetDocumentManager()->MakeNewDocumentName(); 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,24 +265,59 @@ 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(); + + // Now see if there are some other template with identical view and document + // classes, whose filters may also be used. + + if (docTemplate->GetViewClassInfo() && docTemplate->GetDocClassInfo()) + { + wxList::compatibility_iterator node = docTemplate->GetDocumentManager()->GetTemplates().GetFirst(); + 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.empty() ) + filter << wxT('|'); + + filter << t->GetDescription() << wxT(" (") << t->GetFileFilter() << wxT(") |") + << t->GetFileFilter(); + } - wxString tmp = wxFileSelector(_("Save as"), - docTemplate->GetDirectory(), + node = node->GetNext(); + } + } +#else + wxString filter = docTemplate->GetFileFilter() ; +#endif + wxString defaultDir = docTemplate->GetDirectory(); + if (defaultDir.IsEmpty()) + defaultDir = wxPathOnly(GetFilename()); + + wxString tmp = wxFileSelector(_("Save As"), + defaultDir, wxFileNameFromPath(GetFilename()), docTemplate->GetDefaultExtension(), - docTemplate->GetFileFilter(), - wxSAVE | wxOVERWRITE_PROMPT, + filter, + wxFD_SAVE | wxFD_OVERWRITE_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(); @@ -288,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. @@ -301,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 @@ -410,28 +408,46 @@ wxOutputStream& wxDocument::SaveObject(wxOutputStream& stream) bool wxDocument::Revert() { - return FALSE; + return false; } // Get title, or filename if no title, else unnamed +#if WXWIN_COMPATIBILITY_2_8 bool wxDocument::GetPrintableName(wxString& buf) const { - if (m_documentTitle != wxT("")) - { - buf = m_documentTitle; - return TRUE; - } - else if (m_documentFile != wxT("")) - { - buf = wxFileNameFromPath(m_documentFile); - return TRUE; - } - else - { - buf = _("unnamed"); - return TRUE; - } + // this function can not only be overridden by the user code but also + // called by it so we need to ensure that we return the same thing as + // GetUserReadableName() but we can't call it because this would result in + // an infinite recursion, hence we use the helper DoGetUserReadableName() + buf = DoGetUserReadableName(); + + return true; +} +#endif // WXWIN_COMPATIBILITY_2_8 + +wxString wxDocument::GetUserReadableName() const +{ +#if WXWIN_COMPATIBILITY_2_8 + // we need to call the old virtual function to ensure that the overridden + // version of it is still called + wxString name; + if ( GetPrintableName(name) ) + return name; +#endif // WXWIN_COMPATIBILITY_2_8 + + return DoGetUserReadableName(); +} + +wxString wxDocument::DoGetUserReadableName() const +{ + if ( !m_documentTitle.empty() ) + return m_documentTitle; + + if ( !m_documentFile.empty() ) + return wxFileNameFromPath(m_documentFile); + + return _("unnamed"); } wxWindow *wxDocument::GetDocumentWindow() const @@ -448,42 +464,40 @@ wxCommandProcessor *wxDocument::OnCreateCommandProcessor() return new wxCommandProcessor; } -// TRUE if safe to close +// true if safe to close bool wxDocument::OnSaveModified() { if (IsModified()) { - wxString title; - GetPrintableName(title); + wxString title = GetUserReadableName(); wxString msgTitle; - if (wxTheApp->GetAppName() != wxT("")) - msgTitle = wxTheApp->GetAppName(); + if (!wxTheApp->GetAppDisplayName().empty()) + msgTitle = wxTheApp->GetAppDisplayName(); else msgTitle = wxString(_("Warning")); wxString prompt; - prompt.Printf(_("Do you want to save changes to document %s?"), - (const wxChar *)title); + prompt.Printf(_("Do you want to save changes to document %s?"), title); int res = wxMessageBox(prompt, msgTitle, wxYES_NO|wxCANCEL|wxICON_QUESTION, 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) @@ -493,22 +507,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. @@ -564,6 +578,63 @@ void wxDocument::SetFilename(const wxString& filename, bool notifyViews) } } +bool wxDocument::DoSaveDocument(const wxString& file) +{ + wxString msgTitle; + if (!wxTheApp->GetAppDisplayName().empty()) + msgTitle = wxTheApp->GetAppDisplayName(); + 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 // ---------------------------------------------------------------------------- @@ -577,7 +648,7 @@ wxView::wxView() wxView::~wxView() { - GetDocumentManager()->ActivateView(this, FALSE); + GetDocumentManager()->ActivateView(this, false); m_viewDocument->RemoveView(this); } @@ -587,7 +658,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)) @@ -605,14 +676,16 @@ void wxView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint)) void wxView::OnChangeFilename() { - if (GetFrame() && GetDocument()) - { - wxString title; + // GetFrame can return wxWindow rather than wxTopLevelWindow due to + // generic MDI implementation so use SetLabel rather than SetTitle. + // It should cause SetTitle() for top level windows. + wxWindow *win = GetFrame(); + if (!win) return; - GetDocument()->GetPrintableName(title); + wxDocument *doc = GetDocument(); + if (!doc) return; - GetFrame()->SetTitle(title); - } + win->SetLabel(doc->GetUserReadableName()); } void wxView::SetDocument(wxDocument *doc) @@ -625,9 +698,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) @@ -641,7 +714,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 @@ -688,29 +761,43 @@ 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; + + if (InitDocument(doc, path, flags)) + { + return doc; + } + else + { return (wxDocument *) NULL; - wxDocument *doc = (wxDocument *)m_docClassInfo->CreateObject(); + } +} + +bool wxDocTemplate::InitDocument(wxDocument* doc, const wxString& path, long flags) +{ doc->SetFilename(path); doc->SetDocumentTemplate(this); GetDocumentManager()->AddDocument(doc); doc->SetCommandProcessor(doc->OnCreateCommandProcessor()); if (doc->OnCreate(path, flags)) - return doc; + return true; else { if (GetDocumentManager()->GetDocuments().Member(doc)) doc->DeleteAllViews(); - return (wxDocument *) NULL; + return false; } } 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)) { @@ -727,9 +814,36 @@ wxView *wxDocTemplate::CreateView(wxDocument *doc, long flags) // that of the template bool wxDocTemplate::FileMatchesTemplate(const wxString& path) { + wxStringTokenizer parser (GetFileFilter(), wxT(";")); + wxString anything = wxT ("*"); + while (parser.HasMoreTokens()) + { + wxString filter = parser.GetNextToken(); + wxString filterExt = FindExtension (filter); + if ( filter.IsSameAs (anything) || + filterExt.IsSameAs (anything) || + filterExt.IsSameAs (FindExtension (path)) ) + return true; + } 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 // ---------------------------------------------------------------------------- @@ -757,11 +871,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() @@ -801,9 +913,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) @@ -813,22 +925,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) @@ -838,13 +952,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() @@ -867,17 +981,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(); } @@ -918,29 +1032,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 @@ -964,7 +1062,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 } @@ -995,7 +1093,7 @@ void wxDocManager::OnRedo(wxCommandEvent& event) void wxDocManager::OnUpdateFileOpen(wxUpdateUIEvent& event) { - event.Enable( TRUE ); + event.Enable( true ); } void wxDocManager::OnUpdateFileClose(wxUpdateUIEvent& event) @@ -1012,7 +1110,7 @@ void wxDocManager::OnUpdateFileRevert(wxUpdateUIEvent& event) void wxDocManager::OnUpdateFileNew(wxUpdateUIEvent& event) { - event.Enable( TRUE ); + event.Enable( true ); } void wxDocManager::OnUpdateFileSave(wxUpdateUIEvent& event) @@ -1031,7 +1129,7 @@ void wxDocManager::OnUpdateUndo(wxUpdateUIEvent& event) { wxDocument *doc = GetCurrentDocument(); if (!doc) - event.Enable(FALSE); + event.Enable(false); else if (!doc->GetCommandProcessor()) event.Skip(); else @@ -1045,7 +1143,7 @@ void wxDocManager::OnUpdateRedo(wxUpdateUIEvent& event) { wxDocument *doc = GetCurrentDocument(); if (!doc) - event.Enable(FALSE); + event.Enable(false); else if (!doc->GetCommandProcessor()) event.Skip(); else @@ -1061,11 +1159,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(); @@ -1091,7 +1184,7 @@ bool wxDocManager::ProcessEvent(wxEvent& event) if (view) { if (view->ProcessEvent(event)) - return TRUE; + return true; } return wxEvtHandler::ProcessEvent(event); } @@ -1133,7 +1226,7 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags) { if (docToClose) { - if (!CloseDocument(docToClose, FALSE)) + if (!CloseDocument(docToClose, false)) { delete[] templates; return NULL; @@ -1148,7 +1241,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; } @@ -1159,7 +1257,7 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags) { if (docToClose) { - if (!CloseDocument(docToClose, FALSE)) + if (!CloseDocument(docToClose, false)) { return NULL; } @@ -1171,7 +1269,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; } @@ -1182,9 +1285,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) { @@ -1207,12 +1308,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) { @@ -1289,7 +1412,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 @@ -1301,27 +1424,43 @@ wxDocument *wxDocManager::GetCurrentDocument() const return (wxDocument *) NULL; } -// Make a default document name -bool wxDocManager::MakeDefaultName(wxString& name) +// Make a default name for a new document +#if WXWIN_COMPATIBILITY_2_8 +bool wxDocManager::MakeDefaultName(wxString& WXUNUSED(name)) +{ + // we consider that this function can only be overridden by the user code, + // not called by it as it only makes sense to call it internally, so we + // don't bother to return anything from here + return false; +} +#endif // WXWIN_COMPATIBILITY_2_8 + +wxString wxDocManager::MakeNewDocumentName() { - name.Printf(_("unnamed%d"), m_defaultDocumentNameCounter); - m_defaultDocumentNameCounter++; + wxString name; + +#if WXWIN_COMPATIBILITY_2_8 + if ( !MakeDefaultName(name) ) +#endif // WXWIN_COMPATIBILITY_2_8 + { + name.Printf(_("unnamed%d"), m_defaultDocumentNameCounter); + m_defaultDocumentNameCounter++; + } - return TRUE; + return name; } // Make a frame title (override this to do something different) // If docName is empty, a document is not currently active. wxString wxDocManager::MakeFrameTitle(wxDocument* doc) { - wxString appName = wxTheApp->GetAppName(); + wxString appName = wxTheApp->GetAppDisplayName(); wxString title; if (!doc) title = appName; else { - wxString docName; - doc->GetPrintableName(docName); + wxString docName = doc->GetUserReadableName(); title = docName + wxString(_(" - ")) + appName; } return title; @@ -1466,7 +1605,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() @@ -1482,29 +1621,29 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates, wxWindow* parent = wxFindSuitableParent(); - wxString pathTmp = wxFileSelectorEx(_("Select a file"), + wxString pathTmp = wxFileSelectorEx(_("Open 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()) - msgTitle = wxTheApp->GetAppName(); + if (!wxTheApp->GetAppDisplayName().empty()) + msgTitle = wxTheApp->GetAppDisplayName(); else msgTitle = wxString(_("File error")); (void)wxMessageBox(_("Sorry, could not open this file."), msgTitle, wxOK | wxICON_EXCLAMATION, parent); - path = wxT(""); + path = wxEmptyString; return (wxDocTemplate *) NULL; } m_lastDirectory = wxPathOnly(pathTmp); @@ -1528,7 +1667,7 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates, } else { - path = wxT(""); + path = wxEmptyString; } return theTemplate; @@ -1547,14 +1686,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 ) @@ -1569,7 +1708,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; @@ -1629,12 +1768,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 ) @@ -1648,7 +1787,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; @@ -1759,15 +1898,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) ) { @@ -1775,10 +1910,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) @@ -1794,12 +1929,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; @@ -1823,6 +1958,11 @@ BEGIN_EVENT_TABLE(wxDocParentFrame, wxFrame) EVT_CLOSE(wxDocParentFrame::OnCloseWindow) END_EVENT_TABLE() +wxDocParentFrame::wxDocParentFrame() +{ + m_docManager = NULL; +} + wxDocParentFrame::wxDocParentFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, @@ -1836,6 +1976,19 @@ wxDocParentFrame::wxDocParentFrame(wxDocManager *manager, m_docManager = manager; } +bool wxDocParentFrame::Create(wxDocManager *manager, + wxFrame *frame, + wxWindowID id, + const wxString& title, + const wxPoint& pos, + const wxSize& size, + long style, + const wxString& name) +{ + m_docManager = manager; + return base_type::Create(frame, id, title, pos, size, style, name); +} + void wxDocParentFrame::OnExit(wxCommandEvent& WXUNUSED(event)) { Close(); @@ -1845,7 +1998,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) ) @@ -1879,7 +2032,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 @@ -1938,7 +2091,7 @@ bool wxDocPrintout::OnPrintPage(int WXUNUSED(page)) { m_printoutView->OnDraw(dc); } - return TRUE; + return true; } bool wxDocPrintout::HasPage(int pageNum) @@ -1949,9 +2102,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) @@ -1968,50 +2121,28 @@ void wxDocPrintout::GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, in // File history processor // ---------------------------------------------------------------------------- -static inline wxChar* MYcopystring(const wxString& s) -{ - wxChar* copy = new wxChar[s.length() + 1]; - return wxStrcpy(copy, s.c_str()); -} - -static inline wxChar* MYcopystring(const wxChar* s) -{ - wxChar* copy = new wxChar[wxStrlen(s) + 1]; - return wxStrcpy(copy, s); -} - wxFileHistory::wxFileHistory(size_t maxFiles, wxWindowID idBase) { m_fileMaxFiles = maxFiles; m_idBase = idBase; - m_fileHistoryN = 0; - m_fileHistory = new wxChar *[m_fileMaxFiles]; } wxFileHistory::~wxFileHistory() { - size_t i; - for (i = 0; i < m_fileHistoryN; i++) - delete[] m_fileHistory[i]; - delete[] m_fileHistory; } -// File history management void wxFileHistory::AddFileToHistory(const wxString& file) { + wxFileName fn(file); size_t i; // Check we don't already have this file - for (i = 0; i < m_fileHistoryN; i++) + for (i = 0; i < m_fileHistory.GetCount(); i++) { -#if defined( __WXMSW__ ) // Add any other OSes with case insensitive file names - wxString testString; - if ( m_fileHistory[i] ) - testString = m_fileHistory[i]; - if ( m_fileHistory[i] && ( file.Lower() == testString.Lower() ) ) -#else - if ( m_fileHistory[i] && ( file == m_fileHistory[i] ) ) -#endif + // we need to do a comparison using wxFileNames because it knows + // how to exactly compare files on the different platforms + // (e.g. handle case [in]sensitive filesystems) + if ( fn == wxFileName(m_fileHistory[i]) ) { // we do have it, move it to the top of the history RemoveFileFromHistory (i); @@ -2021,43 +2152,36 @@ void wxFileHistory::AddFileToHistory(const wxString& file) } // if we already have a full history, delete the one at the end - if ( m_fileMaxFiles == m_fileHistoryN ) + if ( m_fileMaxFiles == m_fileHistory.GetCount() ) { - RemoveFileFromHistory (m_fileHistoryN - 1); + RemoveFileFromHistory (m_fileHistory.GetCount() - 1); AddFileToHistory (file); return; } // Add to the project file history: // Move existing files (if any) down so we can insert file at beginning. - if (m_fileHistoryN < m_fileMaxFiles) + if (m_fileHistory.GetCount() < m_fileMaxFiles) { wxList::compatibility_iterator node = m_fileMenus.GetFirst(); while (node) { wxMenu* menu = (wxMenu*) node->GetData(); - if ( m_fileHistoryN == 0 && menu->GetMenuItemCount() ) + if ( m_fileHistory.IsEmpty() && menu->GetMenuItemCount() ) { menu->AppendSeparator(); } - menu->Append(m_idBase+m_fileHistoryN, _("[EMPTY]")); + menu->Append(m_idBase+m_fileHistory.GetCount(), _("[EMPTY]")); node = node->GetNext(); } - m_fileHistoryN ++; - } - // Shuffle filenames down - for (i = (m_fileHistoryN-1); i > 0; i--) - { - m_fileHistory[i] = m_fileHistory[i-1]; } - m_fileHistory[0] = MYcopystring(file); + + m_fileHistory.Insert(file, 0); // this is the directory of the last opened file wxString pathCurrent; wxSplitPath( m_fileHistory[0], &pathCurrent, NULL, NULL ); - for (i = 0; i < m_fileHistoryN; i++) - { - if ( m_fileHistory[i] ) + for (i = 0; i < m_fileHistory.GetCount(); i++) { // if in same directory just show the filename; otherwise the full // path @@ -2075,8 +2199,12 @@ 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(); while (node) { @@ -2085,52 +2213,45 @@ void wxFileHistory::AddFileToHistory(const wxString& file) node = node->GetNext(); } } - } } void wxFileHistory::RemoveFileFromHistory(size_t i) { - wxCHECK_RET( i < m_fileHistoryN, + wxCHECK_RET( i < m_fileHistory.GetCount(), wxT("invalid index in wxFileHistory::RemoveFileFromHistory") ); - // delete the element from the array (could use memmove() too...) - delete [] m_fileHistory[i]; - - size_t j; - for ( j = i; j < m_fileHistoryN - 1; j++ ) - { - m_fileHistory[j] = m_fileHistory[j + 1]; - } + // delete the element from the array + m_fileHistory.RemoveAt(i); wxList::compatibility_iterator node = m_fileMenus.GetFirst(); while ( node ) { - wxMenu* menu = (wxMenu*) node->GetData(); + wxMenu* menu = (wxMenu*) node->GetData(); - // shuffle filenames up - wxString buf; - for ( j = i; j < m_fileHistoryN - 1; j++ ) - { - buf.Printf(s_MRUEntryFormat, j + 1, m_fileHistory[j]); - menu->SetLabel(m_idBase + j, buf); - } + // shuffle filenames up + wxString buf; + for ( size_t j = i; j < m_fileHistory.GetCount(); j++ ) + { + buf.Printf(s_MRUEntryFormat, j + 1, m_fileHistory[j].c_str()); + menu->SetLabel(m_idBase + j, buf); + } - node = node->GetNext(); + node = node->GetNext(); // delete the last menu item which is unused now - wxWindowID lastItemId = m_idBase + m_fileHistoryN - 1; + wxWindowID lastItemId = m_idBase + wx_truncate_cast(wxWindowID, m_fileHistory.GetCount()); if (menu->FindItem(lastItemId)) { menu->Delete(lastItemId); } // delete the last separator too if no more files are left - if ( m_fileHistoryN == 1 ) + if ( m_fileHistory.GetCount() == 0 ) { - wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetLast(); - if ( node ) + wxMenuItemList::compatibility_iterator nodeLast = menu->GetMenuItems().GetLast(); + if ( nodeLast ) { - wxMenuItem *menuItem = node->GetData(); + wxMenuItem *menuItem = nodeLast->GetData(); if ( menuItem->IsSeparator() ) { menu->Delete(menuItem); @@ -2140,23 +2261,6 @@ void wxFileHistory::RemoveFileFromHistory(size_t i) //else: menu is empty somehow } } - - m_fileHistoryN--; -} - -wxString wxFileHistory::GetHistoryFile(size_t i) const -{ - wxString s; - if ( i < m_fileHistoryN ) - { - s = m_fileHistory[i]; - } - else - { - wxFAIL_MSG( wxT("bad index in wxFileHistory::GetHistoryFile") ); - } - - return s; } void wxFileHistory::UseMenu(wxMenu *menu) @@ -2173,17 +2277,21 @@ void wxFileHistory::RemoveMenu(wxMenu *menu) #if wxUSE_CONFIG void wxFileHistory::Load(wxConfigBase& config) { - m_fileHistoryN = 0; + m_fileHistory.Clear(); + wxString buf; - buf.Printf(wxT("file%d"), (int)m_fileHistoryN+1); + buf.Printf(wxT("file%d"), 1); + wxString historyFile; - while ((m_fileHistoryN < m_fileMaxFiles) && config.Read(buf, &historyFile) && (historyFile != wxT(""))) + while ((m_fileHistory.GetCount() < 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(""); + m_fileHistory.Add(historyFile); + + buf.Printf(wxT("file%d"), (int)m_fileHistory.GetCount()+1); + historyFile = wxEmptyString; } + AddFilesToMenu(); } @@ -2194,7 +2302,7 @@ void wxFileHistory::Save(wxConfigBase& config) { wxString buf; buf.Printf(wxT("file%d"), (int)i+1); - if (i < m_fileHistoryN) + if (i < m_fileHistory.GetCount()) config.Write(buf, wxString(m_fileHistory[i])); else config.Write(buf, wxEmptyString); @@ -2204,7 +2312,7 @@ void wxFileHistory::Save(wxConfigBase& config) void wxFileHistory::AddFilesToMenu() { - if (m_fileHistoryN > 0) + if (m_fileHistory.GetCount() > 0) { wxList::compatibility_iterator node = m_fileMenus.GetFirst(); while (node) @@ -2216,15 +2324,12 @@ void wxFileHistory::AddFilesToMenu() } size_t i; - for (i = 0; i < m_fileHistoryN; i++) - { - if (m_fileHistory[i]) + for (i = 0; i < m_fileHistory.GetCount(); i++) { wxString buf; - buf.Printf(s_MRUEntryFormat, i+1, m_fileHistory[i]); + buf.Printf(s_MRUEntryFormat, i+1, m_fileHistory[i].c_str()); menu->Append(m_idBase+i, buf); } - } node = node->GetNext(); } } @@ -2232,7 +2337,7 @@ void wxFileHistory::AddFilesToMenu() void wxFileHistory::AddFilesToMenu(wxMenu* menu) { - if (m_fileHistoryN > 0) + if (m_fileHistory.GetCount() > 0) { if (menu->GetMenuItemCount()) { @@ -2240,16 +2345,13 @@ void wxFileHistory::AddFilesToMenu(wxMenu* menu) } size_t i; - for (i = 0; i < m_fileHistoryN; i++) - { - if (m_fileHistory[i]) + for (i = 0; i < m_fileHistory.GetCount(); i++) { wxString buf; - buf.Printf(s_MRUEntryFormat, i+1, m_fileHistory[i]); + buf.Printf(s_MRUEntryFormat, i+1, m_fileHistory[i].c_str()); menu->Append(m_idBase+i, buf); } } - } } // ---------------------------------------------------------------------------- @@ -2263,7 +2365,7 @@ bool wxTransferFileToStream(const wxString& filename, wxSTD ostream& stream) { wxFFile file(filename, _T("rb")); if ( !file.IsOpened() ) - return FALSE; + return false; char buf[4096]; @@ -2272,22 +2374,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 @@ -2296,12 +2398,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 @@ -2310,7 +2412,7 @@ bool wxTransferFileToStream(const wxString& filename, wxOutputStream& stream) { wxFFile file(filename, _T("rb")); if ( !file.IsOpened() ) - return FALSE; + return false; char buf[4096]; @@ -2319,38 +2421,44 @@ 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 + for ( ;; ) { stream.Read(buf, WXSIZEOF(buf)); const size_t nRead = stream.LastRead(); - if ( !nRead || !file.Write(buf, nRead) ) - return FALSE; + if ( !nRead ) + { + if ( stream.Eof() ) + break; + + return false; + } + + if ( !file.Write(buf, nRead) ) + return false; } - while ( !stream.Eof() ); - return TRUE; + return true; } #endif // wxUSE_STD_IOSTREAM/!wxUSE_STD_IOSTREAM #endif // wxUSE_DOC_VIEW_ARCHITECTURE -