X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c058cafa56179e79df02ad370bdeafd725ff2478..661698e54f2bc599dc1a961ffbae08ccdd6b9b97:/include/wx/dateevt.h diff --git a/include/wx/dateevt.h b/include/wx/dateevt.h index 18db28eb60..8364efb402 100644 --- a/include/wx/dateevt.h +++ b/include/wx/dateevt.h @@ -17,7 +17,7 @@ #include "wx/window.h" // ---------------------------------------------------------------------------- -// wxDateEvent: used by wxCalendarCtrl and wxDatePickerCtrl +// wxDateEvent: used by wxCalendarCtrl, wxDatePickerCtrl and wxTimePickerCtrl. // ---------------------------------------------------------------------------- class WXDLLIMPEXP_ADV wxDateEvent : public wxCommandEvent @@ -47,21 +47,19 @@ private: // event types and macros for handling them // ---------------------------------------------------------------------------- -extern WXDLLIMPEXP_ADV const wxEventType wxEVT_DATE_CHANGED; +wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_ADV, wxEVT_DATE_CHANGED, wxDateEvent); +wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_ADV, wxEVT_TIME_CHANGED, wxDateEvent); typedef void (wxEvtHandler::*wxDateEventFunction)(wxDateEvent&); #define wxDateEventHandler(func) \ - (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxDateEventFunction, &func) + wxEVENT_HANDLER_CAST(wxDateEventFunction, func) #define EVT_DATE_CHANGED(id, fn) \ wx__DECLARE_EVT1(wxEVT_DATE_CHANGED, id, wxDateEventHandler(fn)) -#ifdef _WX_DEFINE_DATE_EVENTS_ - const wxEventType wxEVT_DATE_CHANGED = wxNewEventType(); - - IMPLEMENT_DYNAMIC_CLASS(wxDateEvent, wxCommandEvent) -#endif +#define EVT_TIME_CHANGED(id, fn) \ + wx__DECLARE_EVT1(wxEVT_TIME_CHANGED, id, wxDateEventHandler(fn)) #endif // _WX_DATEEVT_H_