got rid of wxEvtHandler::m_isWindow, use virtual functions (overridden in wxWindow...

[wxWidgets.git] / include / wx / docview.h

diff --git a/include/wx/docview.h b/include/wx/docview.h
index 8c8bf6fa6f405a8b6773171ca5690480ec02aca8..81a4177100f55f45799feef74e457450d4ead1f2 100644 (file)
--- a/include/wx/docview.h
+++ b/include/wx/docview.h
@@ -161,7 +161,7 @@ protected:
     wxDocument*           m_documentParent;
     wxCommandProcessor*   m_commandProcessor;
     bool                  m_savedYet;
     wxDocument*           m_documentParent;
     wxCommandProcessor*   m_commandProcessor;
     bool                  m_savedYet;

-    
+

 private:
     DECLARE_ABSTRACT_CLASS(wxDocument)
     DECLARE_NO_COPY_CLASS(wxDocument)
 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;
     // For dynamic creation of appropriate instances.
     wxClassInfo*      m_docClassInfo;
     wxClassInfo*      m_viewClassInfo;

-    
+

 private:
     DECLARE_CLASS(wxDocTemplate)
     DECLARE_NO_COPY_CLASS(wxDocTemplate)
 private:
     DECLARE_CLASS(wxDocTemplate)
     DECLARE_NO_COPY_CLASS(wxDocTemplate)


@@ -302,8 +302,6 @@ private:
 // the templates and documents.
 class WXDLLEXPORT wxDocManager: public wxEvtHandler
 {
 // the templates and documents.
 class WXDLLEXPORT wxDocManager: public wxEvtHandler
 {

-    DECLARE_DYNAMIC_CLASS(wxDocManager)
-

 public:
     wxDocManager(long flags = wxDEFAULT_DOCMAN_FLAGS, bool initialize = TRUE);
     ~wxDocManager();
 public:
     wxDocManager(long flags = wxDEFAULT_DOCMAN_FLAGS, bool initialize = TRUE);
     ~wxDocManager();


@@ -373,6 +371,9 @@ public:
     // closes all currently open documents
     bool CloseDocuments(bool force = TRUE);
 
     // 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);
 
     // Clear remaining documents and templates
     bool Clear(bool force = TRUE);
 


@@ -396,7 +397,7 @@ public:
     // File history management
     virtual void AddFileToHistory(const wxString& file);
     virtual void RemoveFileFromHistory(size_t i);
     // 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);
     virtual wxString GetHistoryFile(size_t i) const;
     virtual void FileHistoryUseMenu(wxMenu *menu);
     virtual void FileHistoryRemoveMenu(wxMenu *menu);


@@ -408,12 +409,15 @@ public:
     virtual void FileHistoryAddFilesToMenu();
     virtual void FileHistoryAddFilesToMenu(wxMenu* menu);
 
     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; }
 
 
     // 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;
 protected:
     long              m_flags;
     int               m_defaultDocumentNameCounter;


@@ -426,9 +430,15 @@ protected:
     static wxDocManager* sm_docManager;
 
     DECLARE_EVENT_TABLE()
     static wxDocManager* sm_docManager;
 
     DECLARE_EVENT_TABLE()

+    DECLARE_DYNAMIC_CLASS(wxDocManager)

     DECLARE_NO_COPY_CLASS(wxDocManager)
 };
 
     DECLARE_NO_COPY_CLASS(wxDocManager)
 };
 

+inline size_t wxDocManager::GetNoHistoryFiles() const
+{
+    return GetHistoryFilesCount();
+}
+

 // ----------------------------------------------------------------------------
 // A default child frame
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // A default child frame
 // ----------------------------------------------------------------------------


@@ -557,13 +567,13 @@ public:
 
     // Accessors
     virtual wxString GetHistoryFile(size_t i) const;
 
     // Accessors
     virtual wxString GetHistoryFile(size_t i) const;

-
-    // A synonym for GetNoHistoryFiles

     virtual size_t GetCount() const { return m_fileHistoryN; }
     virtual size_t GetCount() const { return m_fileHistoryN; }

-    size_t GetNoHistoryFiles() const { return m_fileHistoryN; }

 
     wxList& GetMenus() const { return (wxList&) 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;
 protected:
     // Last n files
     wxChar**          m_fileHistory;


@@ -573,7 +583,7 @@ protected:
     wxList            m_fileMenus;
     // Max files to maintain
     size_t            m_fileMaxFiles;
     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;
 private:
     // The ID of the first history menu item (Doesn't have to be wxID_FILE1)
     wxWindowID m_idBase;


@@ -582,6 +592,11 @@ private:
     DECLARE_NO_COPY_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.
 #if wxUSE_STD_IOSTREAM
 // For compatibility with existing file formats:
 // converts from/to a stream to/from a temporary file.