implement default width for toolbar labels

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60199 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-04-16 13:02:48 +00:00 · 2009-04-16 13:02:48 +00:00 · e54e92e681
commit e54e92e681
parent b18e2046af
1 changed files with 7 additions and 1 deletions
--- 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);
 }