X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dc1efb1d9f4e4ce7d8f889dad3aaab7026b73058..66e23ad2081689dad6e829b9667cdbc93ac45154:/src/common/docview.cpp?ds=sidebyside diff --git a/src/common/docview.cpp b/src/common/docview.cpp index 1f8003aff7..549eb66f48 100644 --- a/src/common/docview.cpp +++ b/src/common/docview.cpp @@ -130,6 +130,7 @@ wxDocument::wxDocument(wxDocument *parent) m_documentModified = FALSE; m_documentParent = parent; m_documentTemplate = (wxDocTemplate *) NULL; + m_commandProcessor = (wxCommandProcessor*) NULL; m_savedYet = FALSE; } @@ -145,7 +146,8 @@ wxDocument::~wxDocument() if (m_commandProcessor) delete m_commandProcessor; - GetDocumentManager()->RemoveDocument(this); + if (GetDocumentManager()) + GetDocumentManager()->RemoveDocument(this); // Not safe to do here, since it'll invoke virtual view functions // expecting to see valid derived objects: and by the time we get here, @@ -172,6 +174,8 @@ bool wxDocument::OnCloseDocument() // deleted. bool wxDocument::DeleteAllViews() { + wxDocManager* manager = GetDocumentManager(); + wxNode *node = m_documentViews.First(); while (node) { @@ -184,6 +188,11 @@ bool wxDocument::DeleteAllViews() delete view; // Deletes node implicitly node = next; } + // If we haven't yet deleted the document (for example + // if there were no views) then delete it. + if (manager && manager->GetDocuments().Member(this)) + delete this; + return TRUE; } @@ -196,7 +205,7 @@ wxView *wxDocument::GetFirstView() const wxDocManager *wxDocument::GetDocumentManager() const { - return m_documentTemplate->GetDocumentManager(); + return (m_documentTemplate ? m_documentTemplate->GetDocumentManager() : (wxDocManager*) NULL); } bool wxDocument::OnNewDocument() @@ -239,7 +248,7 @@ bool wxDocument::SaveAs() wxString tmp = wxFileSelector(_("Save as"), docTemplate->GetDirectory(), - GetFilename(), + wxFileNameFromPath(GetFilename()), docTemplate->GetDefaultExtension(), docTemplate->GetFileFilter(), wxSAVE | wxOVERWRITE_PROMPT, @@ -287,7 +296,7 @@ bool wxDocument::OnSaveDocument(const wxString& file) msgTitle = wxString(_("File error")); #if wxUSE_STD_IOSTREAM - ofstream store(wxString(file.fn_str())); + ofstream store(wxString(file.fn_str()).mb_str()); if (store.fail() || store.bad()) #else wxFileOutputStream store(wxString(file.fn_str())); @@ -323,7 +332,7 @@ bool wxDocument::OnOpenDocument(const wxString& file) msgTitle = wxString(_("File error")); #if wxUSE_STD_IOSTREAM - ifstream store(wxString(file.fn_str())); + ifstream store(wxString(file.fn_str()).mb_str()); if (store.fail() || store.bad()) #else wxFileInputStream store(wxString(file.fn_str())); @@ -655,7 +664,8 @@ wxDocument *wxDocTemplate::CreateDocument(const wxString& path, long flags) return doc; else { - delete doc; + if (GetDocumentManager()->GetDocuments().Member(doc)) + doc->DeleteAllViews(); return (wxDocument *) NULL; } } @@ -806,7 +816,10 @@ void wxDocManager::OnFileNew(wxCommandEvent& WXUNUSED(event)) void wxDocManager::OnFileOpen(wxCommandEvent& WXUNUSED(event)) { - CreateDocument(wxString(""), 0); + if ( !CreateDocument(wxString(""), 0) ) + { + OnOpenFileFailure(); + } } void wxDocManager::OnFileRevert(wxCommandEvent& WXUNUSED(event)) @@ -1093,15 +1106,16 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags) newDoc->SetDocumentTemplate(temp); if (!newDoc->OnOpenDocument(path2)) { - delete newDoc; + newDoc->DeleteAllViews(); + // delete newDoc; // Implicitly deleted by DeleteAllViews return (wxDocument *) NULL; } AddFileToHistory(path2); } return newDoc; } - else - return (wxDocument *) NULL; + + return (wxDocument *) NULL; } wxView *wxDocManager::CreateView(wxDocument *doc, long flags) @@ -1291,6 +1305,28 @@ 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. // How to implement in wxWindows? Must extend the file selector // dialog or implement own; OR match the extension to the @@ -1328,36 +1364,53 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates, wxString descrBuf = wxT("*.*"); #endif - int FilterIndex = 0; + int FilterIndex = -1; + + wxWindow* parent = wxFindSuitableParent(); + wxString pathTmp = wxFileSelectorEx(_("Select a file"), m_lastDirectory, wxT(""), &FilterIndex, descrBuf, 0, - wxTheApp->GetTopWindow()); + parent); + wxDocTemplate *theTemplate = (wxDocTemplate *)NULL; if (!pathTmp.IsEmpty()) { + if (!wxFileExists(pathTmp)) + { + wxString msgTitle; + if (!wxTheApp->GetAppName().IsEmpty()) + msgTitle = wxTheApp->GetAppName(); + else + msgTitle = wxString(_("File error")); + + (void)wxMessageBox(_("Sorry, could not open this file."), msgTitle, wxOK | wxICON_EXCLAMATION, + parent); + + path = wxT(""); + return (wxDocTemplate *) NULL; + } m_lastDirectory = wxPathOnly(pathTmp); path = pathTmp; - // This is dodgy in that we're selecting the template on the - // basis of the file extension, which may not be a standard - // one. We really want to know exactly which template was - // chosen by using a more advanced file selector. - wxDocTemplate *theTemplate = FindTemplateForPath(path); - if ( !theTemplate ) + // first choose the template using the extension, if this fails (i.e. + // wxFileSelectorEx() didn't fill it), then use the path + if ( FilterIndex != -1 ) theTemplate = templates[FilterIndex]; - - return theTemplate; + if ( !theTemplate ) + theTemplate = FindTemplateForPath(path); } else { path = wxT(""); - return (wxDocTemplate *) NULL; } + + return theTemplate; + #if 0 // In all other windowing systems, until we have more advanced // file selectors, we must select the document type (template) first, and @@ -1382,61 +1435,134 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates, } wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates, - int noTemplates) + int noTemplates, bool sort) { - wxChar **strings = new wxChar *[noTemplates]; - wxChar **data = new wxChar *[noTemplates]; + wxArrayString strings(sort); + wxDocTemplate **data = new wxDocTemplate *[noTemplates]; int i; int n = 0; - for (i = 0; i < noTemplates; i++) - { - if (templates[i]->IsVisible()) - { - strings[n] = (wxChar *)templates[i]->m_description.c_str(); - data[n] = (wxChar *)templates[i]; - n ++; - } - } - if (n == 0) - { - delete[] strings; - delete[] data; - return (wxDocTemplate *) NULL; - } - else if (n == 1) - { - wxDocTemplate *temp = (wxDocTemplate *)data[0]; - delete[] strings; - delete[] data; - return temp; + for (i = 0; i < noTemplates; i++) + { + if (templates[i]->IsVisible()) + { + strings.Add(templates[i]->m_description); + if (!sort) + { + data[n] = templates[i]; + n ++; + } + } + } // for + + if (sort) + { + // Yes, this will be slow, but template lists + // are typically short. + int j; + n = strings.Count(); + for (i = 0; i < n; i++) + { + for (j = 0; j < noTemplates; j++) + { + if (strings[i] == templates[j]->m_description) + data[i] = templates[j]; + } + } + } + + wxDocTemplate *theTemplate; + + switch ( n ) + { + case 0: + // no visible templates, hence nothing to choose from + theTemplate = NULL; + break; + + case 1: + // don't propose the user to choose if he heas no choice + theTemplate = data[0]; + break; + + default: + // propose the user to choose one of several + theTemplate = (wxDocTemplate *)wxGetSingleChoiceData + ( + _("Select a document template"), + _("Templates"), + strings, + (void **)data, + wxFindSuitableParent() + ); } - wxDocTemplate *theTemplate = (wxDocTemplate *)wxGetSingleChoiceData(_("Select a document template"), _("Templates"), n, - strings, (void **)data); - delete[] strings; delete[] data; + return theTemplate; } wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates, - int noTemplates) + int noTemplates, bool sort) { - wxChar **strings = new wxChar *[noTemplates]; - wxChar **data = new wxChar *[noTemplates]; + wxArrayString strings(sort); + wxDocTemplate **data = new wxDocTemplate *[noTemplates]; int i; int n = 0; for (i = 0; i < noTemplates; i++) { - if (templates[i]->IsVisible() && (templates[i]->GetViewName() != wxT(""))) + wxDocTemplate *templ = templates[i]; + if ( templ->IsVisible() && !templ->GetViewName().empty() ) { - strings[n] = (wxChar *)templates[i]->m_viewTypeName.c_str(); - data[n] = (wxChar *)templates[i]; - n ++; + strings.Add(templ->m_viewTypeName); + if (!sort) + { + data[n] = templ; + n ++; + } } } - wxDocTemplate *theTemplate = (wxDocTemplate *)wxGetSingleChoiceData(_("Select a document view"), _("Views"), n, - strings, (void **)data); - delete[] strings; + + if (sort) + { + // Yes, this will be slow, but template lists + // are typically short. + int j; + n = strings.Count(); + for (i = 0; i < n; i++) + { + for (j = 0; j < noTemplates; j++) + { + if (strings[i] == templates[j]->m_viewTypeName) + data[i] = templates[j]; + } + } + } + + wxDocTemplate *theTemplate; + + // the same logic as above + switch ( n ) + { + case 0: + theTemplate = (wxDocTemplate *)NULL; + break; + + case 1: + theTemplate = data[0]; + break; + + default: + theTemplate = (wxDocTemplate *)wxGetSingleChoiceData + ( + _("Select a document view"), + _("Views"), + strings, + (void **)data, + wxFindSuitableParent() + ); + + } + delete[] data; return theTemplate; } @@ -1600,7 +1726,7 @@ void wxDocParentFrame::OnExit(wxCommandEvent& WXUNUSED(event)) void wxDocParentFrame::OnMRUFile(wxCommandEvent& event) { - int n = event.GetSelection() - wxID_FILE1; // the index in MRU list + int n = event.GetId() - wxID_FILE1; // the index in MRU list wxString filename(m_docManager->GetHistoryFile(n)); if ( !filename.IsEmpty() ) { @@ -1616,8 +1742,7 @@ void wxDocParentFrame::OnMRUFile(wxCommandEvent& event) // about it m_docManager->RemoveFileFromHistory(n); - wxLogError(_("The file '%s' doesn't exist and couldn't be opened.\n" - "It has been also removed from the MRU files list."), + wxLogError(_("The file '%s' doesn't exist and couldn't be opened.\nIt has been also removed from the MRU files list."), filename.c_str()); } } @@ -1732,6 +1857,8 @@ wxCommandProcessor::wxCommandProcessor(int maxCommands) m_maxNoCommands = maxCommands; m_currentCommand = (wxNode *) NULL; m_commandEditMenu = (wxMenu *) NULL; + m_undoAccelerator = wxT("\tCtrl+Z"); + m_redoAccelerator = wxT("\tCtrl+Y"); } wxCommandProcessor::~wxCommandProcessor() @@ -1867,9 +1994,9 @@ void wxCommandProcessor::SetMenuStrings() if (commandName == wxT("")) commandName = _("Unnamed command"); bool canUndo = command->CanUndo(); if (canUndo) - buf = wxString(_("&Undo ")) + commandName; + buf = wxString(_("&Undo ")) + commandName + m_undoAccelerator; else - buf = wxString(_("Can't &Undo ")) + commandName; + buf = wxString(_("Can't &Undo ")) + commandName + m_undoAccelerator; m_commandEditMenu->SetLabel(wxID_UNDO, buf); m_commandEditMenu->Enable(wxID_UNDO, canUndo); @@ -1880,24 +2007,24 @@ void wxCommandProcessor::SetMenuStrings() wxCommand *redoCommand = (wxCommand *)m_currentCommand->Next()->Data(); wxString redoCommandName(redoCommand->GetName()); if (redoCommandName == wxT("")) redoCommandName = _("Unnamed command"); - buf = wxString(_("&Redo ")) + redoCommandName; + buf = wxString(_("&Redo ")) + redoCommandName + m_redoAccelerator; m_commandEditMenu->SetLabel(wxID_REDO, buf); m_commandEditMenu->Enable(wxID_REDO, TRUE); } else { - m_commandEditMenu->SetLabel(wxID_REDO, _("&Redo")); + m_commandEditMenu->SetLabel(wxID_REDO, _("&Redo") + m_redoAccelerator); m_commandEditMenu->Enable(wxID_REDO, FALSE); } } else { - m_commandEditMenu->SetLabel(wxID_UNDO, _("&Undo")); + m_commandEditMenu->SetLabel(wxID_UNDO, _("&Undo") + m_undoAccelerator); m_commandEditMenu->Enable(wxID_UNDO, FALSE); if (m_commands.Number() == 0) { - m_commandEditMenu->SetLabel(wxID_REDO, _("&Redo")); + m_commandEditMenu->SetLabel(wxID_REDO, _("&Redo") + m_redoAccelerator); m_commandEditMenu->Enable(wxID_REDO, FALSE); } else @@ -1907,7 +2034,7 @@ void wxCommandProcessor::SetMenuStrings() wxCommand *redoCommand = (wxCommand *)m_commands.First()->Data(); wxString redoCommandName(redoCommand->GetName()); if (redoCommandName == wxT("")) redoCommandName = _("Unnamed command"); - buf = wxString(_("&Redo ")) + redoCommandName; + buf = wxString(_("&Redo ")) + redoCommandName + m_redoAccelerator; m_commandEditMenu->SetLabel(wxID_REDO, buf); m_commandEditMenu->Enable(wxID_REDO, TRUE); } @@ -1951,22 +2078,29 @@ wxFileHistory::~wxFileHistory() void wxFileHistory::AddFileToHistory(const wxString& file) { int i; + // Check we don't already have this file for (i = 0; i < m_fileHistoryN; i++) { - if (m_fileHistory[i] && wxString(m_fileHistory[i]) == file) + if ( m_fileHistory[i] && (file == m_fileHistory[i]) ) + { + // we do have it, move it to the top of the history + RemoveFileFromHistory (i); + AddFileToHistory (file); return; + } } - // Add to the project file history: - // Move existing files (if any) down so we can insert file at beginning. - - // First delete filename that has popped off the end of the array (if any) - if (m_fileHistoryN == m_fileMaxFiles) + // if we already have a full history, delete the one at the end + if ( m_fileMaxFiles == m_fileHistoryN ) { - delete[] m_fileHistory[m_fileMaxFiles-1]; - m_fileHistory[m_fileMaxFiles-1] = (wxChar *) NULL; + RemoveFileFromHistory (m_fileHistoryN - 1); + AddFileToHistory (file); + return; } + + // Add to the project file history: + // Move existing files (if any) down so we can insert file at beginning. if (m_fileHistoryN < m_fileMaxFiles) { wxNode* node = m_fileMenus.First(); @@ -1987,19 +2121,40 @@ void wxFileHistory::AddFileToHistory(const wxString& file) } m_fileHistory[0] = copystring(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++) - if (m_fileHistory[i]) + { + if ( m_fileHistory[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]; + } + wxString buf; - buf.Printf(s_MRUEntryFormat, i+1, m_fileHistory[i]); + buf.Printf(s_MRUEntryFormat, i + 1, pathInMenu.c_str()); wxNode* node = m_fileMenus.First(); while (node) { wxMenu* menu = (wxMenu*) node->Data(); - menu->SetLabel(wxID_FILE1+i, buf); + menu->SetLabel(wxID_FILE1 + i, buf); node = node->Next(); } } + } } void wxFileHistory::RemoveFileFromHistory(int i) @@ -2007,11 +2162,6 @@ void wxFileHistory::RemoveFileFromHistory(int i) wxCHECK_RET( i < m_fileHistoryN, wxT("invalid index in wxFileHistory::RemoveFileFromHistory") ); - wxNode* node = m_fileMenus.First(); - while ( node ) - { - wxMenu* menu = (wxMenu*) node->Data(); - // delete the element from the array (could use memmove() too...) delete [] m_fileHistory[i]; @@ -2021,6 +2171,12 @@ void wxFileHistory::RemoveFileFromHistory(int i) m_fileHistory[j] = m_fileHistory[j + 1]; } + wxNode* node = m_fileMenus.First(); + while ( node ) + { + wxMenu* menu = (wxMenu*) node->Data(); + + // shuffle filenames up wxString buf; for ( j = i; j < m_fileHistoryN - 1; j++ ) @@ -2032,6 +2188,7 @@ void wxFileHistory::RemoveFileFromHistory(int i) node = node->Next(); // delete the last menu item which is unused now + if (menu->FindItem(wxID_FILE1 + m_fileHistoryN - 1)) menu->Delete(wxID_FILE1 + m_fileHistoryN - 1); // delete the last separator too if no more files are left @@ -2162,7 +2319,7 @@ bool wxTransferFileToStream(const wxString& filename, ostream& stream) FILE *fd1; int ch; - if ((fd1 = fopen (filename.fn_str(), "rb")) == NULL) + if ((fd1 = wxFopen (filename.fn_str(), _T("rb"))) == NULL) return FALSE; while ((ch = getc (fd1)) != EOF) @@ -2177,7 +2334,7 @@ bool wxTransferStreamToFile(istream& stream, const wxString& filename) FILE *fd1; int ch; - if ((fd1 = fopen (filename.fn_str(), "wb")) == NULL) + if ((fd1 = wxFopen (filename.fn_str(), _T("wb"))) == NULL) { return FALSE; } @@ -2197,7 +2354,7 @@ bool wxTransferFileToStream(const wxString& filename, wxOutputStream& stream) FILE *fd1; int ch; - if ((fd1 = fopen (filename.fn_str(), "rb")) == NULL) + if ((fd1 = wxFopen (filename, wxT("rb"))) == NULL) return FALSE; while ((ch = getc (fd1)) != EOF) @@ -2212,7 +2369,7 @@ bool wxTransferStreamToFile(wxInputStream& stream, const wxString& filename) FILE *fd1; char ch; - if ((fd1 = fopen (filename.fn_str(), "wb")) == NULL) + if ((fd1 = wxFopen (filename, wxT("wb"))) == NULL) { return FALSE; }