X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dbda9e86f0e5ec1184bc16d135bb7205bc99236e..8366ae934aab9f835747b0c2e456231e8795fe78:/include/wx/valgen.h?ds=sidebyside diff --git a/include/wx/valgen.h b/include/wx/valgen.h index 8a43952b60..1dbcdb62ec 100644 --- a/include/wx/valgen.h +++ b/include/wx/valgen.h @@ -4,9 +4,9 @@ // Author: Kevin Smith // Modified by: // Created: Jan 22 1999 -// RCS-ID: +// RCS-ID: // Copyright: (c) 1999 Kevin Smith -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_VALGENH__ @@ -18,6 +18,8 @@ #include "wx/validate.h" +#if wxUSE_VALIDATORS + class WXDLLEXPORT wxGenericValidator: public wxValidator { public: @@ -33,18 +35,18 @@ public: // if you're passing a reference to a validator. // Another possibility is to always pass a pointer to a new validator // (so the calling code can use a copy constructor of the relevant class). - virtual wxValidator *Clone(void) const { return new wxGenericValidator(*this); } + virtual wxObject *Clone() const { return new wxGenericValidator(*this); } bool Copy(const wxGenericValidator& val); // Called when the value in the window must be validated. // This function can pop up an error message. - virtual bool Validate(wxWindow *parent) {return TRUE;} + virtual bool Validate(wxWindow * WXUNUSED(parent)) { return TRUE; } // Called to transfer data to the window - virtual bool TransferToWindow(void); + virtual bool TransferToWindow(); // Called to transfer data to the window - virtual bool TransferFromWindow(void); + virtual bool TransferFromWindow(); protected: void Initialize(); @@ -55,4 +57,8 @@ protected: wxArrayInt* m_pArrayInt; }; -#endif // _WX_VALGENH__ +#endif + // wxUSE_VALIDATORS + +#endif + // _WX_VALGENH__