X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/88ac883a0d005437c97a60d8195bd5e4719b1154..d54598dd855e64cf2086b73cb3b8e3b99c513bbc:/src/common/docview.cpp?ds=inline diff --git a/src/common/docview.cpp b/src/common/docview.cpp index ece6ec34a4..95b489ee7d 100644 --- a/src/common/docview.cpp +++ b/src/common/docview.cpp @@ -25,11 +25,7 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#ifndef WX_PRECOMP - #include "wx/defs.h" + #pragma hdrstop #endif #if wxUSE_DOC_VIEW_ARCHITECTURE @@ -46,26 +42,34 @@ #include "wx/intl.h" #endif + #ifdef __WXGTK__ #include "wx/mdi.h" #endif +#if wxUSE_PRINTING_ARCHITECTURE + #include "wx/prntbase.h" + #include "wx/printdlg.h" +#endif + #include "wx/msgdlg.h" #include "wx/choicdlg.h" #include "wx/docview.h" -#include "wx/prntbase.h" -#include "wx/printdlg.h" #include "wx/confbase.h" +#include "wx/file.h" #include #include -#include "wx/ioswrap.h" - -#if wxUSE_IOSTREAMH +#if wxUSE_STD_IOSTREAM + #include "wx/ioswrap.h" + #if wxUSE_IOSTREAMH #include -#else + #else #include + #endif +#else + #include "wx/wfstream.h" #endif // ---------------------------------------------------------------------------- @@ -95,6 +99,12 @@ static inline wxString FindExtension(const wxChar *path); +// ---------------------------------------------------------------------------- +// local constants +// ---------------------------------------------------------------------------- + +static const char *s_MRUEntryFormat = wxT("&%d %s"); + // ============================================================================ // implementation // ============================================================================ @@ -214,7 +224,7 @@ bool wxDocument::Save() bool ret = FALSE; if (!IsModified()) return TRUE; - if (m_documentFile == _T("") || !m_savedYet) + if (m_documentFile == wxT("") || !m_savedYet) ret = SaveAs(); else ret = OnSaveDocument(m_documentFile); @@ -244,7 +254,7 @@ bool wxDocument::SaveAs() wxString path, name, ext; wxSplitPath(fileName, & path, & name, & ext); - if (ext.IsEmpty() || ext == _T("")) + if (ext.IsEmpty() || ext == wxT("")) { fileName += "."; fileName += docTemplate->GetDefaultExtension(); @@ -273,20 +283,25 @@ bool wxDocument::OnSaveDocument(const wxString& file) return FALSE; wxString msgTitle; - if (wxTheApp->GetAppName() != _T("")) + if (wxTheApp->GetAppName() != wxT("")) msgTitle = wxTheApp->GetAppName(); else msgTitle = wxString(_("File error")); - ofstream store(file.fn_str()); +#if wxUSE_STD_IOSTREAM + ofstream store(wxString(file.fn_str())); if (store.fail() || store.bad()) +#else + wxFileOutputStream store(wxString(file.fn_str())); + if (store.LastError() != 0) +#endif { (void)wxMessageBox(_("Sorry, could not open this file for saving."), msgTitle, wxOK | wxICON_EXCLAMATION, GetDocumentWindow()); // Saving error return FALSE; } - if (SaveObject(store)==FALSE) + if (!SaveObject(store)) { (void)wxMessageBox(_("Sorry, could not save this file."), msgTitle, wxOK | wxICON_EXCLAMATION, GetDocumentWindow()); @@ -304,19 +319,24 @@ bool wxDocument::OnOpenDocument(const wxString& file) return FALSE; wxString msgTitle; - if (wxTheApp->GetAppName() != _T("")) + if (wxTheApp->GetAppName() != wxT("")) msgTitle = wxTheApp->GetAppName(); else msgTitle = wxString(_("File error")); - ifstream store(file.fn_str()); +#if wxUSE_STD_IOSTREAM + ifstream store(wxString(file.fn_str())); if (store.fail() || store.bad()) +#else + wxFileInputStream store(wxString(file.fn_str())); + if (store.LastError() != 0) +#endif { (void)wxMessageBox(_("Sorry, could not open this file."), msgTitle, wxOK|wxICON_EXCLAMATION, GetDocumentWindow()); return FALSE; } - if (LoadObject(store)==FALSE) + if (!LoadObject(store)) { (void)wxMessageBox(_("Sorry, could not open this file."), msgTitle, wxOK|wxICON_EXCLAMATION, GetDocumentWindow()); @@ -331,17 +351,21 @@ bool wxDocument::OnOpenDocument(const wxString& file) return TRUE; } +#if wxUSE_STD_IOSTREAM istream& wxDocument::LoadObject(istream& stream) +#else +wxInputStream& wxDocument::LoadObject(wxInputStream& stream) +#endif { - // wxObject::LoadObject(stream); - return stream; } +#if wxUSE_STD_IOSTREAM ostream& wxDocument::SaveObject(ostream& stream) +#else +wxOutputStream& wxDocument::SaveObject(wxOutputStream& stream) +#endif { - // wxObject::SaveObject(stream); - return stream; } @@ -354,12 +378,12 @@ bool wxDocument::Revert() // Get title, or filename if no title, else unnamed bool wxDocument::GetPrintableName(wxString& buf) const { - if (m_documentTitle != _T("")) + if (m_documentTitle != wxT("")) { buf = m_documentTitle; return TRUE; } - else if (m_documentFile != _T("")) + else if (m_documentFile != wxT("")) { buf = wxFileNameFromPath(m_documentFile); return TRUE; @@ -394,7 +418,7 @@ bool wxDocument::OnSaveModified() GetPrintableName(title); wxString msgTitle; - if (wxTheApp->GetAppName() != _T("")) + if (wxTheApp->GetAppName() != wxT("")) msgTitle = wxTheApp->GetAppName(); else msgTitle = wxString(_("Warning")); @@ -668,9 +692,11 @@ BEGIN_EVENT_TABLE(wxDocManager, wxEvtHandler) EVT_MENU(wxID_SAVEAS, wxDocManager::OnFileSaveAs) EVT_MENU(wxID_UNDO, wxDocManager::OnUndo) EVT_MENU(wxID_REDO, wxDocManager::OnRedo) +#if wxUSE_PRINTING_ARCHITECTURE EVT_MENU(wxID_PRINT, wxDocManager::OnPrint) EVT_MENU(wxID_PRINT_SETUP, wxDocManager::OnPrintSetup) EVT_MENU(wxID_PREVIEW, wxDocManager::OnPreview) +#endif END_EVENT_TABLE() wxDocManager::wxDocManager(long flags, bool initialize) @@ -680,6 +706,7 @@ wxDocManager::wxDocManager(long flags, bool initialize) m_currentView = (wxView *) NULL; m_maxDocsOpen = 10000; m_fileHistory = (wxFileHistory *) NULL; + m_lastDirectory = wxT("") ; if (initialize) Initialize(); } @@ -804,6 +831,7 @@ void wxDocManager::OnPrint(wxCommandEvent& WXUNUSED(event)) void wxDocManager::OnPrintSetup(wxCommandEvent& WXUNUSED(event)) { +#if wxUSE_PRINTING_ARCHITECTURE wxWindow *parentWin = wxTheApp->GetTopWindow(); wxView *view = GetCurrentView(); if (view) @@ -811,9 +839,10 @@ void wxDocManager::OnPrintSetup(wxCommandEvent& WXUNUSED(event)) wxPrintDialogData data; - wxPrintDialog printerDialog(parentWin, & data); + wxPrintDialog printerDialog(parentWin, &data); printerDialog.GetPrintDialogData().SetSetupDialog(TRUE); printerDialog.ShowModal(); +#endif // wxUSE_PRINTING_ARCHITECTURE } void wxDocManager::OnPreview(wxCommandEvent& WXUNUSED(event)) @@ -957,8 +986,8 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags) // Existing document wxDocTemplate *temp = (wxDocTemplate *) NULL; - wxString path2(_T("")); - if (path != _T("")) + wxString path2(wxT("")); + if (path != wxT("")) path2 = path; if (flags & wxDOC_SILENT) @@ -1074,6 +1103,12 @@ void wxDocManager::AddFileToHistory(const wxString& file) m_fileHistory->AddFileToHistory(file); } +void wxDocManager::RemoveFileFromHistory(int i) +{ + if (m_fileHistory) + m_fileHistory->RemoveFileFromHistory(i); +} + wxString wxDocManager::GetHistoryFile(int i) const { wxString histFile; @@ -1177,21 +1212,21 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates, { // add a '|' to separate this filter from the previous one if ( !descrBuf.IsEmpty() ) - descrBuf << _T('|'); + descrBuf << wxT('|'); descrBuf << templates[i]->GetDescription() - << _T(" (") << templates[i]->GetFileFilter() << _T(") |") + << wxT(" (") << templates[i]->GetFileFilter() << wxT(") |") << templates[i]->GetFileFilter(); } } #else - wxString descrBuf = _T("*.*"); + wxString descrBuf = wxT("*.*"); #endif int FilterIndex = 0; wxString pathTmp = wxFileSelectorEx(_("Select a file"), - _T(""), - _T(""), + m_lastDirectory, + wxT(""), &FilterIndex, descrBuf, 0, @@ -1199,6 +1234,8 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates, if (!pathTmp.IsEmpty()) { + m_lastDirectory = wxPathOnly(pathTmp); + path = pathTmp; wxString theExt = FindExtension(path); if (!theExt) @@ -1216,7 +1253,7 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates, } else { - path = _T(""); + path = wxT(""); return (wxDocTemplate *) NULL; } #if 0 @@ -1227,7 +1264,7 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates, if (!temp) return (wxDocTemplate *) NULL; - wxChar *pathTmp = wxFileSelector(_("Select a file"), _T(""), _T(""), + wxChar *pathTmp = wxFileSelector(_("Select a file"), wxT(""), wxT(""), temp->GetDefaultExtension(), temp->GetFileFilter(), 0, wxTheApp->GetTopWindow()); @@ -1253,7 +1290,7 @@ wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates, { if (templates[i]->IsVisible()) { - strings[n] = WXSTRINGCAST templates[i]->m_description; + strings[n] = (wxChar *)templates[i]->m_description.c_str(); data[n] = (wxChar *)templates[i]; n ++; } @@ -1273,7 +1310,7 @@ wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates, } wxDocTemplate *theTemplate = (wxDocTemplate *)wxGetSingleChoiceData(_("Select a document template"), _("Templates"), n, - strings, data); + strings, (char **)data); delete[] strings; delete[] data; return theTemplate; @@ -1288,15 +1325,15 @@ wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates, int n = 0; for (i = 0; i < noTemplates; i++) { - if (templates[i]->IsVisible() && (templates[i]->GetViewName() != _T(""))) + if (templates[i]->IsVisible() && (templates[i]->GetViewName() != wxT(""))) { - strings[n] = WXSTRINGCAST templates[i]->m_viewTypeName; + strings[n] = (wxChar *)templates[i]->m_viewTypeName.c_str(); data[n] = (wxChar *)templates[i]; n ++; } } wxDocTemplate *theTemplate = (wxDocTemplate *)wxGetSingleChoiceData(_("Select a document view"), _("Views"), n, - strings, data); + strings, (char **)data); delete[] strings; delete[] data; return theTemplate; @@ -1461,9 +1498,27 @@ void wxDocParentFrame::OnExit(wxCommandEvent& WXUNUSED(event)) void wxDocParentFrame::OnMRUFile(wxCommandEvent& event) { - wxString f(m_docManager->GetHistoryFile(event.GetSelection() - wxID_FILE1)); - if (f != _T("")) - (void)m_docManager->CreateDocument(f, wxDOC_SILENT); + int n = event.GetSelection() - wxID_FILE1; // the index in MRU list + wxString filename(m_docManager->GetHistoryFile(n)); + if ( !filename.IsEmpty() ) + { + // verify that the file exists before doing anything else + if ( wxFile::Exists(filename) ) + { + // try to open it + (void)m_docManager->CreateDocument(filename, wxDOC_SILENT); + } + else + { + // remove the bogus filename from the MRU list and notify the user + // 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."), + filename.c_str()); + } + } } // Extend event processing to search the view's event table @@ -1491,7 +1546,7 @@ void wxDocParentFrame::OnCloseWindow(wxCloseEvent& event) #if wxUSE_PRINTING_ARCHITECTURE wxDocPrintout::wxDocPrintout(wxView *view, const wxString& title) - : wxPrintout(WXSTRINGCAST title) + : wxPrintout(title) { m_printoutView = view; } @@ -1707,7 +1762,7 @@ void wxCommandProcessor::SetMenuStrings() { wxCommand *command = (wxCommand *)m_currentCommand->Data(); wxString commandName(command->GetName()); - if (commandName == _T("")) commandName = _("Unnamed command"); + if (commandName == wxT("")) commandName = _("Unnamed command"); bool canUndo = command->CanUndo(); if (canUndo) buf = wxString(_("&Undo ")) + commandName; @@ -1722,7 +1777,7 @@ void wxCommandProcessor::SetMenuStrings() { wxCommand *redoCommand = (wxCommand *)m_currentCommand->Next()->Data(); wxString redoCommandName(redoCommand->GetName()); - if (redoCommandName == _T("")) redoCommandName = _("Unnamed command"); + if (redoCommandName == wxT("")) redoCommandName = _("Unnamed command"); buf = wxString(_("&Redo ")) + redoCommandName; m_commandEditMenu->SetLabel(wxID_REDO, buf); m_commandEditMenu->Enable(wxID_REDO, TRUE); @@ -1749,7 +1804,7 @@ void wxCommandProcessor::SetMenuStrings() // we've undone to the start of the list, but can redo the first. wxCommand *redoCommand = (wxCommand *)m_commands.First()->Data(); wxString redoCommandName(redoCommand->GetName()); - if (redoCommandName == _T("")) redoCommandName = _("Unnamed command"); + if (redoCommandName == wxT("")) redoCommandName = _("Unnamed command"); buf = wxString(_("&Redo ")) + redoCommandName; m_commandEditMenu->SetLabel(wxID_REDO, buf); m_commandEditMenu->Enable(wxID_REDO, TRUE); @@ -1834,7 +1889,7 @@ void wxFileHistory::AddFileToHistory(const wxString& file) if (m_fileHistory[i]) { wxString buf; - buf.Printf(_T("&%d %s"), i+1, m_fileHistory[i]); + buf.Printf(s_MRUEntryFormat, i+1, m_fileHistory[i]); wxNode* node = m_fileMenus.First(); while (node) { @@ -1845,6 +1900,49 @@ void wxFileHistory::AddFileToHistory(const wxString& file) } } +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(); + + // wxMenu::Delete() is missing from wxGTK, so this can't be done :-( +#if 0 + // delete the menu items + menu->Delete(wxID_FILE1 + i); +#endif + + // delete the element from the array (could use memmove() too...) + delete [] m_fileHistory[i]; + + int j; + for ( j = i; j < m_fileHistoryN - 1; j++ ) + { + m_fileHistory[j] = m_fileHistory[j + 1]; + } + + // shuffle filenames up + wxString buf; + for ( j = i; j < m_fileHistoryN - 1; j++ ) + { + buf.Printf(s_MRUEntryFormat, j + 1, m_fileHistory[j]); + menu->SetLabel(wxID_FILE1 + j, buf); + } + + // to be removed as soon as wxMenu::Delete() is implemented +#if 1 + menu->SetLabel(wxID_FILE1 + m_fileHistoryN - 1, wxT("")); +#endif + + node = node->Next(); + } + m_fileHistoryN--; +} + wxString wxFileHistory::GetHistoryFile(int i) const { if (i < m_fileHistoryN) @@ -1869,13 +1967,13 @@ void wxFileHistory::Load(wxConfigBase& config) { m_fileHistoryN = 0; wxString buf; - buf.Printf(_T("file%d"), m_fileHistoryN+1); + buf.Printf(wxT("file%d"), m_fileHistoryN+1); wxString historyFile; - while ((m_fileHistoryN <= m_fileMaxFiles) && config.Read(buf, &historyFile) && (historyFile != _T(""))) + while ((m_fileHistoryN <= m_fileMaxFiles) && config.Read(buf, &historyFile) && (historyFile != wxT(""))) { m_fileHistory[m_fileHistoryN] = copystring((const wxChar*) historyFile); m_fileHistoryN ++; - buf.Printf(_T("file%d"), m_fileHistoryN+1); + buf.Printf(wxT("file%d"), m_fileHistoryN+1); historyFile = ""; } AddFilesToMenu(); @@ -1887,7 +1985,7 @@ void wxFileHistory::Save(wxConfigBase& config) for (i = 0; i < m_fileHistoryN; i++) { wxString buf; - buf.Printf(_T("file%d"), i+1); + buf.Printf(wxT("file%d"), i+1); config.Write(buf, wxString(m_fileHistory[i])); } } @@ -1908,7 +2006,7 @@ void wxFileHistory::AddFilesToMenu() if (m_fileHistory[i]) { wxString buf; - buf.Printf(_T("&%d %s"), i+1, m_fileHistory[i]); + buf.Printf(s_MRUEntryFormat, i+1, m_fileHistory[i]); menu->Append(wxID_FILE1+i, buf); } } @@ -1928,7 +2026,7 @@ void wxFileHistory::AddFilesToMenu(wxMenu* menu) if (m_fileHistory[i]) { wxString buf; - buf.Printf(_T("&%d %s"), i+1, m_fileHistory[i]); + buf.Printf(s_MRUEntryFormat, i+1, m_fileHistory[i]); menu->Append(wxID_FILE1+i, buf); } } @@ -1940,6 +2038,7 @@ void wxFileHistory::AddFilesToMenu(wxMenu* menu) // manipulate files directly // ---------------------------------------------------------------------------- +#if wxUSE_STD_IOSTREAM bool wxTransferFileToStream(const wxString& filename, ostream& stream) { FILE *fd1; @@ -1974,6 +2073,7 @@ bool wxTransferStreamToFile(istream& stream, const wxString& filename) fclose (fd1); return TRUE; } +#endif #endif // wxUSE_DOC_VIEW_ARCHITECTURE