X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/os2/toolbar.h?ds=sidebyside diff --git a/include/wx/os2/toolbar.h b/include/wx/os2/toolbar.h index 6a3fc3438f..d0fc1a1c7d 100644 --- a/include/wx/os2/toolbar.h +++ b/include/wx/os2/toolbar.h @@ -1,12 +1,11 @@ ///////////////////////////////////////////////////////////////////////////// -// 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: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_TOOLBAR_H_ @@ -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