applying patch, fixes #10524

[wxWidgets.git] / src / xrc / xh_mdi.cpp

diff --git a/src/xrc/xh_mdi.cpp b/src/xrc/xh_mdi.cpp
index 35c9cae13ad159eedb3e328852e30f89d203dff2..95fa08e21e1758c13d1a90e4f4791fb0a1c8a5a5 100644 (file)
--- a/src/xrc/xh_mdi.cpp
+++ b/src/xrc/xh_mdi.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/xrc/xh_mdi.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/xrc/xh_mdi.cpp

-// Purpose:     XRC resource for dialogs
+// Purpose:     XRC resource for wxMDI

 // Author:      David M. Falkinder & Vaclav Slavik
 // Created:     14/02/2005
 // RCS-ID:      $Id$
 // Author:      David M. Falkinder & Vaclav Slavik
 // Created:     14/02/2005
 // RCS-ID:      $Id$


@@ -18,15 +18,14 @@
 #if wxUSE_XRC && wxUSE_MDI
 
 #include "wx/xrc/xh_mdi.h"
 #if wxUSE_XRC && wxUSE_MDI
 
 #include "wx/xrc/xh_mdi.h"

+#include "wx/mdi.h"

 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"

+    #include "wx/dialog.h" // to get wxDEFAULT_DIALOG_STYLE

 #endif
 
 #endif
 

-#include "wx/mdi.h"
-#include "wx/dialog.h" // to get wxDEFAULT_DIALOG_STYLE
-

 IMPLEMENT_DYNAMIC_CLASS(wxMdiXmlHandler, wxXmlResourceHandler)
 
 wxMdiXmlHandler::wxMdiXmlHandler() : wxXmlResourceHandler()
 IMPLEMENT_DYNAMIC_CLASS(wxMdiXmlHandler, wxXmlResourceHandler)
 
 wxMdiXmlHandler::wxMdiXmlHandler() : wxXmlResourceHandler()


@@ -89,7 +88,7 @@ wxWindow *wxMdiXmlHandler::CreateFrame()
 
         if ( !mdiParent )
         {
 
         if ( !mdiParent )
         {

-            wxLogError(wxT("Parent of wxMDIParentFrame must be wxMDIParentFrame."));
+            wxLogError(wxT("Parent of wxMDIChildFrame must be wxMDIParentFrame."));

             return NULL;
         }
 
             return NULL;
         }