X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e49c85af1c3166c9cdfdc99b4d9d5103c3c1bd61..b6e2eddeaf7e559589ce41ac41e88f9bd71c5a08:/include/wx/docview.h?ds=sidebyside

diff --git a/include/wx/docview.h b/include/wx/docview.h
index 8c8bf6fa6f..11989e4c1a 100644
--- a/include/wx/docview.h
+++ b/include/wx/docview.h
@@ -12,7 +12,7 @@
 #ifndef _WX_DOCH__
 #define _WX_DOCH__
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "docview.h"
 #endif
 
@@ -161,7 +161,7 @@ protected:
     wxDocument*           m_documentParent;
     wxCommandProcessor*   m_commandProcessor;
     bool                  m_savedYet;
-    
+
 private:
     DECLARE_ABSTRACT_CLASS(wxDocument)
     DECLARE_NO_COPY_CLASS(wxDocument)
@@ -202,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);
 
@@ -292,7 +287,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 +297,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();
@@ -373,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; }
@@ -396,7 +392,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);
@@ -408,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;
@@ -426,9 +425,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
 // ----------------------------------------------------------------------------
@@ -557,12 +562,12 @@ 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; }
+    const wxList& GetMenus() const { return m_fileMenus; }
+
+    // deprecated, use GetCount() instead
+    wxDEPRECATED( size_t GetNoHistoryFiles() const );
 
 protected:
     // Last n files
@@ -573,7 +578,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;
@@ -582,6 +587,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.