Separated creation and initialisation of a document via its doc template.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27600 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/latex/wx/doctempl.tex b/docs/latex/wx/doctempl.tex
index ebae77f6ef5eaab95b3d6559c9f88e38682075b1..afaaea357e16dee3546389acfb4e1e5ea544370d 100644 (file)
--- a/docs/latex/wx/doctempl.tex
+++ b/docs/latex/wx/doctempl.tex
@@ -154,6 +154,9 @@ Creates a new instance of the associated document class. If you have not supplie
 a wxClassInfo parameter to the template constructor, you will need to override this
 function to return an appropriate document instance.
 
+This function calls wxDocTemplate::InitDocument which in turns
+calls wxDocument::OnCreate.
+
 \membersection{wxDocTemplate::CreateView}
 
 \func{wxView *}{CreateView}{\param{wxDocument *}{doc}, \param{long}{ flags = 0}}
@@ -210,6 +213,13 @@ Returns the flags, as passed to the document template constructor.
 
 Returns the view type name, as passed to the document template constructor.
 
+\membersection{wxDocTemplate::InitDocument}
+
+\func{bool}{InitDocument}{\param{wxDocument* }{doc}, \param{const wxString\& }{path}, \param{long}{ flags = 0}}
+
+Initialises the document, calling wxDocument::OnCreate. This is called from
+wxDocTemplate::CreateDocument.
+
 \membersection{wxDocTemplate::IsVisible}
 
 \func{bool}{IsVisible}{\void}

diff --git a/include/wx/docview.h b/include/wx/docview.h
index ef574fd486e640ba4c627cdfc6b913b0305e1f75..08a9a3ce4440ee977a0c85c792a4e444d8a46cf8 100644 (file)
--- a/include/wx/docview.h
+++ b/include/wx/docview.h
@@ -254,6 +254,10 @@ public:
     virtual wxDocument *CreateDocument(const wxString& path, long flags = 0);
     virtual wxView *CreateView(wxDocument *doc, long flags = 0);
 
+    // Helper method for CreateDocument; also allows you to do your own document
+    // creation
+    virtual bool InitDocument(wxDocument* doc, const wxString& path, long flags = 0);
+
     wxString GetDefaultExtension() const { return m_defaultExt; };
     wxString GetDescription() const { return m_description; }
     wxString GetDirectory() const { return m_directory; };

diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index a9687e03270dc043b4d3bea4e2e6f5c036c11d7c..f77b00cdbda2f97f9c81506006b9d3f4e679ed7a 100644 (file)
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -691,18 +691,31 @@ wxDocument *wxDocTemplate::CreateDocument(const wxString& path, long flags)
     if (!m_docClassInfo)
         return (wxDocument *) NULL;
     wxDocument *doc = (wxDocument *)m_docClassInfo->CreateObject();
+    
+    if (InitDocument(doc, path, flags))
+    {
+        return doc;
+    }
+    else
+    {
+        return (wxDocument *) NULL;
+    }
+}
+
+bool wxDocTemplate::InitDocument(wxDocument* doc, const wxString& path, long flags)
+{
     doc->SetFilename(path);
     doc->SetDocumentTemplate(this);
     GetDocumentManager()->AddDocument(doc);
     doc->SetCommandProcessor(doc->OnCreateCommandProcessor());
 
     if (doc->OnCreate(path, flags))
-        return doc;
+        return true;
     else
     {
         if (GetDocumentManager()->GetDocuments().Member(doc))
             doc->DeleteAllViews();
-        return (wxDocument *) NULL;
+        return false;
     }
 }