From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 3 Aug 2008 11:27:03 +0000 (+0000)
Subject: no real changes, just refactor to remove some code duplication in wxToolBarTool
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/402c3347d26736250a43550ee8253c03fe9052e0?ds=inline

no real changes, just refactor to remove some code duplication in wxToolBarTool

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

diff --git a/src/osx/carbon/toolbar.cpp b/src/osx/carbon/toolbar.cpp
index 64a2201cce..a3aedf7db6 100644
--- a/src/osx/carbon/toolbar.cpp
+++ b/src/osx/carbon/toolbar.cpp
@@ -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,
@@ -215,25 +208,29 @@ public:
 
         if ( m_toolbarItemRef )
         {
-            wxFont f;
-            wxFontEncoding enc;
-            if ( GetToolBar() )
-                f = GetToolBar()->GetFont();
-            if ( f.IsOk() )
-                enc = f.GetEncoding();
-            else
-                enc = wxFont::GetDefaultEncoding();
-
             // strip mnemonics from the label for compatibility with the usual
             // labels in wxStaticText sense
             wxString labelStr = wxStripMenuCodes(label);
 
-            HIToolbarItemSetLabel( m_toolbarItemRef, wxCFStringRef(labelStr, enc) );
+            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;