X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/79e4b6277eec63c346239e8957fed478f5daa6ab..ca77701441e39245dcbfce903049e76f166979e5:/include/wx/unix/fontutil.h diff --git a/include/wx/unix/fontutil.h b/include/wx/unix/fontutil.h index ada65aa9f3..831a812800 100644 --- a/include/wx/unix/fontutil.h +++ b/include/wx/unix/fontutil.h @@ -5,16 +5,15 @@ // Modified by: // Created: 05.11.99 // RCS-ID: $Id$ -// Copyright: (c) wxWindows team -// Licence: wxWindows license +// Copyright: (c) wxWidgets team +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_UNIX_FONTUTIL_H_ #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,17 @@ #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 = NULL); + +// returns the font specified by the given XLFD +extern wxNativeFont wxLoadFont(const wxString& fontSpec); #endif // _WX_UNIX_FONTUTIL_H_