X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f03fc89fff2d6e823e7d4d14fbe14822ad6777b1..2fda2145700445519a0ce539b04dc72bae180124:/include/wx/validate.h diff --git a/include/wx/validate.h b/include/wx/validate.h index cb3c8aef9b..f4be5b093d 100644 --- a/include/wx/validate.h +++ b/include/wx/validate.h @@ -12,12 +12,22 @@ #ifndef _WX_VALIDATEH__ #define _WX_VALIDATEH__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "validate.h" #endif +#if defined(wxUSE_VALIDATORS) && !wxUSE_VALIDATORS + // wxWindows is compiled without support for wxValidator, but we still + // want to be able to pass wxDefaultValidator to the functions which take + // a wxValidator parameter to avoid using "#if wxUSE_VALIDATORS" + // everywhere + class WXDLLEXPORT wxValidator; + #define wxDefaultValidator (*((wxValidator *)NULL)) +#else // wxUSE_VALIDATORS + #include "wx/event.h" +class WXDLLEXPORT wxWindow; class WXDLLEXPORT wxWindowBase; /* @@ -49,7 +59,7 @@ public: // Called when the value in the window must be validated. // This function can pop up an error message. - virtual bool Validate(wxWindowBase *WXUNUSED(parent)) { return FALSE; }; + virtual bool Validate(wxWindow *WXUNUSED(parent)) { return FALSE; }; // Called to transfer data to the window virtual bool TransferToWindow() { return FALSE; } @@ -58,7 +68,7 @@ public: virtual bool TransferFromWindow() { return FALSE; }; // accessors - wxWindowBase *GetWindow() const { return m_validatorWindow; } + wxWindow *GetWindow() const { return (wxWindow *)m_validatorWindow; } void SetWindow(wxWindowBase *win) { m_validatorWindow = win; } // validators beep by default if invalid key is pressed, these functions @@ -73,9 +83,12 @@ private: static bool ms_isSilent; DECLARE_DYNAMIC_CLASS(wxValidator) + DECLARE_NO_COPY_CLASS(wxValidator) }; WXDLLEXPORT_DATA(extern const wxValidator) wxDefaultValidator; +#endif // wxUSE_VALIDATORS + #endif // _WX_VALIDATEH__