define wxFooHandler() macros for all wxFooEvents to make it possible to use Connect() type-safely; simplified event macros definitions by extracing common part to wx__DECLARE_EVTn()

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32048 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-02-14 23:53:48 +00:00
parent 2ff29ddf87
commit 7fa03f0434
20 changed files with 559 additions and 429 deletions

View File

@@ -125,23 +125,18 @@ extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING
typedef void (wxEvtHandler::*wxChoicebookEventFunction)(wxChoicebookEvent&);
#define EVT_CHOICEBOOK_PAGE_CHANGED(id, fn) \
DECLARE_EVENT_TABLE_ENTRY( \
wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED, \
id, \
wxID_ANY, \
(wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( wxChoicebookEventFunction, &fn ), \
NULL \
),
#define wxChoicebookEventHandler(func) \
(wxObjectEventFunction)wxStaticCastEvent(wxChoicebookEventFunction, &func)
#define EVT_CHOICEBOOK_PAGE_CHANGING(id, fn) \
DECLARE_EVENT_TABLE_ENTRY( \
wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING, \
id, \
wxID_ANY, \
(wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( wxChoicebookEventFunction, &fn ), \
NULL \
),
#define EVT_CHOICEBOOK_PAGE_CHANGED(id, fn) \
wx__DECLARE_EVT1(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED, \
id, \
wxChoicebookEventHandler(fn))
#define EVT_CHOICEBOOK_PAGE_CHANGING(id, fn) \
wx__DECLARE_EVT1(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING, \
id, \
wxChoicebookEventHandler(fn))
#endif // wxUSE_CHOICEBOOK