X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dd47af27e12ee66b3e9eed6f1711e516f36dc837..74af0b13434f4fa5c814a19a6d325d271944accf:/src/xrc/xh_mdi.cpp diff --git a/src/xrc/xh_mdi.cpp b/src/xrc/xh_mdi.cpp index d98e5409f7..50a7ed1cb7 100644 --- a/src/xrc/xh_mdi.cpp +++ b/src/xrc/xh_mdi.cpp @@ -18,12 +18,12 @@ #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 - #include "wx/mdi.h" #endif IMPLEMENT_DYNAMIC_CLASS(wxMdiXmlHandler, wxXmlResourceHandler) @@ -88,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; } @@ -117,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);