From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 2 Apr 2010 19:30:29 +0000 (+0000)
Subject: Show labels for controls in wxOSX/Carbon toolbars.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/bd044e27b3c7f9b6d56e75b9e1b789be3545cd5e?ds=inline

Show labels for controls in wxOSX/Carbon toolbars.

Add a call to HIToolbarItemSetLabel().

Closes #11885.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63830 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/osx/carbon/toolbar.cpp b/src/osx/carbon/toolbar.cpp
index f3a127ab46..35b9bd4ff8 100644
--- a/src/osx/carbon/toolbar.cpp
+++ b/src/osx/carbon/toolbar.cpp
@@ -1322,6 +1322,10 @@ bool wxToolBar::Realize()
                             wxFAIL_MSG("Reference count of native tool was illegal before removal");
                         }
                         wxASSERT( IsValidControlHandle(tool->GetControl()->GetPeer()->GetControlRef() )) ;
+
+                        wxString label = tool->GetLabel();
+                        if ( !label.empty() )
+                            HIToolbarItemSetLabel( hiItemRef, wxCFStringRef(label, GetFont().GetEncoding()) );
                     }
                 }