X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b72b1920368319d626f486e511fceeea144f7676..ef094fa075bc56bcbc33b12159c395ea28afda3b:/include/wx/docview.h?ds=sidebyside diff --git a/include/wx/docview.h b/include/wx/docview.h index ef9a47fd52..81a4177100 100644 --- a/include/wx/docview.h +++ b/include/wx/docview.h @@ -161,7 +161,7 @@ protected: wxDocument* m_documentParent; wxCommandProcessor* m_commandProcessor; bool m_savedYet; - + private: DECLARE_ABSTRACT_CLASS(wxDocument) DECLARE_NO_COPY_CLASS(wxDocument) @@ -292,7 +292,7 @@ protected: // For dynamic creation of appropriate instances. wxClassInfo* m_docClassInfo; wxClassInfo* m_viewClassInfo; - + private: DECLARE_CLASS(wxDocTemplate) DECLARE_NO_COPY_CLASS(wxDocTemplate) @@ -302,8 +302,6 @@ private: // the templates and documents. class WXDLLEXPORT wxDocManager: public wxEvtHandler { - DECLARE_DYNAMIC_CLASS(wxDocManager) - public: wxDocManager(long flags = wxDEFAULT_DOCMAN_FLAGS, bool initialize = TRUE); ~wxDocManager(); @@ -399,7 +397,7 @@ public: // File history management virtual void AddFileToHistory(const wxString& file); virtual void RemoveFileFromHistory(size_t i); - virtual size_t GetNoHistoryFiles() const; + virtual size_t GetHistoryFilesCount() const; virtual wxString GetHistoryFile(size_t i) const; virtual void FileHistoryUseMenu(wxMenu *menu); virtual void FileHistoryRemoveMenu(wxMenu *menu); @@ -411,12 +409,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; @@ -429,9 +430,15 @@ 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 // ---------------------------------------------------------------------------- @@ -560,13 +567,13 @@ public: // Accessors virtual wxString GetHistoryFile(size_t i) const; - - // A synonym for GetNoHistoryFiles virtual size_t GetCount() const { return m_fileHistoryN; } - size_t GetNoHistoryFiles() const { return m_fileHistoryN; } wxList& GetMenus() const { return (wxList&) m_fileMenus; } + // deprecated, use GetCount() instead + wxDEPRECATED( size_t GetNoHistoryFiles() const ); + protected: // Last n files wxChar** m_fileHistory; @@ -576,7 +583,7 @@ protected: 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; @@ -585,6 +592,11 @@ private: 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.