X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/79e4b6277eec63c346239e8957fed478f5daa6ab..edb89f7e356761b4fbdaebb8b5ebd5c7a7643da7:/include/wx/unix/fontutil.h diff --git a/include/wx/unix/fontutil.h b/include/wx/unix/fontutil.h index ada65aa9f3..b021ac6fd1 100644 --- a/include/wx/unix/fontutil.h +++ b/include/wx/unix/fontutil.h @@ -13,8 +13,7 @@ #define _WX_UNIX_FONTUTIL_H_ #ifdef __X__ - struct XFontStruct; - typedef XFontStruct *wxNativeFont; + typedef WXFontStructPtr wxNativeFont; #elif defined(__WXGTK__) typedef GdkFont *wxNativeFont; #else @@ -22,12 +21,14 @@ #endif // returns the handle of the nearest available font or 0 -extern wxNativeFont wxLoadQueryNearestFont(int pointSize, - int family, - int style, - int weight, - bool underlined, - const wxString &facename, - wxFontEncoding encoding); +extern wxNativeFont +wxLoadQueryNearestFont(int pointSize, + int family, + int style, + int weight, + bool underlined, + const wxString &facename, + wxFontEncoding encoding, + wxString* xFontName = (wxString *)NULL); #endif // _WX_UNIX_FONTUTIL_H_