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

Use toll-free bridges from CTFontRef to NSFont or UIFont from (#507)

Browse Source
This commit is contained in:
Stefan Csomor
2017-06-24 11:09:29 +02:00
committed by GitHub
parent 36de95bd8e
commit a77066d530
3 changed files with 2 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/osx/font.h
View File

@@ -148,15 +148,11 @@ public:
#if wxOSX_USE_COCOA
WX_NSFont OSXGetNSFont() const;
static WX_NSFont OSXCreateNSFont(wxOSXSystemFont font, wxNativeFontInfo* info);
static WX_NSFont OSXCreateNSFont(const wxNativeFontInfo* info);
static void SetNativeInfoFromNSFont(WX_NSFont nsfont, wxNativeFontInfo* info);
#endif
#if wxOSX_USE_IPHONE
WX_UIFont OSXGetUIFont() const;
static WX_UIFont OSXCreateUIFont(wxOSXSystemFont font, wxNativeFontInfo* info);
static WX_UIFont OSXCreateUIFont(const wxNativeFontInfo* info);
#endif
protected: