From 3a7c763bce8960572f38e5a07bd22189b2ca44b0 Mon Sep 17 00:00:00 2001 From: Benjamin Williams Date: Thu, 14 May 2009 09:55:04 +0000 Subject: [PATCH] implement default width for toolbar lables (from trunk r60199) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_9_0_BRANCH@60630 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/aui/auibar.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/aui/auibar.cpp b/src/aui/auibar.cpp index 3fe31d4b0c..d356d353a2 100644 --- a/src/aui/auibar.cpp +++ b/src/aui/auibar.cpp @@ -554,7 +554,13 @@ wxSize wxAuiDefaultToolBarArt::GetLabelSize( // get item's width width = item.GetMinSize().GetWidth(); - + + if (width == -1) + { + // no width specified, measure the text ourselves + width = dc.GetTextExtent(item.GetLabel()).GetX(); + } + return wxSize(width, height); }