From 6d0f27a4cc0a34ba65c32b3c9dbd9707dadb34e1 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 14 Sep 2014 23:08:27 +0000 Subject: [PATCH] Blind fix to wxiOS build after strike-through fixes. 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 --- src/osx/carbon/utilscocoa.mm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/osx/carbon/utilscocoa.mm b/src/osx/carbon/utilscocoa.mm index 9256d994eb..b51e6f9283 100644 --- a/src/osx/carbon/utilscocoa.mm +++ b/src/osx/carbon/utilscocoa.mm @@ -311,6 +311,7 @@ WX_UIFont wxFont::OSXCreateUIFont(wxOSXSystemFont font, wxNativeFontInfo* info) wxFontStyle fontstyle = wxFONTSTYLE_NORMAL; wxFontWeight fontweight = wxFONTWEIGHT_NORMAL; bool underlined = false; + bool strikethrough = false; int size = (int) ([uifont pointSize]+0.5); /* @@ -324,8 +325,9 @@ WX_UIFont wxFont::OSXCreateUIFont(wxOSXSystemFont font, wxNativeFontInfo* info) fontstyle = wxFONTSTYLE_ITALIC ; */ wxCFStringRef fontname( wxCFRetain([uifont familyName]) ); - info->Init(size,wxFONTFAMILY_DEFAULT,fontstyle,fontweight,underlined, - fontname.AsString(), wxFONTENCODING_DEFAULT); + info->Init(size, wxFONTFAMILY_DEFAULT, fontstyle, fontweight, + underlined, strikethrough, + fontname.AsString(), wxFONTENCODING_DEFAULT); } return uifont;