X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a23fd0e1d1329a4a258b4defb3e0b0001b700c6e..10769d8c47c21fe0ec5034726791a5ad4cf19475:/include/wx/msw/tabctrl.h diff --git a/include/wx/msw/tabctrl.h b/include/wx/msw/tabctrl.h index 9f425689f1..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 @@ -113,17 +113,8 @@ class WXDLLEXPORT wxTabCtrl: public wxControl // Insert an item bool InsertItem(int item, const wxString& text, int imageId = -1, void* data = NULL); -// Implementation + // Implementation - // Call default behaviour - void OnPaint(wxPaintEvent& event) { Default() ; } - void OnSize(wxSizeEvent& event) { Default() ; } - void OnMouseEvent(wxMouseEvent& event) { Default() ; } - void OnKillFocus(wxFocusEvent& event) { Default() ; } - - void Command(wxCommandEvent& event); - - virtual bool MSWCommand(WXUINT param, WXWORD id); virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); // Responds to colour changes @@ -145,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_