Undo the Test commit

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

diff --git a/include/wx/docview.h b/include/wx/docview.h
index 8eafaccc135ae0ccce05c9f96ad1a65519f9d675..1672e1c02899318eefee91c9e8bc1e26eed4249b 100644 (file)
--- a/include/wx/docview.h
+++ b/include/wx/docview.h
@@ -348,9 +348,9 @@ public:
     virtual wxDocTemplate *SelectDocumentPath(wxDocTemplate **templates,
             int noTemplates, wxString& path, long flags, bool save = FALSE);
     virtual wxDocTemplate *SelectDocumentType(wxDocTemplate **templates,
     virtual wxDocTemplate *SelectDocumentPath(wxDocTemplate **templates,
             int noTemplates, wxString& path, long flags, bool save = FALSE);
     virtual wxDocTemplate *SelectDocumentType(wxDocTemplate **templates,

-            int noTemplates);
+            int noTemplates, bool sort = FALSE);

     virtual wxDocTemplate *SelectViewType(wxDocTemplate **templates,
     virtual wxDocTemplate *SelectViewType(wxDocTemplate **templates,

-            int noTemplates);
+            int noTemplates, bool sort = FALSE);

     virtual wxDocTemplate *FindTemplateForPath(const wxString& path);
 
     void AssociateTemplate(wxDocTemplate *temp);
     virtual wxDocTemplate *FindTemplateForPath(const wxString& path);
 
     void AssociateTemplate(wxDocTemplate *temp);


@@ -373,7 +373,8 @@ public:
     virtual void ActivateView(wxView *view, bool activate = TRUE, bool deleting = FALSE);
     virtual wxView *GetCurrentView() const;
 
     virtual void ActivateView(wxView *view, bool activate = TRUE, bool deleting = FALSE);
     virtual wxView *GetCurrentView() const;
 

-    virtual wxList& GetDocuments() const { return (wxList&) m_docs; }
+    wxList& GetDocuments() { return m_docs; }
+    wxList& GetTemplates() { return m_templates; }

 
     // Make a default document name
     virtual bool MakeDefaultName(wxString& buf);
 
     // Make a default document name
     virtual bool MakeDefaultName(wxString& buf);