readding trace constant

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

diff --git a/src/xrc/xh_wizrd.cpp b/src/xrc/xh_wizrd.cpp
index 4fd68ca54dfa32cdcfa02c47c57a5ff4e19e8bfd..6efb06635a50f5d16397091b547e1b8ba86d3a87 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
 // Purpose:     XRC resource for wxWizard
 // Author:      Vaclav Slavik
 // Created:     2003/03/01


@@ -8,10 +8,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "xh_wizrd.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -19,10 +15,14 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if wxUSE_XML && wxUSE_XRC && wxUSE_WIZARDDLG
+#if wxUSE_XRC && wxUSE_WIZARDDLG

 
 #include "wx/xrc/xh_wizrd.h"
 
 #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)
 #include "wx/wizard.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxWizardXmlHandler, wxXmlResourceHandler)


@@ -32,6 +32,7 @@ wxWizardXmlHandler::wxWizardXmlHandler() : wxXmlResourceHandler()
     m_wizard = NULL;
     m_lastSimplePage = NULL;
     XRC_ADD_STYLE(wxWIZARD_EX_HELPBUTTON);
     m_wizard = NULL;
     m_lastSimplePage = NULL;
     XRC_ADD_STYLE(wxWIZARD_EX_HELPBUTTON);

+    AddWindowStyles();

 }
 
 wxObject *wxWizardXmlHandler::DoCreateResource()
 }
 
 wxObject *wxWizardXmlHandler::DoCreateResource()


@@ -58,8 +59,7 @@ wxObject *wxWizardXmlHandler::DoCreateResource()
     }
     else
     {
     }
     else
     {

-        wxWizardPage *page = NULL;
-        wxUnusedVar(page);
+        wxWizardPage *page;

 
         if (m_class == wxT("wxWizardPageSimple"))
         {
 
         if (m_class == wxT("wxWizardPageSimple"))
         {


@@ -72,13 +72,14 @@ wxObject *wxWizardXmlHandler::DoCreateResource()
         }
         else /*if (m_class == wxT("wxWizardPage"))*/
         {
         }
         else /*if (m_class == wxT("wxWizardPage"))*/
         {

-            wxWizardPage *p = NULL;
-            if (m_instance)
-                p = wxStaticCast(m_instance, wxWizardPage);
-            else
+            if ( !m_instance )
+            {

                 wxLogError(wxT("wxWizardPage is abstract class, must be subclassed"));
                 wxLogError(wxT("wxWizardPage is abstract class, must be subclassed"));

-            p->Create(m_wizard, GetBitmap());
-            page = p;
+                return NULL;
+            }
+
+            page = wxStaticCast(m_instance, wxWizardPage);
+            page->Create(m_wizard, GetBitmap());

         }
 
         page->SetName(GetName());
         }
 
         page->SetName(GetName());