X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/724b119a15d857c97d1a9e4604692ac55d8b58b9..4863e55108155a4e109e401407e01495ebf45b36:/src/common/docview.cpp diff --git a/src/common/docview.cpp b/src/common/docview.cpp index 34cbdbadaf..9c5118b3c1 100644 --- a/src/common/docview.cpp +++ b/src/common/docview.cpp @@ -2,7 +2,7 @@ // Name: src/common/docview.cpp // Purpose: Document/view classes // Author: Julian Smart -// Modified by: +// Modified by: Vadim Zeitlin // Created: 01/02/97 // RCS-ID: $Id$ // Copyright: (c) Julian Smart @@ -44,37 +44,37 @@ #include "wx/choicdlg.h" #endif -#include "wx/ffile.h" - -#ifdef __WXMAC__ - #include "wx/filename.h" -#endif - #if wxUSE_PRINTING_ARCHITECTURE #include "wx/prntbase.h" #include "wx/printdlg.h" #endif #include "wx/confbase.h" +#include "wx/filename.h" #include "wx/file.h" +#include "wx/ffile.h" #include "wx/cmdproc.h" #include "wx/tokenzr.h" #include "wx/filename.h" - -#include -#include +#include "wx/stdpaths.h" +#include "wx/vector.h" +#include "wx/ptr_scpd.h" #if wxUSE_STD_IOSTREAM #include "wx/ioswrap.h" + #include "wx/beforestd.h" #if wxUSE_IOSTREAMH #include #else #include #endif + #include "wx/afterstd.h" #else #include "wx/wfstream.h" #endif +typedef wxVector wxDocTemplates; + // ---------------------------------------------------------------------------- // wxWidgets macros // ---------------------------------------------------------------------------- @@ -92,36 +92,48 @@ IMPLEMENT_CLASS(wxDocParentFrame, wxFrame) IMPLEMENT_DYNAMIC_CLASS(wxFileHistory, wxObject) -// ---------------------------------------------------------------------------- -// function prototypes -// ---------------------------------------------------------------------------- - -static wxWindow* wxFindSuitableParent(void); - -// ---------------------------------------------------------------------------- -// local constants -// ---------------------------------------------------------------------------- - -static const wxChar *s_MRUEntryFormat = wxT("&%d %s"); - // ============================================================================ // implementation // ============================================================================ // ---------------------------------------------------------------------------- -// local functions +// private helpers // ---------------------------------------------------------------------------- -static wxString FindExtension(const wxString& path) +namespace +{ + +wxWindow *wxFindSuitableParent() +{ + wxWindow * const win = wxGetTopLevelParent(wxWindow::FindFocus()); + + return win ? win : wxTheApp->GetTopWindow(); +} + +wxString FindExtension(const wxString& path) { wxString ext; - wxSplitPath(path, NULL, NULL, &ext); + wxFileName::SplitPath(path, NULL, NULL, &ext); // VZ: extensions are considered not case sensitive - is this really a good // idea? return ext.MakeLower(); } +// return the string used for the MRU list items in the menu +// +// NB: the index n is 0-based, as usual, but the strings start from 1 +wxString GetMRUEntryLabel(int n, const wxString& path) +{ + // we need to quote '&' characters which are used for mnemonics + wxString pathInMenu(path); + pathInMenu.Replace("&", "&&"); + + return wxString::Format("&%d %s", n + 1, pathInMenu); +} + +} // anonymous namespace + // ---------------------------------------------------------------------------- // Definition of wxDocument // ---------------------------------------------------------------------------- @@ -130,8 +142,8 @@ wxDocument::wxDocument(wxDocument *parent) { m_documentModified = false; m_documentParent = parent; - m_documentTemplate = (wxDocTemplate *) NULL; - m_commandProcessor = (wxCommandProcessor*) NULL; + m_documentTemplate = NULL; + m_commandProcessor = NULL; m_savedYet = false; } @@ -144,8 +156,7 @@ wxDocument::~wxDocument() { DeleteContents(); - if (m_commandProcessor) - delete m_commandProcessor; + delete m_commandProcessor; if (GetDocumentManager()) GetDocumentManager()->RemoveDocument(this); @@ -158,10 +169,10 @@ wxDocument::~wxDocument() bool wxDocument::Close() { - if (OnSaveModified()) - return OnCloseDocument(); - else + if ( !OnSaveModified() ) return false; + + return OnCloseDocument(); } bool wxDocument::OnCloseDocument() @@ -221,22 +232,22 @@ bool wxDocument::DeleteAllViews() wxView *wxDocument::GetFirstView() const { - if (m_documentViews.GetCount() == 0) - return (wxView *) NULL; - return (wxView *)m_documentViews.GetFirst()->GetData(); + if ( m_documentViews.empty() ) + return NULL; + + return static_cast(m_documentViews.GetFirst()->GetData()); } wxDocManager *wxDocument::GetDocumentManager() const { - return (m_documentTemplate ? m_documentTemplate->GetDocumentManager() : (wxDocManager*) NULL); + return m_documentTemplate ? m_documentTemplate->GetDocumentManager() : NULL; } bool wxDocument::OnNewDocument() { - if (!OnSaveModified()) + if ( !OnSaveModified() ) return false; - if (OnCloseDocument()==false) return false; DeleteContents(); Modify(false); SetDocumentSaved(false); @@ -250,7 +261,7 @@ bool wxDocument::OnNewDocument() bool wxDocument::Save() { - if (!IsModified() && m_savedYet) + if ( AlreadySaved() ) return true; if ( m_documentFile.empty() || !m_savedYet ) @@ -265,15 +276,17 @@ bool wxDocument::SaveAs() if (!docTemplate) return false; -#if defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXMAC__) - wxString filter = docTemplate->GetDescription() + wxT(" (") + docTemplate->GetFileFilter() + wxT(")|") + docTemplate->GetFileFilter(); +#ifdef wxHAS_MULTIPLE_FILEDLG_FILTERS + 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(); + wxList::compatibility_iterator + node = docTemplate->GetDocumentManager()->GetTemplates().GetFirst(); while (node) { wxDocTemplate *t = (wxDocTemplate*) node->GetData(); @@ -286,7 +299,8 @@ bool wxDocument::SaveAs() if ( !filter.empty() ) filter << wxT('|'); - filter << t->GetDescription() << wxT(" (") << t->GetFileFilter() << wxT(") |") + filter << t->GetDescription() + << wxT(" (") << t->GetFileFilter() << wxT(") |") << t->GetFileFilter(); } @@ -296,20 +310,28 @@ bool wxDocument::SaveAs() #else wxString filter = docTemplate->GetFileFilter() ; #endif - wxString tmp = wxFileSelector(_("Save as"), - docTemplate->GetDirectory(), + + wxString defaultDir = docTemplate->GetDirectory(); + if ( defaultDir.empty() ) + { + defaultDir = wxPathOnly(GetFilename()); + if ( defaultDir.empty() ) + defaultDir = GetDocumentManager()->GetLastDirectory(); + } + + wxString fileName = wxFileSelector(_("Save As"), + defaultDir, wxFileNameFromPath(GetFilename()), docTemplate->GetDefaultExtension(), filter, wxFD_SAVE | wxFD_OVERWRITE_PROMPT, GetDocumentWindow()); - if (tmp.empty()) - return false; + if (fileName.empty()) + return false; // cancelled by user - wxString fileName(tmp); - wxString path, name, ext; - wxSplitPath(fileName, & path, & name, & ext); + wxString ext; + wxFileName::SplitPath(fileName, NULL, NULL, &ext); if (ext.empty()) { @@ -317,33 +339,22 @@ bool wxDocument::SaveAs() fileName += docTemplate->GetDefaultExtension(); } - SetFilename(fileName); - SetTitle(wxFileNameFromPath(fileName)); - - // Notify the views that the filename has changed - wxList::compatibility_iterator node = m_documentViews.GetFirst(); - while (node) - { - wxView *view = (wxView *)node->GetData(); - view->OnChangeFilename(); - node = node->GetNext(); - } - // Files that were not saved correctly are not added to the FileHistory. - if (!OnSaveDocument(m_documentFile)) + if (!OnSaveDocument(fileName)) 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. + SetTitle(wxFileNameFromPath(fileName)); + SetFilename(fileName, true); // will call OnChangeFileName automatically + + // 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. if (docTemplate->FileMatchesTemplate(fileName)) { GetDocumentManager()->AddFileToHistory(fileName); } - else - { - // The user will probably not be able to open the file again, so - // we could warn about the wrong file-extension here. - } + //else: the user will probably not be able to open the file again, so we + // could warn about the wrong file-extension here + return true; } @@ -358,7 +369,7 @@ bool wxDocument::OnSaveDocument(const wxString& file) Modify(false); SetFilename(file); SetDocumentSaved(true); -#ifdef __WXMAC__ +#if defined( __WXOSX_MAC__ ) && wxOSX_USE_CARBON wxFileName fn(file) ; fn.MacSetDefaultTypeAndCreator() ; #endif @@ -367,7 +378,7 @@ bool wxDocument::OnSaveDocument(const wxString& file) bool wxDocument::OnOpenDocument(const wxString& file) { - if (!OnSaveModified()) + if ( !OnSaveModified() ) return false; if ( !DoOpenDocument(file) ) @@ -446,11 +457,9 @@ wxString wxDocument::DoGetUserReadableName() const wxWindow *wxDocument::GetDocumentWindow() const { - wxView *view = GetFirstView(); - if (view) - return view->GetFrame(); - else - return wxTheApp->GetTopWindow(); + wxView * const view = GetFirstView(); + + return view ? view->GetFrame() : wxTheApp->GetTopWindow(); } wxCommandProcessor *wxDocument::OnCreateCommandProcessor() @@ -461,31 +470,32 @@ wxCommandProcessor *wxDocument::OnCreateCommandProcessor() // true if safe to close bool wxDocument::OnSaveModified() { - if (IsModified()) - { - wxString title = GetUserReadableName(); - - wxString msgTitle; - if (!wxTheApp->GetAppName().empty()) - msgTitle = wxTheApp->GetAppName(); - else - msgTitle = wxString(_("Warning")); - - wxString prompt; - 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) + if ( IsModified() ) + { + switch ( wxMessageBox + ( + wxString::Format + ( + _("Do you want to save changes to %s?"), + GetUserReadableName() + ), + wxTheApp->GetAppDisplayName(), + wxYES_NO | wxCANCEL | wxICON_QUESTION | wxCENTRE, + wxFindSuitableParent() + ) ) { - Modify(false); - return true; + case wxNO: + Modify(false); + break; + + case wxYES: + return Save(); + + case wxCANCEL: + return false; } - else if (res == wxYES) - return Save(); - else if (res == wxCANCEL) - return false; } + return true; } @@ -496,7 +506,7 @@ bool wxDocument::Draw(wxDC& WXUNUSED(context)) bool wxDocument::AddView(wxView *view) { - if (!m_documentViews.Member(view)) + if ( !m_documentViews.Member(view) ) { m_documentViews.Append(view); OnChangedViewList(); @@ -513,10 +523,7 @@ bool wxDocument::RemoveView(wxView *view) bool wxDocument::OnCreate(const wxString& WXUNUSED(path), long flags) { - if (GetDocumentTemplate()->CreateView(this, flags)) - return true; - else - return false; + return GetDocumentTemplate()->CreateView(this, flags) != NULL; } // Called after a view is added or removed. @@ -524,13 +531,8 @@ bool wxDocument::OnCreate(const wxString& WXUNUSED(path), long flags) // there are no more views. void wxDocument::OnChangedViewList() { - if (m_documentViews.GetCount() == 0) - { - if (OnSaveModified()) - { - delete this; - } - } + if ( m_documentViews.empty() && OnSaveModified() ) + delete this; } void wxDocument::UpdateAllViews(wxView *sender, wxObject *hint) @@ -559,6 +561,11 @@ void wxDocument::NotifyClosing() void wxDocument::SetFilename(const wxString& filename, bool notifyViews) { m_documentFile = filename; + OnChangeFilename(notifyViews); +} + +void wxDocument::OnChangeFilename(bool notifyViews) +{ if ( notifyViews ) { // Notify the views that the filename has changed @@ -574,30 +581,21 @@ 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()) + if ( !store ) #else wxFileOutputStream store(file); - if (store.GetLastError() != wxSTREAM_NO_ERROR) + if ( store.GetLastError() != wxSTREAM_NO_ERROR ) #endif { - (void)wxMessageBox(_("Sorry, could not open this file for saving."), msgTitle, wxOK | wxICON_EXCLAMATION, - GetDocumentWindow()); - // Saving error + wxLogError(_("File \"%s\" could not be opened for writing."), file); return false; } + if (!SaveObject(store)) { - (void)wxMessageBox(_("Sorry, could not save this file."), msgTitle, wxOK | wxICON_EXCLAMATION, - GetDocumentWindow()); - // Saving error + wxLogError(_("Failed to save document to the file \"%s\"."), file); return false; } @@ -608,24 +606,29 @@ bool wxDocument::DoOpenDocument(const wxString& file) { #if wxUSE_STD_IOSTREAM wxSTD ifstream store(file.mb_str(), wxSTD ios::binary); - if (!store.fail() && !store.bad()) + if ( !store ) #else wxFileInputStream store(file); - if (store.GetLastError() == wxSTREAM_NO_ERROR) + if (store.GetLastError() != wxSTREAM_NO_ERROR || !store.IsOk()) #endif { + wxLogError(_("File \"%s\" could not be opened for reading."), file); + return false; + } + #if wxUSE_STD_IOSTREAM - LoadObject(store); - if ( !!store || store.eof() ) + LoadObject(store); + if ( !store ) #else - int res = LoadObject(store).GetLastError(); - if ( res == wxSTREAM_NO_ERROR || res == wxSTREAM_EOF ) + int res = LoadObject(store).GetLastError(); + if ( res != wxSTREAM_NO_ERROR && res != wxSTREAM_EOF ) #endif - return true; + { + wxLogError(_("Failed to read document from the file \"%s\"."), file); + return false; } - wxLogError(_("Sorry, could not open this file.")); - return false; + return true; } @@ -635,9 +638,9 @@ bool wxDocument::DoOpenDocument(const wxString& file) wxView::wxView() { - m_viewDocument = (wxDocument*) NULL; + m_viewDocument = NULL; - m_viewFrame = (wxFrame *) NULL; + m_viewFrame = NULL; } wxView::~wxView() @@ -646,16 +649,15 @@ wxView::~wxView() m_viewDocument->RemoveView(this); } -// Extend event processing to search the document's event table -bool wxView::ProcessEvent(wxEvent& event) +bool wxView::TryValidator(wxEvent& event) { - if ( !GetDocument() || !GetDocument()->ProcessEvent(event) ) - return wxEvtHandler::ProcessEvent(event); - - return true; + wxDocument * const doc = GetDocument(); + return doc && doc->ProcessEventHere(event); } -void wxView::OnActivateView(bool WXUNUSED(activate), wxView *WXUNUSED(activeView), wxView *WXUNUSED(deactiveView)) +void wxView::OnActivateView(bool WXUNUSED(activate), + wxView *WXUNUSED(activeView), + wxView *WXUNUSED(deactiveView)) { } @@ -691,10 +693,7 @@ void wxView::SetDocument(wxDocument *doc) bool wxView::Close(bool deleteWindow) { - if (OnClose(deleteWindow)) - return true; - else - return false; + return OnClose(deleteWindow); } void wxView::Activate(bool activate) @@ -755,21 +754,16 @@ wxDocTemplate::~wxDocTemplate() // Tries to dynamically construct an object of the right class. wxDocument *wxDocTemplate::CreateDocument(const wxString& path, long flags) { - wxDocument *doc = DoCreateDocument(); - if ( doc == NULL ) - return (wxDocument *) NULL; + wxDocument * const doc = DoCreateDocument(); - if (InitDocument(doc, path, flags)) - { - return doc; - } - else - { - return (wxDocument *) NULL; - } + // VZ: this code doesn't delete doc if InitDocument() (i.e. doc->OnCreate()) + // fails, is this intentional? + + return doc && InitDocument(doc, path, flags) ? doc : NULL; } -bool wxDocTemplate::InitDocument(wxDocument* doc, const wxString& path, long flags) +bool +wxDocTemplate::InitDocument(wxDocument* doc, const wxString& path, long flags) { doc->SetFilename(path); doc->SetDocumentTemplate(this); @@ -778,30 +772,23 @@ bool wxDocTemplate::InitDocument(wxDocument* doc, const wxString& path, long fla if (doc->OnCreate(path, flags)) return true; - else - { - if (GetDocumentManager()->GetDocuments().Member(doc)) - doc->DeleteAllViews(); - return false; - } + + if (GetDocumentManager()->GetDocuments().Member(doc)) + doc->DeleteAllViews(); + return false; } wxView *wxDocTemplate::CreateView(wxDocument *doc, long flags) { - wxView *view = DoCreateView(); - if ( view == NULL ) - return (wxView *) NULL; + wxScopedPtr view(DoCreateView()); + if ( !view ) + return NULL; view->SetDocument(doc); - if (view->OnCreate(doc, flags)) - { - return view; - } - else - { - delete view; - return (wxView *) NULL; - } + if ( !view->OnCreate(doc, flags) ) + return NULL; + + return view.release(); } // The default (very primitive) format detection: check is the extension is @@ -825,17 +812,17 @@ bool wxDocTemplate::FileMatchesTemplate(const wxString& path) wxDocument *wxDocTemplate::DoCreateDocument() { if (!m_docClassInfo) - return (wxDocument *) NULL; + return NULL; - return (wxDocument *)m_docClassInfo->CreateObject(); + return static_cast(m_docClassInfo->CreateObject()); } wxView *wxDocTemplate::DoCreateView() { if (!m_viewClassInfo) - return (wxView *) NULL; + return NULL; - return (wxView *)m_viewClassInfo->CreateObject(); + return static_cast(m_viewClassInfo->CreateObject()); } // ---------------------------------------------------------------------------- @@ -854,12 +841,12 @@ BEGIN_EVENT_TABLE(wxDocManager, wxEvtHandler) EVT_MENU(wxID_REDO, wxDocManager::OnRedo) EVT_UPDATE_UI(wxID_OPEN, wxDocManager::OnUpdateFileOpen) - EVT_UPDATE_UI(wxID_CLOSE, wxDocManager::OnUpdateFileClose) - EVT_UPDATE_UI(wxID_CLOSE_ALL, wxDocManager::OnUpdateFileClose) - EVT_UPDATE_UI(wxID_REVERT, wxDocManager::OnUpdateFileRevert) + EVT_UPDATE_UI(wxID_CLOSE, wxDocManager::OnUpdateDisableIfNoDoc) + EVT_UPDATE_UI(wxID_CLOSE_ALL, wxDocManager::OnUpdateDisableIfNoDoc) + EVT_UPDATE_UI(wxID_REVERT, wxDocManager::OnUpdateDisableIfNoDoc) EVT_UPDATE_UI(wxID_NEW, wxDocManager::OnUpdateFileNew) EVT_UPDATE_UI(wxID_SAVE, wxDocManager::OnUpdateFileSave) - EVT_UPDATE_UI(wxID_SAVEAS, wxDocManager::OnUpdateFileSaveAs) + EVT_UPDATE_UI(wxID_SAVEAS, wxDocManager::OnUpdateDisableIfNoDoc) EVT_UPDATE_UI(wxID_UNDO, wxDocManager::OnUpdateUndo) EVT_UPDATE_UI(wxID_REDO, wxDocManager::OnUpdateRedo) @@ -867,49 +854,49 @@ BEGIN_EVENT_TABLE(wxDocManager, wxEvtHandler) EVT_MENU(wxID_PRINT, wxDocManager::OnPrint) EVT_MENU(wxID_PREVIEW, wxDocManager::OnPreview) - EVT_UPDATE_UI(wxID_PRINT, wxDocManager::OnUpdatePrint) - EVT_UPDATE_UI(wxID_PREVIEW, wxDocManager::OnUpdatePreview) + EVT_UPDATE_UI(wxID_PRINT, wxDocManager::OnUpdateDisableIfNoDoc) + EVT_UPDATE_UI(wxID_PREVIEW, wxDocManager::OnUpdateDisableIfNoDoc) #endif END_EVENT_TABLE() -wxDocManager* wxDocManager::sm_docManager = (wxDocManager*) NULL; +wxDocManager* wxDocManager::sm_docManager = NULL; -wxDocManager::wxDocManager(long flags, bool initialize) +wxDocManager::wxDocManager(long WXUNUSED(flags), bool initialize) { + wxASSERT_MSG( !sm_docManager, "multiple wxDocManagers not allowed" ); + + sm_docManager = this; + m_defaultDocumentNameCounter = 1; - m_flags = flags; - m_currentView = (wxView *) NULL; - m_maxDocsOpen = 10000; - m_fileHistory = (wxFileHistory *) NULL; - if (initialize) + m_currentView = NULL; + m_maxDocsOpen = INT_MAX; + m_fileHistory = NULL; + if ( initialize ) Initialize(); - sm_docManager = this; } wxDocManager::~wxDocManager() { Clear(); - if (m_fileHistory) - delete m_fileHistory; - sm_docManager = (wxDocManager*) NULL; + delete m_fileHistory; + sm_docManager = NULL; } // closes the specified document bool wxDocManager::CloseDocument(wxDocument* doc, bool force) { - if (doc->Close() || force) - { - // Implicitly deletes the document when - // the last view is deleted - doc->DeleteAllViews(); + if ( !doc->Close() && !force ) + return false; - // Check we're really deleted - if (m_docs.Member(doc)) - delete doc; + // Implicitly deletes the document when + // the last view is deleted + doc->DeleteAllViews(); - return true; - } - return false; + // Check we're really deleted + if (m_docs.Member(doc)) + delete doc; + + return true; } bool wxDocManager::CloseDocuments(bool force) @@ -955,6 +942,19 @@ bool wxDocManager::Initialize() return true; } +wxString wxDocManager::GetLastDirectory() const +{ + // use the system-dependent default location for the document files if + // we're being opened for the first time + if ( m_lastDirectory.empty() ) + { + wxDocManager * const self = const_cast(this); + self->m_lastDirectory = wxStandardPaths::Get().GetAppDocumentsDir(); + } + + return m_lastDirectory; +} + wxFileHistory *wxDocManager::OnCreateFileHistory() { return new wxFileHistory; @@ -980,12 +980,12 @@ void wxDocManager::OnFileCloseAll(wxCommandEvent& WXUNUSED(event)) void wxDocManager::OnFileNew(wxCommandEvent& WXUNUSED(event)) { - CreateDocument( wxEmptyString, wxDOC_NEW ); + CreateNewDocument(); } void wxDocManager::OnFileOpen(wxCommandEvent& WXUNUSED(event)) { - if ( !CreateDocument( wxEmptyString, 0) ) + if ( !CreateDocument("") ) { OnOpenFileFailure(); } @@ -1018,7 +1018,7 @@ void wxDocManager::OnFileSaveAs(wxCommandEvent& WXUNUSED(event)) void wxDocManager::OnPrint(wxCommandEvent& WXUNUSED(event)) { #if wxUSE_PRINTING_ARCHITECTURE - wxView *view = GetCurrentView(); + wxView *view = GetActiveView(); if (!view) return; @@ -1036,7 +1036,7 @@ void wxDocManager::OnPrint(wxCommandEvent& WXUNUSED(event)) void wxDocManager::OnPreview(wxCommandEvent& WXUNUSED(event)) { #if wxUSE_PRINTING_ARCHITECTURE - wxView *view = GetCurrentView(); + wxView *view = GetActiveView(); if (!view) return; @@ -1044,16 +1044,18 @@ void wxDocManager::OnPreview(wxCommandEvent& WXUNUSED(event)) if (printout) { // Pass two printout objects: for preview, and possible printing. - wxPrintPreviewBase *preview = new wxPrintPreview(printout, view->OnCreatePrintout()); + wxPrintPreviewBase * + preview = new wxPrintPreview(printout, view->OnCreatePrintout()); if ( !preview->Ok() ) { delete preview; - wxMessageBox( _("Sorry, print preview needs a printer to be installed.") ); + wxLogError(_("Print preview creation failed.")); return; } - wxPreviewFrame *frame = new wxPreviewFrame(preview, (wxFrame *)wxTheApp->GetTopWindow(), _("Print Preview"), - wxPoint(100, 100), wxSize(600, 650)); + wxPreviewFrame * + frame = new wxPreviewFrame(preview, wxTheApp->GetTopWindow(), + _("Print Preview")); frame->Centre(wxBOTH); frame->Initialize(); frame->Show(true); @@ -1063,343 +1065,271 @@ void wxDocManager::OnPreview(wxCommandEvent& WXUNUSED(event)) void wxDocManager::OnUndo(wxCommandEvent& event) { - wxDocument *doc = GetCurrentDocument(); - if (!doc) - return; - if (doc->GetCommandProcessor()) - doc->GetCommandProcessor()->Undo(); - else + wxCommandProcessor * const cmdproc = GetCurrentCommandProcessor(); + if ( !cmdproc ) + { event.Skip(); + return; + } + + cmdproc->Undo(); } void wxDocManager::OnRedo(wxCommandEvent& event) { - wxDocument *doc = GetCurrentDocument(); - if (!doc) - return; - if (doc->GetCommandProcessor()) - doc->GetCommandProcessor()->Redo(); - else + wxCommandProcessor * const cmdproc = GetCurrentCommandProcessor(); + if ( !cmdproc ) + { event.Skip(); + return; + } + + cmdproc->Redo(); } // Handlers for UI update commands void wxDocManager::OnUpdateFileOpen(wxUpdateUIEvent& event) { - event.Enable( true ); + // CreateDocument() (which is called from OnFileOpen) may succeed + // only when there is at least a template: + event.Enable( GetTemplates().GetCount()>0 ); } -void wxDocManager::OnUpdateFileClose(wxUpdateUIEvent& event) +void wxDocManager::OnUpdateDisableIfNoDoc(wxUpdateUIEvent& event) { - wxDocument *doc = GetCurrentDocument(); - event.Enable( (doc != (wxDocument*) NULL) ); -} - -void wxDocManager::OnUpdateFileRevert(wxUpdateUIEvent& event) -{ - wxDocument *doc = GetCurrentDocument(); - event.Enable( (doc != (wxDocument*) NULL) ); + event.Enable( GetCurrentDocument() != NULL ); } void wxDocManager::OnUpdateFileNew(wxUpdateUIEvent& event) { - event.Enable( true ); + // CreateDocument() (which is called from OnFileNew) may succeed + // only when there is at least a template: + event.Enable( GetTemplates().GetCount()>0 ); } void wxDocManager::OnUpdateFileSave(wxUpdateUIEvent& event) { - wxDocument *doc = GetCurrentDocument(); - event.Enable( doc && doc->IsModified() ); -} - -void wxDocManager::OnUpdateFileSaveAs(wxUpdateUIEvent& event) -{ - wxDocument *doc = GetCurrentDocument(); - event.Enable( (doc != (wxDocument*) NULL) ); + wxDocument * const doc = GetCurrentDocument(); + event.Enable( doc && !doc->AlreadySaved() ); } void wxDocManager::OnUpdateUndo(wxUpdateUIEvent& event) { - wxDocument *doc = GetCurrentDocument(); - if (!doc) - event.Enable(false); - else if (!doc->GetCommandProcessor()) - event.Skip(); - else + wxCommandProcessor * const cmdproc = GetCurrentCommandProcessor(); + if ( !cmdproc ) { - event.Enable( doc->GetCommandProcessor()->CanUndo() ); - doc->GetCommandProcessor()->SetMenuStrings(); + event.Enable(false); + return; } + + event.Enable(cmdproc->CanUndo()); + cmdproc->SetMenuStrings(); } void wxDocManager::OnUpdateRedo(wxUpdateUIEvent& event) { - wxDocument *doc = GetCurrentDocument(); - if (!doc) - event.Enable(false); - else if (!doc->GetCommandProcessor()) - event.Skip(); - else + wxCommandProcessor * const cmdproc = GetCurrentCommandProcessor(); + if ( !cmdproc ) { - event.Enable( doc->GetCommandProcessor()->CanRedo() ); - doc->GetCommandProcessor()->SetMenuStrings(); + event.Enable(false); + return; } -} -void wxDocManager::OnUpdatePrint(wxUpdateUIEvent& event) -{ - wxDocument *doc = GetCurrentDocument(); - event.Enable( (doc != (wxDocument*) NULL) ); + event.Enable(cmdproc->CanRedo()); + cmdproc->SetMenuStrings(); } -void wxDocManager::OnUpdatePreview(wxUpdateUIEvent& event) +wxView *wxDocManager::GetActiveView() const { - wxDocument *doc = GetCurrentDocument(); - event.Enable( (doc != (wxDocument*) NULL) ); -} + wxView *view = GetCurrentView(); -wxView *wxDocManager::GetCurrentView() const -{ - if (m_currentView) - return m_currentView; - if (m_docs.GetCount() == 1) + if ( !view && !m_docs.empty() ) { - wxDocument* doc = (wxDocument*) m_docs.GetFirst()->GetData(); - return doc->GetFirstView(); + // if we have exactly one document, consider its view to be the current + // one + // + // VZ: I'm not exactly sure why is this needed but this is how this + // code used to behave before the bug #9518 was fixed and it seems + // safer to preserve the old logic + wxList::compatibility_iterator node = m_docs.GetFirst(); + if ( !node->GetNext() ) + { + wxDocument *doc = static_cast(node->GetData()); + view = doc->GetFirstView(); + } + //else: we have more than one document } - return (wxView *) NULL; + + return view; } -// Extend event processing to search the view's event table -bool wxDocManager::ProcessEvent(wxEvent& event) +bool wxDocManager::TryValidator(wxEvent& event) { - wxView* view = GetCurrentView(); - if (view) - { - if (view->ProcessEvent(event)) - return true; - } - return wxEvtHandler::ProcessEvent(event); + wxView * const view = GetActiveView(); + return view && view->ProcessEventHere(event); } -wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags) +namespace { - wxDocTemplate **templates = new wxDocTemplate *[m_templates.GetCount()]; - int n = 0; - for (size_t i = 0; i < m_templates.GetCount(); i++) +// helper function: return only the visible templates +wxDocTemplates GetVisibleTemplates(const wxList& allTemplates) +{ + // select only the visible templates + const size_t totalNumTemplates = allTemplates.GetCount(); + wxDocTemplates templates; + if ( totalNumTemplates ) { - wxDocTemplate *temp = (wxDocTemplate *)(m_templates.Item(i)->GetData()); - if (temp->IsVisible()) + templates.reserve(totalNumTemplates); + + for ( wxList::const_iterator i = allTemplates.begin(), + end = allTemplates.end(); + i != end; + ++i ) { - templates[n] = temp; - n ++; + wxDocTemplate * const temp = (wxDocTemplate *)*i; + if ( temp->IsVisible() ) + templates.push_back(temp); } } - if (n == 0) - { - delete[] templates; - return (wxDocument *) NULL; - } - wxDocument* docToClose = NULL; + return templates; +} + +} // anonymous namespace - // If we've reached the max number of docs, close the - // first one. - if ( (int)GetDocuments().GetCount() >= m_maxDocsOpen ) +wxDocument *wxDocManager::CreateDocument(const wxString& pathOrig, long flags) +{ + // this ought to be const but SelectDocumentType/Path() are not + // const-correct and can't be changed as, being virtual, this risks + // breaking user code overriding them + wxDocTemplates templates(GetVisibleTemplates(m_templates)); + const size_t numTemplates = templates.size(); + if ( !numTemplates ) { - wxDocument *doc = (wxDocument *)GetDocuments().GetFirst()->GetData(); - docToClose = doc; + // no templates can be used, can't create document + return NULL; } - // New document: user chooses a template, unless there's only one. - if (flags & wxDOC_NEW) - { - if (n == 1) - { - if (docToClose) - { - if (!CloseDocument(docToClose, false)) - { - delete[] templates; - return NULL; - } - } - wxDocTemplate *temp = templates[0]; - delete[] templates; - wxDocument *newDoc = temp->CreateDocument(path, flags); + // normally user should select the template to use but wxDOC_SILENT flag we + // choose one ourselves + wxString path = pathOrig; // may be modified below + wxDocTemplate *temp; + if ( flags & wxDOC_SILENT ) + { + wxASSERT_MSG( !path.empty(), + "using empty path with wxDOC_SILENT doesn't make sense" ); - if (newDoc) - { - newDoc->SetDocumentName(temp->GetDocumentName()); - newDoc->SetDocumentTemplate(temp); - if (!newDoc->OnNewDocument() ) - { - // Document is implicitly deleted by DeleteAllViews - newDoc->DeleteAllViews(); - return NULL; - } - } - return newDoc; + temp = FindTemplateForPath(path); + if ( !temp ) + { + wxLogWarning(_("The format of file '%s' couldn't be determined."), + path); } + } + else // not silent, ask the user + { + // for the new file we need just the template, for an existing one we + // need the template and the path, unless it's already specified + if ( (flags & wxDOC_NEW) || !path.empty() ) + temp = SelectDocumentType(&templates[0], numTemplates); + else + temp = SelectDocumentPath(&templates[0], numTemplates, path, flags); + } - wxDocTemplate *temp = SelectDocumentType(templates, n); - delete[] templates; - if (temp) - { - if (docToClose) - { - if (!CloseDocument(docToClose, false)) - { - return NULL; - } - } + if ( !temp ) + return NULL; - wxDocument *newDoc = temp->CreateDocument(path, flags); + // check whether the document with this path is already opened + if ( !path.empty() ) + { + const wxFileName fn(path); + for ( wxList::const_iterator i = m_docs.begin(); i != m_docs.end(); ++i ) + { + wxDocument * const doc = (wxDocument*)*i; - if (newDoc) + if ( fn == doc->GetFilename() ) { - newDoc->SetDocumentName(temp->GetDocumentName()); - newDoc->SetDocumentTemplate(temp); - if (!newDoc->OnNewDocument() ) + // file already open, just activate it and return + if ( doc->GetFirstView() ) { - // Document is implicitly deleted by DeleteAllViews - newDoc->DeleteAllViews(); - return NULL; + ActivateView(doc->GetFirstView()); + if ( doc->GetDocumentWindow() ) + doc->GetDocumentWindow()->SetFocus(); + return doc; } } - return newDoc; } - else - return (wxDocument *) NULL; } - // Existing document - wxDocTemplate *temp; - wxString path2 = path; + // no, we need to create a new document - if (flags & wxDOC_SILENT) + + // if we've reached the max number of docs, close the first one. + if ( (int)GetDocuments().GetCount() >= m_maxDocsOpen ) { - temp = FindTemplateForPath(path2); - if (!temp) + if ( !CloseDocument((wxDocument *)GetDocuments().GetFirst()->GetData()) ) { - // Since we do not add files with non-default extensions to the FileHistory this - // can only happen if the application changes the allowed templates in runtime. - (void)wxMessageBox(_("Sorry, the format for this file is unknown."), - _("Open File"), - wxOK | wxICON_EXCLAMATION, wxFindSuitableParent()); + // can't open the new document if closing the old one failed + return NULL; } } - else - temp = SelectDocumentPath(templates, n, path2, flags); - delete[] templates; - if (temp) - { - if (docToClose) - { - if (!CloseDocument(docToClose, false)) - { - return NULL; - } - } + // do create and initialize the new document finally + wxDocument * const docNew = temp->CreateDocument(path, flags); + if ( !docNew ) + 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; - } - } - } + docNew->SetDocumentName(temp->GetDocumentName()); + docNew->SetDocumentTemplate(temp); - wxDocument *newDoc = temp->CreateDocument(path2, flags); - if (newDoc) - { - newDoc->SetDocumentName(temp->GetDocumentName()); - newDoc->SetDocumentTemplate(temp); - if (!newDoc->OnOpenDocument(path2)) - { - newDoc->DeleteAllViews(); - // delete newDoc; // Implicitly deleted by DeleteAllViews - return (wxDocument *) NULL; - } - // 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. - if (temp->FileMatchesTemplate(path2)) - AddFileToHistory(path2); - } - return newDoc; + // call the appropriate function depending on whether we're creating a new + // file or opening an existing one + if ( !(flags & wxDOC_NEW ? docNew->OnNewDocument() + : docNew->OnOpenDocument(path)) ) + { + // Document is implicitly deleted by DeleteAllViews + docNew->DeleteAllViews(); + return NULL; } - return (wxDocument *) NULL; + // add the successfully opened file to MRU, but only if we're going to be + // able to reopen it successfully later which requires the template for + // this document to be retrievable from the file extension + if ( !(flags & wxDOC_NEW) && temp->FileMatchesTemplate(path) ) + AddFileToHistory(path); + + return docNew; } wxView *wxDocManager::CreateView(wxDocument *doc, long flags) { - wxDocTemplate **templates = new wxDocTemplate *[m_templates.GetCount()]; - int n =0; + wxDocTemplates templates(GetVisibleTemplates(m_templates)); + const size_t numTemplates = templates.size(); - for (size_t i = 0; i < m_templates.GetCount(); i++) - { - wxDocTemplate *temp = (wxDocTemplate *)(m_templates.Item(i)->GetData()); - if (temp->IsVisible()) - { - if (temp->GetDocumentName() == doc->GetDocumentName()) - { - templates[n] = temp; - n ++; - } - } - } - if (n == 0) - { - delete[] templates; - return (wxView *) NULL; - } - if (n == 1) - { - wxDocTemplate *temp = templates[0]; - delete[] templates; - wxView *view = temp->CreateView(doc, flags); - if (view) - view->SetViewName(temp->GetViewName()); - return view; - } + if ( numTemplates == 0 ) + return NULL; - wxDocTemplate *temp = SelectViewType(templates, n); - delete[] templates; - if (temp) - { - wxView *view = temp->CreateView(doc, flags); - if (view) - view->SetViewName(temp->GetViewName()); - return view; - } - else - return (wxView *) NULL; + wxDocTemplate * const + temp = numTemplates == 1 ? templates[0] + : SelectViewType(&templates[0], numTemplates); + + if ( !temp ) + return NULL; + + wxView *view = temp->CreateView(doc, flags); + if ( view ) + view->SetViewName(temp->GetViewName()); + return view; } // Not yet implemented -void wxDocManager::DeleteTemplate(wxDocTemplate *WXUNUSED(temp), long WXUNUSED(flags)) +void +wxDocManager::DeleteTemplate(wxDocTemplate *WXUNUSED(temp), long WXUNUSED(flags)) { } @@ -1411,11 +1341,14 @@ bool wxDocManager::FlushDoc(wxDocument *WXUNUSED(doc)) wxDocument *wxDocManager::GetCurrentDocument() const { - wxView *view = GetCurrentView(); - if (view) - return view->GetDocument(); - else - return (wxDocument *) NULL; + wxView * const view = GetActiveView(); + return view ? view->GetDocument() : NULL; +} + +wxCommandProcessor *wxDocManager::GetCurrentCommandProcessor() const +{ + wxDocument * const doc = GetCurrentDocument(); + return doc ? doc->GetCommandProcessor() : NULL; } // Make a default name for a new document @@ -1448,7 +1381,7 @@ wxString wxDocManager::MakeNewDocumentName() // 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; @@ -1464,7 +1397,7 @@ wxString wxDocManager::MakeFrameTitle(wxDocument* doc) // Not yet implemented wxDocTemplate *wxDocManager::MatchTemplate(const wxString& WXUNUSED(path)) { - return (wxDocTemplate *) NULL; + return NULL; } // File history management @@ -1503,7 +1436,7 @@ void wxDocManager::FileHistoryRemoveMenu(wxMenu *menu) } #if wxUSE_CONFIG -void wxDocManager::FileHistoryLoad(wxConfigBase& config) +void wxDocManager::FileHistoryLoad(const wxConfigBase& config) { if (m_fileHistory) m_fileHistory->Load(config); @@ -1538,7 +1471,7 @@ size_t wxDocManager::GetHistoryFilesCount() const // against that of the template wxDocTemplate *wxDocManager::FindTemplateForPath(const wxString& path) { - wxDocTemplate *theTemplate = (wxDocTemplate *) NULL; + wxDocTemplate *theTemplate = NULL; // Find the template which this extension corresponds to for (size_t i = 0; i < m_templates.GetCount(); i++) @@ -1553,48 +1486,20 @@ wxDocTemplate *wxDocManager::FindTemplateForPath(const wxString& path) return theTemplate; } -// Try to get a more suitable parent frame than the top window, -// for selection dialogs. Otherwise you may get an unexpected -// window being activated when a dialog is shown. -static wxWindow* wxFindSuitableParent() -{ - wxWindow* parent = wxTheApp->GetTopWindow(); - - wxWindow* focusWindow = wxWindow::FindFocus(); - if (focusWindow) - { - while (focusWindow && - !focusWindow->IsKindOf(CLASSINFO(wxDialog)) && - !focusWindow->IsKindOf(CLASSINFO(wxFrame))) - - focusWindow = focusWindow->GetParent(); - - if (focusWindow) - parent = focusWindow; - } - return parent; -} - // Prompts user to open a file, using file specs in templates. // Must extend the file selector dialog or implement own; OR // match the extension to the template extension. wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates, -#if defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXMAC__) int noTemplates, -#else - int WXUNUSED(noTemplates), -#endif wxString& path, long WXUNUSED(flags), bool WXUNUSED(save)) { - // We can only have multiple filters in Windows and GTK -#if defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXMAC__) +#ifdef wxHAS_MULTIPLE_FILEDLG_FILTERS wxString descrBuf; - int i; - for (i = 0; i < noTemplates; i++) + for (int i = 0; i < noTemplates; i++) { if (templates[i]->IsVisible()) { @@ -1609,38 +1514,42 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates, } #else wxString descrBuf = wxT("*.*"); + wxUnusedVar(noTemplates); #endif int FilterIndex = -1; wxWindow* parent = wxFindSuitableParent(); - wxString pathTmp = wxFileSelectorEx(_("Select a file"), - m_lastDirectory, + wxString pathTmp = wxFileSelectorEx(_("Open File"), + GetLastDirectory(), wxEmptyString, &FilterIndex, descrBuf, 0, parent); - wxDocTemplate *theTemplate = (wxDocTemplate *)NULL; + wxDocTemplate *theTemplate = NULL; if (!pathTmp.empty()) { if (!wxFileExists(pathTmp)) { wxString msgTitle; - if (!wxTheApp->GetAppName().empty()) - 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); + wxMessageBox(_("Sorry, could not open this file."), + msgTitle, + wxOK | wxICON_EXCLAMATION | wxCENTRE, + parent); path = wxEmptyString; - return (wxDocTemplate *) NULL; + return NULL; } - m_lastDirectory = wxPathOnly(pathTmp); + + SetLastDirectory(wxPathOnly(pathTmp)); path = pathTmp; @@ -1652,16 +1561,18 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates, theTemplate = FindTemplateForPath(path); if ( !theTemplate ) { - // Since we do not add files with non-default extensions to the FileHistory this - // can only happen if the application changes the allowed templates in runtime. - (void)wxMessageBox(_("Sorry, the format for this file is unknown."), - _("Open File"), - wxOK | wxICON_EXCLAMATION, wxFindSuitableParent()); + // Since we do not add files with non-default extensions to the + // file history this can only happen if the application changes the + // allowed templates in runtime. + wxMessageBox(_("Sorry, the format for this file is unknown."), + _("Open File"), + wxOK | wxICON_EXCLAMATION | wxCENTRE, + parent); } } else { - path = wxEmptyString; + path.clear(); } return theTemplate; @@ -1671,7 +1582,7 @@ wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates, int noTemplates, bool sort) { wxArrayString strings; - wxDocTemplate **data = new wxDocTemplate *[noTemplates]; + wxScopedArray data(new wxDocTemplate *[noTemplates]); int i; int n = 0; @@ -1727,7 +1638,7 @@ wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates, break; case 1: - // don't propose the user to choose if he heas no choice + // don't propose the user to choose if he has no choice theTemplate = data[0]; break; @@ -1738,13 +1649,11 @@ wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates, _("Select a document template"), _("Templates"), strings, - (void **)data, + (void **)data.get(), wxFindSuitableParent() ); } - delete[] data; - return theTemplate; } @@ -1752,7 +1661,7 @@ wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates, int noTemplates, bool sort) { wxArrayString strings; - wxDocTemplate **data = new wxDocTemplate *[noTemplates]; + wxScopedArray data(new wxDocTemplate *[noTemplates]); int i; int n = 0; @@ -1802,7 +1711,7 @@ wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates, switch ( n ) { case 0: - theTemplate = (wxDocTemplate *)NULL; + theTemplate = NULL; break; case 1: @@ -1815,13 +1724,12 @@ wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates, _("Select a document view"), _("Views"), strings, - (void **)data, + (void **)data.get(), wxFindSuitableParent() ); } - delete[] data; return theTemplate; } @@ -1861,7 +1769,7 @@ void wxDocManager::ActivateView(wxView *view, bool activate) if ( m_currentView == view ) { // don't keep stale pointer - m_currentView = (wxView *) NULL; + m_currentView = NULL; } } } @@ -1892,22 +1800,15 @@ wxDocChildFrame::wxDocChildFrame(wxDocument *doc, view->SetFrame(this); } -// Extend event processing to search the view's event table -bool wxDocChildFrame::ProcessEvent(wxEvent& event) +bool wxDocChildFrame::TryValidator(wxEvent& event) { - if (m_childView) - m_childView->Activate(true); + if ( !m_childView ) + return false; - if ( !m_childView || ! m_childView->ProcessEvent(event) ) - { - // Only hand up to the parent if it's a menu command - if (!event.IsKindOf(CLASSINFO(wxCommandEvent)) || !GetParent() || !GetParent()->ProcessEvent(event)) - return wxEvtHandler::ProcessEvent(event); - else - return true; - } - else - return true; + // FIXME: why is this needed here? + m_childView->Activate(true); + + return m_childView->ProcessEventHere(event); } void wxDocChildFrame::OnActivate(wxActivateEvent& event) @@ -1920,26 +1821,22 @@ void wxDocChildFrame::OnActivate(wxActivateEvent& event) void wxDocChildFrame::OnCloseWindow(wxCloseEvent& event) { - if (m_childView) + if ( !m_childView ) + return; + + // passing false to Close() means to not delete associated window + if ( event.CanVeto() && !m_childView->Close(false) ) { - bool ans = event.CanVeto() - ? m_childView->Close(false) // false means don't delete associated window - : true; // Must delete. + event.Veto(); + return; + } - if (ans) - { - m_childView->Activate(false); - delete m_childView; - m_childView = (wxView *) NULL; - m_childDocument = (wxDocument *) NULL; + m_childView->Activate(false); + delete m_childView; + m_childView = NULL; + m_childDocument = NULL; - this->Destroy(); - } - else - event.Veto(); - } - else - event.Veto(); + Destroy(); } // ---------------------------------------------------------------------------- @@ -1992,41 +1889,39 @@ void wxDocParentFrame::OnMRUFile(wxCommandEvent& event) { int n = event.GetId() - wxID_FILE1; // the index in MRU list wxString filename(m_docManager->GetHistoryFile(n)); - if ( !filename.empty() ) - { - // verify that the file exists before doing anything else - if ( wxFile::Exists(filename) ) - { - // try to open it - if (!m_docManager->CreateDocument(filename, wxDOC_SILENT)) - { - // remove the file from the MRU list. The user should already be notified. - m_docManager->RemoveFileFromHistory(n); + if ( filename.empty() ) + return; - wxLogError(_("The file '%s' couldn't be opened.\nIt has been removed from the most recently used files list."), - filename.c_str()); - } - } - else - { - // remove the bogus filename from the MRU list and notify the user - // about it - m_docManager->RemoveFileFromHistory(n); + wxString errMsg; // must contain exactly one "%s" if non-empty + if ( wxFile::Exists(filename) ) + { + // try to open it + if ( m_docManager->CreateDocument(filename, wxDOC_SILENT) ) + return; - wxLogError(_("The file '%s' doesn't exist and couldn't be opened.\nIt has been removed from the most recently used files list."), - filename.c_str()); - } + errMsg = _("The file '%s' couldn't be opened."); + } + else // file doesn't exist + { + errMsg = _("The file '%s' doesn't exist and couldn't be opened."); } + + + wxASSERT_MSG( !errMsg.empty(), "should have an error message" ); + + // remove the file which we can't open from the MRU list + m_docManager->RemoveFileFromHistory(n); + + // and tell the user about it + wxLogError(errMsg + '\n' + + _("It has been removed from the most recently used files list."), + filename); } // Extend event processing to search the view's event table -bool wxDocParentFrame::ProcessEvent(wxEvent& event) +bool wxDocParentFrame::TryValidator(wxEvent& event) { - // Try the document manager, then do default processing - if (!m_docManager || !m_docManager->ProcessEvent(event)) - return wxEvtHandler::ProcessEvent(event); - else - return true; + return m_docManager && m_docManager->ProcessEventHere(event); } // Define the behaviour for the frame closing @@ -2035,7 +1930,7 @@ void wxDocParentFrame::OnCloseWindow(wxCloseEvent& event) { if (m_docManager->Clear(!event.CanVeto())) { - this->Destroy(); + Destroy(); } else event.Veto(); @@ -2101,7 +1996,8 @@ bool wxDocPrintout::OnBeginDocument(int startPage, int endPage) return true; } -void wxDocPrintout::GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int *selPageTo) +void wxDocPrintout::GetPageInfo(int *minPage, int *maxPage, + int *selPageFrom, int *selPageTo) { *minPage = 1; *maxPage = 1; @@ -2112,7 +2008,7 @@ void wxDocPrintout::GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, in #endif // wxUSE_PRINTING_ARCHITECTURE // ---------------------------------------------------------------------------- -// File history processor +// File history (a.k.a. MRU, most recently used, files list) // ---------------------------------------------------------------------------- wxFileHistory::wxFileHistory(size_t maxFiles, wxWindowID idBase) @@ -2121,136 +2017,113 @@ wxFileHistory::wxFileHistory(size_t maxFiles, wxWindowID idBase) m_idBase = idBase; } -wxFileHistory::~wxFileHistory() -{ -} - 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_fileHistory.GetCount(); i++) + // check if we don't already have this file + const wxFileName fnNew(file); + size_t i, + numFiles = m_fileHistory.size(); + for ( i = 0; i < numFiles; i++ ) { - // 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]) ) + if ( fnNew == m_fileHistory[i] ) { // we do have it, move it to the top of the history - RemoveFileFromHistory (i); - AddFileToHistory (file); - return; + RemoveFileFromHistory(i); + numFiles--; + break; } } // if we already have a full history, delete the one at the end - if ( m_fileMaxFiles == m_fileHistory.GetCount() ) + if ( numFiles == m_fileMaxFiles ) { - RemoveFileFromHistory (m_fileHistory.GetCount() - 1); - AddFileToHistory (file); - return; + RemoveFileFromHistory(--numFiles); } - // Add to the project file history: - // Move existing files (if any) down so we can insert file at beginning. - if (m_fileHistory.GetCount() < m_fileMaxFiles) + // add a new menu item to all file menus (they will be updated below) + for ( wxList::compatibility_iterator node = m_fileMenus.GetFirst(); + node; + node = node->GetNext() ) { - wxList::compatibility_iterator node = m_fileMenus.GetFirst(); - while (node) - { - wxMenu* menu = (wxMenu*) node->GetData(); - if ( m_fileHistory.IsEmpty() && menu->GetMenuItemCount() ) - { - menu->AppendSeparator(); - } - menu->Append(m_idBase+m_fileHistory.GetCount(), _("[EMPTY]")); - node = node->GetNext(); - } + wxMenu * const menu = (wxMenu *)node->GetData(); + + if ( !numFiles && menu->GetMenuItemCount() ) + menu->AppendSeparator(); + + // label doesn't matter, it will be set below anyhow, but it can't + // be empty (this is supposed to indicate a stock item) + menu->Append(m_idBase + numFiles, " "); } - m_fileHistory.Insert(file, 0); + // insert the new file in the beginning of the file history + m_fileHistory.insert(m_fileHistory.begin(), file); + numFiles++; - // this is the directory of the last opened file - wxString pathCurrent; - wxSplitPath( m_fileHistory[0], &pathCurrent, NULL, NULL ); - for (i = 0; i < m_fileHistory.GetCount(); i++) - { - // if in same directory just show the filename; otherwise the full - // path - wxString pathInMenu, path, filename, ext; - wxSplitPath( m_fileHistory[i], &path, &filename, &ext ); - if ( path == pathCurrent ) - { - pathInMenu = filename; - if ( !ext.empty() ) - pathInMenu = pathInMenu + wxFILE_SEP_EXT + ext; - } - else - { - // absolute path; could also set relative path - pathInMenu = m_fileHistory[i]; - } + // update the labels in all menus + for ( i = 0; i < numFiles; i++ ) + { + // if in same directory just show the filename; otherwise the full path + const wxFileName fnOld(m_fileHistory[i]); - // we need to quote '&' characters which are used for mnemonics - pathInMenu.Replace(_T("&"), _T("&&")); + wxString pathInMenu; + if ( fnOld.GetPath() == fnNew.GetPath() ) + { + pathInMenu = fnOld.GetFullName(); + } + else // file in different directory + { + // absolute path; could also set relative path + pathInMenu = m_fileHistory[i]; + } - wxString buf; - buf.Printf(s_MRUEntryFormat, i + 1, pathInMenu.c_str()); + for ( wxList::compatibility_iterator node = m_fileMenus.GetFirst(); + node; + node = node->GetNext() ) + { + wxMenu * const menu = (wxMenu *)node->GetData(); - wxList::compatibility_iterator node = m_fileMenus.GetFirst(); - while (node) - { - wxMenu* menu = (wxMenu*) node->GetData(); - menu->SetLabel(m_idBase + i, buf); - node = node->GetNext(); - } + menu->SetLabel(m_idBase + i, GetMRUEntryLabel(i, pathInMenu)); } + } } void wxFileHistory::RemoveFileFromHistory(size_t i) { - wxCHECK_RET( i < m_fileHistory.GetCount(), + size_t numFiles = m_fileHistory.size(); + wxCHECK_RET( i < numFiles, wxT("invalid index in wxFileHistory::RemoveFileFromHistory") ); - // delete the element from the array + // delete the element from the array m_fileHistory.RemoveAt(i); + numFiles--; - wxList::compatibility_iterator node = m_fileMenus.GetFirst(); - while ( node ) + for ( wxList::compatibility_iterator node = m_fileMenus.GetFirst(); + node; + node = node->GetNext() ) { - wxMenu* menu = (wxMenu*) node->GetData(); + wxMenu * const menu = (wxMenu *) node->GetData(); - // shuffle filenames up - wxString buf; - for ( size_t j = i; j < m_fileHistory.GetCount(); j++ ) + // shift filenames up + for ( size_t j = i; j < numFiles; j++ ) { - buf.Printf(s_MRUEntryFormat, j + 1, m_fileHistory[j].c_str()); - menu->SetLabel(m_idBase + j, buf); + menu->SetLabel(m_idBase + j, GetMRUEntryLabel(j, m_fileHistory[j])); } - node = node->GetNext(); - // delete the last menu item which is unused now - wxWindowID lastItemId = m_idBase + wx_truncate_cast(wxWindowID, m_fileHistory.GetCount()); - if (menu->FindItem(lastItemId)) - { + const wxWindowID lastItemId = m_idBase + numFiles; + if ( menu->FindItem(lastItemId) ) menu->Delete(lastItemId); - } // delete the last separator too if no more files are left - if ( m_fileHistory.GetCount() == 0 ) + if ( m_fileHistory.empty() ) { - wxMenuItemList::compatibility_iterator nodeLast = menu->GetMenuItems().GetLast(); + const wxMenuItemList::compatibility_iterator + nodeLast = menu->GetMenuItems().GetLast(); if ( nodeLast ) { - wxMenuItem *menuItem = nodeLast->GetData(); - if ( menuItem->IsSeparator() ) - { - menu->Delete(menuItem); - } - //else: should we search backwards for the last separator? + wxMenuItem * const lastMenuItem = nodeLast->GetData(); + if ( lastMenuItem->IsSeparator() ) + menu->Delete(lastMenuItem); } //else: menu is empty somehow } @@ -2259,7 +2132,7 @@ void wxFileHistory::RemoveFileFromHistory(size_t i) void wxFileHistory::UseMenu(wxMenu *menu) { - if (!m_fileMenus.Member(menu)) + if ( !m_fileMenus.Member(menu) ) m_fileMenus.Append(menu); } @@ -2269,7 +2142,7 @@ void wxFileHistory::RemoveMenu(wxMenu *menu) } #if wxUSE_CONFIG -void wxFileHistory::Load(wxConfigBase& config) +void wxFileHistory::Load(const wxConfigBase& config) { m_fileHistory.Clear(); @@ -2277,7 +2150,7 @@ void wxFileHistory::Load(wxConfigBase& config) buf.Printf(wxT("file%d"), 1); wxString historyFile; - while ((m_fileHistory.GetCount() < m_fileMaxFiles) && + while ((m_fileHistory.GetCount() < m_fileMaxFiles) && config.Read(buf, &historyFile) && !historyFile.empty()) { m_fileHistory.Add(historyFile); @@ -2306,46 +2179,29 @@ void wxFileHistory::Save(wxConfigBase& config) void wxFileHistory::AddFilesToMenu() { - if (m_fileHistory.GetCount() > 0) - { - wxList::compatibility_iterator node = m_fileMenus.GetFirst(); - while (node) - { - wxMenu* menu = (wxMenu*) node->GetData(); - if (menu->GetMenuItemCount()) - { - menu->AppendSeparator(); - } + if ( m_fileHistory.empty() ) + return; - size_t i; - for (i = 0; i < m_fileHistory.GetCount(); i++) - { - wxString buf; - buf.Printf(s_MRUEntryFormat, i+1, m_fileHistory[i].c_str()); - menu->Append(m_idBase+i, buf); - } - node = node->GetNext(); - } + for ( wxList::compatibility_iterator node = m_fileMenus.GetFirst(); + node; + node = node->GetNext() ) + { + AddFilesToMenu((wxMenu *) node->GetData()); } } void wxFileHistory::AddFilesToMenu(wxMenu* menu) { - if (m_fileHistory.GetCount() > 0) - { - if (menu->GetMenuItemCount()) - { - menu->AppendSeparator(); - } + if ( m_fileHistory.empty() ) + return; - size_t i; - for (i = 0; i < m_fileHistory.GetCount(); i++) - { - wxString buf; - buf.Printf(s_MRUEntryFormat, i+1, m_fileHistory[i].c_str()); - menu->Append(m_idBase+i, buf); - } - } + if ( menu->GetMenuItemCount() ) + menu->AppendSeparator(); + + for ( size_t i = 0; i < m_fileHistory.GetCount(); i++ ) + { + menu->Append(m_idBase + i, GetMRUEntryLabel(i, m_fileHistory[i])); + } } // ---------------------------------------------------------------------------- @@ -2433,15 +2289,22 @@ bool wxTransferStreamToFile(wxInputStream& stream, const wxString& filename) return false; char buf[4096]; - do + for ( ;; ) { stream.Read(buf, WXSIZEOF(buf)); const size_t nRead = stream.LastRead(); - if ( !nRead || !file.Write(buf, nRead) ) + if ( !nRead ) + { + if ( stream.Eof() ) + break; + + return false; + } + + if ( !file.Write(buf, nRead) ) return false; } - while ( !stream.Eof() ); return true; }