X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f38374d0d7aa865e9bbe8ee61b75b94ffcdfb220..2fda2145700445519a0ce539b04dc72bae180124:/include/wx/validate.h?ds=sidebyside diff --git a/include/wx/validate.h b/include/wx/validate.h index 25a4c5894a..f4be5b093d 100644 --- a/include/wx/validate.h +++ b/include/wx/validate.h @@ -12,18 +12,21 @@ #ifndef _WX_VALIDATEH__ #define _WX_VALIDATEH__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "validate.h" #endif -#include "wx/event.h" - #if defined(wxUSE_VALIDATORS) && !wxUSE_VALIDATORS - // wxWindows is compiled without support for wxValidator + // 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; @@ -80,6 +83,7 @@ private: static bool ms_isSilent; DECLARE_DYNAMIC_CLASS(wxValidator) + DECLARE_NO_COPY_CLASS(wxValidator) }; WXDLLEXPORT_DATA(extern const wxValidator) wxDefaultValidator;