Fix wxStyledTextCtrl compilation in non-Unicode build.

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

diff --git a/include/wx/encinfo.h b/include/wx/encinfo.h
index 49f744bd69cd6e3910cae73720c5f1cee2894ee1..0980174c83854e44a9003656f43c200efc2d5ace 100644 (file)
--- a/include/wx/encinfo.h
+++ b/include/wx/encinfo.h
@@ -32,10 +32,9 @@
 // to create a font of non-standard encoding (like KOI8) under Windows - the
 // facename specifies the encoding then)
 
 // 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"
 {
     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__) || \


@@ -53,17 +52,11 @@ 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(__WXMGL__)
-    int      mglEncoding;
-#elif defined(__WXDFB__)
-    // DirectFB uses UTF-8 internally, doesn't use font encodings
+#elif defined(wxHAS_UTF8_FONTS)
+    // ports using UTF-8 for text don't need encoding information for fonts

 #else
     #error "Unsupported toolkit"
 #endif
 #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);