X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1c067fe3c1e752658c63b4d556eb6a5468213860..dca2fe5daecf9c74f227062d8a9a259b4e5ef1fc:/src/xrc/xh_frame.cpp diff --git a/src/xrc/xh_frame.cpp b/src/xrc/xh_frame.cpp index d1b7a64227..5ad0e1ee83 100644 --- a/src/xrc/xh_frame.cpp +++ b/src/xrc/xh_frame.cpp @@ -3,7 +3,6 @@ // Purpose: XRC resource for dialogs // Author: Vaclav Slavik & Aleks. // Created: 2000/03/05 -// RCS-ID: $Id$ // Copyright: (c) 2000 Vaclav Slavik // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -18,10 +17,13 @@ #if wxUSE_XRC #include "wx/xrc/xh_frame.h" -#include "wx/frame.h" -#include "wx/dialog.h" // to get wxDEFAULT_DIALOG_STYLE -#include "wx/log.h" -#include "wx/intl.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" + #include "wx/log.h" + #include "wx/frame.h" + #include "wx/dialog.h" // to get wxDEFAULT_DIALOG_STYLE +#endif IMPLEMENT_DYNAMIC_CLASS(wxFrameXmlHandler, wxXmlResourceHandler) @@ -76,7 +78,7 @@ wxObject *wxFrameXmlHandler::DoCreateResource() if (HasParam(wxT("pos"))) frame->Move(GetPosition()); if (HasParam(wxT("icon"))) - frame->SetIcon(GetIcon(wxT("icon"), wxART_FRAME_ICON)); + frame->SetIcons(GetIconBundle(wxT("icon"), wxART_FRAME_ICON)); SetupWindow(frame);