remove dependency from former cocoa port

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76728 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-06-18 13:11:42 +00:00
parent cd27126831
commit 13fc136d54
1 changed files with 2 additions and 2 deletions
--- 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);

    }
 }