Use LF eol-style svn property for all Unix-only files.

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

diff --git a/include/wx/docview.h b/include/wx/docview.h
index f4ecc6895025bf97e801cc02a189e904f037ca03..3b06cb0826db0af8a401ec916343f1a6eb23340d 100644 (file)
--- a/include/wx/docview.h
+++ b/include/wx/docview.h
@@ -21,6 +21,7 @@
 #include "wx/string.h"
 #include "wx/frame.h"
 #include "wx/filehistory.h"
+#include "wx/vector.h"
 
 #if wxUSE_PRINTING_ARCHITECTURE
     #include "wx/print.h"
@@ -60,11 +61,9 @@ enum
 
 #define wxMAX_FILE_HISTORY 9
 
-#ifndef __VISUALC6__
 typedef wxVector<wxDocument*> wxDocVector;
 typedef wxVector<wxView*> wxViewVector;
 typedef wxVector<wxDocTemplate*> wxDocTemplateVector;
-#endif
 
 class WXDLLIMPEXP_CORE wxDocument : public wxEvtHandler
 {
@@ -87,6 +86,9 @@ public:
     bool GetDocumentSaved() const { return m_savedYet; }
     void SetDocumentSaved(bool saved = true) { m_savedYet = saved; }
 
+    // activate the first view of the document if any
+    void Activate();
+
     // return true if the document hasn't been modified since the last time it
     // was saved (implying that it returns false if it was never saved, even if
     // the document is not modified)
@@ -148,8 +150,9 @@ public:
     virtual bool RemoveView(wxView *view);
 
 #ifndef __VISUALC6__
-    wxViewVector GetViewsVector() const { return m_documentViews.AsVector<wxView*>(); }
-#endif
+    wxViewVector GetViewsVector() const;
+#endif // !__VISUALC6__
+
     wxList& GetViews() { return m_documentViews; }
     const wxList& GetViews() const { return m_documentViews; }
 
@@ -443,6 +446,9 @@ public:
     // Find template from document class info, may return NULL.
     wxDocTemplate* FindTemplate(const wxClassInfo* documentClassInfo);
 
+    // Find document from file name, may return NULL.
+    wxDocument* FindDocumentByPath(const wxString& path) const;
+
     wxDocument *GetCurrentDocument() const;
 
     void SetMaxDocsOpen(int n) { m_maxDocsOpen = n; }
@@ -467,9 +473,10 @@ public:
     virtual wxView *GetCurrentView() const { return m_currentView; }
 
 #ifndef __VISUALC6__
-    wxDocVector GetDocumentsVector() const { return m_docs.AsVector<wxDocument*>(); }
-    wxDocTemplateVector GetTemplatesVector() const { return m_templates.AsVector<wxDocTemplate*>(); }
-#endif
+    wxDocVector GetDocumentsVector() const;
+    wxDocTemplateVector GetTemplatesVector() const;
+#endif // !__VISUALC6__
+
     wxList& GetDocuments() { return m_docs; }
     wxList& GetTemplates() { return m_templates; }
 
@@ -549,10 +556,6 @@ protected:
     // view and returns it then
     wxView *GetActiveView() const;
 
-    // activate the first view of the given document if any
-    void ActivateDocument(wxDocument *doc);
-
-
     int               m_defaultDocumentNameCounter;
     int               m_maxDocsOpen;
     wxList            m_docs;
@@ -1010,6 +1013,23 @@ enum
 };
 #endif // WXWIN_COMPATIBILITY_2_8
 
+#ifndef __VISUALC6__
+inline wxViewVector wxDocument::GetViewsVector() const
+{
+    return m_documentViews.AsVector<wxView*>();
+}
+
+inline wxDocVector wxDocManager::GetDocumentsVector() const
+{
+    return m_docs.AsVector<wxDocument*>();
+}
+
+inline wxDocTemplateVector wxDocManager::GetTemplatesVector() const
+{
+    return m_templates.AsVector<wxDocTemplate*>();
+}
+#endif // !__VISUALC6__
+
 #endif // wxUSE_DOC_VIEW_ARCHITECTURE
 
 #endif // _WX_DOCH__