wxMac: Fixed wxListCtrl to respect items' non-default fonts.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52247 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -2712,9 +2712,8 @@ void wxMacDataBrowserListCtrlControl::DrawItem(
|
||||
if (bgColor == wxNullColour)
|
||||
bgColor = listBgColor;
|
||||
|
||||
wxFont listFont = list->GetFont();
|
||||
if (font == wxNullFont)
|
||||
font = listFont;
|
||||
if (!font.Ok())
|
||||
font = list->GetFont();
|
||||
|
||||
wxCFStringRef cfString( text, wxLocale::GetSystemEncoding() );
|
||||
|
||||
@@ -2840,8 +2839,7 @@ void wxMacDataBrowserListCtrlControl::DrawItem(
|
||||
|
||||
if (font.Ok())
|
||||
{
|
||||
if (font.GetFamily() != wxFONTFAMILY_DEFAULT)
|
||||
info.fontID = font.MacGetThemeFontID();
|
||||
info.fontID = font.MacGetThemeFontID();
|
||||
|
||||
::TextSize( (short)(font.MacGetFontSize()) ) ;
|
||||
::TextFace( font.MacGetFontStyle() ) ;
|
||||
|
Reference in New Issue
Block a user