X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/764a3a49068a94d1edb96f299b10c155d101c1b0..2fda2145700445519a0ce539b04dc72bae180124:/include/wx/validate.h

diff --git a/include/wx/validate.h b/include/wx/validate.h
index 31cb7a014c..f4be5b093d 100644
--- a/include/wx/validate.h
+++ b/include/wx/validate.h
@@ -12,10 +12,19 @@
 #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;
@@ -74,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__