Fix <object_ref> processing to respect overridden attributes.

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

diff --git a/src/xrc/xh_dlg.cpp b/src/xrc/xh_dlg.cpp
index 704ac90abf5e4df5dc6051787b88b7f50f2d8d53..268d60f4f14654115d39e694d713c36d9a4337b4 100644 (file)
--- a/src/xrc/xh_dlg.cpp
+++ b/src/xrc/xh_dlg.cpp
@@ -23,10 +23,9 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/frame.h"
+    #include "wx/dialog.h"
 #endif
 
-#include "wx/dialog.h"
-
 IMPLEMENT_DYNAMIC_CLASS(wxDialogXmlHandler, wxXmlResourceHandler)
 
 wxDialogXmlHandler::wxDialogXmlHandler() : wxXmlResourceHandler()
@@ -74,7 +73,7 @@ wxObject *wxDialogXmlHandler::DoCreateResource()
     if (HasParam(wxT("pos")))
         dlg->Move(GetPosition());
     if (HasParam(wxT("icon")))
-        dlg->SetIcon(GetIcon(wxT("icon"), wxART_FRAME_ICON));
+        dlg->SetIcons(GetIconBundle(wxT("icon"), wxART_FRAME_ICON));
 
     SetupWindow(dlg);