X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ac0ac8241f5ea7249ea01c04452efc0b72f49b1f..af547d51b7494fd365ae29e048d458ff72b27056:/src/common/docview.cpp diff --git a/src/common/docview.cpp b/src/common/docview.cpp index 95b489ee7d..1f8003aff7 100644 --- a/src/common/docview.cpp +++ b/src/common/docview.cpp @@ -76,7 +76,6 @@ // wxWindows macros // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_ABSTRACT_CLASS(wxDocument, wxEvtHandler) IMPLEMENT_ABSTRACT_CLASS(wxView, wxEvtHandler) IMPLEMENT_ABSTRACT_CLASS(wxDocTemplate, wxObject) @@ -91,7 +90,6 @@ IMPLEMENT_CLASS(wxCommand, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxCommandProcessor, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxFileHistory, wxObject) -#endif // ---------------------------------------------------------------------------- // function prototypes @@ -103,7 +101,7 @@ static inline wxString FindExtension(const wxChar *path); // local constants // ---------------------------------------------------------------------------- -static const char *s_MRUEntryFormat = wxT("&%d %s"); +static const wxChar *s_MRUEntryFormat = wxT("&%d %s"); // ============================================================================ // implementation @@ -293,7 +291,7 @@ bool wxDocument::OnSaveDocument(const wxString& file) if (store.fail() || store.bad()) #else wxFileOutputStream store(wxString(file.fn_str())); - if (store.LastError() != 0) + if (store.LastError() != wxSTREAM_NOERROR) #endif { (void)wxMessageBox(_("Sorry, could not open this file for saving."), msgTitle, wxOK | wxICON_EXCLAMATION, @@ -329,14 +327,20 @@ bool wxDocument::OnOpenDocument(const wxString& file) if (store.fail() || store.bad()) #else wxFileInputStream store(wxString(file.fn_str())); - if (store.LastError() != 0) + if (store.LastError() != wxSTREAM_NOERROR) #endif { (void)wxMessageBox(_("Sorry, could not open this file."), msgTitle, wxOK|wxICON_EXCLAMATION, GetDocumentWindow()); return 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()); @@ -522,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); } @@ -558,10 +562,11 @@ void wxView::OnChangeFilename() { if (GetFrame() && GetDocument()) { - wxString name; - GetDocument()->GetPrintableName(name); + wxString title; + + GetDocument()->GetPrintableName(title); - GetFrame()->SetTitle(name); + GetFrame()->SetTitle(title); } } @@ -692,13 +697,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; @@ -706,9 +727,9 @@ wxDocManager::wxDocManager(long flags, bool initialize) m_currentView = (wxView *) NULL; m_maxDocsOpen = 10000; m_fileHistory = (wxFileHistory *) NULL; - m_lastDirectory = wxT("") ; if (initialize) Initialize(); + sm_docManager = this; } wxDocManager::~wxDocManager() @@ -716,6 +737,7 @@ wxDocManager::~wxDocManager() Clear(); if (m_fileHistory) delete m_fileHistory; + sm_docManager = (wxDocManager*) NULL; } bool wxDocManager::Clear(bool force) @@ -886,6 +908,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) @@ -1090,6 +1177,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)) { @@ -1192,7 +1297,7 @@ wxDocTemplate *wxDocManager::FindTemplateForPath(const wxString& path) // template extension. wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates, -#ifdef __WXMSW__ +#if defined(__WXMSW__) || defined(__WXGTK__) int noTemplates, #else int WXUNUSED(noTemplates), @@ -1201,8 +1306,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; @@ -1237,9 +1342,6 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates, m_lastDirectory = wxPathOnly(pathTmp); path = pathTmp; - wxString theExt = FindExtension(path); - if (!theExt) - return (wxDocTemplate *) NULL; // This is dodgy in that we're selecting the template on the // basis of the file extension, which may not be a standard @@ -1310,7 +1412,7 @@ wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates, } wxDocTemplate *theTemplate = (wxDocTemplate *)wxGetSingleChoiceData(_("Select a document template"), _("Templates"), n, - strings, (char **)data); + strings, (void **)data); delete[] strings; delete[] data; return theTemplate; @@ -1333,7 +1435,7 @@ wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates, } } wxDocTemplate *theTemplate = (wxDocTemplate *)wxGetSingleChoiceData(_("Select a document view"), _("Views"), n, - strings, (char **)data); + strings, (void **)data); delete[] strings; delete[] data; return theTemplate; @@ -1910,12 +2012,6 @@ void wxFileHistory::RemoveFileFromHistory(int i) { wxMenu* menu = (wxMenu*) node->Data(); - // wxMenu::Delete() is missing from wxGTK, so this can't be done :-( -#if 0 - // delete the menu items - menu->Delete(wxID_FILE1 + i); -#endif - // delete the element from the array (could use memmove() too...) delete [] m_fileHistory[i]; @@ -1933,22 +2029,44 @@ void wxFileHistory::RemoveFileFromHistory(int i) menu->SetLabel(wxID_FILE1 + j, buf); } - // to be removed as soon as wxMenu::Delete() is implemented -#if 1 - menu->SetLabel(wxID_FILE1 + m_fileHistoryN - 1, wxT("")); -#endif - node = node->Next(); + + // 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) @@ -1974,7 +2092,7 @@ void wxFileHistory::Load(wxConfigBase& config) m_fileHistory[m_fileHistoryN] = copystring((const wxChar*) historyFile); m_fileHistoryN ++; buf.Printf(wxT("file%d"), m_fileHistoryN+1); - historyFile = ""; + historyFile = wxT(""); } AddFilesToMenu(); } @@ -2073,6 +2191,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 = fopen (filename.fn_str(), "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 = fopen (filename.fn_str(), "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