X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a533f5c122c27b44a80b4eef2bd907a44bec8b70..1be06faf7318abf88a35b299b90ceb2a49c0353b:/src/common/docview.cpp diff --git a/src/common/docview.cpp b/src/common/docview.cpp index 3834c2a2e7..bcb467b60e 100644 --- a/src/common/docview.cpp +++ b/src/common/docview.cpp @@ -42,6 +42,7 @@ #include "wx/intl.h" #endif + #ifdef __WXGTK__ #include "wx/mdi.h" #endif @@ -55,6 +56,7 @@ #include "wx/choicdlg.h" #include "wx/docview.h" #include "wx/confbase.h" +#include "wx/file.h" #include #include @@ -74,7 +76,6 @@ // wxWindows macros // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_ABSTRACT_CLASS(wxDocument, wxEvtHandler) IMPLEMENT_ABSTRACT_CLASS(wxView, wxEvtHandler) IMPLEMENT_ABSTRACT_CLASS(wxDocTemplate, wxObject) @@ -89,7 +90,6 @@ IMPLEMENT_CLASS(wxCommand, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxCommandProcessor, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxFileHistory, wxObject) -#endif // ---------------------------------------------------------------------------- // function prototypes @@ -97,6 +97,12 @@ static inline wxString FindExtension(const wxChar *path); +// ---------------------------------------------------------------------------- +// local constants +// ---------------------------------------------------------------------------- + +static const wxChar *s_MRUEntryFormat = wxT("&%d %s"); + // ============================================================================ // implementation // ============================================================================ @@ -124,6 +130,7 @@ wxDocument::wxDocument(wxDocument *parent) m_documentModified = FALSE; m_documentParent = parent; m_documentTemplate = (wxDocTemplate *) NULL; + m_commandProcessor = (wxCommandProcessor*) NULL; m_savedYet = FALSE; } @@ -139,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, @@ -166,6 +174,8 @@ bool wxDocument::OnCloseDocument() // deleted. bool wxDocument::DeleteAllViews() { + wxDocManager* manager = GetDocumentManager(); + wxNode *node = m_documentViews.First(); while (node) { @@ -178,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; } @@ -190,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() @@ -216,7 +231,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); @@ -246,7 +261,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(); @@ -275,17 +290,17 @@ 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")); #if wxUSE_STD_IOSTREAM - ofstream store(file.fn_str()); + ofstream store(wxString(file.fn_str()).mb_str()); if (store.fail() || store.bad()) #else - wxFileOutputStream store(file.fn_str()); - if (store.LastError() == 0) + wxFileOutputStream store(wxString(file.fn_str())); + if (store.LastError() != wxSTREAM_NOERROR) #endif { (void)wxMessageBox(_("Sorry, could not open this file for saving."), msgTitle, wxOK | wxICON_EXCLAMATION, @@ -293,7 +308,7 @@ bool wxDocument::OnSaveDocument(const wxString& file) // Saving error return FALSE; } - if (SaveObject(store)==FALSE) + if (!SaveObject(store)) { (void)wxMessageBox(_("Sorry, could not save this file."), msgTitle, wxOK | wxICON_EXCLAMATION, GetDocumentWindow()); @@ -311,24 +326,30 @@ 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")); #if wxUSE_STD_IOSTREAM - ifstream store(file.fn_str()); + ifstream store(wxString(file.fn_str()).mb_str()); if (store.fail() || store.bad()) #else - wxFileInputStream store(file.fn_str()); - if (store.LastError() == 0) + wxFileInputStream store(wxString(file.fn_str())); + if (store.LastError() != wxSTREAM_NOERROR) #endif { (void)wxMessageBox(_("Sorry, could not open this file."), msgTitle, wxOK|wxICON_EXCLAMATION, GetDocumentWindow()); return FALSE; } - if (LoadObject(store)==FALSE) +#if wxUSE_STD_IOSTREAM + if (!LoadObject(store)) +#else + int res = LoadObject(store).LastError(); + if ((res != wxSTREAM_NOERROR) && + (res != wxSTREAM_EOF)) +#endif { (void)wxMessageBox(_("Sorry, could not open this file."), msgTitle, wxOK|wxICON_EXCLAMATION, GetDocumentWindow()); @@ -345,25 +366,21 @@ bool wxDocument::OnOpenDocument(const wxString& file) #if wxUSE_STD_IOSTREAM istream& wxDocument::LoadObject(istream& stream) +#else +wxInputStream& wxDocument::LoadObject(wxInputStream& stream) +#endif { return stream; } +#if wxUSE_STD_IOSTREAM ostream& wxDocument::SaveObject(ostream& stream) -{ - return stream; -} #else -bool wxDocument::LoadObject(wxInputStream& stream) -{ - return TRUE; -} - -bool wxDocument::SaveObject(wxOutputStream& stream) +wxOutputStream& wxDocument::SaveObject(wxOutputStream& stream) +#endif { - return TRUE; + return stream; } -#endif bool wxDocument::Revert() { @@ -374,12 +391,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; @@ -414,7 +431,7 @@ bool wxDocument::OnSaveModified() GetPrintableName(title); wxString msgTitle; - if (wxTheApp->GetAppName() != _T("")) + if (wxTheApp->GetAppName() != wxT("")) msgTitle = wxTheApp->GetAppName(); else msgTitle = wxString(_("Warning")); @@ -518,13 +535,13 @@ wxView::wxView() // SetDocument(doc); m_viewDocument = (wxDocument*) NULL; - m_viewTypeName = ""; + m_viewTypeName = wxT(""); m_viewFrame = (wxFrame *) NULL; } wxView::~wxView() { - GetDocumentManager()->ActivateView(this, FALSE, TRUE); +// GetDocumentManager()->ActivateView(this, FALSE, TRUE); m_viewDocument->RemoveView(this); } @@ -554,10 +571,11 @@ void wxView::OnChangeFilename() { if (GetFrame() && GetDocument()) { - wxString name; - GetDocument()->GetPrintableName(name); + wxString title; + + GetDocument()->GetPrintableName(title); - GetFrame()->SetTitle(name); + GetFrame()->SetTitle(title); } } @@ -646,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; } } @@ -688,13 +707,29 @@ BEGIN_EVENT_TABLE(wxDocManager, wxEvtHandler) EVT_MENU(wxID_SAVEAS, wxDocManager::OnFileSaveAs) EVT_MENU(wxID_UNDO, wxDocManager::OnUndo) EVT_MENU(wxID_REDO, wxDocManager::OnRedo) + + EVT_UPDATE_UI(wxID_OPEN, wxDocManager::OnUpdateFileOpen) + EVT_UPDATE_UI(wxID_CLOSE, wxDocManager::OnUpdateFileClose) + EVT_UPDATE_UI(wxID_REVERT, wxDocManager::OnUpdateFileRevert) + 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_UNDO, wxDocManager::OnUpdateUndo) + EVT_UPDATE_UI(wxID_REDO, wxDocManager::OnUpdateRedo) + #if wxUSE_PRINTING_ARCHITECTURE EVT_MENU(wxID_PRINT, wxDocManager::OnPrint) EVT_MENU(wxID_PRINT_SETUP, wxDocManager::OnPrintSetup) EVT_MENU(wxID_PREVIEW, wxDocManager::OnPreview) + + EVT_UPDATE_UI(wxID_PRINT, wxDocManager::OnUpdatePrint) + EVT_UPDATE_UI(wxID_PRINT_SETUP, wxDocManager::OnUpdatePrintSetup) + EVT_UPDATE_UI(wxID_PREVIEW, wxDocManager::OnUpdatePreview) #endif END_EVENT_TABLE() +wxDocManager* wxDocManager::sm_docManager = (wxDocManager*) NULL; + wxDocManager::wxDocManager(long flags, bool initialize) { m_defaultDocumentNameCounter = 1; @@ -704,6 +739,7 @@ wxDocManager::wxDocManager(long flags, bool initialize) m_fileHistory = (wxFileHistory *) NULL; if (initialize) Initialize(); + sm_docManager = this; } wxDocManager::~wxDocManager() @@ -711,6 +747,7 @@ wxDocManager::~wxDocManager() Clear(); if (m_fileHistory) delete m_fileHistory; + sm_docManager = (wxDocManager*) NULL; } bool wxDocManager::Clear(bool force) @@ -779,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)) @@ -834,7 +874,7 @@ 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 @@ -881,6 +921,71 @@ void wxDocManager::OnRedo(wxCommandEvent& WXUNUSED(event)) doc->GetCommandProcessor()->Redo(); } +// Handlers for UI update commands + +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) +{ + wxDocument *doc = GetCurrentDocument(); + event.Enable( (doc != (wxDocument*) NULL) ); +} + +void wxDocManager::OnUpdateFileNew(wxUpdateUIEvent& event) +{ + event.Enable( TRUE ); +} + +void wxDocManager::OnUpdateFileSave(wxUpdateUIEvent& event) +{ + wxDocument *doc = GetCurrentDocument(); + event.Enable( (doc != (wxDocument*) NULL) ); +} + +void wxDocManager::OnUpdateFileSaveAs(wxUpdateUIEvent& event) +{ + wxDocument *doc = GetCurrentDocument(); + event.Enable( (doc != (wxDocument*) NULL) ); +} + +void wxDocManager::OnUpdateUndo(wxUpdateUIEvent& event) +{ + wxDocument *doc = GetCurrentDocument(); + event.Enable( (doc && doc->GetCommandProcessor() && doc->GetCommandProcessor()->CanUndo()) ); +} + +void wxDocManager::OnUpdateRedo(wxUpdateUIEvent& event) +{ + wxDocument *doc = GetCurrentDocument(); + event.Enable( (doc && doc->GetCommandProcessor() && doc->GetCommandProcessor()->CanRedo()) ); +} + +void wxDocManager::OnUpdatePrint(wxUpdateUIEvent& event) +{ + wxDocument *doc = GetCurrentDocument(); + event.Enable( (doc != (wxDocument*) NULL) ); +} + +void wxDocManager::OnUpdatePrintSetup(wxUpdateUIEvent& event) +{ + event.Enable( TRUE ); +} + +void wxDocManager::OnUpdatePreview(wxUpdateUIEvent& event) +{ + wxDocument *doc = GetCurrentDocument(); + event.Enable( (doc != (wxDocument*) NULL) ); +} + wxView *wxDocManager::GetCurrentView() const { if (m_currentView) @@ -981,8 +1086,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) @@ -1001,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) @@ -1085,6 +1191,24 @@ bool wxDocManager::MakeDefaultName(wxString& name) return TRUE; } +// 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 title; + if (!doc) + title = appName; + else + { + wxString docName; + doc->GetPrintableName(docName); + title = docName + wxString(_(" - ")) + appName; + } + return title; +} + + // Not yet implemented wxDocTemplate *wxDocManager::MatchTemplate(const wxString& WXUNUSED(path)) { @@ -1098,6 +1222,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; @@ -1175,13 +1305,35 @@ 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 // template extension. wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates, -#ifdef __WXMSW__ +#if defined(__WXMSW__) || defined(__WXGTK__) int noTemplates, #else int WXUNUSED(noTemplates), @@ -1190,8 +1342,8 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates, long WXUNUSED(flags), bool WXUNUSED(save)) { - // We can only have multiple filters in Windows -#ifdef __WXMSW__ + // We can only have multiple filters in Windows and GTK +#if defined(__WXMSW__) || defined(__WXGTK__) wxString descrBuf; int i; @@ -1201,48 +1353,64 @@ 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; + int FilterIndex = -1; + + wxWindow* parent = wxFindSuitableParent(); + wxString pathTmp = wxFileSelectorEx(_("Select a file"), - _T(""), - _T(""), + m_lastDirectory, + wxT(""), &FilterIndex, descrBuf, 0, - wxTheApp->GetTopWindow()); + parent); + wxDocTemplate *theTemplate = (wxDocTemplate *)NULL; if (!pathTmp.IsEmpty()) { - path = pathTmp; - wxString theExt = FindExtension(path); - if (!theExt) + 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); - // 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 ) - theTemplate = templates[FilterIndex]; + path = pathTmp; - return 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]; + if ( !theTemplate ) + theTemplate = FindTemplateForPath(path); } else { - path = _T(""); - return (wxDocTemplate *) NULL; + path = wxT(""); } + + 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 @@ -1251,7 +1419,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()); @@ -1277,7 +1445,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 ++; } @@ -1296,8 +1464,10 @@ wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates, return temp; } + wxWindow* parent = wxFindSuitableParent(); + wxDocTemplate *theTemplate = (wxDocTemplate *)wxGetSingleChoiceData(_("Select a document template"), _("Templates"), n, - strings, data); + strings, (void **)data, parent); delete[] strings; delete[] data; return theTemplate; @@ -1312,15 +1482,17 @@ 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 ++; } } + wxWindow* parent = wxFindSuitableParent(); + wxDocTemplate *theTemplate = (wxDocTemplate *)wxGetSingleChoiceData(_("Select a document view"), _("Views"), n, - strings, data); + strings, (void **)data, parent); delete[] strings; delete[] data; return theTemplate; @@ -1485,9 +1657,26 @@ 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.\nIt has been also removed from the MRU files list."), + filename.c_str()); + } + } } // Extend event processing to search the view's event table @@ -1515,7 +1704,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; } @@ -1731,7 +1920,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; @@ -1746,7 +1935,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); @@ -1773,7 +1962,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); @@ -1858,7 +2047,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) { @@ -1869,12 +2058,71 @@ 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(); + + // 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); + } + + node = node->Next(); + + // delete the last menu item which is unused now + menu->Delete(wxID_FILE1 + m_fileHistoryN - 1); + + // delete the last separator too if no more files are left + if ( m_fileHistoryN == 1 ) + { + wxMenuItemList::Node *node = menu->GetMenuItems().GetLast(); + if ( node ) + { + wxMenuItem *menuItem = node->GetData(); + if ( menuItem->IsSeparator() ) + { + menu->Delete(menuItem); + } + //else: should we search backwards for the last separator? + } + //else: menu is empty somehow + } + } + + m_fileHistoryN--; +} + wxString wxFileHistory::GetHistoryFile(int i) const { - if (i < m_fileHistoryN) - return wxString(m_fileHistory[i]); + wxString s; + if ( i < m_fileHistoryN ) + { + s = m_fileHistory[i]; + } else - return wxString(""); + { + wxFAIL_MSG( wxT("bad index in wxFileHistory::GetHistoryFile") ); + } + + return s; } void wxFileHistory::UseMenu(wxMenu *menu) @@ -1893,14 +2141,14 @@ 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); - historyFile = ""; + buf.Printf(wxT("file%d"), m_fileHistoryN+1); + historyFile = wxT(""); } AddFilesToMenu(); } @@ -1911,7 +2159,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])); } } @@ -1932,7 +2180,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); } } @@ -1952,7 +2200,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); } } @@ -1970,7 +2218,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) @@ -1985,7 +2233,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; } @@ -1999,6 +2247,42 @@ bool wxTransferStreamToFile(istream& stream, const wxString& filename) fclose (fd1); return TRUE; } +#else +bool wxTransferFileToStream(const wxString& filename, wxOutputStream& stream) +{ + FILE *fd1; + int ch; + + if ((fd1 = wxFopen (filename, wxT("rb"))) == NULL) + return FALSE; + + while ((ch = getc (fd1)) != EOF) + stream.PutC((char) ch); + + fclose (fd1); + return TRUE; +} + +bool wxTransferStreamToFile(wxInputStream& stream, const wxString& filename) +{ + FILE *fd1; + char ch; + + if ((fd1 = wxFopen (filename, wxT("wb"))) == NULL) + { + return FALSE; + } + + int len = stream.StreamSize(); + // TODO: is this the correct test for EOF? + while (stream.TellI() < (len - 1)) + { + ch = stream.GetC(); + putc (ch, fd1); + } + fclose (fd1); + return TRUE; +} #endif #endif // wxUSE_DOC_VIEW_ARCHITECTURE