make wxTmemchr() return (and take) char* instead of void* in ANSI build too

[wxWidgets.git] / include / wx / encinfo.h

diff --git a/include/wx/encinfo.h b/include/wx/encinfo.h
index 7013ba60b159e3be025a35453d8b69845dbe93d2..27550701f46db3c37a3339fe3833e03571cf778f 100644 (file)
--- a/include/wx/encinfo.h
+++ b/include/wx/encinfo.h
@@ -35,6 +35,7 @@
 struct WXDLLEXPORT wxNativeEncodingInfo
 {
     wxString facename;          // may be empty meaning "any"
 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__) || \
     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(_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
 #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);
     // 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);