]> git.saurik.com Git - wxWidgets.git/blobdiff - src/osx/carbon/toolbar.cpp
remove declaration for ctor which is never defined
[wxWidgets.git] / src / osx / carbon / toolbar.cpp
index ca73d5fd8987cf938e4186aef1642ee6c92ca80d..a3aedf7db67057819155a646d67c8d7709c49cb4 100644 (file)
@@ -178,14 +178,7 @@ public:
         m_toolbarItemRef = ref;
         if ( m_toolbarItemRef )
         {
-            wxFont f;
-            wxFontEncoding enc;
-            if ( GetToolBar() )
-                f = GetToolBar()->GetFont();
-            if ( f.IsOk() )
-                enc = f.GetEncoding();
-            else
-                enc = wxFont::GetDefaultEncoding();
+            wxFontEncoding enc = GetToolBarFontEncoding();
 
             HIToolbarItemSetHelpText(
                 m_toolbarItemRef,
@@ -208,9 +201,36 @@ public:
     {
         return m_index;
     }
-#endif
+
+    virtual void SetLabel(const wxString& label)
+    {
+        wxToolBarToolBase::SetLabel(label);
+
+        if ( m_toolbarItemRef )
+        {
+            // strip mnemonics from the label for compatibility with the usual
+            // labels in wxStaticText sense
+            wxString labelStr = wxStripMenuCodes(label);
+
+            HIToolbarItemSetLabel(
+                m_toolbarItemRef,
+                wxCFStringRef(labelStr, GetToolBarFontEncoding()) );
+        }
+    }
+#endif // wxOSX_USE_NATIVE_TOOLBAR
 
 private:
+#if wxOSX_USE_NATIVE_TOOLBAR
+    wxFontEncoding GetToolBarFontEncoding() const
+    {
+        wxFont f;
+        wxFontEncoding enc;
+        if ( GetToolBar() )
+            f = GetToolBar()->GetFont();
+        return f.IsOk() ? f.GetEncoding() : wxFont::GetDefaultEncoding();
+    }
+#endif // wxOSX_USE_NATIVE_TOOLBAR
+
     void Init()
     {
         m_controlHandle = NULL;