Merge in from trunk r68626 - r68683

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

diff --git a/src/xrc/xh_wizrd.cpp b/src/xrc/xh_wizrd.cpp
index fd49ef89f75b0ad4f9e723c97d74ea905c5dc2ff..97dc42b94dd1b58728677b63c2f6009f5b69babb 100644 (file)
--- a/src/xrc/xh_wizrd.cpp
+++ b/src/xrc/xh_wizrd.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        xh_wizrd.cpp
+// Name:        src/xrc/xh_wizrd.cpp
 // Purpose:     XRC resource for wxWizard
 // Author:      Vaclav Slavik
 // Created:     2003/03/01
@@ -18,7 +18,11 @@
 #if wxUSE_XRC && wxUSE_WIZARDDLG
 
 #include "wx/xrc/xh_wizrd.h"
-#include "wx/log.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+#endif
+
 #include "wx/wizard.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxWizardXmlHandler, wxXmlResourceHandler)
@@ -45,6 +49,7 @@ wxObject *wxWizardXmlHandler::DoCreateResource()
                     GetText(wxT("title")),
                     GetBitmap(),
                     GetPosition());
+        SetupWindow(wiz);
 
         wxWizard *old = m_wizard;
         m_wizard = wiz;
@@ -70,7 +75,7 @@ wxObject *wxWizardXmlHandler::DoCreateResource()
         {
             if ( !m_instance )
             {
-                wxLogError(wxT("wxWizardPage is abstract class, must be subclassed"));
+                ReportError("wxWizardPage is abstract class and must be subclassed");
                 return NULL;
             }