Add missing wxUSE_OLE checks to safearray.cpp.

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

diff --git a/include/wx/generic/buttonbar.h b/include/wx/generic/buttonbar.h
index 96e83491a9c2e38030bf338567326283c18f2a0b..3a4a464a45e5886119d8b625607832e723598f3a 100644 (file)
--- 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,
 // Created:     2006-04-13
 // Id:          $Id$
 // Copyright:   (c) Julian Smart, Robert Roebling, Vadim Zeitlin,

-//              SciTech Software, Inc. 
+//              SciTech Software, Inc.

 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 


@@ -16,14 +16,14 @@
 #include "wx/bmpbuttn.h"
 #include "wx/toolbar.h"
 
 #include "wx/bmpbuttn.h"
 #include "wx/toolbar.h"
 

-class WXDLLEXPORT wxButtonToolBarTool;
+class WXDLLIMPEXP_FWD_CORE wxButtonToolBarTool;

 
 // ----------------------------------------------------------------------------
 // wxButtonToolBar
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxButtonToolBar
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxButtonToolBar : public wxToolBarBase
-{    
+class WXDLLIMPEXP_CORE wxButtonToolBar : public wxToolBarBase
+{

 public:
     // construction/destruction
     wxButtonToolBar() { Init(); }
 public:
     // construction/destruction
     wxButtonToolBar() { Init(); }


@@ -45,7 +45,7 @@ public:
                  const wxSize& size = wxDefaultSize,
                  long style = 0,
                  const wxString& name = wxToolBarNameStr );
                  const wxSize& size = wxDefaultSize,
                  long style = 0,
                  const wxString& name = wxToolBarNameStr );

-                 
+

     virtual ~wxButtonToolBar();
 
     virtual bool Realize();
     virtual ~wxButtonToolBar();
 
     virtual bool Realize();


@@ -73,7 +73,8 @@ protected:
                                           wxObject *clientData,
                                           const wxString& shortHelp,
                                           const wxString& longHelp);
                                           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;
 
 
     virtual wxSize DoGetBestClientSize() const;
 


@@ -93,6 +94,9 @@ protected:
     // paints a border
     void OnPaint(wxPaintEvent& 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;
 private:
     // have we calculated the positions of our tools?
     bool m_needsLayout;


@@ -104,6 +108,12 @@ private:
     wxCoord m_maxWidth,
             m_maxHeight;
 
     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()
 private:
     DECLARE_DYNAMIC_CLASS(wxButtonToolBar)
     DECLARE_EVENT_TABLE()