Applied patch [ 619705 ] Fixes wxApp::GetComCtl32Version

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

diff --git a/include/wx/validate.h b/include/wx/validate.h
index 25a4c5894aa06ea27dc58c1a70b5cff13ee2f13b..abc83188e193724048ea6f4b7660c2454571450d 100644 (file)
--- 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
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Julian Smart

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_VALIDATEH__
 #define _WX_VALIDATEH__
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_VALIDATEH__
 #define _WX_VALIDATEH__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

     #pragma interface "validate.h"
 #endif
 
     #pragma interface "validate.h"
 #endif
 

-#include "wx/event.h"
-

 #if defined(wxUSE_VALIDATORS) && !wxUSE_VALIDATORS
 #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
 
     class WXDLLEXPORT wxValidator;
     #define wxDefaultValidator (*((wxValidator *)NULL))
 #else // wxUSE_VALIDATORS
 

+#include "wx/event.h"
+

 class WXDLLEXPORT wxWindow;
 class WXDLLEXPORT wxWindowBase;
 
 class WXDLLEXPORT wxWindow;
 class WXDLLEXPORT wxWindowBase;
 


@@ -80,6 +83,7 @@ private:
     static bool ms_isSilent;
 
     DECLARE_DYNAMIC_CLASS(wxValidator)
     static bool ms_isSilent;
 
     DECLARE_DYNAMIC_CLASS(wxValidator)

+    DECLARE_NO_COPY_CLASS(wxValidator)

 };
 
 WXDLLEXPORT_DATA(extern const wxValidator) wxDefaultValidator;
 };
 
 WXDLLEXPORT_DATA(extern const wxValidator) wxDefaultValidator;