X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9045ad9dfc9d205ad645e6d496bec9ccddd91ced..8b0f8432d72fc44aa7247ab1c19c04103323feea:/include/wx/motif/font.h?ds=sidebyside diff --git a/include/wx/motif/font.h b/include/wx/motif/font.h index 04bf7c63cb..62be50f08e 100644 --- a/include/wx/motif/font.h +++ b/include/wx/motif/font.h @@ -12,7 +12,7 @@ #ifndef _WX_FONT_H_ #define _WX_FONT_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "font.h" #endif @@ -99,7 +99,13 @@ public: WXDisplay* display = NULL) const; WXFontList GetFontList(double scale = 1.0, WXDisplay* display = NULL) const; - +#if __WXMOTIF20__ + WXRenderTable GetRenderTable(WXDisplay* display) const; +#endif + // returns either a XmFontList or XmRendition, depending + // on Motif version + WXFontType GetFontType(WXDisplay* display) const; + static WXString GetFontTag(); protected: virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info );