X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/571d14b2621325840e465e1e55be9f5a362a5dbd..472eec8a0391538e4dcf7f7c6c4f4d44c8383616:/include/wx/spinctrl.h diff --git a/include/wx/spinctrl.h b/include/wx/spinctrl.h index ce1b7f3553..6080b61365 100644 --- a/include/wx/spinctrl.h +++ b/include/wx/spinctrl.h @@ -12,6 +12,10 @@ #ifndef _WX_SPINCTRL_H_ #define _WX_SPINCTRL_H_ +#include "wx/defs.h" + +#if wxUSE_SPINCTRL + #include "wx/spinbutt.h" // should make wxSpinEvent visible to the app // ---------------------------------------------------------------------------- @@ -59,8 +63,10 @@ protected: #include "wx/msw/spinctrl.h" #elif defined(__WXPM__) #include "wx/os2/spinctrl.h" -#elif defined(__WXGTK__) +#elif defined(__WXGTK20__) #include "wx/gtk/spinctrl.h" +#elif defined(__WXGTK__) + #include "wx/gtk1/spinctrl.h" #elif defined(__WXMOTIF__) #include "wx/generic/spinctlg.h" #elif defined(__WXMAC__) @@ -70,7 +76,8 @@ protected: #endif // platform #define EVT_SPINCTRL(id, fn) \ - DECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_SPINCTRL_UPDATED, id, -1, (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxSpinEventFunction, & fn ), (wxObject *) NULL ), + wx__DECLARE_EVT1(wxEVT_COMMAND_SPINCTRL_UPDATED, id, wxSpinEventHandler(fn)) -#endif // _WX_SPINCTRL_H_ +#endif // wxUSE_SPINCTRL +#endif // _WX_SPINCTRL_H_