X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/621f9767c815b149f5fe4e74de86b40bdb09213b..9e691f46b2ec1b5dbbff2e51131e3c532e688a89:/include/wx/generic/sashwin.h diff --git a/include/wx/generic/sashwin.h b/include/wx/generic/sashwin.h index 6c4ae240c9..2e90124cc7 100644 --- a/include/wx/generic/sashwin.h +++ b/include/wx/generic/sashwin.h @@ -193,7 +193,11 @@ private: DECLARE_EVENT_TABLE() }; -#define wxEVT_SASH_DRAGGED (wxEVT_FIRST + 1200) +BEGIN_DECLARE_EVENT_TYPES() + DECLARE_EVENT_TYPE(wxEVT_SASH_DRAGGED, wxEVT_FIRST + 1200) +END_DECLARE_EVENT_TYPES() + +// #define wxEVT_SASH_DRAGGED (wxEVT_FIRST + 1200) enum wxSashDragStatus { @@ -228,8 +232,10 @@ class WXDLLEXPORT wxSashEvent: public wxCommandEvent typedef void (wxEvtHandler::*wxSashEventFunction)(wxSashEvent&); -#define EVT_SASH_DRAGGED(id, fn) { wxEVT_SASH_DRAGGED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSashEventFunction) & fn, NULL }, -#define EVT_SASH_DRAGGED_RANGE(id1, id2, fn) { wxEVT_SASH_DRAGGED, id1, id2, (wxObjectEventFunction) (wxEventFunction) (wxSashEventFunction) & fn, NULL }, +#define EVT_SASH_DRAGGED(id, fn) \ + DECLARE_EVENT_TABLE_ENTRY( wxEVT_SASH_DRAGGED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSashEventFunction) & fn, NULL ), +#define EVT_SASH_DRAGGED_RANGE(id1, id2, fn) \ + DECLARE_EVENT_TABLE_ENTRY( wxEVT_SASH_DRAGGED, id1, id2, (wxObjectEventFunction) (wxEventFunction) (wxSashEventFunction) & fn, NULL ), #endif // wxUSE_SASH