non-pch build fixes

[wxWidgets.git] / include / wx / wizard.h

diff --git a/include/wx/wizard.h b/include/wx/wizard.h
index 61d66c976941bd1ee46b8e942813d0fd7c66cee5..3674896fa4845183e3233dc4016d486b736e89ab 100644 (file)
--- a/include/wx/wizard.h
+++ b/include/wx/wizard.h
@@ -25,13 +25,9 @@
 // headers and other simple declarations
 // ----------------------------------------------------------------------------
 
 // headers and other simple declarations
 // ----------------------------------------------------------------------------
 

-#ifndef WX_PRECOMP
-    #include "wx/dialog.h"      // the base class
-    #include "wx/panel.h"       // ditto
-
-    #include "wx/event.h"       // wxEVT_XXX constants
-#endif // WX_PRECOMP
-
+#include "wx/dialog.h"      // the base class
+#include "wx/panel.h"       // ditto
+#include "wx/event.h"       // wxEVT_XXX constants

 #include "wx/bitmap.h"
 
 // Extended style to specify a help button
 #include "wx/bitmap.h"
 
 // Extended style to specify a help button


@@ -76,9 +72,7 @@ public:
     // wxNullBitmap from here - the default one will be used then.
     virtual wxBitmap GetBitmap() const { return m_bitmap; }
 
     // wxNullBitmap from here - the default one will be used then.
     virtual wxBitmap GetBitmap() const { return m_bitmap; }
 

-    // due to a typo in #if condition, the validation functions were disabled
-    // in 2.6.[01] releases so check for wxABI_VERSION here
-#if wxUSE_VALIDATORS && (wxABI_VERSION >= 20602)
+#if wxUSE_VALIDATORS

     // Override the base functions to allow a validator to be assigned to this page.
     virtual bool TransferDataToWindow()
     {
     // Override the base functions to allow a validator to be assigned to this page.
     virtual bool TransferDataToWindow()
     {


@@ -228,16 +222,6 @@ public:
     // page to GetPageAreaSizer and 5 if you don't.
     virtual void SetBorder(int border) = 0;
 
     // page to GetPageAreaSizer and 5 if you don't.
     virtual void SetBorder(int border) = 0;
 

-    // wxWizard should be created using "new wxWizard" now, not with Create()
-#if WXWIN_COMPATIBILITY_2_2
-    wxDEPRECATED( static wxWizard *Create(wxWindow *parent,
-                                          int id = wxID_ANY,
-                                          const wxString& title = wxEmptyString,
-                                          const wxBitmap& bitmap = wxNullBitmap,
-                                          const wxPoint& pos = wxDefaultPosition,
-                                          const wxSize& size = wxDefaultSize) );
-#endif // WXWIN_COMPATIBILITY_2_2
-

     // the methods below may be overridden by the derived classes to provide
     // custom logic for determining the pages order
 
     // the methods below may be overridden by the derived classes to provide
     // custom logic for determining the pages order