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

Blind fix to wxiOS build after strike-through fixes.

Browse Source 
This should correct build breakage caused by r77695.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77700 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-09-14 23:08:27 +00:00
parent f5d6be6d86
commit 6d0f27a4cc
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/osx/carbon/utilscocoa.mm
View File

@@ -311,6 +311,7 @@ WX_UIFont wxFont::OSXCreateUIFont(wxOSXSystemFont font, wxNativeFontInfo* info)
wxFontStyle fontstyle = wxFONTSTYLE_NORMAL; wxFontStyle fontstyle = wxFONTSTYLE_NORMAL;
wxFontWeight fontweight = wxFONTWEIGHT_NORMAL; wxFontWeight fontweight = wxFONTWEIGHT_NORMAL;
bool underlined = false; bool underlined = false;
bool strikethrough = false;
int size = (int) ([uifont pointSize]+0.5); int size = (int) ([uifont pointSize]+0.5);
/* /*
@@ -324,8 +325,9 @@ WX_UIFont wxFont::OSXCreateUIFont(wxOSXSystemFont font, wxNativeFontInfo* info)
fontstyle = wxFONTSTYLE_ITALIC ; fontstyle = wxFONTSTYLE_ITALIC ;
*/ */
wxCFStringRef fontname( wxCFRetain([uifont familyName]) ); wxCFStringRef fontname( wxCFRetain([uifont familyName]) );
info->Init(size,wxFONTFAMILY_DEFAULT,fontstyle,fontweight,underlined, info->Init(size, wxFONTFAMILY_DEFAULT, fontstyle, fontweight,
fontname.AsString(), wxFONTENCODING_DEFAULT); underlined, strikethrough,
fontname.AsString(), wxFONTENCODING_DEFAULT);
} }
return uifont; return uifont;