X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/063807f6c3b48f4ee4e391187bb9230b641e4fa4..c099b53353ec8c689681a1bc8f5117a584e4098d:/include/wx/os2/toolbar.h?ds=sidebyside diff --git a/include/wx/os2/toolbar.h b/include/wx/os2/toolbar.h index edb8e0e785..ab156e37f1 100644 --- a/include/wx/os2/toolbar.h +++ b/include/wx/os2/toolbar.h @@ -19,7 +19,7 @@ #define ID_TOOLTIMER 100 #define ID_TOOLEXPTIMER 101 -class WXDLLEXPORT wxToolBar: public wxToolBarBase +class WXDLLIMPEXP_CORE wxToolBar: public wxToolBarBase { public: /* @@ -165,7 +165,8 @@ protected: ,const wxString& rsShortHelp ,const wxString& rsLongHelp ); - virtual wxToolBarToolBase* CreateTool(wxControl* pControl); + virtual wxToolBarToolBase* CreateTool(wxControl* pControl, + const wxString& label); // // Helpers @@ -205,6 +206,15 @@ private: wxCoord m_vXMouse; wxCoord m_vYMouse; + // + // Virtual function hiding supression + virtual wxToolBarToolBase *InsertTool (size_t nPos, wxToolBarToolBase* pTool) + { + return( wxToolBarBase::InsertTool( nPos + ,pTool + )); + } + DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS(wxToolBar) };