Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/encinfo.h b/include/wx/encinfo.h
index b35acb1a652743c0434b645cab587c8eb243d625..27b14538473548cd209ba96ddff8c5384cce5a47 100644 (file)
--- a/include/wx/encinfo.h
+++ b/include/wx/encinfo.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     19.09.2003 (extracted from wx/fontenc.h)
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     19.09.2003 (extracted from wx/fontenc.h)

-// RCS-ID:      $Id$

 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -35,7 +34,6 @@
 struct WXDLLIMPEXP_CORE wxNativeEncodingInfo
 {
     wxString facename;          // may be empty meaning "any"
 struct WXDLLIMPEXP_CORE 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__) || \


@@ -55,12 +53,9 @@ struct WXDLLIMPEXP_CORE wxNativeEncodingInfo
              xencoding;
 #elif defined(wxHAS_UTF8_FONTS)
     // ports using UTF-8 for text don't need encoding information for fonts
              xencoding;
 #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
 #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);