Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54954 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-08-03 11:27:03 +00:00
parent e3e061ee13
commit 402c3347d2
1 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/osx/carbon/toolbar.cpp
View File

@@ -178,14 +178,7 @@ public:
m_toolbarItemRef = ref; m_toolbarItemRef = ref;
if ( m_toolbarItemRef ) if ( m_toolbarItemRef )
{ {
wxFont f; wxFontEncoding enc = GetToolBarFontEncoding();
wxFontEncoding enc;
if ( GetToolBar() )
f = GetToolBar()->GetFont();
if ( f.IsOk() )
enc = f.GetEncoding();
else
enc = wxFont::GetDefaultEncoding();
HIToolbarItemSetHelpText( HIToolbarItemSetHelpText(
m_toolbarItemRef, m_toolbarItemRef,
@@ -215,25 +208,29 @@ public:
if ( m_toolbarItemRef ) 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 // strip mnemonics from the label for compatibility with the usual
// labels in wxStaticText sense // labels in wxStaticText sense
wxString labelStr = wxStripMenuCodes(label); wxString labelStr = wxStripMenuCodes(label);
HIToolbarItemSetLabel( m_toolbarItemRef, wxCFStringRef(labelStr, enc) ); HIToolbarItemSetLabel(
m_toolbarItemRef,
wxCFStringRef(labelStr, GetToolBarFontEncoding()) );
} }
} }
#endif // wxOSX_USE_NATIVE_TOOLBAR #endif // wxOSX_USE_NATIVE_TOOLBAR
private: 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() void Init()
{ {
m_controlHandle = NULL; m_controlHandle = NULL;