X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/42e69d6b435a4dd5415caf3750db62cf45b6f373..5a224901b8ede55e1db9980f0fcaf7d2cb49285f:/include/wx/msw/tabctrl.h diff --git a/include/wx/msw/tabctrl.h b/include/wx/msw/tabctrl.h index ced0e85065..d1985bfddd 100644 --- a/include/wx/msw/tabctrl.h +++ b/include/wx/msw/tabctrl.h @@ -18,7 +18,7 @@ class wxImageList; -// WXDLLEXPORT_DATA(extern const char*) wxToolBarNameStr; +// WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr; /* * Flags returned by HitTest @@ -136,10 +136,10 @@ class WXDLLEXPORT wxTabEvent: public wxCommandEvent typedef void (wxEvtHandler::*wxTabEventFunction)(wxTabEvent&); -#define EVT_TAB_SEL_CHANGED(id, fn) { wxEVT_COMMAND_TAB_SEL_CHANGED, \ - id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTabEventFunction) & fn, NULL }, -#define EVT_TAB_SEL_CHANGING(id, fn) { wxEVT_COMMAND_TAB_SEL_CHANGING, \ - id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTabEventFunction) & fn, NULL }, +#define EVT_TAB_SEL_CHANGED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_COMMAND_TAB_SEL_CHANGED, \ + id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTabEventFunction) & fn, NULL), +#define EVT_TAB_SEL_CHANGING(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_COMMAND_TAB_SEL_CHANGING, \ + id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTabEventFunction) & fn, NULL), #endif // _WX_TABCTRL_H_