X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/063807f6c3b48f4ee4e391187bb9230b641e4fa4..e91e1e3d5cab263883c1cee1689c898b8f7c4ecd:/include/wx/os2/toolbar.h?ds=sidebyside diff --git a/include/wx/os2/toolbar.h b/include/wx/os2/toolbar.h index edb8e0e785..d0fc1a1c7d 100644 --- a/include/wx/os2/toolbar.h +++ b/include/wx/os2/toolbar.h @@ -1,10 +1,9 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: toolbar.h +// Name: wx/os2/toolbar.h // Purpose: wxToolBar class // Author: David Webster // Modified by: // Created: 10/17/98 -// RCS-ID: $Id$ // Copyright: (c) David Webster // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -19,7 +18,7 @@ #define ID_TOOLTIMER 100 #define ID_TOOLEXPTIMER 101 -class WXDLLEXPORT wxToolBar: public wxToolBarBase +class WXDLLIMPEXP_CORE wxToolBar: public wxToolBarBase { public: /* @@ -35,7 +34,7 @@ public: ,wxWindowID vId ,const wxPoint& rPos = wxDefaultPosition ,const wxSize& rSize = wxDefaultSize - ,long lStyle = wxNO_BORDER | wxTB_HORIZONTAL + ,long lStyle = wxTB_HORIZONTAL ,const wxString& rName = wxToolBarNameStr ) : m_vToolTimer(this, ID_TOOLTIMER) , m_vToolExpTimer(this, ID_TOOLEXPTIMER) @@ -55,7 +54,7 @@ public: ,wxWindowID vId ,const wxPoint& rPos = wxDefaultPosition ,const wxSize& rSize = wxDefaultSize - ,long lStyle = wxNO_BORDER | wxTB_HORIZONTAL + ,long lStyle = wxTB_HORIZONTAL ,const wxString& rName = wxToolBarNameStr ); @@ -165,7 +164,8 @@ protected: ,const wxString& rsShortHelp ,const wxString& rsLongHelp ); - virtual wxToolBarToolBase* CreateTool(wxControl* pControl); + virtual wxToolBarToolBase* CreateTool(wxControl* pControl, + const wxString& label); // // Helpers @@ -205,6 +205,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) };