Wine fixes

[wxWidgets.git] / include / wx / generic / buttonbar.h

diff --git a/include/wx/generic/buttonbar.h b/include/wx/generic/buttonbar.h
index 1cb9d63a7f35084e52fd3cf9f12a5b4896f8dca6..c0f319b5c90552236f0dbf6f649175271eadee2a 100644 (file)
--- a/include/wx/generic/buttonbar.h
+++ b/include/wx/generic/buttonbar.h
@@ -14,6 +14,7 @@
 #define _WX_BUTTONBAR_H_
 
 #include "wx/bmpbuttn.h"
+#include "wx/toolbar.h"
 
 class WXDLLEXPORT wxButtonToolBarTool;
 
@@ -89,6 +90,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;
@@ -100,6 +107,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()