X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/feb72429e84a705de867331397ff7b6cbaeec48a..835165d576b66441987b78519e6ef1fe74ea795a:/include/wx/dateevt.h?ds=sidebyside diff --git a/include/wx/dateevt.h b/include/wx/dateevt.h index a4403b57df..b6cec94f9c 100644 --- a/include/wx/dateevt.h +++ b/include/wx/dateevt.h @@ -14,6 +14,7 @@ #include "wx/event.h" #include "wx/datetime.h" +#include "wx/window.h" // ---------------------------------------------------------------------------- // wxDateEvent: used by wxCalendarCtrl and wxDatePickerCtrl @@ -33,29 +34,28 @@ public: const wxDateTime& GetDate() const { return m_date; } void SetDate(const wxDateTime &date) { m_date = date; } + // default copy ctor, assignment operator and dtor are ok + virtual wxEvent *Clone() const { return new wxDateEvent(*this); } + private: wxDateTime m_date; - DECLARE_DYNAMIC_CLASS_NO_COPY(wxDateEvent) + DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxDateEvent) }; // ---------------------------------------------------------------------------- // event types and macros for handling them // ---------------------------------------------------------------------------- -BEGIN_DECLARE_EVENT_TYPES() - DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_DATE_CHANGED, 1101) -END_DECLARE_EVENT_TYPES() +wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_ADV, wxEVT_DATE_CHANGED, wxDateEvent); typedef void (wxEvtHandler::*wxDateEventFunction)(wxDateEvent&); -#define EVT_DATE_CHANGED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_DATE_CHANGED, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) wxStaticCastEvent( wxDateEventFunction, & fn ), (wxObject *) NULL), - -#ifdef _WX_DEFINE_DATE_EVENTS_ - DEFINE_EVENT_TYPE(wxEVT_DATE_CHANGED) +#define wxDateEventHandler(func) \ + wxEVENT_HANDLER_CAST(wxDateEventFunction, func) - IMPLEMENT_DYNAMIC_CLASS(wxDateEvent, wxCommandEvent) -#endif +#define EVT_DATE_CHANGED(id, fn) \ + wx__DECLARE_EVT1(wxEVT_DATE_CHANGED, id, wxDateEventHandler(fn)) #endif // _WX_DATEEVT_H_