X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fac6eaec24736932770d26367b93c376a3f6d050..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/generic/buttonbar.h diff --git a/include/wx/generic/buttonbar.h b/include/wx/generic/buttonbar.h index c0f319b5c9..e933a3ca2c 100644 --- a/include/wx/generic/buttonbar.h +++ b/include/wx/generic/buttonbar.h @@ -4,9 +4,8 @@ // Author: Julian Smart, after Robert Roebling, Vadim Zeitlin, SciTech // Modified by: // Created: 2006-04-13 -// Id: $Id$ // Copyright: (c) Julian Smart, Robert Roebling, Vadim Zeitlin, -// SciTech Software, Inc. +// SciTech Software, Inc. // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -16,14 +15,14 @@ #include "wx/bmpbuttn.h" #include "wx/toolbar.h" -class WXDLLEXPORT wxButtonToolBarTool; +class WXDLLIMPEXP_FWD_CORE wxButtonToolBarTool; // ---------------------------------------------------------------------------- // wxButtonToolBar // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxButtonToolBar : public wxToolBarBase -{ +class WXDLLIMPEXP_CORE wxButtonToolBar : public wxToolBarBase +{ public: // construction/destruction wxButtonToolBar() { Init(); } @@ -45,7 +44,7 @@ public: const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = wxToolBarNameStr ); - + virtual ~wxButtonToolBar(); virtual bool Realize(); @@ -73,7 +72,8 @@ protected: wxObject *clientData, const wxString& shortHelp, const wxString& longHelp); - virtual wxToolBarToolBase *CreateTool(wxControl *control); + virtual wxToolBarToolBase *CreateTool(wxControl *control, + const wxString& label); virtual wxSize DoGetBestClientSize() const;