Committed Jaako's renderer patch

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

diff --git a/include/wx/docview.h b/include/wx/docview.h
index 381dd1ac1a3027c79aba33bd798ba4a34a672db6..36a9bd114e6fed09851383a4fd51d2610c5a9403 100644 (file)
--- a/include/wx/docview.h
+++ b/include/wx/docview.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        docview.h
+// Name:        wx/docview.h

 // Purpose:     Doc/View classes
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     Doc/View classes
 // Author:      Julian Smart
 // Modified by:


@@ -12,10 +12,6 @@
 #ifndef _WX_DOCH__
 #define _WX_DOCH__
 
 #ifndef _WX_DOCH__
 #define _WX_DOCH__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "docview.h"
-#endif
-

 #include "wx/defs.h"
 
 #if wxUSE_DOC_VIEW_ARCHITECTURE
 #include "wx/defs.h"
 
 #if wxUSE_DOC_VIEW_ARCHITECTURE


@@ -130,7 +126,8 @@ public:
 
     virtual bool AddView(wxView *view);
     virtual bool RemoveView(wxView *view);
 
     virtual bool AddView(wxView *view);
     virtual bool RemoveView(wxView *view);

-    wxList& GetViews() const { return (wxList&) m_documentViews; }
+    wxList& GetViews() { return m_documentViews; }
+    const wxList& GetViews() const { return m_documentViews; }

     wxView *GetFirstView() const;
 
     virtual void UpdateAllViews(wxView *sender = (wxView *) NULL, wxObject *hint = (wxObject *) NULL);
     wxView *GetFirstView() const;
 
     virtual void UpdateAllViews(wxView *sender = (wxView *) NULL, wxObject *hint = (wxObject *) NULL);


@@ -427,8 +424,10 @@ public:
     // Get the current document manager
     static wxDocManager* GetDocumentManager() { return sm_docManager; }
 
     // Get the current document manager
     static wxDocManager* GetDocumentManager() { return sm_docManager; }
 

+#if WXWIN_COMPATIBILITY_2_6

     // deprecated, use GetHistoryFilesCount() instead
     wxDEPRECATED( size_t GetNoHistoryFiles() const );
     // deprecated, use GetHistoryFilesCount() instead
     wxDEPRECATED( size_t GetNoHistoryFiles() const );

+#endif // WXWIN_COMPATIBILITY_2_6

 
 protected:
     long              m_flags;
 
 protected:
     long              m_flags;


@@ -446,10 +445,12 @@ protected:
     DECLARE_NO_COPY_CLASS(wxDocManager)
 };
 
     DECLARE_NO_COPY_CLASS(wxDocManager)
 };
 

+#if WXWIN_COMPATIBILITY_2_6

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

+#endif // WXWIN_COMPATIBILITY_2_6

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


@@ -583,8 +584,10 @@ public:
 
     const wxList& GetMenus() const { return m_fileMenus; }
 
 
     const wxList& GetMenus() const { return m_fileMenus; }
 

+#if WXWIN_COMPATIBILITY_2_6

     // deprecated, use GetCount() instead
     wxDEPRECATED( size_t GetNoHistoryFiles() const );
     // deprecated, use GetCount() instead
     wxDEPRECATED( size_t GetNoHistoryFiles() const );

+#endif // WXWIN_COMPATIBILITY_2_6

 
 protected:
     // Last n files
 
 protected:
     // Last n files


@@ -604,10 +607,12 @@ private:
     DECLARE_NO_COPY_CLASS(wxFileHistory)
 };
 
     DECLARE_NO_COPY_CLASS(wxFileHistory)
 };
 

+#if WXWIN_COMPATIBILITY_2_6

 inline size_t wxFileHistory::GetNoHistoryFiles() const
 {
     return m_fileHistoryN;
 }
 inline size_t wxFileHistory::GetNoHistoryFiles() const
 {
     return m_fileHistoryN;
 }

+#endif // WXWIN_COMPATIBILITY_2_6

 
 #if wxUSE_STD_IOSTREAM
 // For compatibility with existing file formats:
 
 #if wxUSE_STD_IOSTREAM
 // For compatibility with existing file formats: