Rename wxWebNavigationError to wxWebViewNavigationError and wxWebNavigationEvent...

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

diff --git a/src/xrc/xh_frame.cpp b/src/xrc/xh_frame.cpp
index dc6d8fc2988a6b4632ea099e48e24ead1521446b..b575f8bd8bfadce6d3eb0698149917994cedfdff 100644 (file)
--- a/src/xrc/xh_frame.cpp
+++ b/src/xrc/xh_frame.cpp
@@ -21,12 +21,11 @@
 
 #ifndef WX_PRECOMP
     #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
 
 #endif
 

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

 IMPLEMENT_DYNAMIC_CLASS(wxFrameXmlHandler, wxXmlResourceHandler)
 
 wxFrameXmlHandler::wxFrameXmlHandler() : wxXmlResourceHandler()
 IMPLEMENT_DYNAMIC_CLASS(wxFrameXmlHandler, wxXmlResourceHandler)
 
 wxFrameXmlHandler::wxFrameXmlHandler() : wxXmlResourceHandler()


@@ -80,7 +79,7 @@ wxObject *wxFrameXmlHandler::DoCreateResource()
     if (HasParam(wxT("pos")))
         frame->Move(GetPosition());
     if (HasParam(wxT("icon")))
     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);
 
 
     SetupWindow(frame);