X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/88ac883a0d005437c97a60d8195bd5e4719b1154..66f8b9ace213e02e184460e0c1a212cacea27edd:/include/wx/validate.h diff --git a/include/wx/validate.h b/include/wx/validate.h index 25a4c5894a..abc83188e1 100644 --- a/include/wx/validate.h +++ b/include/wx/validate.h @@ -6,24 +6,27 @@ // Created: 29/01/98 // RCS-ID: $Id$ // Copyright: (c) 1998 Julian Smart -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #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;