Fixed conflicts with Robert's similar fixes; fixed toolbar size calculation
authorJulian Smart <julian@anthemion.co.uk>
Sun, 24 Feb 2002 23:04:46 +0000 (23:04 +0000)
committerJulian Smart <julian@anthemion.co.uk>
Sun, 24 Feb 2002 23:04:46 +0000 (23:04 +0000)
commit16c9a4258f33da3a3a6c14bec9d1b239f2c93edd
treee1040b7378ed14559a4942c0b630a43ea52a1d19
parentd1017acfc30c5ee208535c2e84735d17d26b5010
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
include/wx/univ/toolbar.h
samples/toolbar/toolbar.cpp
src/common/framecmn.cpp
src/univ/framuniv.cpp
src/univ/toolbar.cpp