X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b3c861501a451503b31c075ccb59d16b0ae01e99..3d4e20dd0baa3399b72b66a12ddcb0f898c43989:/include/wx/encinfo.h diff --git a/include/wx/encinfo.h b/include/wx/encinfo.h index 49f744bd69..b35acb1a65 100644 --- a/include/wx/encinfo.h +++ b/include/wx/encinfo.h @@ -32,7 +32,7 @@ // to create a font of non-standard encoding (like KOI8) under Windows - the // facename specifies the encoding then) -struct WXDLLEXPORT wxNativeEncodingInfo +struct WXDLLIMPEXP_CORE wxNativeEncodingInfo { wxString facename; // may be empty meaning "any" #ifndef __WXPALMOS__ @@ -53,13 +53,10 @@ struct WXDLLEXPORT wxNativeEncodingInfo #elif defined(_WX_X_FONTLIKE) wxString xregistry, xencoding; -#elif defined(__WXGTK20__) - // No way to specify this in Pango as this - // seems to be handled internally. +#elif defined(wxHAS_UTF8_FONTS) + // ports using UTF-8 for text don't need encoding information for fonts #elif defined(__WXMGL__) int mglEncoding; -#elif defined(__WXDFB__) - // DirectFB uses UTF-8 internally, doesn't use font encodings #else #error "Unsupported toolkit" #endif