X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b7341fe06f10dbe562f077c9a5ed9ea7afa9195a..bcd286534a7d880de1b9156a87e6bf5df87f6573:/include/wx/docview.h diff --git a/include/wx/docview.h b/include/wx/docview.h index 55fa2c7920..6f678c9b29 100644 --- a/include/wx/docview.h +++ b/include/wx/docview.h @@ -19,6 +19,7 @@ #include "wx/list.h" #include "wx/string.h" #include "wx/frame.h" +#include "wx/filehistory.h" #if wxUSE_PRINTING_ARCHITECTURE #include "wx/print.h" @@ -31,7 +32,6 @@ class WXDLLIMPEXP_FWD_CORE wxDocTemplate; class WXDLLIMPEXP_FWD_CORE wxDocManager; class WXDLLIMPEXP_FWD_CORE wxPrintInfo; class WXDLLIMPEXP_FWD_CORE wxCommandProcessor; -class WXDLLIMPEXP_FWD_CORE wxFileHistory; class WXDLLIMPEXP_FWD_BASE wxConfigBase; class wxDocChildFrameAnyBase; @@ -133,7 +133,7 @@ public: virtual bool Draw(wxDC&); virtual bool IsModified() const { return m_documentModified; } - virtual void Modify(bool mod) { m_documentModified = mod; } + virtual void Modify(bool mod); virtual bool AddView(wxView *view); virtual bool RemoveView(wxView *view); @@ -377,6 +377,7 @@ public: // Handlers for UI update commands void OnUpdateFileOpen(wxUpdateUIEvent& event); void OnUpdateDisableIfNoDoc(wxUpdateUIEvent& event); + void OnUpdateFileRevert(wxUpdateUIEvent& event); void OnUpdateFileNew(wxUpdateUIEvent& event); void OnUpdateFileSave(wxUpdateUIEvent& event); void OnUpdateUndo(wxUpdateUIEvent& event); @@ -477,6 +478,12 @@ public: #endif // WXWIN_COMPATIBILITY_2_6 protected: +#if wxUSE_PRINTING_ARCHITECTURE + virtual wxPreviewFrame* CreatePreviewFrame(wxPrintPreviewBase* preview, + wxWindow *parent, + const wxString& title); +#endif // wxUSE_PRINTING_ARCHITECTURE + // hook the currently active view into event handlers chain here virtual bool TryBefore(wxEvent& event); @@ -520,16 +527,38 @@ inline size_t wxDocManager::GetNoHistoryFiles() const class WXDLLIMPEXP_CORE wxDocChildFrameAnyBase { public: + // default ctor, use Create() after it + wxDocChildFrameAnyBase() + { + m_childDocument = NULL; + m_childView = NULL; + m_win = NULL; + } + + // full ctor equivalent to using the default one and Create(0 wxDocChildFrameAnyBase(wxDocument *doc, wxView *view, wxWindow *win) - : m_win(win) + { + Create(doc, view, win); + } + + // method which must be called for an object created using the default ctor + // + // note that it returns bool just for consistency with Create() methods in + // other classes, we never return false from here + bool Create(wxDocument *doc, wxView *view, wxWindow *win) { m_childDocument = doc; m_childView = view; + m_win = win; if ( view ) view->SetDocChildFrame(this); + + return true; } + // dtor doesn't need to be virtual, an object should never be destroyed via + // a pointer to this class ~wxDocChildFrameAnyBase() { // prevent the view from deleting us if we're being deleted directly @@ -564,7 +593,7 @@ protected: // the associated window: having it here is not terribly elegant but it // allows us to avoid having any virtual functions in this class - wxWindow * const m_win; + wxWindow* m_win; wxDECLARE_NO_COPY_CLASS(wxDocChildFrameAnyBase); @@ -587,6 +616,9 @@ class WXDLLIMPEXP_CORE wxDocChildFrameAny : public ChildFrame, public: typedef ChildFrame BaseClass; + // default ctor, use Create after it + wxDocChildFrameAny() { } + // ctor for a frame showing the given view of the specified document wxDocChildFrameAny(wxDocument *doc, wxView *view, @@ -597,13 +629,32 @@ public: const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr) - : BaseClass(parent, id, title, pos, size, style, name), - wxDocChildFrameAnyBase(doc, view, this) { + Create(doc, view, parent, id, title, pos, size, style, name); + } + + bool Create(wxDocument *doc, + wxView *view, + ParentFrame *parent, + wxWindowID id, + const wxString& title, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxDEFAULT_FRAME_STYLE, + const wxString& name = wxFrameNameStr) + { + if ( !wxDocChildFrameAnyBase::Create(doc, view, this) ) + return false; + + if ( !BaseClass::Create(parent, id, title, pos, size, style, name) ) + return false; + this->Connect(wxEVT_ACTIVATE, wxActivateEventHandler(wxDocChildFrameAny::OnActivate)); this->Connect(wxEVT_CLOSE_WINDOW, wxCloseEventHandler(wxDocChildFrameAny::OnCloseWindow)); + + return true; } virtual bool Destroy() @@ -651,6 +702,7 @@ private: // for dll-interface class 'wxDocChildFrame'" -- this is bogus as the // template will be DLL-exported but only once it is used as base class // here! + #pragma warning (push) #pragma warning (disable:4275) #endif @@ -659,6 +711,10 @@ typedef wxDocChildFrameAny wxDocChildFrameBase; class WXDLLIMPEXP_CORE wxDocChildFrame : public wxDocChildFrameBase { public: + wxDocChildFrame() + { + } + wxDocChildFrame(wxDocument *doc, wxView *view, wxFrame *parent, @@ -673,13 +729,30 @@ public: { } + bool Create(wxDocument *doc, + wxView *view, + wxFrame *parent, + wxWindowID id, + const wxString& title, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxDEFAULT_FRAME_STYLE, + const wxString& name = wxFrameNameStr) + { + return wxDocChildFrameBase::Create + ( + doc, view, + parent, id, title, pos, size, style, name + ); + } + private: DECLARE_CLASS(wxDocChildFrame) wxDECLARE_NO_COPY_CLASS(wxDocChildFrame); }; #ifdef __VISUALC6__ - #pragma warning (default:4275) + #pragma warning (pop) #endif // ---------------------------------------------------------------------------- @@ -755,72 +828,6 @@ private: }; #endif // wxUSE_PRINTING_ARCHITECTURE -// ---------------------------------------------------------------------------- -// File history management -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxFileHistory : public wxObject -{ -public: - wxFileHistory(size_t maxFiles = 9, wxWindowID idBase = wxID_FILE1); - - // Operations - virtual void AddFileToHistory(const wxString& file); - virtual void RemoveFileFromHistory(size_t i); - virtual int GetMaxFiles() const { return (int)m_fileMaxFiles; } - virtual void UseMenu(wxMenu *menu); - - // Remove menu from the list (MDI child may be closing) - virtual void RemoveMenu(wxMenu *menu); - -#if wxUSE_CONFIG - virtual void Load(const wxConfigBase& config); - virtual void Save(wxConfigBase& config); -#endif // wxUSE_CONFIG - - virtual void AddFilesToMenu(); - virtual void AddFilesToMenu(wxMenu* menu); // Single menu - - // Accessors - virtual wxString GetHistoryFile(size_t i) const { return m_fileHistory[i]; } - virtual size_t GetCount() const { return m_fileHistory.GetCount(); } - - const wxList& GetMenus() const { return m_fileMenus; } - - // Set/get base id - void SetBaseId(wxWindowID baseId) { m_idBase = baseId; } - wxWindowID GetBaseId() const { return m_idBase; } - -#if WXWIN_COMPATIBILITY_2_6 - // deprecated, use GetCount() instead - wxDEPRECATED( size_t GetNoHistoryFiles() const ); -#endif // WXWIN_COMPATIBILITY_2_6 - -protected: - // Last n files - wxArrayString m_fileHistory; - - // Menus to maintain (may need several for an MDI app) - wxList m_fileMenus; - - // Max files to maintain - size_t m_fileMaxFiles; - -private: - // The ID of the first history menu item (Doesn't have to be wxID_FILE1) - wxWindowID m_idBase; - - DECLARE_DYNAMIC_CLASS(wxFileHistory) - wxDECLARE_NO_COPY_CLASS(wxFileHistory); -}; - -#if WXWIN_COMPATIBILITY_2_6 -inline size_t wxFileHistory::GetNoHistoryFiles() const -{ - return m_fileHistory.GetCount(); -} -#endif // WXWIN_COMPATIBILITY_2_6 - // For compatibility with existing file formats: // converts from/to a stream to/from a temporary file. #if wxUSE_STD_IOSTREAM