Toolbar/tooltip udates

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

diff --git a/include/wx/validate.h b/include/wx/validate.h
index 370f38e473e24badc8e372e81204834abb6edde0..3851adada2853fe0515ab6fee7cdf3be855bc269 100644 (file)
--- a/include/wx/validate.h
+++ b/include/wx/validate.h
@@ -16,14 +16,17 @@
     #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,13 +83,10 @@ private:
     static bool ms_isSilent;
 
     DECLARE_DYNAMIC_CLASS(wxValidator)
     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;
 WXDLLEXPORT_DATA(extern const wxValidator) wxDefaultValidator;

-#endif

 
 #endif // wxUSE_VALIDATORS
 
 
 #endif // wxUSE_VALIDATORS