X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/446e5259d796ee4428ed90b5943c76df032095be..3dccf96eabc68d95839782d35e6193855f007fd2:/include/wx/msw/tabctrl.h diff --git a/include/wx/msw/tabctrl.h b/include/wx/msw/tabctrl.h index 5d8901e2ec..4e348af1d2 100644 --- a/include/wx/msw/tabctrl.h +++ b/include/wx/msw/tabctrl.h @@ -6,19 +6,15 @@ // Created: 01/02/97 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_TABCTRL_H_ #define _WX_TABCTRL_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "tabctrl.h" -#endif - class WXDLLIMPEXP_CORE wxImageList; -// WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr; +// extern WXDLLEXPORT_DATA(const wxChar) wxToolBarNameStr[]; /* * Flags returned by HitTest @@ -44,7 +40,7 @@ class WXDLLEXPORT wxTabCtrl: public wxControl { Create(parent, id, pos, size, style, name); } - ~wxTabCtrl(); + virtual ~wxTabCtrl(); // Accessors @@ -156,9 +152,9 @@ private: typedef void (wxEvtHandler::*wxTabEventFunction)(wxTabEvent&); #define EVT_TAB_SEL_CHANGED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_COMMAND_TAB_SEL_CHANGED, \ - id, -1, (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxTabEventFunction, & fn ), NULL), + id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxTabEventFunction, & fn ), NULL), #define EVT_TAB_SEL_CHANGING(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_COMMAND_TAB_SEL_CHANGING, \ - id, -1, (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxTabEventFunction, & fn ), NULL), + id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxTabEventFunction, & fn ), NULL), #endif // _WX_TABCTRL_H_