X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4a10ea8b13fd0851e71e6fa5ebbe5b93933be11e..952f4277280975bada5ab5019728449d41a80a1b:/src/common/docview.cpp diff --git a/src/common/docview.cpp b/src/common/docview.cpp index 5e2cada2da..dbc0e56630 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 @@ -21,60 +21,58 @@ #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" -#endif - -#include "wx/ffile.h" - -#ifdef __WXMAC__ - #include "wx/filename.h" -#endif - -#ifdef __WXGTK__ + #include "wx/msgdlg.h" #include "wx/mdi.h" + #include "wx/choicdlg.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/filename.h" #include "wx/file.h" +#include "wx/ffile.h" #include "wx/cmdproc.h" - -#include -#include +#include "wx/tokenzr.h" +#include "wx/filename.h" +#include "wx/vector.h" #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 +typedef wxVector wxDocTemplates; + // ---------------------------------------------------------------------------- // wxWidgets macros // ---------------------------------------------------------------------------- @@ -92,28 +90,25 @@ IMPLEMENT_CLASS(wxDocParentFrame, wxFrame) IMPLEMENT_DYNAMIC_CLASS(wxFileHistory, wxObject) -// ---------------------------------------------------------------------------- -// function prototypes -// ---------------------------------------------------------------------------- - -static inline wxString FindExtension(const wxChar *path); -static wxWindow* wxFindSuitableParent(void); - -// ---------------------------------------------------------------------------- -// local constants -// ---------------------------------------------------------------------------- - -static const wxChar *s_MRUEntryFormat = wxT("&%d %s"); - // ============================================================================ // implementation // ============================================================================ // ---------------------------------------------------------------------------- -// local functions +// private helpers // ---------------------------------------------------------------------------- -static wxString FindExtension(const wxChar *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); @@ -123,6 +118,20 @@ static wxString FindExtension(const wxChar *path) 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 // ---------------------------------------------------------------------------- @@ -131,8 +140,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; } @@ -223,27 +232,25 @@ bool wxDocument::DeleteAllViews() wxView *wxDocument::GetFirstView() const { if (m_documentViews.GetCount() == 0) - return (wxView *) NULL; + return NULL; return (wxView *)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); - wxString name; - GetDocumentManager()->MakeDefaultName(name); + const wxString name = GetDocumentManager()->MakeNewDocumentName(); SetTitle(name); SetFilename(name, true); @@ -252,7 +259,7 @@ bool wxDocument::OnNewDocument() bool wxDocument::Save() { - if (!IsModified() && m_savedYet) + if ( AlreadySaved() ) return true; if ( m_documentFile.empty() || !m_savedYet ) @@ -275,7 +282,7 @@ bool wxDocument::SaveAs() if (docTemplate->GetViewClassInfo() && docTemplate->GetDocClassInfo()) { - wxList::compatibility_iterator node = wxDocManager::GetDocumentManager()->GetTemplates().GetFirst(); + wxList::compatibility_iterator node = docTemplate->GetDocumentManager()->GetTemplates().GetFirst(); while (node) { wxDocTemplate *t = (wxDocTemplate*) node->GetData(); @@ -298,12 +305,16 @@ bool wxDocument::SaveAs() #else wxString filter = docTemplate->GetFileFilter() ; #endif - wxString tmp = wxFileSelector(_("Save as"), - docTemplate->GetDirectory(), + wxString defaultDir = docTemplate->GetDirectory(); + if (defaultDir.IsEmpty()) + defaultDir = wxPathOnly(GetFilename()); + + wxString tmp = wxFileSelector(_("Save As"), + defaultDir, wxFileNameFromPath(GetFilename()), docTemplate->GetDefaultExtension(), filter, - wxSAVE | wxOVERWRITE_PROMPT, + wxFD_SAVE | wxFD_OVERWRITE_PROMPT, GetDocumentWindow()); if (tmp.empty()) @@ -360,7 +371,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 @@ -369,7 +380,7 @@ bool wxDocument::OnSaveDocument(const wxString& file) bool wxDocument::OnOpenDocument(const wxString& file) { - if (!OnSaveModified()) + if ( !OnSaveModified() ) return false; if ( !DoOpenDocument(file) ) @@ -409,23 +420,41 @@ bool wxDocument::Revert() // Get title, or filename if no title, else unnamed +#if WXWIN_COMPATIBILITY_2_8 bool wxDocument::GetPrintableName(wxString& buf) const { - if (!m_documentTitle.empty()) - { - buf = m_documentTitle; - return true; - } - else if (!m_documentFile.empty()) - { - 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 @@ -445,33 +474,32 @@ wxCommandProcessor *wxDocument::OnCreateCommandProcessor() // true if safe to close bool wxDocument::OnSaveModified() { - if (IsModified()) - { - wxString title; - GetPrintableName(title); - - 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?"), - (const wxChar *)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 document %s?"), + GetUserReadableName() + ), + wxTheApp->GetAppDisplayName(), + wxYES_NO | wxCANCEL | wxICON_QUESTION, + GetDocumentWindow() + ) ) { - 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; } @@ -482,7 +510,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(); @@ -499,10 +527,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. @@ -510,13 +535,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) @@ -560,30 +580,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; } @@ -594,24 +605,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) #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; } @@ -621,9 +637,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() @@ -632,13 +648,10 @@ 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)) @@ -656,14 +669,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) @@ -675,10 +690,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) @@ -739,21 +751,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); @@ -774,7 +781,7 @@ wxView *wxDocTemplate::CreateView(wxDocument *doc, long flags) { wxView *view = DoCreateView(); if ( view == NULL ) - return (wxView *) NULL; + return NULL; view->SetDocument(doc); if (view->OnCreate(doc, flags)) @@ -784,7 +791,7 @@ wxView *wxDocTemplate::CreateView(wxDocument *doc, long flags) else { delete view; - return (wxView *) NULL; + return NULL; } } @@ -792,13 +799,24 @@ 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 NULL; return (wxDocument *)m_docClassInfo->CreateObject(); } @@ -806,7 +824,7 @@ wxDocument *wxDocTemplate::DoCreateDocument() wxView *wxDocTemplate::DoCreateView() { if (!m_viewClassInfo) - return (wxView *) NULL; + return NULL; return (wxView *)m_viewClassInfo->CreateObject(); } @@ -827,12 +845,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) @@ -840,31 +858,32 @@ 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 @@ -953,7 +972,7 @@ void wxDocManager::OnFileCloseAll(wxCommandEvent& WXUNUSED(event)) void wxDocManager::OnFileNew(wxCommandEvent& WXUNUSED(event)) { - CreateDocument( wxEmptyString, wxDOC_NEW ); + CreateNewDocument(); } void wxDocManager::OnFileOpen(wxCommandEvent& WXUNUSED(event)) @@ -1063,16 +1082,9 @@ void wxDocManager::OnUpdateFileOpen(wxUpdateUIEvent& event) event.Enable( true ); } -void wxDocManager::OnUpdateFileClose(wxUpdateUIEvent& event) -{ - wxDocument *doc = GetCurrentDocument(); - event.Enable( (doc != (wxDocument*) NULL) ); -} - -void wxDocManager::OnUpdateFileRevert(wxUpdateUIEvent& event) +void wxDocManager::OnUpdateDisableIfNoDoc(wxUpdateUIEvent& event) { - wxDocument *doc = GetCurrentDocument(); - event.Enable( (doc != (wxDocument*) NULL) ); + event.Enable( GetCurrentDocument() != NULL ); } void wxDocManager::OnUpdateFileNew(wxUpdateUIEvent& event) @@ -1082,14 +1094,8 @@ void wxDocManager::OnUpdateFileNew(wxUpdateUIEvent& event) 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) @@ -1120,18 +1126,6 @@ void wxDocManager::OnUpdateRedo(wxUpdateUIEvent& event) } } -void wxDocManager::OnUpdatePrint(wxUpdateUIEvent& event) -{ - wxDocument *doc = GetCurrentDocument(); - event.Enable( (doc != (wxDocument*) NULL) ); -} - -void wxDocManager::OnUpdatePreview(wxUpdateUIEvent& event) -{ - wxDocument *doc = GetCurrentDocument(); - event.Enable( (doc != (wxDocument*) NULL) ); -} - wxView *wxDocManager::GetCurrentView() const { if (m_currentView) @@ -1141,238 +1135,175 @@ wxView *wxDocManager::GetCurrentView() const wxDocument* doc = (wxDocument*) m_docs.GetFirst()->GetData(); return doc->GetFirstView(); } - return (wxView *) NULL; + return NULL; } -// 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 = GetCurrentView(); + 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; +} - // If we've reached the max number of docs, close the - // first one. - if ( (int)GetDocuments().GetCount() >= m_maxDocsOpen ) +} // anonymous namespace + +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)) { } @@ -1388,30 +1319,46 @@ wxDocument *wxDocManager::GetCurrentDocument() const if (view) return view->GetDocument(); else - return (wxDocument *) NULL; + return NULL; +} + +// 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 -// Make a default document name -bool wxDocManager::MakeDefaultName(wxString& name) +wxString wxDocManager::MakeNewDocumentName() { - name.Printf(_("unnamed%d"), m_defaultDocumentNameCounter); - m_defaultDocumentNameCounter++; + wxString name; - return true; +#if WXWIN_COMPATIBILITY_2_8 + if ( !MakeDefaultName(name) ) +#endif // WXWIN_COMPATIBILITY_2_8 + { + name.Printf(_("unnamed%d"), m_defaultDocumentNameCounter); + m_defaultDocumentNameCounter++; + } + + 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; @@ -1421,7 +1368,7 @@ wxString wxDocManager::MakeFrameTitle(wxDocument* doc) // Not yet implemented wxDocTemplate *wxDocManager::MatchTemplate(const wxString& WXUNUSED(path)) { - return (wxDocTemplate *) NULL; + return NULL; } // File history management @@ -1460,7 +1407,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); @@ -1495,7 +1442,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++) @@ -1510,38 +1457,12 @@ 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)) @@ -1566,13 +1487,14 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates, } #else wxString descrBuf = wxT("*.*"); + wxUnusedVar(noTemplates); #endif int FilterIndex = -1; wxWindow* parent = wxFindSuitableParent(); - wxString pathTmp = wxFileSelectorEx(_("Select a file"), + wxString pathTmp = wxFileSelectorEx(_("Open File"), m_lastDirectory, wxEmptyString, &FilterIndex, @@ -1580,14 +1502,14 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates, 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")); @@ -1595,7 +1517,7 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates, parent); path = wxEmptyString; - return (wxDocTemplate *) NULL; + return NULL; } m_lastDirectory = wxPathOnly(pathTmp); @@ -1684,7 +1606,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; @@ -1759,7 +1681,7 @@ wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates, switch ( n ) { case 0: - theTemplate = (wxDocTemplate *)NULL; + theTemplate = NULL; break; case 1: @@ -1818,7 +1740,7 @@ void wxDocManager::ActivateView(wxView *view, bool activate) if ( m_currentView == view ) { // don't keep stale pointer - m_currentView = (wxView *) NULL; + m_currentView = NULL; } } } @@ -1849,22 +1771,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) @@ -1887,8 +1802,8 @@ void wxDocChildFrame::OnCloseWindow(wxCloseEvent& event) { m_childView->Activate(false); delete m_childView; - m_childView = (wxView *) NULL; - m_childDocument = (wxDocument *) NULL; + m_childView = NULL; + m_childDocument = NULL; this->Destroy(); } @@ -1909,6 +1824,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, @@ -1922,6 +1842,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(); @@ -1931,41 +1864,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 @@ -2051,205 +1982,131 @@ 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) // ---------------------------------------------------------------------------- -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) { - size_t i; - - // Check we don't already have this file - for (i = 0; i < m_fileHistoryN; 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++ ) { -#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 + 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_fileHistoryN ) + if ( numFiles == m_fileMaxFiles ) { - RemoveFileFromHistory (m_fileHistoryN - 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_fileHistoryN < 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_fileHistoryN == 0 && menu->GetMenuItemCount() ) - { - menu->AppendSeparator(); - } - menu->Append(m_idBase+m_fileHistoryN, _("[EMPTY]")); - node = node->GetNext(); - } - m_fileHistoryN ++; - } - // Shuffle filenames down - for (i = (m_fileHistoryN-1); i > 0; i--) - { - m_fileHistory[i] = m_fileHistory[i-1]; + 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[0] = MYcopystring(file); - // 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++) + // insert the new file in the beginning of the file history + m_fileHistory.insert(m_fileHistory.begin(), file); + numFiles++; + + // update the labels in all menus + for ( i = 0; i < numFiles; i++ ) { - if ( m_fileHistory[i] ) + // if in same directory just show the filename; otherwise the full path + const wxFileName fnOld(m_fileHistory[i]); + + wxString pathInMenu; + if ( fnOld.GetPath() == fnNew.GetPath() ) { - // 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]; - } + pathInMenu = fnOld.GetFullName(); + } + else // file in different directory + { + // absolute path; could also set relative path + 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) - { - wxMenu* menu = (wxMenu*) node->GetData(); - menu->SetLabel(m_idBase + i, buf); - node = node->GetNext(); - } + for ( wxList::compatibility_iterator node = m_fileMenus.GetFirst(); + node; + node = node->GetNext() ) + { + wxMenu * const menu = (wxMenu *)node->GetData(); + + menu->SetLabel(m_idBase + i, GetMRUEntryLabel(i, pathInMenu)); } } } void wxFileHistory::RemoveFileFromHistory(size_t i) { - wxCHECK_RET( i < m_fileHistoryN, + size_t numFiles = m_fileHistory.size(); + wxCHECK_RET( i < numFiles, 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); + 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 ( j = i; j < m_fileHistoryN - 1; j++ ) + // shift filenames up + for ( size_t j = i; j < numFiles; j++ ) { - buf.Printf(s_MRUEntryFormat, j + 1, m_fileHistory[j]); - 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_fileHistoryN) - 1; - 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_fileHistoryN == 1 ) + 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 } } - - 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) { - if (!m_fileMenus.Member(menu)) + if ( !m_fileMenus.Member(menu) ) m_fileMenus.Append(menu); } @@ -2259,19 +2116,23 @@ void wxFileHistory::RemoveMenu(wxMenu *menu) } #if wxUSE_CONFIG -void wxFileHistory::Load(wxConfigBase& config) +void wxFileHistory::Load(const 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.empty())) + 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); + m_fileHistory.Add(historyFile); + + buf.Printf(wxT("file%d"), (int)m_fileHistory.GetCount()+1); historyFile = wxEmptyString; } + AddFilesToMenu(); } @@ -2282,7 +2143,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); @@ -2292,51 +2153,28 @@ void wxFileHistory::Save(wxConfigBase& config) void wxFileHistory::AddFilesToMenu() { - if (m_fileHistoryN > 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_fileHistoryN; i++) - { - if (m_fileHistory[i]) - { - wxString buf; - buf.Printf(s_MRUEntryFormat, i+1, m_fileHistory[i]); - 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_fileHistoryN > 0) - { - if (menu->GetMenuItemCount()) - { - menu->AppendSeparator(); - } + if ( m_fileHistory.empty() ) + return; - size_t i; - for (i = 0; i < m_fileHistoryN; i++) - { - if (m_fileHistory[i]) - { - wxString buf; - buf.Printf(s_MRUEntryFormat, i+1, m_fileHistory[i]); - 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])); } } @@ -2425,15 +2263,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; } @@ -2441,4 +2286,3 @@ bool wxTransferStreamToFile(wxInputStream& stream, const wxString& filename) #endif // wxUSE_STD_IOSTREAM/!wxUSE_STD_IOSTREAM #endif // wxUSE_DOC_VIEW_ARCHITECTURE -