X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d07ce169a8baef7f4eb68fa4b618012f878bec3d..82e94f591f2638b07a4f28c096d94ec7e8571c20:/src/common/docview.cpp diff --git a/src/common/docview.cpp b/src/common/docview.cpp index b0e10bdc68..40e21501fe 100644 --- a/src/common/docview.cpp +++ b/src/common/docview.cpp @@ -43,6 +43,9 @@ #include "wx/log.h" #endif +#ifdef __WXMAC__ + #include "wx/filename.h" +#endif #ifdef __WXGTK__ #include "wx/mdi.h" @@ -178,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; @@ -200,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 @@ -272,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); @@ -317,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; } @@ -491,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()) { @@ -502,24 +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->Data(); + wxView *view = (wxView *)node->GetData(); if (view != sender) view->OnUpdate(sender, hint); - node = node->Next(); + node = node->GetNext(); } } void wxDocument::NotifyClosing() { - wxNode *node = m_documentViews.First(); + wxNode *node = m_documentViews.GetFirst(); while (node) { - wxView *view = (wxView *)node->Data(); + wxView *view = (wxView *)node->GetData(); view->OnClosingDocument(); - node = node->Next(); + node = node->GetNext(); } } @@ -529,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(); } } } @@ -767,11 +774,11 @@ wxDocManager::~wxDocManager() 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; @@ -797,11 +804,11 @@ bool wxDocManager::Clear(bool force) if (!CloseDocuments(force)) return FALSE; - wxNode *node = m_templates.First(); + 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; } @@ -1022,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; @@ -1044,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; @@ -1064,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 @@ -1155,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()) @@ -1328,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; @@ -1944,14 +1950,14 @@ 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(); + wxMenu* menu = (wxMenu*) node->GetData(); if (m_fileHistoryN == 0) menu->AppendSeparator(); menu->Append(wxID_FILE1+m_fileHistoryN, _("[EMPTY]")); - node = node->Next(); + node = node->GetNext(); } m_fileHistoryN ++; } @@ -1987,12 +1993,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(); } } } @@ -2012,10 +2018,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 @@ -2026,7 +2032,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)) @@ -2111,10 +2117,10 @@ void wxFileHistory::AddFilesToMenu() { if (m_fileHistoryN > 0) { - wxNode* node = m_fileMenus.First(); + wxNode* node = m_fileMenus.GetFirst(); while (node) { - wxMenu* menu = (wxMenu*) node->Data(); + wxMenu* menu = (wxMenu*) node->GetData(); menu->AppendSeparator(); int i; for (i = 0; i < m_fileHistoryN; i++) @@ -2126,7 +2132,7 @@ void wxFileHistory::AddFilesToMenu() menu->Append(wxID_FILE1+i, buf); } } - node = node->Next(); + node = node->GetNext(); } } }