X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5f159ac91d08a32ddd33e384c0357f7dc5500e2..2f00b79f60a894e5eb3f94ff671f6fef0b49d5d6:/include/wx/docview.h?ds=inline

diff --git a/include/wx/docview.h b/include/wx/docview.h
index 81a4177100..de70706367 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
 
@@ -379,7 +379,7 @@ public:
 
     // 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; }
@@ -569,7 +569,7 @@ public:
     virtual wxString GetHistoryFile(size_t i) const;
     virtual size_t GetCount() 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 );