X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..6968a3b87cee46f5c5af9b46e1ef97f17133cef7:/include/wx/encinfo.h?ds=sidebyside diff --git a/include/wx/encinfo.h b/include/wx/encinfo.h index 1083e8d5a8..0980174c83 100644 --- a/include/wx/encinfo.h +++ b/include/wx/encinfo.h @@ -6,7 +6,7 @@ // Created: 19.09.2003 (extracted from wx/fontenc.h) // RCS-ID: $Id$ // Copyright: (c) 2003 Vadim Zeitlin -// Licence: wxWidgets licence +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// #ifndef _WX_ENCINFO_H_ @@ -32,12 +32,16 @@ // 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 -#if defined(__WXMSW__) || defined(__WXPM__) || defined(__WXMAC__) || defined(__WXCOCOA__) // FIXME: __WXCOCOA__ +#if defined(__WXMSW__) || \ + defined(__WXPM__) || \ + defined(__WXMAC__) || \ + defined(__WXCOCOA__) // FIXME: __WXCOCOA__ + wxNativeEncodingInfo() : facename() , encoding(wxFONTENCODING_SYSTEM) @@ -48,15 +52,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);