X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/48f9e8107ae11a0bd952f258feeaf7c2f57324ca..ba5787676d002f76b4c3944cb598b626f10f058d:/include/wx/encinfo.h diff --git a/include/wx/encinfo.h b/include/wx/encinfo.h index a5e7af1b03..27550701f4 100644 --- a/include/wx/encinfo.h +++ b/include/wx/encinfo.h @@ -5,7 +5,7 @@ // Modified by: // Created: 19.09.2003 (extracted from wx/fontenc.h) // RCS-ID: $Id$ -// Copyright: (c) 2003 Vadim Zeitlin +// Copyright: (c) 2003 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -35,9 +35,14 @@ struct WXDLLEXPORT wxNativeEncodingInfo { wxString facename; // may be empty meaning "any" +#ifndef __WXPALMOS__ 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 +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);