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

wxMac: Fixed wxListCtrl to respect items' non-default fonts.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52247 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2008-03-02 10:59:58 +00:00
parent 34a3ed019b
commit 80d72f726d
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/mac/carbon/listctrl_mac.cpp
View File

@@ -2712,9 +2712,8 @@ void wxMacDataBrowserListCtrlControl::DrawItem(
if (bgColor == wxNullColour) if (bgColor == wxNullColour)
bgColor = listBgColor; bgColor = listBgColor;
wxFont listFont = list->GetFont(); if (!font.Ok())
if (font == wxNullFont) font = list->GetFont();
font = listFont;
wxCFStringRef cfString( text, wxLocale::GetSystemEncoding() ); wxCFStringRef cfString( text, wxLocale::GetSystemEncoding() );
@@ -2840,8 +2839,7 @@ void wxMacDataBrowserListCtrlControl::DrawItem(
if (font.Ok()) if (font.Ok())
{ {
if (font.GetFamily() != wxFONTFAMILY_DEFAULT) info.fontID = font.MacGetThemeFontID();
info.fontID = font.MacGetThemeFontID();
::TextSize( (short)(font.MacGetFontSize()) ) ; ::TextSize( (short)(font.MacGetFontSize()) ) ;
::TextFace( font.MacGetFontStyle() ) ; ::TextFace( font.MacGetFontStyle() ) ;