X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cab1a6053dce9f0a2dcd87d8e2d12d8633f4785f..333e57d578e9e0fb6555452b5a53698ffd85ee69:/include/wx/validate.h?ds=sidebyside diff --git a/include/wx/validate.h b/include/wx/validate.h index 59dcf2ad14..83aa586093 100644 --- a/include/wx/validate.h +++ b/include/wx/validate.h @@ -12,18 +12,14 @@ #ifndef _WX_VALIDATE_H_ #define _WX_VALIDATE_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "validate.h" -#endif - #include "wx/defs.h" #if wxUSE_VALIDATORS #include "wx/event.h" -class WXDLLEXPORT wxWindow; -class WXDLLEXPORT wxWindowBase; +class WXDLLIMPEXP_FWD_CORE wxWindow; +class WXDLLIMPEXP_FWD_CORE wxWindowBase; /* A validator has up to three purposes: @@ -54,13 +50,13 @@ public: // Called when the value in the window must be validated. // This function can pop up an error message. - virtual bool Validate(wxWindow *WXUNUSED(parent)) { return false; }; + virtual bool Validate(wxWindow *WXUNUSED(parent)) { return false; } // Called to transfer data to the window virtual bool TransferToWindow() { return false; } // Called to transfer data from the window - virtual bool TransferFromWindow() { return false; }; + virtual bool TransferFromWindow() { return false; } // accessors wxWindow *GetWindow() const { return (wxWindow *)m_validatorWindow; } @@ -81,7 +77,7 @@ private: DECLARE_NO_COPY_CLASS(wxValidator) }; -WXDLLEXPORT_DATA(extern const wxValidator) wxDefaultValidator; +extern WXDLLEXPORT_DATA(const wxValidator) wxDefaultValidator; #define wxVALIDATOR_PARAM(val) val @@ -90,7 +86,7 @@ WXDLLEXPORT_DATA(extern const wxValidator) wxDefaultValidator; // 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; + class WXDLLIMPEXP_FWD_CORE wxValidator; #define wxDefaultValidator (*((wxValidator *)NULL)) // this macro allows to avoid warnings about unused parameters when