fix for calculating the header window height (patch 805791)

[wxWidgets.git] / src / common / docmdi.cpp

diff --git a/src/common/docmdi.cpp b/src/common/docmdi.cpp
index 2c7f79268a0ff19ca1b29c159bc05b0f429b2123..4d6141dd8c51dbe84665e4dbdfebe75bc40742a0 100644 (file)
--- a/src/common/docmdi.cpp
+++ b/src/common/docmdi.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "docmdi.h"
 #endif
 
@@ -87,14 +87,36 @@ BEGIN_EVENT_TABLE(wxDocMDIChildFrame, wxMDIChildFrame)
     EVT_CLOSE(wxDocMDIChildFrame::OnCloseWindow)
 END_EVENT_TABLE()
 
+void wxDocMDIChildFrame::Init()
+{
+    m_childDocument = (wxDocument*)  NULL;
+    m_childView = (wxView*) NULL;
+}
+
+wxDocMDIChildFrame::wxDocMDIChildFrame()
+{
+    Init();
+}
+
 wxDocMDIChildFrame::wxDocMDIChildFrame(wxDocument *doc, wxView *view, wxMDIParentFrame *frame, wxWindowID  id,
-  const wxString& title, const wxPoint& pos, const wxSize& size, long style, const wxString& name):
-    wxMDIChildFrame(frame, id, title, pos, size, style, name)
+  const wxString& title, const wxPoint& pos, const wxSize& size, long style, const wxString& name)
+{
+    Init();
+    Create(doc, view, frame, id, title, pos, size, style, name);
+}
+
+bool wxDocMDIChildFrame::Create(wxDocument *doc, wxView *view, wxMDIParentFrame *frame, wxWindowID  id,
+  const wxString& title, const wxPoint& pos, const wxSize& size, long style, const wxString& name)
 {
   m_childDocument = doc;
   m_childView = view;
+    if (wxMDIChildFrame::Create(frame, id, title, pos, size, style, name)) {
   if (view)
     view->SetFrame(this);
+        return TRUE;
+    }
+
+    return FALSE;
 }
 
 wxDocMDIChildFrame::~wxDocMDIChildFrame(void)