X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f33396842a7bdecef5c1de6f80b145a096bbeabc..ae77fce66c3061534832af3eec7e636723859121:/src/common/docview.cpp diff --git a/src/common/docview.cpp b/src/common/docview.cpp index 056ca6f48e..5f8f896791 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 @@ -39,39 +35,47 @@ #include "wx/utils.h" #include "wx/app.h" #include "wx/dc.h" -#include "wx/dialog.h" + #include "wx/dialog.h" #include "wx/menu.h" #include "wx/list.h" #include "wx/filedlg.h" - #include + #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/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 // ---------------------------------------------------------------------------- // wxWindows macros // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_ABSTRACT_CLASS(wxDocument, wxEvtHandler) IMPLEMENT_ABSTRACT_CLASS(wxView, wxEvtHandler) IMPLEMENT_ABSTRACT_CLASS(wxDocTemplate, wxObject) @@ -86,7 +90,6 @@ IMPLEMENT_CLASS(wxCommand, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxCommandProcessor, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxFileHistory, wxObject) -#endif // ---------------------------------------------------------------------------- // function prototypes @@ -94,6 +97,12 @@ static inline wxString FindExtension(const wxChar *path); +// ---------------------------------------------------------------------------- +// local constants +// ---------------------------------------------------------------------------- + +static const wxChar *s_MRUEntryFormat = wxT("&%d %s"); + // ============================================================================ // implementation // ============================================================================ @@ -178,14 +187,14 @@ bool wxDocument::DeleteAllViews() return TRUE; } -wxView *wxDocument::GetFirstView(void) const +wxView *wxDocument::GetFirstView() const { if (m_documentViews.Number() == 0) return (wxView *) NULL; return (wxView *)m_documentViews.First()->Data(); } -wxDocManager *wxDocument::GetDocumentManager(void) const +wxDocManager *wxDocument::GetDocumentManager() const { return m_documentTemplate->GetDocumentManager(); } @@ -213,7 +222,7 @@ bool wxDocument::Save() bool ret = FALSE; if (!IsModified()) return TRUE; - if (m_documentFile == "" || !m_savedYet) + if (m_documentFile == wxT("") || !m_savedYet) ret = SaveAs(); else ret = OnSaveDocument(m_documentFile); @@ -240,12 +249,10 @@ bool wxDocument::SaveAs() return FALSE; wxString fileName(tmp); - wxString path(""); - wxString name(""); - wxString ext(""); + wxString path, name, ext; wxSplitPath(fileName, & path, & name, & ext); - if (ext.IsEmpty() || ext == "") + if (ext.IsEmpty() || ext == wxT("")) { fileName += "."; fileName += docTemplate->GetDefaultExtension(); @@ -274,20 +281,25 @@ bool wxDocument::OnSaveDocument(const wxString& file) return FALSE; wxString msgTitle; - if (wxTheApp->GetAppName() != "") + 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() != wxSTREAM_NOERROR) +#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()); @@ -305,19 +317,30 @@ bool wxDocument::OnOpenDocument(const wxString& file) return FALSE; wxString msgTitle; - if (wxTheApp->GetAppName() != "") + 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() != 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()); @@ -332,17 +355,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; } @@ -355,12 +382,12 @@ bool wxDocument::Revert() // Get title, or filename if no title, else unnamed bool wxDocument::GetPrintableName(wxString& buf) const { - if (m_documentTitle != "") + if (m_documentTitle != wxT("")) { buf = m_documentTitle; return TRUE; } - else if (m_documentFile != "") + else if (m_documentFile != wxT("")) { buf = wxFileNameFromPath(m_documentFile); return TRUE; @@ -372,7 +399,7 @@ bool wxDocument::GetPrintableName(wxString& buf) const } } -wxWindow *wxDocument::GetDocumentWindow(void) const +wxWindow *wxDocument::GetDocumentWindow() const { wxView *view = GetFirstView(); if (view) @@ -395,7 +422,7 @@ bool wxDocument::OnSaveModified() GetPrintableName(title); wxString msgTitle; - if (wxTheApp->GetAppName() != "") + if (wxTheApp->GetAppName() != wxT("")) msgTitle = wxTheApp->GetAppName(); else msgTitle = wxString(_("Warning")); @@ -499,13 +526,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); } @@ -576,7 +603,7 @@ wxPrintout *wxView::OnCreatePrintout() { return new wxDocPrintout(this); } -#endif +#endif // wxUSE_PRINTING_ARCHITECTURE // ---------------------------------------------------------------------------- // wxDocTemplate @@ -649,6 +676,13 @@ wxView *wxDocTemplate::CreateView(wxDocument *doc, long flags) } } +// The default (very primitive) format detection: check is the extension is +// that of the template +bool wxDocTemplate::FileMatchesTemplate(const wxString& path) +{ + return GetDefaultExtension().IsSameAs(FindExtension(path)); +} + // ---------------------------------------------------------------------------- // wxDocManager // ---------------------------------------------------------------------------- @@ -662,9 +696,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) @@ -780,6 +816,7 @@ void wxDocManager::OnFileSaveAs(wxCommandEvent& WXUNUSED(event)) void wxDocManager::OnPrint(wxCommandEvent& WXUNUSED(event)) { +#if wxUSE_PRINTING_ARCHITECTURE wxView *view = GetCurrentView(); if (!view) return; @@ -792,10 +829,12 @@ void wxDocManager::OnPrint(wxCommandEvent& WXUNUSED(event)) delete printout; } +#endif // wxUSE_PRINTING_ARCHITECTURE } void wxDocManager::OnPrintSetup(wxCommandEvent& WXUNUSED(event)) { +#if wxUSE_PRINTING_ARCHITECTURE wxWindow *parentWin = wxTheApp->GetTopWindow(); wxView *view = GetCurrentView(); if (view) @@ -803,13 +842,15 @@ 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)) { +#if wxUSE_PRINTING_ARCHITECTURE wxView *view = GetCurrentView(); if (!view) return; @@ -827,6 +868,7 @@ void wxDocManager::OnPreview(wxCommandEvent& WXUNUSED(event)) frame->Initialize(); frame->Show(TRUE); } +#endif // wxUSE_PRINTING_ARCHITECTURE } void wxDocManager::OnUndo(wxCommandEvent& WXUNUSED(event)) @@ -847,7 +889,7 @@ void wxDocManager::OnRedo(wxCommandEvent& WXUNUSED(event)) doc->GetCommandProcessor()->Redo(); } -wxView *wxDocManager::GetCurrentView(void) const +wxView *wxDocManager::GetCurrentView() const { if (m_currentView) return m_currentView; @@ -947,8 +989,8 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags) // Existing document wxDocTemplate *temp = (wxDocTemplate *) NULL; - wxString path2(""); - if (path != "") + wxString path2(wxT("")); + if (path != wxT("")) path2 = path; if (flags & wxDOC_SILENT) @@ -1034,7 +1076,7 @@ bool wxDocManager::FlushDoc(wxDocument *WXUNUSED(doc)) return FALSE; } -wxDocument *wxDocManager::GetCurrentDocument(void) const +wxDocument *wxDocManager::GetCurrentDocument() const { if (m_currentView) return m_currentView->GetDocument(); @@ -1064,6 +1106,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; @@ -1112,7 +1160,7 @@ void wxDocManager::FileHistoryAddFilesToMenu() m_fileHistory->AddFilesToMenu(); } -int wxDocManager::GetNoHistoryFiles(void) const +int wxDocManager::GetNoHistoryFiles() const { if (m_fileHistory) return m_fileHistory->GetNoHistoryFiles(); @@ -1121,24 +1169,18 @@ int wxDocManager::GetNoHistoryFiles(void) const } -// Given a path, try to find a matching template. Won't always work, of -// course. +// Find out the document template via matching in the document file format +// against that of the template wxDocTemplate *wxDocManager::FindTemplateForPath(const wxString& path) { - wxString theExt = FindExtension(path); - if (!theExt) - return (wxDocTemplate *) NULL; wxDocTemplate *theTemplate = (wxDocTemplate *) NULL; - if (m_templates.Number() == 1) - return (wxDocTemplate *)m_templates.First()->Data(); - // Find the template which this extension corresponds to int i; for (i = 0; i < m_templates.Number(); i++) { wxDocTemplate *temp = (wxDocTemplate *)m_templates.Nth(i)->Data(); - if (wxStrcmp(temp->GetDefaultExtension(), theExt) == 0) + if ( temp->FileMatchesTemplate(path) ) { theTemplate = temp; break; @@ -1153,13 +1195,17 @@ wxDocTemplate *wxDocManager::FindTemplateForPath(const wxString& path) // template extension. wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates, +#if defined(__WXMSW__) || defined(__WXGTK__) int noTemplates, +#else + int WXUNUSED(noTemplates), +#endif wxString& path, 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; @@ -1169,22 +1215,30 @@ 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 - wxString pathTmp = wxFileSelector(_("Select a file"), _T(""), _T(""), _T(""), - descrBuf, 0, wxTheApp->GetTopWindow()); + int FilterIndex = 0; + wxString pathTmp = wxFileSelectorEx(_("Select a file"), + m_lastDirectory, + wxT(""), + &FilterIndex, + descrBuf, + 0, + wxTheApp->GetTopWindow()); if (!pathTmp.IsEmpty()) { + m_lastDirectory = wxPathOnly(pathTmp); + path = pathTmp; wxString theExt = FindExtension(path); if (!theExt) @@ -1195,11 +1249,14 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates, // 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]; + return theTemplate; } else { - path = ""; + path = wxT(""); return (wxDocTemplate *) NULL; } #if 0 @@ -1210,7 +1267,7 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates, if (!temp) return (wxDocTemplate *) NULL; - char *pathTmp = wxFileSelector(_("Select a file"), "", "", + wxChar *pathTmp = wxFileSelector(_("Select a file"), wxT(""), wxT(""), temp->GetDefaultExtension(), temp->GetFileFilter(), 0, wxTheApp->GetTopWindow()); @@ -1236,7 +1293,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 ++; } @@ -1256,7 +1313,7 @@ wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates, } wxDocTemplate *theTemplate = (wxDocTemplate *)wxGetSingleChoiceData(_("Select a document template"), _("Templates"), n, - strings, data); + strings, (void **)data); delete[] strings; delete[] data; return theTemplate; @@ -1271,15 +1328,15 @@ wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates, int n = 0; for (i = 0; i < noTemplates; i++) { - if (templates[i]->IsVisible() && (templates[i]->GetViewName() != "")) + 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, (void **)data); delete[] strings; delete[] data; return theTemplate; @@ -1444,9 +1501,27 @@ void wxDocParentFrame::OnExit(wxCommandEvent& WXUNUSED(event)) void wxDocParentFrame::OnMRUFile(wxCommandEvent& event) { - wxString f(m_docManager->GetHistoryFile(event.GetSelection() - wxID_FILE1)); - if (f != "") - (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 @@ -1474,7 +1549,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; } @@ -1654,14 +1729,14 @@ bool wxCommandProcessor::Redo() return FALSE; } -bool wxCommandProcessor::CanUndo(void) const +bool wxCommandProcessor::CanUndo() const { if (m_currentCommand) return ((wxCommand *)m_currentCommand->Data())->CanUndo(); return FALSE; } -bool wxCommandProcessor::CanRedo(void) const +bool wxCommandProcessor::CanRedo() const { if ((m_currentCommand != (wxNode*) NULL) && (m_currentCommand->Next() == (wxNode*) NULL)) return FALSE; @@ -1690,7 +1765,7 @@ void wxCommandProcessor::SetMenuStrings() { wxCommand *command = (wxCommand *)m_currentCommand->Data(); wxString commandName(command->GetName()); - if (commandName == "") commandName = _("Unnamed command"); + if (commandName == wxT("")) commandName = _("Unnamed command"); bool canUndo = command->CanUndo(); if (canUndo) buf = wxString(_("&Undo ")) + commandName; @@ -1705,7 +1780,7 @@ void wxCommandProcessor::SetMenuStrings() { wxCommand *redoCommand = (wxCommand *)m_currentCommand->Next()->Data(); wxString redoCommandName(redoCommand->GetName()); - if (redoCommandName == "") 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); @@ -1732,7 +1807,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 == "") 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); @@ -1817,7 +1892,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) { @@ -1828,12 +1903,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) @@ -1852,14 +1986,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 != "")) + 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(); } @@ -1870,7 +2004,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])); } } @@ -1891,7 +2025,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); } } @@ -1911,7 +2045,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); } } @@ -1923,6 +2057,7 @@ void wxFileHistory::AddFilesToMenu(wxMenu* menu) // manipulate files directly // ---------------------------------------------------------------------------- +#if wxUSE_STD_IOSTREAM bool wxTransferFileToStream(const wxString& filename, ostream& stream) { FILE *fd1; @@ -1957,6 +2092,7 @@ bool wxTransferStreamToFile(istream& stream, const wxString& filename) fclose (fd1); return TRUE; } +#endif #endif // wxUSE_DOC_VIEW_ARCHITECTURE