X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bd365871aadca528e03f3b6bb8382a1fdf5f1817..f672c969519f7565cd80f85adeca5a6efdace8f5:/src/common/docview.cpp diff --git a/src/common/docview.cpp b/src/common/docview.cpp index 11f9b7b673..162a175517 100644 --- a/src/common/docview.cpp +++ b/src/common/docview.cpp @@ -56,8 +56,11 @@ #include "wx/cmdproc.h" #include "wx/tokenzr.h" #include "wx/filename.h" +#include "wx/stdpaths.h" #include "wx/vector.h" -#include "wx/ptr_scpd.h" +#include "wx/scopedarray.h" +#include "wx/scopedptr.h" +#include "wx/except.h" #if wxUSE_STD_IOSTREAM #include "wx/ioswrap.h" @@ -89,8 +92,6 @@ IMPLEMENT_CLASS(wxDocParentFrame, wxFrame) IMPLEMENT_DYNAMIC_CLASS(wxDocPrintout, wxPrintout) #endif -IMPLEMENT_DYNAMIC_CLASS(wxFileHistory, wxObject) - // ============================================================================ // implementation // ============================================================================ @@ -102,13 +103,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxFileHistory, wxObject) namespace { -wxWindow *wxFindSuitableParent() -{ - wxWindow * const win = wxGetTopLevelParent(wxWindow::FindFocus()); - - return win ? win : wxTheApp->GetTopWindow(); -} - wxString FindExtension(const wxString& path) { wxString ext; @@ -119,18 +113,6 @@ wxString FindExtension(const wxString& path) return ext.MakeLower(); } -// return the string used for the MRU list items in the menu -// -// NB: the index n is 0-based, as usual, but the strings start from 1 -wxString GetMRUEntryLabel(int n, const wxString& path) -{ - // we need to quote '&' characters which are used for mnemonics - wxString pathInMenu(path); - pathInMenu.Replace("&", "&&"); - - return wxString::Format("&%d %s", n + 1, pathInMenu); -} - } // anonymous namespace // ---------------------------------------------------------------------------- @@ -153,10 +135,7 @@ bool wxDocument::DeleteContents() wxDocument::~wxDocument() { - DeleteContents(); - - if (m_commandProcessor) - delete m_commandProcessor; + delete m_commandProcessor; if (GetDocumentManager()) GetDocumentManager()->RemoveDocument(this); @@ -169,10 +148,10 @@ wxDocument::~wxDocument() bool wxDocument::Close() { - if (OnSaveModified()) - return OnCloseDocument(); - else + if ( !OnSaveModified() ) return false; + + return OnCloseDocument(); } bool wxDocument::OnCloseDocument() @@ -232,9 +211,22 @@ bool wxDocument::DeleteAllViews() wxView *wxDocument::GetFirstView() const { - if (m_documentViews.GetCount() == 0) + if ( m_documentViews.empty() ) return NULL; - return (wxView *)m_documentViews.GetFirst()->GetData(); + + return static_cast(m_documentViews.GetFirst()->GetData()); +} + +void wxDocument::Modify(bool mod) +{ + if (mod != m_documentModified) + { + m_documentModified = mod; + + // Allow views to append asterix to the title + wxView* view = GetFirstView(); + if (view) view->OnChangeFilename(); + } } wxDocManager *wxDocument::GetDocumentManager() const @@ -244,11 +236,13 @@ wxDocManager *wxDocument::GetDocumentManager() const bool wxDocument::OnNewDocument() { - if ( !OnSaveModified() ) - return false; + // notice that there is no need to neither reset nor even check the + // modified flag here as the document itself is a new object (this is only + // called from CreateDocument()) and so it shouldn't be saved anyhow even + // if it is modified -- this could happen if the user code creates + // documents pre-filled with some user-entered (and which hence must not be + // lost) information - DeleteContents(); - Modify(false); SetDocumentSaved(false); const wxString name = GetDocumentManager()->MakeNewDocumentName(); @@ -275,15 +269,17 @@ bool wxDocument::SaveAs() if (!docTemplate) return false; -#if defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXMAC__) - wxString filter = docTemplate->GetDescription() + wxT(" (") + docTemplate->GetFileFilter() + wxT(")|") + docTemplate->GetFileFilter(); +#ifdef wxHAS_MULTIPLE_FILEDLG_FILTERS + wxString filter = docTemplate->GetDescription() + wxT(" (") + + docTemplate->GetFileFilter() + wxT(")|") + + docTemplate->GetFileFilter(); // Now see if there are some other template with identical view and document // classes, whose filters may also be used. - if (docTemplate->GetViewClassInfo() && docTemplate->GetDocClassInfo()) { - wxList::compatibility_iterator node = docTemplate->GetDocumentManager()->GetTemplates().GetFirst(); + wxList::compatibility_iterator + node = docTemplate->GetDocumentManager()->GetTemplates().GetFirst(); while (node) { wxDocTemplate *t = (wxDocTemplate*) node->GetData(); @@ -296,7 +292,8 @@ bool wxDocument::SaveAs() if ( !filter.empty() ) filter << wxT('|'); - filter << t->GetDescription() << wxT(" (") << t->GetFileFilter() << wxT(") |") + filter << t->GetDescription() + << wxT(" (") << t->GetFileFilter() << wxT(") |") << t->GetFileFilter(); } @@ -306,11 +303,16 @@ bool wxDocument::SaveAs() #else wxString filter = docTemplate->GetFileFilter() ; #endif + wxString defaultDir = docTemplate->GetDirectory(); - if (defaultDir.IsEmpty()) + if ( defaultDir.empty() ) + { defaultDir = wxPathOnly(GetFilename()); + if ( defaultDir.empty() ) + defaultDir = GetDocumentManager()->GetLastDirectory(); + } - wxString tmp = wxFileSelector(_("Save As"), + wxString fileName = wxFileSelector(_("Save As"), defaultDir, wxFileNameFromPath(GetFilename()), docTemplate->GetDefaultExtension(), @@ -318,47 +320,26 @@ bool wxDocument::SaveAs() wxFD_SAVE | wxFD_OVERWRITE_PROMPT, GetDocumentWindow()); - if (tmp.empty()) - return false; - - wxString fileName(tmp); - wxString path, name, ext; - wxFileName::SplitPath(fileName, & path, & name, & ext); + if (fileName.empty()) + return false; // cancelled by user - if (ext.empty()) - { - fileName += wxT("."); - fileName += docTemplate->GetDefaultExtension(); - } + // Files that were not saved correctly are not added to the FileHistory. + if (!OnSaveDocument(fileName)) + return false; - SetFilename(fileName); SetTitle(wxFileNameFromPath(fileName)); + SetFilename(fileName, true); // will call OnChangeFileName automatically - // Notify the views that the filename has changed - wxList::compatibility_iterator node = m_documentViews.GetFirst(); - while (node) + // A file that doesn't use the default extension of its document template + // cannot be opened via the FileHistory, so we do not add it. + if (docTemplate->FileMatchesTemplate(fileName)) { - wxView *view = (wxView *)node->GetData(); - view->OnChangeFilename(); - node = node->GetNext(); + GetDocumentManager()->AddFileToHistory(fileName); } + //else: the user will probably not be able to open the file again, so we + // could warn about the wrong file-extension here - // Files that were not saved correctly are not added to the FileHistory. - if (!OnSaveDocument(m_documentFile)) - return false; - - // A file that doesn't use the default extension of its document template cannot be opened - // via the FileHistory, so we do not add it. - if (docTemplate->FileMatchesTemplate(fileName)) - { - GetDocumentManager()->AddFileToHistory(fileName); - } - else - { - // The user will probably not be able to open the file again, so - // we could warn about the wrong file-extension here. - } - return true; + return true; } bool wxDocument::OnSaveDocument(const wxString& file) @@ -381,15 +362,20 @@ bool wxDocument::OnSaveDocument(const wxString& file) bool wxDocument::OnOpenDocument(const wxString& file) { - if ( !OnSaveModified() ) - return false; + // notice that there is no need to check the modified flag here for the + // reasons explained in OnNewDocument() if ( !DoOpenDocument(file) ) return false; SetFilename(file, true); - Modify(false); - m_savedYet = true; + + // stretching the logic a little this does make sense because the document + // had been saved into the file we just loaded it from, it just could have + // happened during a previous program execution, it's just that the name of + // this method is a bit unfortunate, it should probably have been called + // HasAssociatedFileName() + SetDocumentSaved(true); UpdateAllViews(); @@ -416,7 +402,22 @@ wxOutputStream& wxDocument::SaveObject(wxOutputStream& stream) bool wxDocument::Revert() { - return false; + if ( wxMessageBox + ( + _("Discard changes and reload the last saved version?"), + wxTheApp->GetAppDisplayName(), + wxYES_NO | wxCANCEL | wxICON_QUESTION, + GetDocumentWindow() + ) != wxYES ) + return false; + + if ( !DoOpenDocument(GetFilename()) ) + return false; + + Modify(false); + UpdateAllViews(); + + return true; } @@ -460,11 +461,9 @@ wxString wxDocument::DoGetUserReadableName() const wxWindow *wxDocument::GetDocumentWindow() const { - wxView *view = GetFirstView(); - if (view) - return view->GetFrame(); - else - return wxTheApp->GetTopWindow(); + wxView * const view = GetFirstView(); + + return view ? view->GetFrame() : wxTheApp->GetTopWindow(); } wxCommandProcessor *wxDocument::OnCreateCommandProcessor() @@ -481,12 +480,11 @@ bool wxDocument::OnSaveModified() ( wxString::Format ( - _("Do you want to save changes to document %s?"), + _("Do you want to save changes to %s?"), GetUserReadableName() ), wxTheApp->GetAppDisplayName(), - wxYES_NO | wxCANCEL | wxICON_QUESTION, - GetDocumentWindow() + wxYES_NO | wxCANCEL | wxICON_QUESTION | wxCENTRE ) ) { case wxNO: @@ -566,6 +564,11 @@ void wxDocument::NotifyClosing() void wxDocument::SetFilename(const wxString& filename, bool notifyViews) { m_documentFile = filename; + OnChangeFilename(notifyViews); +} + +void wxDocument::OnChangeFilename(bool notifyViews) +{ if ( notifyViews ) { // Notify the views that the filename has changed @@ -609,7 +612,7 @@ bool wxDocument::DoOpenDocument(const wxString& file) if ( !store ) #else wxFileInputStream store(file); - if (store.GetLastError() != wxSTREAM_NO_ERROR) + if (store.GetLastError() != wxSTREAM_NO_ERROR || !store.IsOk()) #endif { wxLogError(_("File \"%s\" could not be opened for reading."), file); @@ -641,21 +644,55 @@ wxView::wxView() m_viewDocument = NULL; m_viewFrame = NULL; + + m_docChildFrame = NULL; } wxView::~wxView() { - GetDocumentManager()->ActivateView(this, false); - m_viewDocument->RemoveView(this); + if (m_viewDocument && GetDocumentManager()) + GetDocumentManager()->ActivateView(this, false); + + // reset our frame view first, before removing it from the document as + // SetView(NULL) is a simple call while RemoveView() may result in user + // code being executed and this user code can, for example, show a message + // box which would result in an activation event for m_docChildFrame and so + // could reactivate the view being destroyed -- unless we reset it first + if ( m_docChildFrame && m_docChildFrame->GetView() == this ) + { + // prevent it from doing anything with us + m_docChildFrame->SetView(NULL); + + // it doesn't make sense to leave the frame alive if its associated + // view doesn't exist any more so unconditionally close it as well + // + // notice that we only get here if m_docChildFrame is non-NULL in the + // first place and it will be always NULL if we're deleted because our + // frame was closed, so this only catches the case of directly deleting + // the view, as it happens if its creation fails in wxDocTemplate:: + // CreateView() for example + m_docChildFrame->GetWindow()->Destroy(); + } + + if ( m_viewDocument ) + m_viewDocument->RemoveView(this); +} + +void wxView::SetDocChildFrame(wxDocChildFrameAnyBase *docChildFrame) +{ + SetFrame(docChildFrame ? docChildFrame->GetWindow() : NULL); + m_docChildFrame = docChildFrame; } -bool wxView::TryValidator(wxEvent& event) +bool wxView::TryBefore(wxEvent& event) { wxDocument * const doc = GetDocument(); - return doc && doc->ProcessEventHere(event); + return doc && doc->ProcessEventLocally(event); } -void wxView::OnActivateView(bool WXUNUSED(activate), wxView *WXUNUSED(activeView), wxView *WXUNUSED(deactiveView)) +void wxView::OnActivateView(bool WXUNUSED(activate), + wxView *WXUNUSED(activeView), + wxView *WXUNUSED(deactiveView)) { } @@ -679,7 +716,12 @@ void wxView::OnChangeFilename() wxDocument *doc = GetDocument(); if (!doc) return; - win->SetLabel(doc->GetUserReadableName()); + wxString label = doc->GetUserReadableName(); + if (doc->IsModified()) + { + label += "*"; + } + win->SetLabel(label); } void wxView::SetDocument(wxDocument *doc) @@ -752,11 +794,15 @@ wxDocTemplate::~wxDocTemplate() // Tries to dynamically construct an object of the right class. wxDocument *wxDocTemplate::CreateDocument(const wxString& path, long flags) { + // InitDocument() is supposed to delete the document object if its + // initialization fails so don't use wxScopedPtr<> here: this is fragile + // but unavoidable because the default implementation uses CreateView() + // which may -- or not -- create a wxView and if it does create it and its + // initialization fails then the view destructor will delete the document + // (via RemoveView()) and as we can't distinguish between the two cases we + // just have to assume that it always deletes it in case of failure wxDocument * const doc = DoCreateDocument(); - // VZ: this code doesn't delete doc if InitDocument() (i.e. doc->OnCreate()) - // fails, is this intentional? - return doc && InitDocument(doc, path, flags) ? doc : NULL; } @@ -770,12 +816,10 @@ wxDocTemplate::InitDocument(wxDocument* doc, const wxString& path, long flags) if (doc->OnCreate(path, flags)) return true; - else - { - if (GetDocumentManager()->GetDocuments().Member(doc)) - doc->DeleteAllViews(); - return false; - } + + if (GetDocumentManager()->GetDocuments().Member(doc)) + doc->DeleteAllViews(); + return false; } wxView *wxDocTemplate::CreateView(wxDocument *doc, long flags) @@ -814,7 +858,7 @@ wxDocument *wxDocTemplate::DoCreateDocument() if (!m_docClassInfo) return NULL; - return (wxDocument *)m_docClassInfo->CreateObject(); + return static_cast(m_docClassInfo->CreateObject()); } wxView *wxDocTemplate::DoCreateView() @@ -822,7 +866,7 @@ wxView *wxDocTemplate::DoCreateView() if (!m_viewClassInfo) return NULL; - return (wxView *)m_viewClassInfo->CreateObject(); + return static_cast(m_viewClassInfo->CreateObject()); } // ---------------------------------------------------------------------------- @@ -840,10 +884,15 @@ BEGIN_EVENT_TABLE(wxDocManager, wxEvtHandler) EVT_MENU(wxID_UNDO, wxDocManager::OnUndo) EVT_MENU(wxID_REDO, wxDocManager::OnRedo) + // We don't know in advance how many items can there be in the MRU files + // list so set up OnMRUFile() as a handler for all menu events and do the + // check for the id of the menu item clicked inside it. + EVT_MENU(wxID_ANY, wxDocManager::OnMRUFile) + EVT_UPDATE_UI(wxID_OPEN, wxDocManager::OnUpdateFileOpen) EVT_UPDATE_UI(wxID_CLOSE, wxDocManager::OnUpdateDisableIfNoDoc) EVT_UPDATE_UI(wxID_CLOSE_ALL, wxDocManager::OnUpdateDisableIfNoDoc) - EVT_UPDATE_UI(wxID_REVERT, wxDocManager::OnUpdateDisableIfNoDoc) + 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::OnUpdateDisableIfNoDoc) @@ -853,18 +902,19 @@ BEGIN_EVENT_TABLE(wxDocManager, wxEvtHandler) #if wxUSE_PRINTING_ARCHITECTURE EVT_MENU(wxID_PRINT, wxDocManager::OnPrint) EVT_MENU(wxID_PREVIEW, wxDocManager::OnPreview) + EVT_MENU(wxID_PRINT_SETUP, wxDocManager::OnPageSetup) EVT_UPDATE_UI(wxID_PRINT, wxDocManager::OnUpdateDisableIfNoDoc) EVT_UPDATE_UI(wxID_PREVIEW, wxDocManager::OnUpdateDisableIfNoDoc) -#endif + // NB: we keep "Print setup" menu item always enabled as it can be used + // even without an active document +#endif // wxUSE_PRINTING_ARCHITECTURE END_EVENT_TABLE() wxDocManager* wxDocManager::sm_docManager = NULL; wxDocManager::wxDocManager(long WXUNUSED(flags), bool initialize) { - wxASSERT_MSG( !sm_docManager, "multiple wxDocManagers not allowed" ); - sm_docManager = this; m_defaultDocumentNameCounter = 1; @@ -885,19 +935,18 @@ wxDocManager::~wxDocManager() // closes the specified document bool wxDocManager::CloseDocument(wxDocument* doc, bool force) { - if (doc->Close() || force) - { - // Implicitly deletes the document when - // the last view is deleted - doc->DeleteAllViews(); + if ( !doc->Close() && !force ) + return false; - // Check we're really deleted - if (m_docs.Member(doc)) - delete doc; + // Implicitly deletes the document when + // the last view is deleted + doc->DeleteAllViews(); - return true; - } - return false; + // Check we're really deleted + if (m_docs.Member(doc)) + delete doc; + + return true; } bool wxDocManager::CloseDocuments(bool force) @@ -943,6 +992,42 @@ bool wxDocManager::Initialize() return true; } +wxString wxDocManager::GetLastDirectory() const +{ + // if we haven't determined the last used directory yet, do it now + if ( m_lastDirectory.empty() ) + { + // we're going to modify m_lastDirectory in this const method, so do it + // via non-const self pointer instead of const this one + wxDocManager * const self = const_cast(this); + + // first try to reuse the directory of the most recently opened file: + // this ensures that if the user opens a file, closes the program and + // runs it again the "Open file" dialog will open in the directory of + // the last file he used + if ( m_fileHistory && m_fileHistory->GetCount() ) + { + const wxString lastOpened = m_fileHistory->GetHistoryFile(0); + const wxFileName fn(lastOpened); + if ( fn.DirExists() ) + { + self->m_lastDirectory = fn.GetPath(); + } + //else: should we try the next one? + } + //else: no history yet + + // if we don't have any files in the history (yet?), use the + // system-dependent default location for the document files + if ( m_lastDirectory.empty() ) + { + self->m_lastDirectory = wxStandardPaths::Get().GetAppDocumentsDir(); + } + } + + return m_lastDirectory; +} + wxFileHistory *wxDocManager::OnCreateFileHistory() { return new wxFileHistory; @@ -951,14 +1036,8 @@ wxFileHistory *wxDocManager::OnCreateFileHistory() void wxDocManager::OnFileClose(wxCommandEvent& WXUNUSED(event)) { wxDocument *doc = GetCurrentDocument(); - if (!doc) - return; - if (doc->Close()) - { - doc->DeleteAllViews(); - if (m_docs.Member(doc)) - delete doc; - } + if (doc) + CloseDocument(doc); } void wxDocManager::OnFileCloseAll(wxCommandEvent& WXUNUSED(event)) @@ -973,7 +1052,7 @@ void wxDocManager::OnFileNew(wxCommandEvent& WXUNUSED(event)) void wxDocManager::OnFileOpen(wxCommandEvent& WXUNUSED(event)) { - if ( !CreateDocument( wxEmptyString, 0) ) + if ( !CreateDocument("") ) { OnOpenFileFailure(); } @@ -1003,79 +1082,155 @@ void wxDocManager::OnFileSaveAs(wxCommandEvent& WXUNUSED(event)) doc->SaveAs(); } -void wxDocManager::OnPrint(wxCommandEvent& WXUNUSED(event)) +void wxDocManager::OnMRUFile(wxCommandEvent& event) { + // Check if the id is in the range assigned to MRU list entries. + const int id = event.GetId(); + if ( id >= wxID_FILE1 && + id < wxID_FILE1 + static_cast(m_fileHistory->GetCount()) ) + { + DoOpenMRUFile(id - wxID_FILE1); + } + else + { + event.Skip(); + } +} + +void wxDocManager::DoOpenMRUFile(unsigned n) +{ + wxString filename(GetHistoryFile(n)); + if ( filename.empty() ) + return; + + wxString errMsg; // must contain exactly one "%s" if non-empty + if ( wxFile::Exists(filename) ) + { + // try to open it + if ( CreateDocument(filename, wxDOC_SILENT) ) + return; + + errMsg = _("The file '%s' couldn't be opened."); + } + else // file doesn't exist + { + errMsg = _("The file '%s' doesn't exist and couldn't be opened."); + } + + + wxASSERT_MSG( !errMsg.empty(), "should have an error message" ); + + // remove the file which we can't open from the MRU list + RemoveFileFromHistory(n); + + // and tell the user about it + wxLogError(errMsg + '\n' + + _("It has been removed from the most recently used files list."), + filename); +} + #if wxUSE_PRINTING_ARCHITECTURE - wxView *view = GetCurrentView(); + +void wxDocManager::OnPrint(wxCommandEvent& WXUNUSED(event)) +{ + wxView *view = GetActiveView(); if (!view) return; wxPrintout *printout = view->OnCreatePrintout(); if (printout) { - wxPrinter printer; + wxPrintDialogData printDialogData(m_pageSetupDialogData.GetPrintData()); + wxPrinter printer(&printDialogData); printer.Print(view->GetFrame(), printout, true); delete printout; } -#endif // wxUSE_PRINTING_ARCHITECTURE +} + +void wxDocManager::OnPageSetup(wxCommandEvent& WXUNUSED(event)) +{ + wxPageSetupDialog dlg(wxTheApp->GetTopWindow(), &m_pageSetupDialogData); + if ( dlg.ShowModal() == wxID_OK ) + { + m_pageSetupDialogData = dlg.GetPageSetupData(); + } +} + +wxPreviewFrame* wxDocManager::CreatePreviewFrame(wxPrintPreviewBase* preview, + wxWindow *parent, + const wxString& title) +{ + return new wxPreviewFrame(preview, parent, title); } void wxDocManager::OnPreview(wxCommandEvent& WXUNUSED(event)) { -#if wxUSE_PRINTING_ARCHITECTURE - wxView *view = GetCurrentView(); + wxBusyCursor busy; + wxView *view = GetActiveView(); if (!view) return; wxPrintout *printout = view->OnCreatePrintout(); if (printout) { + wxPrintDialogData printDialogData(m_pageSetupDialogData.GetPrintData()); + // Pass two printout objects: for preview, and possible printing. - wxPrintPreviewBase *preview = new wxPrintPreview(printout, view->OnCreatePrintout()); + wxPrintPreviewBase * + preview = new wxPrintPreview(printout, + view->OnCreatePrintout(), + &printDialogData); if ( !preview->Ok() ) { delete preview; - wxMessageBox( _("Sorry, print preview needs a printer to be installed.") ); + wxLogError(_("Print preview creation failed.")); return; } - wxPreviewFrame *frame = new wxPreviewFrame(preview, (wxFrame *)wxTheApp->GetTopWindow(), _("Print Preview"), - wxPoint(100, 100), wxSize(600, 650)); + wxPreviewFrame* frame = CreatePreviewFrame(preview, + wxTheApp->GetTopWindow(), + _("Print Preview")); + wxCHECK_RET( frame, "should create a print preview frame" ); + frame->Centre(wxBOTH); frame->Initialize(); frame->Show(true); } -#endif // wxUSE_PRINTING_ARCHITECTURE } +#endif // wxUSE_PRINTING_ARCHITECTURE void wxDocManager::OnUndo(wxCommandEvent& event) { - wxDocument *doc = GetCurrentDocument(); - if (!doc) - return; - if (doc->GetCommandProcessor()) - doc->GetCommandProcessor()->Undo(); - else + wxCommandProcessor * const cmdproc = GetCurrentCommandProcessor(); + if ( !cmdproc ) + { event.Skip(); + return; + } + + cmdproc->Undo(); } void wxDocManager::OnRedo(wxCommandEvent& event) { - wxDocument *doc = GetCurrentDocument(); - if (!doc) - return; - if (doc->GetCommandProcessor()) - doc->GetCommandProcessor()->Redo(); - else + wxCommandProcessor * const cmdproc = GetCurrentCommandProcessor(); + if ( !cmdproc ) + { event.Skip(); + return; + } + + cmdproc->Redo(); } // Handlers for UI update commands void wxDocManager::OnUpdateFileOpen(wxUpdateUIEvent& event) { - event.Enable( true ); + // CreateDocument() (which is called from OnFileOpen) may succeed + // only when there is at least a template: + event.Enable( GetTemplates().GetCount()>0 ); } void wxDocManager::OnUpdateDisableIfNoDoc(wxUpdateUIEvent& event) @@ -1083,9 +1238,17 @@ void wxDocManager::OnUpdateDisableIfNoDoc(wxUpdateUIEvent& event) event.Enable( GetCurrentDocument() != NULL ); } +void wxDocManager::OnUpdateFileRevert(wxUpdateUIEvent& event) +{ + wxDocument* doc = GetCurrentDocument(); + event.Enable(doc && doc->IsModified() && doc->GetDocumentSaved()); +} + void wxDocManager::OnUpdateFileNew(wxUpdateUIEvent& event) { - event.Enable( true ); + // CreateDocument() (which is called from OnFileNew) may succeed + // only when there is at least a template: + event.Enable( GetTemplates().GetCount()>0 ); } void wxDocManager::OnUpdateFileSave(wxUpdateUIEvent& event) @@ -1096,48 +1259,58 @@ void wxDocManager::OnUpdateFileSave(wxUpdateUIEvent& event) void wxDocManager::OnUpdateUndo(wxUpdateUIEvent& event) { - wxDocument *doc = GetCurrentDocument(); - if (!doc) - event.Enable(false); - else if (!doc->GetCommandProcessor()) - event.Skip(); - else + wxCommandProcessor * const cmdproc = GetCurrentCommandProcessor(); + if ( !cmdproc ) { - event.Enable( doc->GetCommandProcessor()->CanUndo() ); - doc->GetCommandProcessor()->SetMenuStrings(); + event.Enable(false); + return; } + + event.Enable(cmdproc->CanUndo()); + cmdproc->SetMenuStrings(); } void wxDocManager::OnUpdateRedo(wxUpdateUIEvent& event) { - wxDocument *doc = GetCurrentDocument(); - if (!doc) - event.Enable(false); - else if (!doc->GetCommandProcessor()) - event.Skip(); - else + wxCommandProcessor * const cmdproc = GetCurrentCommandProcessor(); + if ( !cmdproc ) { - event.Enable( doc->GetCommandProcessor()->CanRedo() ); - doc->GetCommandProcessor()->SetMenuStrings(); + event.Enable(false); + return; } + + event.Enable(cmdproc->CanRedo()); + cmdproc->SetMenuStrings(); } -wxView *wxDocManager::GetCurrentView() const +wxView *wxDocManager::GetActiveView() const { - if (m_currentView) - return m_currentView; - if (m_docs.GetCount() == 1) + wxView *view = GetCurrentView(); + + if ( !view && !m_docs.empty() ) { - wxDocument* doc = (wxDocument*) m_docs.GetFirst()->GetData(); - return doc->GetFirstView(); + // if we have exactly one document, consider its view to be the current + // one + // + // VZ: I'm not exactly sure why is this needed but this is how this + // code used to behave before the bug #9518 was fixed and it seems + // safer to preserve the old logic + wxList::compatibility_iterator node = m_docs.GetFirst(); + if ( !node->GetNext() ) + { + wxDocument *doc = static_cast(node->GetData()); + view = doc->GetFirstView(); + } + //else: we have more than one document } - return NULL; + + return view; } -bool wxDocManager::TryValidator(wxEvent& event) +bool wxDocManager::TryBefore(wxEvent& event) { - wxView * const view = GetCurrentView(); - return view && view->ProcessEventHere(event); + wxView * const view = GetActiveView(); + return view && view->ProcessEventLocally(event); } namespace @@ -1169,6 +1342,17 @@ wxDocTemplates GetVisibleTemplates(const wxList& allTemplates) } // anonymous namespace +void wxDocManager::ActivateDocument(wxDocument *doc) +{ + wxView * const view = doc->GetFirstView(); + if ( !view ) + return; + + view->Activate(true); + if ( wxWindow *win = view->GetFrame() ) + win->SetFocus(); +} + wxDocument *wxDocManager::CreateDocument(const wxString& pathOrig, long flags) { // this ought to be const but SelectDocumentType/Path() are not @@ -1223,13 +1407,8 @@ wxDocument *wxDocManager::CreateDocument(const wxString& pathOrig, long flags) if ( fn == doc->GetFilename() ) { // file already open, just activate it and return - if ( doc->GetFirstView() ) - { - ActivateView(doc->GetFirstView()); - if ( doc->GetDocumentWindow() ) - doc->GetDocumentWindow()->SetFocus(); - return doc; - } + ActivateDocument(doc); + return doc; } } } @@ -1257,15 +1436,18 @@ wxDocument *wxDocManager::CreateDocument(const wxString& pathOrig, long flags) docNew->SetDocumentName(temp->GetDocumentName()); docNew->SetDocumentTemplate(temp); - // call the appropriate function depending on whether we're creating a new - // file or opening an existing one - if ( !(flags & wxDOC_NEW ? docNew->OnNewDocument() - : docNew->OnOpenDocument(path)) ) + wxTRY { - // Document is implicitly deleted by DeleteAllViews - docNew->DeleteAllViews(); - return NULL; + // call the appropriate function depending on whether we're creating a + // new file or opening an existing one + if ( !(flags & wxDOC_NEW ? docNew->OnNewDocument() + : docNew->OnOpenDocument(path)) ) + { + docNew->DeleteAllViews(); + return NULL; + } } + wxCATCH_ALL( docNew->DeleteAllViews(); throw; ) // add the successfully opened file to MRU, but only if we're going to be // able to reopen it successfully later which requires the template for @@ -1273,6 +1455,11 @@ wxDocument *wxDocManager::CreateDocument(const wxString& pathOrig, long flags) if ( !(flags & wxDOC_NEW) && temp->FileMatchesTemplate(path) ) AddFileToHistory(path); + // at least under Mac (where views are top level windows) it seems to be + // necessary to manually activate the new document to bring it to the + // forefront -- and it shouldn't hurt doing this under the other platforms + ActivateDocument(docNew); + return docNew; } @@ -1311,11 +1498,14 @@ bool wxDocManager::FlushDoc(wxDocument *WXUNUSED(doc)) wxDocument *wxDocManager::GetCurrentDocument() const { - wxView *view = GetCurrentView(); - if (view) - return view->GetDocument(); - else - return NULL; + wxView * const view = GetActiveView(); + return view ? view->GetDocument() : NULL; +} + +wxCommandProcessor *wxDocManager::GetCurrentCommandProcessor() const +{ + wxDocument * const doc = GetCurrentDocument(); + return doc ? doc->GetCommandProcessor() : NULL; } // Make a default name for a new document @@ -1463,12 +1653,10 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates, long WXUNUSED(flags), bool WXUNUSED(save)) { - // We can only have multiple filters in Windows and GTK -#if defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXMAC__) +#ifdef wxHAS_MULTIPLE_FILEDLG_FILTERS wxString descrBuf; - int i; - for (i = 0; i < noTemplates; i++) + for (int i = 0; i < noTemplates; i++) { if (templates[i]->IsVisible()) { @@ -1488,15 +1676,12 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates, int FilterIndex = -1; - wxWindow* parent = wxFindSuitableParent(); - wxString pathTmp = wxFileSelectorEx(_("Open File"), - m_lastDirectory, + GetLastDirectory(), wxEmptyString, &FilterIndex, descrBuf, - 0, - parent); + wxFD_OPEN | wxFD_FILE_MUST_EXIST); wxDocTemplate *theTemplate = NULL; if (!pathTmp.empty()) @@ -1509,13 +1694,15 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates, else msgTitle = wxString(_("File error")); - (void)wxMessageBox(_("Sorry, could not open this file."), msgTitle, wxOK | wxICON_EXCLAMATION, - parent); + wxMessageBox(_("Sorry, could not open this file."), + msgTitle, + wxOK | wxICON_EXCLAMATION | wxCENTRE); path = wxEmptyString; return NULL; } - m_lastDirectory = wxPathOnly(pathTmp); + + SetLastDirectory(wxPathOnly(pathTmp)); path = pathTmp; @@ -1527,16 +1714,17 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates, theTemplate = FindTemplateForPath(path); if ( !theTemplate ) { - // Since we do not add files with non-default extensions to the FileHistory this - // can only happen if the application changes the allowed templates in runtime. - (void)wxMessageBox(_("Sorry, the format for this file is unknown."), - _("Open File"), - wxOK | wxICON_EXCLAMATION, wxFindSuitableParent()); + // Since we do not add files with non-default extensions to the + // file history this can only happen if the application changes the + // allowed templates in runtime. + wxMessageBox(_("Sorry, the format for this file is unknown."), + _("Open File"), + wxOK | wxICON_EXCLAMATION | wxCENTRE); } } else { - path = wxEmptyString; + path.clear(); } return theTemplate; @@ -1546,7 +1734,7 @@ wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates, int noTemplates, bool sort) { wxArrayString strings; - wxDocTemplate **data = new wxDocTemplate *[noTemplates]; + wxScopedArray data(new wxDocTemplate *[noTemplates]); int i; int n = 0; @@ -1613,13 +1801,10 @@ wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates, _("Select a document template"), _("Templates"), strings, - (void **)data, - wxFindSuitableParent() + (void **)data.get() ); } - delete[] data; - return theTemplate; } @@ -1627,7 +1812,7 @@ wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates, int noTemplates, bool sort) { wxArrayString strings; - wxDocTemplate **data = new wxDocTemplate *[noTemplates]; + wxScopedArray data(new wxDocTemplate *[noTemplates]); int i; int n = 0; @@ -1690,13 +1875,11 @@ wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates, _("Select a document view"), _("Views"), strings, - (void **)data, - wxFindSuitableParent() + (void **)data.get() ); } - delete[] data; return theTemplate; } @@ -1711,6 +1894,20 @@ void wxDocManager::DisassociateTemplate(wxDocTemplate *temp) m_templates.DeleteObject(temp); } +wxDocTemplate* wxDocManager::FindTemplate(const wxClassInfo* classinfo) +{ + for ( wxList::compatibility_iterator node = m_templates.GetFirst(); + node; + node = node->GetNext() ) + { + wxDocTemplate* t = wxStaticCast(node->GetData(), wxDocTemplate); + if ( t->GetDocClassInfo() == classinfo ) + return t; + } + + return NULL; +} + // Add and remove a document from the manager's list void wxDocManager::AddDocument(wxDocument *doc) { @@ -1742,175 +1939,64 @@ void wxDocManager::ActivateView(wxView *view, bool activate) } // ---------------------------------------------------------------------------- -// Default document child frame +// wxDocChildFrameAnyBase // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(wxDocChildFrame, wxFrame) - EVT_ACTIVATE(wxDocChildFrame::OnActivate) - EVT_CLOSE(wxDocChildFrame::OnCloseWindow) -END_EVENT_TABLE() - -wxDocChildFrame::wxDocChildFrame(wxDocument *doc, - wxView *view, - wxFrame *frame, - wxWindowID id, - const wxString& title, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) - : wxFrame(frame, id, title, pos, size, style, name) -{ - m_childDocument = doc; - m_childView = view; - if (view) - view->SetFrame(this); -} - -bool wxDocChildFrame::TryValidator(wxEvent& event) +bool wxDocChildFrameAnyBase::CloseView(wxCloseEvent& event) { - if ( !m_childView ) - return false; - - // FIXME: why is this needed here? - m_childView->Activate(true); - - return m_childView->ProcessEventHere(event); -} - -void wxDocChildFrame::OnActivate(wxActivateEvent& event) -{ - wxFrame::OnActivate(event); - - if (m_childView) - m_childView->Activate(event.GetActive()); -} - -void wxDocChildFrame::OnCloseWindow(wxCloseEvent& event) -{ - if (m_childView) + if ( m_childView ) { - bool ans = event.CanVeto() - ? m_childView->Close(false) // false means don't delete associated window - : true; // Must delete. - - if (ans) + // notice that we must call wxView::Close() and OnClose() called from + // it in any case, even if we know that we are going to close anyhow + if ( !m_childView->Close(false) && event.CanVeto() ) { - m_childView->Activate(false); - delete m_childView; - m_childView = NULL; - m_childDocument = NULL; - - this->Destroy(); - } - else event.Veto(); - } - else - event.Veto(); -} - -// ---------------------------------------------------------------------------- -// Default parent frame -// ---------------------------------------------------------------------------- - -BEGIN_EVENT_TABLE(wxDocParentFrame, wxFrame) - EVT_MENU(wxID_EXIT, wxDocParentFrame::OnExit) - EVT_MENU_RANGE(wxID_FILE1, wxID_FILE9, wxDocParentFrame::OnMRUFile) - EVT_CLOSE(wxDocParentFrame::OnCloseWindow) -END_EVENT_TABLE() - -wxDocParentFrame::wxDocParentFrame() -{ - m_docManager = NULL; -} - -wxDocParentFrame::wxDocParentFrame(wxDocManager *manager, - wxFrame *frame, - wxWindowID id, - const wxString& title, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) - : wxFrame(frame, id, title, pos, size, style, name) -{ - m_docManager = manager; -} - -bool wxDocParentFrame::Create(wxDocManager *manager, - wxFrame *frame, - wxWindowID id, - const wxString& title, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) -{ - m_docManager = manager; - return base_type::Create(frame, id, title, pos, size, style, name); -} - -void wxDocParentFrame::OnExit(wxCommandEvent& WXUNUSED(event)) -{ - Close(); -} - -void wxDocParentFrame::OnMRUFile(wxCommandEvent& event) -{ - int n = event.GetId() - wxID_FILE1; // the index in MRU list - wxString filename(m_docManager->GetHistoryFile(n)); - if ( filename.empty() ) - return; + return false; + } - wxString errMsg; // must contain exactly one "%s" if non-empty - if ( wxFile::Exists(filename) ) - { - // try to open it - if ( m_docManager->CreateDocument(filename, wxDOC_SILENT) ) - return; + m_childView->Activate(false); - errMsg = _("The file '%s' couldn't be opened."); - } - else // file doesn't exist - { - errMsg = _("The file '%s' doesn't exist and couldn't be opened."); + // it is important to reset m_childView frame pointer to NULL before + // deleting it because while normally it is the frame which deletes the + // view when it's closed, the view also closes the frame if it is + // deleted directly not by us as indicated by its doc child frame + // pointer still being set + m_childView->SetDocChildFrame(NULL); + wxDELETE(m_childView); } + m_childDocument = NULL; - wxASSERT_MSG( !errMsg.empty(), "should have an error message" ); + return true; +} - // remove the file which we can't open from the MRU list - m_docManager->RemoveFileFromHistory(n); +// ---------------------------------------------------------------------------- +// wxDocParentFrameAnyBase +// ---------------------------------------------------------------------------- - // and tell the user about it - wxLogError(errMsg + '\n' + - _("It has been removed from the most recently used files list."), - filename); -} +#if wxUSE_PRINTING_ARCHITECTURE -// Extend event processing to search the view's event table -bool wxDocParentFrame::TryValidator(wxEvent& event) +namespace { - return m_docManager && m_docManager->ProcessEventHere(event); -} -// Define the behaviour for the frame closing -// - must delete all frames except for the main one. -void wxDocParentFrame::OnCloseWindow(wxCloseEvent& event) +wxString GetAppropriateTitle(const wxView *view, const wxString& titleGiven) { - if (m_docManager->Clear(!event.CanVeto())) + wxString title(titleGiven); + if ( title.empty() ) { - this->Destroy(); + if ( view && view->GetDocument() ) + title = view->GetDocument()->GetUserReadableName(); + else + title = _("Printout"); } - else - event.Veto(); + + return title; } -#if wxUSE_PRINTING_ARCHITECTURE +} // anonymous namespace wxDocPrintout::wxDocPrintout(wxView *view, const wxString& title) - : wxPrintout(title) + : wxPrintout(GetAppropriateTitle(view, title)) { m_printoutView = view; } @@ -1967,7 +2053,8 @@ bool wxDocPrintout::OnBeginDocument(int startPage, int endPage) return true; } -void wxDocPrintout::GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int *selPageTo) +void wxDocPrintout::GetPageInfo(int *minPage, int *maxPage, + int *selPageFrom, int *selPageTo) { *minPage = 1; *maxPage = 1; @@ -1977,203 +2064,6 @@ void wxDocPrintout::GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, in #endif // wxUSE_PRINTING_ARCHITECTURE -// ---------------------------------------------------------------------------- -// File history (a.k.a. MRU, most recently used, files list) -// ---------------------------------------------------------------------------- - -wxFileHistory::wxFileHistory(size_t maxFiles, wxWindowID idBase) -{ - m_fileMaxFiles = maxFiles; - m_idBase = idBase; -} - -void wxFileHistory::AddFileToHistory(const wxString& file) -{ - // check if we don't already have this file - const wxFileName fnNew(file); - size_t i, - numFiles = m_fileHistory.size(); - for ( i = 0; i < numFiles; i++ ) - { - if ( fnNew == m_fileHistory[i] ) - { - // we do have it, move it to the top of the history - RemoveFileFromHistory(i); - numFiles--; - break; - } - } - - // if we already have a full history, delete the one at the end - if ( numFiles == m_fileMaxFiles ) - { - RemoveFileFromHistory(--numFiles); - } - - // add a new menu item to all file menus (they will be updated below) - for ( wxList::compatibility_iterator node = m_fileMenus.GetFirst(); - node; - node = node->GetNext() ) - { - wxMenu * const menu = (wxMenu *)node->GetData(); - - if ( !numFiles && menu->GetMenuItemCount() ) - menu->AppendSeparator(); - - // label doesn't matter, it will be set below anyhow, but it can't - // be empty (this is supposed to indicate a stock item) - menu->Append(m_idBase + numFiles, " "); - } - - // insert the new file in the beginning of the file history - m_fileHistory.insert(m_fileHistory.begin(), file); - numFiles++; - - // update the labels in all menus - for ( i = 0; i < numFiles; i++ ) - { - // if in same directory just show the filename; otherwise the full path - const wxFileName fnOld(m_fileHistory[i]); - - wxString pathInMenu; - if ( fnOld.GetPath() == fnNew.GetPath() ) - { - pathInMenu = fnOld.GetFullName(); - } - else // file in different directory - { - // absolute path; could also set relative path - pathInMenu = m_fileHistory[i]; - } - - for ( wxList::compatibility_iterator node = m_fileMenus.GetFirst(); - node; - node = node->GetNext() ) - { - wxMenu * const menu = (wxMenu *)node->GetData(); - - menu->SetLabel(m_idBase + i, GetMRUEntryLabel(i, pathInMenu)); - } - } -} - -void wxFileHistory::RemoveFileFromHistory(size_t i) -{ - size_t numFiles = m_fileHistory.size(); - wxCHECK_RET( i < numFiles, - wxT("invalid index in wxFileHistory::RemoveFileFromHistory") ); - - // delete the element from the array - m_fileHistory.RemoveAt(i); - numFiles--; - - for ( wxList::compatibility_iterator node = m_fileMenus.GetFirst(); - node; - node = node->GetNext() ) - { - wxMenu * const menu = (wxMenu *) node->GetData(); - - // shift filenames up - for ( size_t j = i; j < numFiles; j++ ) - { - menu->SetLabel(m_idBase + j, GetMRUEntryLabel(j, m_fileHistory[j])); - } - - // delete the last menu item which is unused now - const wxWindowID lastItemId = m_idBase + numFiles; - if ( menu->FindItem(lastItemId) ) - menu->Delete(lastItemId); - - // delete the last separator too if no more files are left - if ( m_fileHistory.empty() ) - { - const wxMenuItemList::compatibility_iterator - nodeLast = menu->GetMenuItems().GetLast(); - if ( nodeLast ) - { - wxMenuItem * const lastMenuItem = nodeLast->GetData(); - if ( lastMenuItem->IsSeparator() ) - menu->Delete(lastMenuItem); - } - //else: menu is empty somehow - } - } -} - -void wxFileHistory::UseMenu(wxMenu *menu) -{ - if ( !m_fileMenus.Member(menu) ) - m_fileMenus.Append(menu); -} - -void wxFileHistory::RemoveMenu(wxMenu *menu) -{ - m_fileMenus.DeleteObject(menu); -} - -#if wxUSE_CONFIG -void wxFileHistory::Load(const wxConfigBase& config) -{ - m_fileHistory.Clear(); - - wxString buf; - buf.Printf(wxT("file%d"), 1); - - wxString historyFile; - while ((m_fileHistory.GetCount() < m_fileMaxFiles) && - config.Read(buf, &historyFile) && !historyFile.empty()) - { - m_fileHistory.Add(historyFile); - - buf.Printf(wxT("file%d"), (int)m_fileHistory.GetCount()+1); - historyFile = wxEmptyString; - } - - AddFilesToMenu(); -} - -void wxFileHistory::Save(wxConfigBase& config) -{ - size_t i; - for (i = 0; i < m_fileMaxFiles; i++) - { - wxString buf; - buf.Printf(wxT("file%d"), (int)i+1); - if (i < m_fileHistory.GetCount()) - config.Write(buf, wxString(m_fileHistory[i])); - else - config.Write(buf, wxEmptyString); - } -} -#endif // wxUSE_CONFIG - -void wxFileHistory::AddFilesToMenu() -{ - if ( m_fileHistory.empty() ) - return; - - for ( wxList::compatibility_iterator node = m_fileMenus.GetFirst(); - node; - node = node->GetNext() ) - { - AddFilesToMenu((wxMenu *) node->GetData()); - } -} - -void wxFileHistory::AddFilesToMenu(wxMenu* menu) -{ - if ( m_fileHistory.empty() ) - return; - - if ( menu->GetMenuItemCount() ) - menu->AppendSeparator(); - - for ( size_t i = 0; i < m_fileHistory.GetCount(); i++ ) - { - menu->Append(m_idBase + i, GetMRUEntryLabel(i, m_fileHistory[i])); - } -} - // ---------------------------------------------------------------------------- // Permits compatibility with existing file formats and functions that // manipulate files directly @@ -2183,7 +2073,11 @@ void wxFileHistory::AddFilesToMenu(wxMenu* menu) bool wxTransferFileToStream(const wxString& filename, wxSTD ostream& stream) { - wxFFile file(filename, _T("rb")); +#if wxUSE_FFILE + wxFFile file(filename, wxT("rb")); +#elif wxUSE_FILE + wxFile file(filename, wxFile::read); +#endif if ( !file.IsOpened() ) return false; @@ -2207,7 +2101,11 @@ bool wxTransferFileToStream(const wxString& filename, wxSTD ostream& stream) bool wxTransferStreamToFile(wxSTD istream& stream, const wxString& filename) { - wxFFile file(filename, _T("wb")); +#if wxUSE_FFILE + wxFFile file(filename, wxT("wb")); +#elif wxUSE_FILE + wxFile file(filename, wxFile::write); +#endif if ( !file.IsOpened() ) return false; @@ -2230,7 +2128,11 @@ bool wxTransferStreamToFile(wxSTD istream& stream, const wxString& filename) bool wxTransferFileToStream(const wxString& filename, wxOutputStream& stream) { - wxFFile file(filename, _T("rb")); +#if wxUSE_FFILE + wxFFile file(filename, wxT("rb")); +#elif wxUSE_FILE + wxFile file(filename, wxFile::read); +#endif if ( !file.IsOpened() ) return false; @@ -2254,7 +2156,11 @@ bool wxTransferFileToStream(const wxString& filename, wxOutputStream& stream) bool wxTransferStreamToFile(wxInputStream& stream, const wxString& filename) { - wxFFile file(filename, _T("wb")); +#if wxUSE_FFILE + wxFFile file(filename, wxT("wb")); +#elif wxUSE_FILE + wxFile file(filename, wxFile::write); +#endif if ( !file.IsOpened() ) return false;