X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/57c4d796c56bd48ce370240107f3e4c07e142985..e450aa692b887adbae4350896f6c90ec8e1368e3:/include/wx/validate.h

diff --git a/include/wx/validate.h b/include/wx/validate.h
index 370f38e473..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,13 +83,10 @@ private:
     static bool ms_isSilent;
 
     DECLARE_DYNAMIC_CLASS(wxValidator)
+    DECLARE_NO_COPY_CLASS(wxValidator)
 };
 
-#if defined(__VISAGECPP__)
-WXDLLEXPORT_DATA(extern const wxValidator*) wxDefaultValidator;
-#else
 WXDLLEXPORT_DATA(extern const wxValidator) wxDefaultValidator;
-#endif
 
 #endif // wxUSE_VALIDATORS