X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/57c4d796c56bd48ce370240107f3e4c07e142985..794bcc2dea743ac907b839f54e451847c9ea4b72:/include/wx/validate.h?ds=inline diff --git a/include/wx/validate.h b/include/wx/validate.h index 370f38e473..0cd221045c 100644 --- a/include/wx/validate.h +++ b/include/wx/validate.h @@ -16,14 +16,17 @@ #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; @@ -82,11 +85,7 @@ private: DECLARE_DYNAMIC_CLASS(wxValidator) }; -#if defined(__VISAGECPP__) -WXDLLEXPORT_DATA(extern const wxValidator*) wxDefaultValidator; -#else WXDLLEXPORT_DATA(extern const wxValidator) wxDefaultValidator; -#endif #endif // wxUSE_VALIDATORS