X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d06a66f52670ed5258b6a1dcf52ed5cd3a06ae1a..f352dd54f0c495798d73e54ec96be8d628a2c787:/src/common/docview.cpp diff --git a/src/common/docview.cpp b/src/common/docview.cpp index 95b9f93b46..84acf51fa9 100644 --- a/src/common/docview.cpp +++ b/src/common/docview.cpp @@ -40,8 +40,12 @@ #include "wx/list.h" #include "wx/filedlg.h" #include "wx/intl.h" + #include "wx/log.h" #endif +#ifdef __WXMAC__ + #include "wx/filename.h" +#endif #ifdef __WXGTK__ #include "wx/mdi.h" @@ -164,6 +168,8 @@ bool wxDocument::Close() bool wxDocument::OnCloseDocument() { + // Tell all views that we're about to close + NotifyClosing(); DeleteContents(); Modify(FALSE); return TRUE; @@ -175,14 +181,14 @@ bool wxDocument::DeleteAllViews() { wxDocManager* manager = GetDocumentManager(); - wxNode *node = m_documentViews.First(); + wxNode *node = m_documentViews.GetFirst(); while (node) { - wxView *view = (wxView *)node->Data(); + wxView *view = (wxView *)node->GetData(); if (!view->Close()) return FALSE; - wxNode *next = node->Next(); + wxNode *next = node->GetNext(); delete view; // Deletes node implicitly node = next; @@ -197,9 +203,9 @@ bool wxDocument::DeleteAllViews() wxView *wxDocument::GetFirstView() const { - if (m_documentViews.Number() == 0) + if (m_documentViews.GetCount() == 0) return (wxView *) NULL; - return (wxView *)m_documentViews.First()->Data(); + return (wxView *)m_documentViews.GetFirst()->GetData(); } wxDocManager *wxDocument::GetDocumentManager() const @@ -259,7 +265,7 @@ bool wxDocument::SaveAs() if (ext.IsEmpty() || ext == wxT("")) { - fileName += "."; + fileName += wxT("."); fileName += docTemplate->GetDefaultExtension(); } @@ -269,12 +275,12 @@ bool wxDocument::SaveAs() GetDocumentManager()->AddFileToHistory(fileName); // Notify the views that the filename has changed - wxNode *node = m_documentViews.First(); + wxNode *node = m_documentViews.GetFirst(); while (node) { - wxView *view = (wxView *)node->Data(); + wxView *view = (wxView *)node->GetData(); view->OnChangeFilename(); - node = node->Next(); + node = node->GetNext(); } return OnSaveDocument(m_documentFile); @@ -292,11 +298,11 @@ bool wxDocument::OnSaveDocument(const wxString& file) msgTitle = wxString(_("File error")); #if wxUSE_STD_IOSTREAM - wxSTD ofstream store(wxString(file.fn_str()).mb_str()); + wxSTD ofstream store(wxString(file.fn_str()).mb_str()); // ????? if (store.fail() || store.bad()) #else - wxFileOutputStream store(wxString(file.fn_str())); - if (store.LastError() != wxSTREAM_NOERROR) + wxFileOutputStream store( file ); + if (store.GetLastError() != wxSTREAM_NO_ERROR) #endif { (void)wxMessageBox(_("Sorry, could not open this file for saving."), msgTitle, wxOK | wxICON_EXCLAMATION, @@ -314,6 +320,10 @@ bool wxDocument::OnSaveDocument(const wxString& file) Modify(FALSE); SetFilename(file); SetDocumentSaved(TRUE); +#ifdef __WXMAC__ + wxFileName fn(file) ; + fn.MacSetDefaultTypeAndCreator() ; +#endif return TRUE; } @@ -329,11 +339,11 @@ bool wxDocument::OnOpenDocument(const wxString& file) msgTitle = wxString(_("File error")); #if wxUSE_STD_IOSTREAM - wxSTD ifstream store(wxString(file.fn_str()).mb_str()); + wxSTD ifstream store(wxString(file.fn_str()).mb_str()); // ???? if (store.fail() || store.bad()) #else - wxFileInputStream store(wxString(file.fn_str())); - if (store.LastError() != wxSTREAM_NOERROR) + wxFileInputStream store( file ); + if (store.GetLastError() != wxSTREAM_NO_ERROR) #endif { (void)wxMessageBox(_("Sorry, could not open this file."), msgTitle, wxOK|wxICON_EXCLAMATION, @@ -341,10 +351,11 @@ bool wxDocument::OnOpenDocument(const wxString& file) return FALSE; } #if wxUSE_STD_IOSTREAM - if (!LoadObject(store)) + LoadObject(store); + if ( !store && !store.eof() ) #else - int res = LoadObject(store).LastError(); - if ((res != wxSTREAM_NOERROR) && + int res = LoadObject(store).GetLastError(); + if ((res != wxSTREAM_NO_ERROR) && (res != wxSTREAM_EOF)) #endif { @@ -487,7 +498,7 @@ bool wxDocument::OnCreate(const wxString& WXUNUSED(path), long flags) // there are no more views. void wxDocument::OnChangedViewList() { - if (m_documentViews.Number() == 0) + if (m_documentViews.GetCount() == 0) { if (OnSaveModified()) { @@ -498,12 +509,24 @@ void wxDocument::OnChangedViewList() void wxDocument::UpdateAllViews(wxView *sender, wxObject *hint) { - wxNode *node = m_documentViews.First(); + wxNode *node = m_documentViews.GetFirst(); + while (node) + { + wxView *view = (wxView *)node->GetData(); + if (view != sender) + view->OnUpdate(sender, hint); + node = node->GetNext(); + } +} + +void wxDocument::NotifyClosing() +{ + wxNode *node = m_documentViews.GetFirst(); while (node) { - wxView *view = (wxView *)node->Data(); - view->OnUpdate(sender, hint); - node = node->Next(); + wxView *view = (wxView *)node->GetData(); + view->OnClosingDocument(); + node = node->GetNext(); } } @@ -513,12 +536,12 @@ void wxDocument::SetFilename(const wxString& filename, bool notifyViews) if ( notifyViews ) { // Notify the views that the filename has changed - wxNode *node = m_documentViews.First(); + wxNode *node = m_documentViews.GetFirst(); while (node) { - wxView *view = (wxView *)node->Data(); + wxView *view = (wxView *)node->GetData(); view->OnChangeFilename(); - node = node->Next(); + node = node->GetNext(); } } } @@ -593,7 +616,7 @@ bool wxView::Close(bool deleteWindow) void wxView::Activate(bool activate) { - if (GetDocumentManager()) + if (GetDocument() && GetDocumentManager()) { OnActivateView(activate, this, GetDocumentManager()->GetCurrentView()); GetDocumentManager()->ActivateView(this, activate); @@ -698,6 +721,7 @@ bool wxDocTemplate::FileMatchesTemplate(const wxString& path) BEGIN_EVENT_TABLE(wxDocManager, wxEvtHandler) EVT_MENU(wxID_OPEN, wxDocManager::OnFileOpen) EVT_MENU(wxID_CLOSE, wxDocManager::OnFileClose) + EVT_MENU(wxID_CLOSE_ALL, wxDocManager::OnFileCloseAll) EVT_MENU(wxID_REVERT, wxDocManager::OnFileRevert) EVT_MENU(wxID_NEW, wxDocManager::OnFileNew) EVT_MENU(wxID_SAVE, wxDocManager::OnFileSave) @@ -707,6 +731,7 @@ BEGIN_EVENT_TABLE(wxDocManager, wxEvtHandler) 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_NEW, wxDocManager::OnUpdateFileNew) EVT_UPDATE_UI(wxID_SAVE, wxDocManager::OnUpdateFileSave) @@ -747,13 +772,13 @@ wxDocManager::~wxDocManager() sm_docManager = (wxDocManager*) NULL; } -bool wxDocManager::Clear(bool force) +bool wxDocManager::CloseDocuments(bool force) { - wxNode *node = m_docs.First(); + wxNode *node = m_docs.GetFirst(); while (node) { - wxDocument *doc = (wxDocument *)node->Data(); - wxNode *next = node->Next(); + wxDocument *doc = (wxDocument *)node->GetData(); + wxNode *next = node->GetNext(); if (!doc->Close() && !force) return FALSE; @@ -771,11 +796,19 @@ bool wxDocManager::Clear(bool force) // delete another. node = next; } - node = m_templates.First(); + return TRUE; +} + +bool wxDocManager::Clear(bool force) +{ + if (!CloseDocuments(force)) + return FALSE; + + wxNode *node = m_templates.GetFirst(); while (node) { - wxDocTemplate *templ = (wxDocTemplate*) node->Data(); - wxNode* next = node->Next(); + wxDocTemplate *templ = (wxDocTemplate*) node->GetData(); + wxNode* next = node->GetNext(); delete templ; node = next; } @@ -806,14 +839,19 @@ void wxDocManager::OnFileClose(wxCommandEvent& WXUNUSED(event)) } } +void wxDocManager::OnFileCloseAll(wxCommandEvent& WXUNUSED(event)) +{ + CloseDocuments(FALSE); +} + void wxDocManager::OnFileNew(wxCommandEvent& WXUNUSED(event)) { - CreateDocument(wxString(""), wxDOC_NEW); + CreateDocument( wxT(""), wxDOC_NEW ); } void wxDocManager::OnFileOpen(wxCommandEvent& WXUNUSED(event)) { - if ( !CreateDocument(wxString(""), 0) ) + if ( !CreateDocument( wxT(""), 0) ) { OnOpenFileFailure(); } @@ -945,7 +983,7 @@ void wxDocManager::OnUpdateFileNew(wxUpdateUIEvent& event) void wxDocManager::OnUpdateFileSave(wxUpdateUIEvent& event) { wxDocument *doc = GetCurrentDocument(); - event.Enable( (doc != (wxDocument*) NULL) ); + event.Enable( doc && doc->IsModified() ); } void wxDocManager::OnUpdateFileSaveAs(wxUpdateUIEvent& event) @@ -958,12 +996,16 @@ void wxDocManager::OnUpdateUndo(wxUpdateUIEvent& event) { wxDocument *doc = GetCurrentDocument(); event.Enable( (doc && doc->GetCommandProcessor() && doc->GetCommandProcessor()->CanUndo()) ); + if (doc && doc->GetCommandProcessor()) + doc->GetCommandProcessor()->SetMenuStrings(); } void wxDocManager::OnUpdateRedo(wxUpdateUIEvent& event) { wxDocument *doc = GetCurrentDocument(); event.Enable( (doc && doc->GetCommandProcessor() && doc->GetCommandProcessor()->CanRedo()) ); + if (doc && doc->GetCommandProcessor()) + doc->GetCommandProcessor()->SetMenuStrings(); } void wxDocManager::OnUpdatePrint(wxUpdateUIEvent& event) @@ -987,9 +1029,9 @@ wxView *wxDocManager::GetCurrentView() const { if (m_currentView) return m_currentView; - if (m_docs.Number() == 1) + if (m_docs.GetCount() == 1) { - wxDocument* doc = (wxDocument*) m_docs.First()->Data(); + wxDocument* doc = (wxDocument*) m_docs.GetFirst()->GetData(); return doc->GetFirstView(); } return (wxView *) NULL; @@ -1009,12 +1051,12 @@ bool wxDocManager::ProcessEvent(wxEvent& event) wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags) { - wxDocTemplate **templates = new wxDocTemplate *[m_templates.Number()]; - int i; - int n = 0; - for (i = 0; i < m_templates.Number(); i++) + wxDocTemplate **templates = new wxDocTemplate *[m_templates.GetCount()]; + int n = 0; + + for (size_t i = 0; i < m_templates.GetCount(); i++) { - wxDocTemplate *temp = (wxDocTemplate *)(m_templates.Nth(i)->Data()); + wxDocTemplate *temp = (wxDocTemplate *)(m_templates.Item(i)->GetData()); if (temp->IsVisible()) { templates[n] = temp; @@ -1029,9 +1071,9 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags) // If we've reached the max number of docs, close the // first one. - if (GetDocuments().Number() >= m_maxDocsOpen) + if ( (int)GetDocuments().GetCount() >= m_maxDocsOpen ) { - wxDocument *doc = (wxDocument *)GetDocuments().First()->Data(); + wxDocument *doc = (wxDocument *)GetDocuments().GetFirst()->GetData(); if (doc->Close()) { // Implicitly deletes the document when @@ -1120,12 +1162,12 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags) wxView *wxDocManager::CreateView(wxDocument *doc, long flags) { - wxDocTemplate **templates = new wxDocTemplate *[m_templates.Number()]; - int n =0; - int i; - for (i = 0; i < m_templates.Number(); i++) + wxDocTemplate **templates = new wxDocTemplate *[m_templates.GetCount()]; + int n =0; + + for (size_t i = 0; i < m_templates.GetCount(); i++) { - wxDocTemplate *temp = (wxDocTemplate *)(m_templates.Nth(i)->Data()); + wxDocTemplate *temp = (wxDocTemplate *)(m_templates.Item(i)->GetData()); if (temp->IsVisible()) { if (temp->GetDocumentName() == doc->GetDocumentName()) @@ -1176,8 +1218,9 @@ bool wxDocManager::FlushDoc(wxDocument *WXUNUSED(doc)) wxDocument *wxDocManager::GetCurrentDocument() const { - if (m_currentView) - return m_currentView->GetDocument(); + wxView *view = GetCurrentView(); + if (view) + return view->GetDocument(); else return (wxDocument *) NULL; } @@ -1292,10 +1335,9 @@ wxDocTemplate *wxDocManager::FindTemplateForPath(const wxString& path) wxDocTemplate *theTemplate = (wxDocTemplate *) NULL; // Find the template which this extension corresponds to - int i; - for (i = 0; i < m_templates.Number(); i++) + for (size_t i = 0; i < m_templates.GetCount(); i++) { - wxDocTemplate *temp = (wxDocTemplate *)m_templates.Nth(i)->Data(); + wxDocTemplate *temp = (wxDocTemplate *)m_templates.Item(i)->GetData(); if ( temp->FileMatchesTemplate(path) ) { theTemplate = temp; @@ -1333,7 +1375,7 @@ static wxWindow* wxFindSuitableParent() // template extension. wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates, -#if defined(__WXMSW__) || defined(__WXGTK__) +#if defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXMAC__) int noTemplates, #else int WXUNUSED(noTemplates), @@ -1343,7 +1385,7 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates, bool WXUNUSED(save)) { // We can only have multiple filters in Windows and GTK -#if defined(__WXMSW__) || defined(__WXGTK__) +#if defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXMAC__) wxString descrBuf; int i; @@ -1441,13 +1483,26 @@ wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates, wxDocTemplate **data = new wxDocTemplate *[noTemplates]; int i; int n = 0; + for (i = 0; i < noTemplates; i++) { if (templates[i]->IsVisible()) { - strings.Add(templates[i]->m_description); - if (!sort) + int j; + bool want = TRUE; + for (j = 0; j < n; j++) { + //filter out NOT unique documents + view combinations + if ( templates[i]->m_docTypeName == data[j]->m_docTypeName && + templates[i]->m_viewTypeName == data[j]->m_viewTypeName + ) + want = FALSE; + } + + if ( want ) + { + strings.Add(templates[i]->m_description); + data[n] = templates[i]; n ++; } @@ -1508,14 +1563,24 @@ wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates, wxDocTemplate **data = new wxDocTemplate *[noTemplates]; int i; int n = 0; + for (i = 0; i < noTemplates; i++) { wxDocTemplate *templ = templates[i]; if ( templ->IsVisible() && !templ->GetViewName().empty() ) { - strings.Add(templ->m_viewTypeName); - if (!sort) + int j; + bool want = TRUE; + for (j = 0; j < n; j++) { + //filter out NOT unique views + if ( templates[i]->m_viewTypeName == data[j]->m_viewTypeName ) + want = FALSE; + } + + if ( want ) + { + strings.Add(templ->m_viewTypeName); data[n] = templ; n ++; } @@ -1885,14 +1950,16 @@ void wxFileHistory::AddFileToHistory(const wxString& file) // Move existing files (if any) down so we can insert file at beginning. if (m_fileHistoryN < m_fileMaxFiles) { - wxNode* node = m_fileMenus.First(); + wxNode* node = m_fileMenus.GetFirst(); while (node) { - wxMenu* menu = (wxMenu*) node->Data(); - if (m_fileHistoryN == 0) + wxMenu* menu = (wxMenu*) node->GetData(); + if ( m_fileHistoryN == 0 && menu->GetMenuItemCount() ) + { menu->AppendSeparator(); + } menu->Append(wxID_FILE1+m_fileHistoryN, _("[EMPTY]")); - node = node->Next(); + node = node->GetNext(); } m_fileHistoryN ++; } @@ -1928,12 +1995,12 @@ void wxFileHistory::AddFileToHistory(const wxString& file) wxString buf; buf.Printf(s_MRUEntryFormat, i + 1, pathInMenu.c_str()); - wxNode* node = m_fileMenus.First(); + wxNode* node = m_fileMenus.GetFirst(); while (node) { - wxMenu* menu = (wxMenu*) node->Data(); + wxMenu* menu = (wxMenu*) node->GetData(); menu->SetLabel(wxID_FILE1 + i, buf); - node = node->Next(); + node = node->GetNext(); } } } @@ -1953,10 +2020,10 @@ void wxFileHistory::RemoveFileFromHistory(int i) m_fileHistory[j] = m_fileHistory[j + 1]; } - wxNode* node = m_fileMenus.First(); + wxNode* node = m_fileMenus.GetFirst(); while ( node ) { - wxMenu* menu = (wxMenu*) node->Data(); + wxMenu* menu = (wxMenu*) node->GetData(); // shuffle filenames up @@ -1967,7 +2034,7 @@ void wxFileHistory::RemoveFileFromHistory(int i) menu->SetLabel(wxID_FILE1 + j, buf); } - node = node->Next(); + node = node->GetNext(); // delete the last menu item which is unused now if (menu->FindItem(wxID_FILE1 + m_fileHistoryN - 1)) @@ -2026,7 +2093,7 @@ void wxFileHistory::Load(wxConfigBase& config) wxString buf; buf.Printf(wxT("file%d"), m_fileHistoryN+1); wxString historyFile; - while ((m_fileHistoryN <= m_fileMaxFiles) && config.Read(buf, &historyFile) && (historyFile != wxT(""))) + while ((m_fileHistoryN < m_fileMaxFiles) && config.Read(buf, &historyFile) && (historyFile != wxT(""))) { m_fileHistory[m_fileHistoryN] = copystring((const wxChar*) historyFile); m_fileHistoryN ++; @@ -2052,11 +2119,15 @@ void wxFileHistory::AddFilesToMenu() { if (m_fileHistoryN > 0) { - wxNode* node = m_fileMenus.First(); + wxNode* node = m_fileMenus.GetFirst(); while (node) { - wxMenu* menu = (wxMenu*) node->Data(); - menu->AppendSeparator(); + wxMenu* menu = (wxMenu*) node->GetData(); + if (menu->GetMenuItemCount()) + { + menu->AppendSeparator(); + } + int i; for (i = 0; i < m_fileHistoryN; i++) { @@ -2067,7 +2138,7 @@ void wxFileHistory::AddFilesToMenu() menu->Append(wxID_FILE1+i, buf); } } - node = node->Next(); + node = node->GetNext(); } } } @@ -2076,7 +2147,11 @@ void wxFileHistory::AddFilesToMenu(wxMenu* menu) { if (m_fileHistoryN > 0) { - menu->AppendSeparator(); + if (menu->GetMenuItemCount()) + { + menu->AppendSeparator(); + } + int i; for (i = 0; i < m_fileHistoryN; i++) { @@ -2156,7 +2231,7 @@ bool wxTransferStreamToFile(wxInputStream& stream, const wxString& filename) return FALSE; } - int len = stream.StreamSize(); + int len = stream.GetSize(); // TODO: is this the correct test for EOF? while (stream.TellI() < (len - 1)) {