X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/69936aea19dfef8d738abb6ed48a77ec6065e142..9611686694f0449c7f7ced2e0badad9f04a22ea5:/include/wx/docview.h diff --git a/include/wx/docview.h b/include/wx/docview.h index 94a13b2cc5..79bb6d7175 100644 --- a/include/wx/docview.h +++ b/include/wx/docview.h @@ -1,27 +1,22 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: docview.h +// Name: wx/docview.h // Purpose: Doc/View classes // Author: Julian Smart // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) +// Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_DOCH__ #define _WX_DOCH__ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "docview.h" -#endif - #include "wx/defs.h" #if wxUSE_DOC_VIEW_ARCHITECTURE #include "wx/list.h" -#include "wx/cmndata.h" #include "wx/string.h" #include "wx/frame.h" @@ -69,10 +64,10 @@ class WXDLLEXPORT wxDocument : public wxEvtHandler { public: wxDocument(wxDocument *parent = (wxDocument *) NULL); - ~wxDocument(); + virtual ~wxDocument(); // accessors - void SetFilename(const wxString& filename, bool notifyViews = FALSE); + void SetFilename(const wxString& filename, bool notifyViews = false); wxString GetFilename() const { return m_documentFile; } void SetTitle(const wxString& title) { m_documentTitle = title; }; @@ -82,7 +77,7 @@ public: wxString GetDocumentName() const { return m_documentTypeName; } bool GetDocumentSaved() const { return m_savedYet; } - void SetDocumentSaved(bool saved = TRUE) { m_savedYet = saved; } + void SetDocumentSaved(bool saved = true) { m_savedYet = saved; } virtual bool Close(); virtual bool Save(); @@ -103,9 +98,9 @@ public: virtual bool OnNewDocument(); virtual bool OnCloseDocument(); - // Prompts for saving if about to close a modified document. Returns TRUE + // Prompts for saving if about to close a modified document. Returns true // if ok to close the document (may have saved in the meantime, or set - // modified to FALSE) + // modified to false) virtual bool OnSaveModified(); // Called by framework if created automatically by the default document @@ -130,7 +125,8 @@ public: virtual bool AddView(wxView *view); virtual bool RemoveView(wxView *view); - wxList& GetViews() const { return (wxList&) m_documentViews; } + wxList& GetViews() { return m_documentViews; } + const wxList& GetViews() const { return m_documentViews; } wxView *GetFirstView() const; virtual void UpdateAllViews(wxView *sender = (wxView *) NULL, wxObject *hint = (wxObject *) NULL); @@ -178,7 +174,7 @@ class WXDLLEXPORT wxView: public wxEvtHandler public: // wxView(wxDocument *doc = (wxDocument *) NULL); wxView(); - ~wxView(); + virtual ~wxView(); wxDocument *GetDocument() const { return m_viewDocument; } virtual void SetDocument(wxDocument *doc); @@ -193,17 +189,17 @@ public: virtual void OnDraw(wxDC *dc) = 0; virtual void OnPrint(wxDC *dc, wxObject *info); virtual void OnUpdate(wxView *sender, wxObject *hint = (wxObject *) NULL); - virtual void OnClosingDocument() {}; + virtual void OnClosingDocument() {} virtual void OnChangeFilename(); // Called by framework if created automatically by the default document // manager class: gives view a chance to initialise - virtual bool OnCreate(wxDocument *WXUNUSED(doc), long WXUNUSED(flags)) { return TRUE; }; + virtual bool OnCreate(wxDocument *WXUNUSED(doc), long WXUNUSED(flags)) { return true; }; // Checks if the view is the last one for the document; if so, asks user // to confirm save data (if modified). If ok, deletes itself and returns - // TRUE. - virtual bool Close(bool deleteWindow = TRUE); + // true. + virtual bool Close(bool deleteWindow = true); // Override to do cleanup/veto close virtual bool OnClose(bool deleteWindow); @@ -252,7 +248,7 @@ public: wxClassInfo *viewClassInfo = (wxClassInfo *)NULL, long flags = wxDEFAULT_TEMPLATE_FLAGS); - ~wxDocTemplate(); + virtual ~wxDocTemplate(); // By default, these two member functions dynamically creates document and // view using dynamic instance construction. Override these if you need a @@ -317,8 +313,8 @@ private: class WXDLLEXPORT wxDocManager: public wxEvtHandler { public: - wxDocManager(long flags = wxDEFAULT_DOCMAN_FLAGS, bool initialize = TRUE); - ~wxDocManager(); + wxDocManager(long flags = wxDEFAULT_DOCMAN_FLAGS, bool initialize = true); + virtual ~wxDocManager(); virtual bool Initialize(); @@ -331,7 +327,6 @@ public: void OnFileSave(wxCommandEvent& event); void OnFileSaveAs(wxCommandEvent& event); void OnPrint(wxCommandEvent& event); - void OnPrintSetup(wxCommandEvent& event); void OnPreview(wxCommandEvent& event); void OnUndo(wxCommandEvent& event); void OnRedo(wxCommandEvent& event); @@ -347,7 +342,6 @@ public: void OnUpdateRedo(wxUpdateUIEvent& event); void OnUpdatePrint(wxUpdateUIEvent& event); - void OnUpdatePrintSetup(wxUpdateUIEvent& event); void OnUpdatePreview(wxUpdateUIEvent& event); // Extend event processing to search the view's event table @@ -363,11 +357,11 @@ public: virtual bool FlushDoc(wxDocument *doc); virtual wxDocTemplate *MatchTemplate(const wxString& path); virtual wxDocTemplate *SelectDocumentPath(wxDocTemplate **templates, - int noTemplates, wxString& path, long flags, bool save = FALSE); + int noTemplates, wxString& path, long flags, bool save = false); virtual wxDocTemplate *SelectDocumentType(wxDocTemplate **templates, - int noTemplates, bool sort = FALSE); + int noTemplates, bool sort = false); virtual wxDocTemplate *SelectViewType(wxDocTemplate **templates, - int noTemplates, bool sort = FALSE); + int noTemplates, bool sort = false); virtual wxDocTemplate *FindTemplateForPath(const wxString& path); void AssociateTemplate(wxDocTemplate *temp); @@ -383,17 +377,17 @@ public: void RemoveDocument(wxDocument *doc); // closes all currently open documents - bool CloseDocuments(bool force = TRUE); + bool CloseDocuments(bool force = true); // closes the specified document - bool CloseDocument(wxDocument* doc, bool force = FALSE); + bool CloseDocument(wxDocument* doc, bool force = false); // Clear remaining documents and templates - bool Clear(bool force = TRUE); + bool Clear(bool force = true); // Views or windows should inform the document manager // when a view is going in or out of focus - virtual void ActivateView(wxView *view, bool activate = TRUE); + virtual void ActivateView(wxView *view, bool activate = true); virtual wxView *GetCurrentView() const; wxList& GetDocuments() { return m_docs; } @@ -429,8 +423,10 @@ public: // Get the current document manager static wxDocManager* GetDocumentManager() { return sm_docManager; } +#if WXWIN_COMPATIBILITY_2_6 // deprecated, use GetHistoryFilesCount() instead wxDEPRECATED( size_t GetNoHistoryFiles() const ); +#endif // WXWIN_COMPATIBILITY_2_6 protected: long m_flags; @@ -448,10 +444,12 @@ protected: DECLARE_NO_COPY_CLASS(wxDocManager) }; +#if WXWIN_COMPATIBILITY_2_6 inline size_t wxDocManager::GetNoHistoryFiles() const { return GetHistoryFilesCount(); } +#endif // WXWIN_COMPATIBILITY_2_6 // ---------------------------------------------------------------------------- // A default child frame @@ -469,7 +467,7 @@ public: const wxSize& size = wxDefaultSize, long type = wxDEFAULT_FRAME_STYLE, const wxString& name = wxT("frame")); - ~wxDocChildFrame(); + virtual ~wxDocChildFrame(){} // Extend event processing to search the view's event table virtual bool ProcessEvent(wxEvent& event); @@ -500,14 +498,24 @@ private: class WXDLLEXPORT wxDocParentFrame : public wxFrame { public: + wxDocParentFrame(); wxDocParentFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - long type = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxT("frame")); + long style = wxDEFAULT_FRAME_STYLE, + const wxString& name = wxFrameNameStr); + + bool Create(wxDocManager *manager, + wxFrame *frame, + wxWindowID id, + const wxString& title, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxDEFAULT_FRAME_STYLE, + const wxString& name = wxFrameNameStr); // Extend event processing to search the document manager's event table virtual bool ProcessEvent(wxEvent& event); @@ -522,6 +530,7 @@ protected: wxDocManager *m_docManager; private: + typedef wxFrame base_type; DECLARE_CLASS(wxDocParentFrame) DECLARE_EVENT_TABLE() DECLARE_NO_COPY_CLASS(wxDocParentFrame) @@ -560,12 +569,12 @@ class WXDLLEXPORT wxFileHistory : public wxObject { public: wxFileHistory(size_t maxFiles = 9, wxWindowID idBase = wxID_FILE1); - ~wxFileHistory(); + virtual ~wxFileHistory(); // Operations virtual void AddFileToHistory(const wxString& file); virtual void RemoveFileFromHistory(size_t i); - virtual int GetMaxFiles() const { return m_fileMaxFiles; } + virtual int GetMaxFiles() const { return (int)m_fileMaxFiles; } virtual void UseMenu(wxMenu *menu); // Remove menu from the list (MDI child may be closing) @@ -585,8 +594,10 @@ public: const wxList& GetMenus() const { return m_fileMenus; } +#if WXWIN_COMPATIBILITY_2_6 // deprecated, use GetCount() instead wxDEPRECATED( size_t GetNoHistoryFiles() const ); +#endif // WXWIN_COMPATIBILITY_2_6 protected: // Last n files @@ -606,10 +617,12 @@ private: DECLARE_NO_COPY_CLASS(wxFileHistory) }; +#if WXWIN_COMPATIBILITY_2_6 inline size_t wxFileHistory::GetNoHistoryFiles() const { return m_fileHistoryN; } +#endif // WXWIN_COMPATIBILITY_2_6 #if wxUSE_STD_IOSTREAM // For compatibility with existing file formats: