Add missing wxUSE_OLE checks to safearray.cpp.

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

diff --git a/include/wx/encinfo.h b/include/wx/encinfo.h
index e39959711720aea239e91e5eead220014d4df3df..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 __PALMOS__

     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,14 +52,10 @@ 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(wxHAS_UTF8_FONTS)
+    // ports using UTF-8 for text don't need encoding information for fonts

 #else
     #error "Unsupported toolkit"
 #else
     #error "Unsupported toolkit"

-#endif

 #endif
     // this struct is saved in config by wxFontMapper, so it should know to
     // serialise itself (implemented in platform-specific code)
 #endif
     // this struct is saved in config by wxFontMapper, so it should know to
     // serialise itself (implemented in platform-specific code)