X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/88a7a4e10ed18f81a576dcd866cfbf02bf404c00..64ea838d8f4d1853b7d850db93ee565e901d099a:/src/xrc/xh_mdi.cpp

diff --git a/src/xrc/xh_mdi.cpp b/src/xrc/xh_mdi.cpp
index 9cb9ee2e7c..50a7ed1cb7 100644
--- a/src/xrc/xh_mdi.cpp
+++ b/src/xrc/xh_mdi.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // 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$
@@ -18,15 +18,14 @@
 #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"
+    #include "wx/dialog.h" // to get wxDEFAULT_DIALOG_STYLE
 #endif
 
-#include "wx/mdi.h"
-#include "wx/dialog.h" // to get wxDEFAULT_DIALOG_STYLE
-#include "wx/log.h"
-
 IMPLEMENT_DYNAMIC_CLASS(wxMdiXmlHandler, wxXmlResourceHandler)
 
 wxMdiXmlHandler::wxMdiXmlHandler() : wxXmlResourceHandler()
@@ -89,7 +88,7 @@ wxWindow *wxMdiXmlHandler::CreateFrame()
 
         if ( !mdiParent )
         {
-            wxLogError(wxT("Parent of wxMDIParentFrame must be wxMDIParentFrame."));
+            ReportError("parent of wxMDIChildFrame must be wxMDIParentFrame");
             return NULL;
         }
 
@@ -118,7 +117,7 @@ wxObject *wxMdiXmlHandler::DoCreateResource()
     {
         wxFrame* f = wxDynamicCast(frame, wxFrame);
         if (f)
-            f->SetIcon(GetIcon(wxT("icon"), wxART_FRAME_ICON));
+            f->SetIcons(GetIconBundle(wxT("icon"), wxART_FRAME_ICON));
     }
 
     SetupWindow(frame);