X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d22004c4f4cc39c10605943572251c72061e28ae..e733c4ce1e24cf7e4b0b0d8362fc59aaa7a7641c:/include/wx/encinfo.h diff --git a/include/wx/encinfo.h b/include/wx/encinfo.h index 7013ba60b1..27b1453847 100644 --- a/include/wx/encinfo.h +++ b/include/wx/encinfo.h @@ -4,7 +4,6 @@ // Author: Vadim Zeitlin // Modified by: // Created: 19.09.2003 (extracted from wx/fontenc.h) -// RCS-ID: $Id$ // Copyright: (c) 2003 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -32,7 +31,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" wxFontEncoding encoding; // so that we know what this struct represents @@ -52,15 +51,11 @@ 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 - // 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);