Fixed conflicts with Robert's similar fixes; fixed toolbar size calculation

and allowed for vertical toolbar git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14396 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-02-24 23:04:46 +00:00
parent d1017acfc3
commit 16c9a4258f
5 changed files with 76 additions and 16 deletions
--- a/include/wx/univ/toolbar.h
+++ b/include/wx/univ/toolbar.h
@@ -101,9 +101,10 @@ protected:
                                          const wxString& shortHelpString,
                                          const wxString& longHelpString);
    virtual wxToolBarToolBase *CreateTool(wxControl *control);
-    
+
 private:
    wxToolBarTool    *m_captured;
+    wxCoord          m_maxWidth, m_maxHeight;
    
 private:
    void OnMouse( wxMouseEvent &event );