X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0c5d3e1ccd1d27ab0cf913ddbffb1b54b5802f3a..683646599939f5113215254870b15d03e830458e:/include/wx/font.h?ds=sidebyside diff --git a/include/wx/font.h b/include/wx/font.h index ff010a2443..db89e4edc4 100644 --- a/include/wx/font.h +++ b/include/wx/font.h @@ -12,6 +12,10 @@ #ifndef _WX_FONT_H_BASE_ #define _WX_FONT_H_BASE_ +#ifdef __GNUG__ + #pragma interface "fontbase.h" +#endif + // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- @@ -97,7 +101,7 @@ enum wxFontEncoding wxFONTENCODING_CP850, // CP437 merged with Latin1 wxFONTENCODING_CP852, // CP437 merged with Latin2 wxFONTENCODING_CP855, // another cyrillic encoding - wxFONTENCODING_CP866 = wxFONTENCODING_ALTERNATIVE, + wxFONTENCODING_CP866, // and another one // and for Windows wxFONTENCODING_CP1250, // WinLatin2 wxFONTENCODING_CP1251, // WinCyrillic @@ -110,6 +114,8 @@ enum wxFontEncoding // wxFontBase represents a font object // ---------------------------------------------------------------------------- +class WXDLLEXPORT wxFontRefData; + class wxFontBase : public wxGDIObject { public: @@ -163,7 +169,7 @@ public: protected: // get the internal data - class WXDLLEXPORT wxFontRefData *GetFontData() const + wxFontRefData *GetFontData() const { return (wxFontRefData *)m_refData; } private: @@ -195,7 +201,6 @@ private: // macros // ---------------------------------------------------------------------------- -// VZ: this is ugly (FIXME) #define M_FONTDATA GetFontData() #endif