X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ffecfa5aeb540b54914739dbb8603edbbd4c00a0..6968a3b87cee46f5c5af9b46e1ef97f17133cef7:/include/wx/encinfo.h diff --git a/include/wx/encinfo.h b/include/wx/encinfo.h index e399597117..0980174c83 100644 --- a/include/wx/encinfo.h +++ b/include/wx/encinfo.h @@ -32,10 +32,9 @@ // 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 __PALMOS__ wxFontEncoding encoding; // so that we know what this struct represents #if defined(__WXMSW__) || \ @@ -53,14 +52,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(__WXMGL__) - int mglEncoding; +#elif defined(wxHAS_UTF8_FONTS) + // ports using UTF-8 for text don't need encoding information for fonts #else #error "Unsupported toolkit" -#endif #endif // this struct is saved in config by wxFontMapper, so it should know to // serialise itself (implemented in platform-specific code)