Implemented wxButton::DoGetBestSize for wxMotif. Now normal buttons

[wxWidgets.git] / include / wx / validate.h

diff --git a/include/wx/validate.h b/include/wx/validate.h
index 25a4c5894aa06ea27dc58c1a70b5cff13ee2f13b..f4be5b093d501ee9377c2476de77e6d9b811808b 100644 (file)
--- 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;