X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e5f49cbf82c40fe1c7cc9806be06f6c1aff42659..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/generic/buttonbar.h?ds=sidebyside diff --git a/include/wx/generic/buttonbar.h b/include/wx/generic/buttonbar.h index 7d339e6eae..165c962d93 100644 --- a/include/wx/generic/buttonbar.h +++ b/include/wx/generic/buttonbar.h @@ -6,7 +6,7 @@ // 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 +16,14 @@ #include "wx/bmpbuttn.h" #include "wx/toolbar.h" -class WXDLLEXPORT wxButtonToolBarTool; +class WXDLLIMPEXP_FWD_CORE wxButtonToolBarTool; // ---------------------------------------------------------------------------- // wxButtonToolBar // ---------------------------------------------------------------------------- class WXDLLEXPORT wxButtonToolBar : public wxToolBarBase -{ +{ public: // construction/destruction wxButtonToolBar() { Init(); } @@ -45,7 +45,7 @@ public: const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = wxToolBarNameStr ); - + virtual ~wxButtonToolBar(); virtual bool Realize(); @@ -73,7 +73,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; @@ -90,6 +91,12 @@ protected: // receives button commands void OnCommand(wxCommandEvent& event); + // paints a border + void OnPaint(wxPaintEvent& event); + + // detects mouse clicks outside buttons + void OnLeftUp(wxMouseEvent& event); + private: // have we calculated the positions of our tools? bool m_needsLayout; @@ -101,6 +108,12 @@ private: wxCoord m_maxWidth, m_maxHeight; + // the height of a label + int m_labelHeight; + + // the space above the label + int m_labelMargin; + private: DECLARE_DYNAMIC_CLASS(wxButtonToolBar) DECLARE_EVENT_TABLE()