added NZST and NZDT time zones (request 617912)

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

diff --git a/include/wx/encinfo.h b/include/wx/encinfo.h
index 1083e8d5a8e3db2b65682189122f8334fc6f787c..49f744bd69cd6e3910cae73720c5f1cee2894ee1 100644 (file)
--- a/include/wx/encinfo.h
+++ b/include/wx/encinfo.h
@@ -6,7 +6,7 @@
 // Created:     19.09.2003 (extracted from wx/fontenc.h)
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Created:     19.09.2003 (extracted from wx/fontenc.h)
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_ENCINFO_H_
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_ENCINFO_H_


@@ -35,9 +35,14 @@
 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
 
     wxFontEncoding encoding;    // so that we know what this struct represents
 

-#if defined(__WXMSW__) || defined(__WXPM__) || defined(__WXMAC__) || defined(__WXCOCOA__) // FIXME: __WXCOCOA__
+#if defined(__WXMSW__) || \
+    defined(__WXPM__)  || \
+    defined(__WXMAC__) || \
+    defined(__WXCOCOA__) // FIXME: __WXCOCOA__
+

     wxNativeEncodingInfo()
         : facename()
         , encoding(wxFONTENCODING_SYSTEM)
     wxNativeEncodingInfo()
         : facename()
         , encoding(wxFONTENCODING_SYSTEM)


@@ -53,10 +58,12 @@ struct WXDLLEXPORT wxNativeEncodingInfo
     // seems to be handled internally.
 #elif defined(__WXMGL__)
     int      mglEncoding;
     // 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
 #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);