X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d22004c4f4cc39c10605943572251c72061e28ae..1154f91b6a4590d4fda9e4cef75aa4ff35ca57bc:/include/wx/encinfo.h diff --git a/include/wx/encinfo.h b/include/wx/encinfo.h index 7013ba60b1..b35acb1a65 100644 --- a/include/wx/encinfo.h +++ b/include/wx/encinfo.h @@ -32,9 +32,10 @@ // 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__ wxFontEncoding encoding; // so that we know what this struct represents #if defined(__WXMSW__) || \ @@ -52,15 +53,14 @@ 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; #else #error "Unsupported toolkit" #endif - +#endif // !__WXPALMOS__ // this struct is saved in config by wxFontMapper, so it should know to // serialise itself (implemented in platform-specific code) bool FromString(const wxString& s);