X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b9f933ab5d4a293790d0f5186c434229678c76ea..ab0881c71cfc1019a2f2fcfedfb3860e73afe219:/include/wx/docview.h?ds=sidebyside diff --git a/include/wx/docview.h b/include/wx/docview.h index 9ffe954246..11989e4c1a 100644 --- a/include/wx/docview.h +++ b/include/wx/docview.h @@ -12,11 +12,14 @@ #ifndef _WX_DOCH__ #define _WX_DOCH__ -#ifdef __GNUG__ +#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" @@ -37,7 +40,7 @@ class WXDLLEXPORT wxFileHistory; class WXDLLEXPORT wxConfigBase; #if wxUSE_STD_IOSTREAM - #include "wx/ioswrap.h" + #include "wx/iosfwrap.h" #else #include "wx/stream.h" #endif @@ -64,8 +67,6 @@ enum class WXDLLEXPORT wxDocument : public wxEvtHandler { - DECLARE_ABSTRACT_CLASS(wxDocument) - public: wxDocument(wxDocument *parent = (wxDocument *) NULL); ~wxDocument(); @@ -160,12 +161,14 @@ protected: wxDocument* m_documentParent; wxCommandProcessor* m_commandProcessor; bool m_savedYet; + +private: + DECLARE_ABSTRACT_CLASS(wxDocument) + DECLARE_NO_COPY_CLASS(wxDocument) }; class WXDLLEXPORT wxView: public wxEvtHandler { - DECLARE_ABSTRACT_CLASS(wxView) - public: // wxView(wxDocument *doc = (wxDocument *) NULL); wxView(); @@ -199,11 +202,6 @@ public: // Override to do cleanup/veto close virtual bool OnClose(bool deleteWindow); -#if WXWIN_COMPATIBILITY - // Defeat compiler warning - bool OnClose() { return wxEvtHandler::OnClose(); } -#endif - // Extend event processing to search the document's event table virtual bool ProcessEvent(wxEvent& event); @@ -222,12 +220,15 @@ protected: wxDocument* m_viewDocument; wxString m_viewTypeName; wxWindow* m_viewFrame; + +private: + DECLARE_ABSTRACT_CLASS(wxView) + DECLARE_NO_COPY_CLASS(wxView) }; // Represents user interface (and other) properties of documents and views class WXDLLEXPORT wxDocTemplate: public wxObject { -DECLARE_CLASS(wxDocTemplate) friend class WXDLLEXPORT wxDocManager; @@ -286,14 +287,16 @@ protected: // For dynamic creation of appropriate instances. wxClassInfo* m_docClassInfo; wxClassInfo* m_viewClassInfo; + +private: + DECLARE_CLASS(wxDocTemplate) + DECLARE_NO_COPY_CLASS(wxDocTemplate) }; // One object of this class may be created in an application, to manage all // the templates and documents. class WXDLLEXPORT wxDocManager: public wxEvtHandler { - DECLARE_DYNAMIC_CLASS(wxDocManager) - public: wxDocManager(long flags = wxDEFAULT_DOCMAN_FLAGS, bool initialize = TRUE); ~wxDocManager(); @@ -333,9 +336,6 @@ public: // called when file format detection didn't work, can be overridden to do // something in this case - // This is of course completely stupid, because if the file dialog is - // cancelled you get an assert. Brilliant. -- JACS -// virtual void OnOpenFileFailure() { wxFAIL_MSG(_T("file format mismatch")); } virtual void OnOpenFileFailure() { } virtual wxDocument *CreateDocument(const wxString& path, long flags = 0); @@ -366,12 +366,15 @@ public: // closes all currently open documents bool CloseDocuments(bool force = TRUE); + // closes the specified document + bool CloseDocument(wxDocument* doc, bool force = FALSE); + // Clear remaining documents and templates 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, bool deleting = FALSE); + virtual void ActivateView(wxView *view, bool activate = TRUE); virtual wxView *GetCurrentView() const; wxList& GetDocuments() { return m_docs; } @@ -388,9 +391,9 @@ public: // File history management virtual void AddFileToHistory(const wxString& file); - virtual void RemoveFileFromHistory(int i); - virtual int GetNoHistoryFiles() const; - virtual wxString GetHistoryFile(int i) const; + virtual void RemoveFileFromHistory(size_t i); + virtual size_t GetHistoryFilesCount() const; + virtual wxString GetHistoryFile(size_t i) const; virtual void FileHistoryUseMenu(wxMenu *menu); virtual void FileHistoryRemoveMenu(wxMenu *menu); #if wxUSE_CONFIG @@ -401,12 +404,15 @@ public: virtual void FileHistoryAddFilesToMenu(); virtual void FileHistoryAddFilesToMenu(wxMenu* menu); - inline wxString GetLastDirectory() const { return m_lastDirectory; } - inline void SetLastDirectory(const wxString& dir) { m_lastDirectory = dir; } + wxString GetLastDirectory() const { return m_lastDirectory; } + void SetLastDirectory(const wxString& dir) { m_lastDirectory = dir; } // Get the current document manager static wxDocManager* GetDocumentManager() { return sm_docManager; } + // deprecated, use GetHistoryFilesCount() instead + wxDEPRECATED( size_t GetNoHistoryFiles() const ); + protected: long m_flags; int m_defaultDocumentNameCounter; @@ -419,16 +425,21 @@ protected: static wxDocManager* sm_docManager; DECLARE_EVENT_TABLE() + DECLARE_DYNAMIC_CLASS(wxDocManager) + DECLARE_NO_COPY_CLASS(wxDocManager) }; +inline size_t wxDocManager::GetNoHistoryFiles() const +{ + return GetHistoryFilesCount(); +} + // ---------------------------------------------------------------------------- // A default child frame // ---------------------------------------------------------------------------- class WXDLLEXPORT wxDocChildFrame : public wxFrame { - DECLARE_CLASS(wxDocChildFrame) - public: wxDocChildFrame(wxDocument *doc, wxView *view, @@ -438,7 +449,7 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long type = wxDEFAULT_FRAME_STYLE, - const wxString& name = "frame"); + const wxString& name = wxT("frame")); ~wxDocChildFrame(); // Extend event processing to search the view's event table @@ -457,7 +468,10 @@ protected: wxDocument* m_childDocument; wxView* m_childView; +private: + DECLARE_CLASS(wxDocChildFrame) DECLARE_EVENT_TABLE() + DECLARE_NO_COPY_CLASS(wxDocChildFrame) }; // ---------------------------------------------------------------------------- @@ -466,8 +480,6 @@ protected: class WXDLLEXPORT wxDocParentFrame : public wxFrame { - DECLARE_CLASS(wxDocParentFrame) - public: wxDocParentFrame(wxDocManager *manager, wxFrame *frame, @@ -476,7 +488,7 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long type = wxDEFAULT_FRAME_STYLE, - const wxString& name = "frame"); + const wxString& name = wxT("frame")); // Extend event processing to search the document manager's event table virtual bool ProcessEvent(wxEvent& event); @@ -490,7 +502,10 @@ public: protected: wxDocManager *m_docManager; +private: + DECLARE_CLASS(wxDocParentFrame) DECLARE_EVENT_TABLE() + DECLARE_NO_COPY_CLASS(wxDocParentFrame) }; // ---------------------------------------------------------------------------- @@ -500,10 +515,8 @@ protected: #if wxUSE_PRINTING_ARCHITECTURE class WXDLLEXPORT wxDocPrintout : public wxPrintout { - DECLARE_DYNAMIC_CLASS(wxDocPrintout) - public: - wxDocPrintout(wxView *view = (wxView *) NULL, const wxString& title = "Printout"); + wxDocPrintout(wxView *view = (wxView *) NULL, const wxString& title = wxT("Printout")); bool OnPrintPage(int page); bool HasPage(int page); bool OnBeginDocument(int startPage, int endPage); @@ -513,6 +526,10 @@ public: protected: wxView* m_printoutView; + +private: + DECLARE_DYNAMIC_CLASS(wxDocPrintout) + DECLARE_NO_COPY_CLASS(wxDocPrintout) }; #endif // wxUSE_PRINTING_ARCHITECTURE @@ -522,15 +539,13 @@ protected: class WXDLLEXPORT wxFileHistory : public wxObject { - DECLARE_DYNAMIC_CLASS(wxFileHistory) - public: - wxFileHistory(int maxFiles = 9); + wxFileHistory(size_t maxFiles = 9, wxWindowID idBase = wxID_FILE1); ~wxFileHistory(); // Operations virtual void AddFileToHistory(const wxString& file); - virtual void RemoveFileFromHistory(int i); + virtual void RemoveFileFromHistory(size_t i); virtual int GetMaxFiles() const { return m_fileMaxFiles; } virtual void UseMenu(wxMenu *menu); @@ -546,25 +561,37 @@ public: virtual void AddFilesToMenu(wxMenu* menu); // Single menu // Accessors - virtual wxString GetHistoryFile(int i) const; + virtual wxString GetHistoryFile(size_t i) const; + virtual size_t GetCount() const { return m_fileHistoryN; } - // A synonym for GetNoHistoryFiles - virtual int GetCount() const { return m_fileHistoryN; } - int GetNoHistoryFiles() const { return m_fileHistoryN; } + const wxList& GetMenus() const { return m_fileMenus; } - wxList& GetMenus() const { return (wxList&) m_fileMenus; } + // deprecated, use GetCount() instead + wxDEPRECATED( size_t GetNoHistoryFiles() const ); protected: // Last n files wxChar** m_fileHistory; // Number of files saved - int m_fileHistoryN; + size_t m_fileHistoryN; // Menus to maintain (may need several for an MDI app) wxList m_fileMenus; // Max files to maintain - int m_fileMaxFiles; + 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) + DECLARE_NO_COPY_CLASS(wxFileHistory) }; +inline size_t wxFileHistory::GetNoHistoryFiles() const +{ + return m_fileHistoryN; +} + #if wxUSE_STD_IOSTREAM // For compatibility with existing file formats: // converts from/to a stream to/from a temporary file. @@ -575,6 +602,8 @@ bool WXDLLEXPORT wxTransferStreamToFile(wxSTD istream& stream, const wxString& f // converts from/to a stream to/from a temporary file. bool WXDLLEXPORT wxTransferFileToStream(const wxString& filename, wxOutputStream& stream); bool WXDLLEXPORT wxTransferStreamToFile(wxInputStream& stream, const wxString& filename); -#endif +#endif // wxUSE_STD_IOSTREAM + +#endif // wxUSE_DOC_VIEW_ARCHITECTURE #endif // _WX_DOCH__