Applied rowspan patch #15276 (dghart)

[wxWidgets.git] / include / wx / xrc / xh_wizrd.h

diff --git a/include/wx/xrc/xh_wizrd.h b/include/wx/xrc/xh_wizrd.h
index b16053f2e6f81043301ac5bee8043f27c9a47423..1831d79c9ca5b77cd373d7af12720eb156cda519 100644 (file)
--- a/include/wx/xrc/xh_wizrd.h
+++ b/include/wx/xrc/xh_wizrd.h
@@ -9,17 +9,19 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_XH_WIZRD_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_XH_WIZRD_H_

-#define _WX_XH_WIZRDL_H_
+#define _WX_XH_WIZRD_H_

 
 #include "wx/xrc/xmlres.h"
 
 
 #include "wx/xrc/xmlres.h"
 

-#if wxUSE_WIZARDDLG
+#if wxUSE_XRC && wxUSE_WIZARDDLG

 
 

-#include "wx/wizard.h"
+class WXDLLIMPEXP_FWD_ADV wxWizard;
+class WXDLLIMPEXP_FWD_ADV wxWizardPageSimple;

 
 class WXDLLIMPEXP_XRC wxWizardXmlHandler : public wxXmlResourceHandler
 {
 
 class WXDLLIMPEXP_XRC wxWizardXmlHandler : public wxXmlResourceHandler
 {

-DECLARE_DYNAMIC_CLASS(wxWizardXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxWizardXmlHandler)
+

 public:
     wxWizardXmlHandler();
     virtual wxObject *DoCreateResource();
 public:
     wxWizardXmlHandler();
     virtual wxObject *DoCreateResource();


@@ -30,6 +32,6 @@ private:
     wxWizardPageSimple *m_lastSimplePage;
 };
 
     wxWizardPageSimple *m_lastSimplePage;
 };
 

-#endif
+#endif // wxUSE_XRC && wxUSE_WIZARDDLG

 
 

-#endif // _WX_XH_PANEL_H_
+#endif // _WX_XH_WIZRD_H_