X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cab1a6053dce9f0a2dcd87d8e2d12d8633f4785f..411a1c35ff2e9be0bef6e2997f00dded357f2906:/include/wx/validate.h diff --git a/include/wx/validate.h b/include/wx/validate.h index 59dcf2ad14..3cd0fdc435 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: @@ -37,7 +33,7 @@ class WXDLLEXPORT wxWindowBase; Note that wxValidator and derived classes use reference counting. */ -class WXDLLEXPORT wxValidator : public wxEvtHandler +class WXDLLIMPEXP_CORE wxValidator : public wxEvtHandler { public: wxValidator(); @@ -48,19 +44,19 @@ public: // Another possibility is to always pass a pointer to a new validator // (so the calling code can use a copy constructor of the relevant class). virtual wxObject *Clone() const - { return (wxValidator *)NULL; } + { return NULL; } bool Copy(const wxValidator& val) { m_validatorWindow = val.m_validatorWindow; return true; } // 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; } @@ -78,10 +74,10 @@ private: static bool ms_isSilent; DECLARE_DYNAMIC_CLASS(wxValidator) - DECLARE_NO_COPY_CLASS(wxValidator) + wxDECLARE_NO_COPY_CLASS(wxValidator); }; -WXDLLEXPORT_DATA(extern const wxValidator) wxDefaultValidator; +extern WXDLLIMPEXP_DATA_CORE(const wxValidator) wxDefaultValidator; #define wxVALIDATOR_PARAM(val) val @@ -90,8 +86,8 @@ 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; - #define wxDefaultValidator (*((wxValidator *)NULL)) + class WXDLLIMPEXP_FWD_CORE wxValidator; + #define wxDefaultValidator (*reinterpret_cast(NULL)) // this macro allows to avoid warnings about unused parameters when // wxUSE_VALIDATORS == 0