From 13fc136d548a32c1403f9e37700bf3de211d7d6b Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Wed, 18 Jun 2014 13:11:42 +0000 Subject: [PATCH] remove dependency from former cocoa port git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76728 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/osx/carbon/utilscocoa.mm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/osx/carbon/utilscocoa.mm b/src/osx/carbon/utilscocoa.mm index 5f84a90e25..77daa4a639 100644 --- a/src/osx/carbon/utilscocoa.mm +++ b/src/osx/carbon/utilscocoa.mm @@ -27,7 +27,7 @@ #include "wx/fontutil.h" -#if wxOSX_USE_COCOA +#if defined( __WXCOCOA__ ) #include "wx/cocoa/string.h" #endif @@ -148,7 +148,7 @@ void wxFont::SetNativeInfoFromNSFont(WX_NSFont theFont, wxNativeFontInfo* info) fontstyle = wxFONTSTYLE_ITALIC ; info->Init(size,fontFamily,fontstyle,fontweight,underlined, - wxStringWithNSString([theFont familyName]), wxFONTENCODING_DEFAULT); + wxCFStringRef::AsString([theFont familyName]), wxFONTENCODING_DEFAULT); } }