X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ffecfa5aeb540b54914739dbb8603edbbd4c00a0..ce4b7808ca940be201422a066de141ca12f13863:/include/wx/encinfo.h diff --git a/include/wx/encinfo.h b/include/wx/encinfo.h index e399597117..49f744bd69 100644 --- a/include/wx/encinfo.h +++ b/include/wx/encinfo.h @@ -35,7 +35,7 @@ struct WXDLLEXPORT wxNativeEncodingInfo { wxString facename; // may be empty meaning "any" -#ifndef __PALMOS__ +#ifndef __WXPALMOS__ wxFontEncoding encoding; // so that we know what this struct represents #if defined(__WXMSW__) || \ @@ -58,10 +58,12 @@ struct WXDLLEXPORT wxNativeEncodingInfo // seems to be handled internally. #elif defined(__WXMGL__) int mglEncoding; +#elif defined(__WXDFB__) + // DirectFB uses UTF-8 internally, doesn't use font encodings #else #error "Unsupported toolkit" #endif -#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);