temporary fix the linking problem due to making GSocket::Detected_Read/Write() non...

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

diff --git a/include/wx/encinfo.h b/include/wx/encinfo.h
index 49f744bd69cd6e3910cae73720c5f1cee2894ee1..b35acb1a652743c0434b645cab587c8eb243d625 100644 (file)
--- a/include/wx/encinfo.h
+++ b/include/wx/encinfo.h
@@ -32,7 +32,7 @@
 // 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"
 #ifndef __WXPALMOS__
@@ -53,13 +53,10 @@ 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;
-#elif defined(__WXDFB__)
-    // DirectFB uses UTF-8 internally, doesn't use font encodings
 #else
     #error "Unsupported toolkit"
 #endif