X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7fa03f04345b620d1a14529b05961116b20a1297..d95c5149add596d0dec940599332a24edf96dc38:/include/wx/calctrl.h?ds=sidebyside diff --git a/include/wx/calctrl.h b/include/wx/calctrl.h index 2fd259e425..9e1add8920 100644 --- a/include/wx/calctrl.h +++ b/include/wx/calctrl.h @@ -166,7 +166,7 @@ class WXDLLIMPEXP_ADV wxCalendarEvent : public wxDateEvent friend class wxCalendarCtrl; public: wxCalendarEvent() { Init(); } - wxCalendarEvent(wxCalendarCtrl *cal, wxEventType type); + inline wxCalendarEvent(wxCalendarCtrl *cal, wxEventType type); void SetWeekDay(const wxDateTime::WeekDay wd) { m_wday = wd; } wxDateTime::WeekDay GetWeekDay() const { return m_wday; } @@ -214,7 +214,7 @@ END_DECLARE_EVENT_TYPES() typedef void (wxEvtHandler::*wxCalendarEventFunction)(wxCalendarEvent&); #define wxCalendarEventHandler(func) \ - (wxObjectEventFunction)wxStaticCastEvent(wxCalendarEventFunction, &func) + (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxCalendarEventFunction, &func) #define wx__DECLARE_CALEVT(evt, id, fn) \ wx__DECLARE_EVT1(wxEVT_CALENDAR_ ## evt, id, wxCalendarEventHandler(fn))