ensure minimal mime support in wxHTML even without wxMimeTypesMananger

[wxWidgets.git] / src / common / intl.cpp

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 0aefb4530a3f2c148257f2367313548419855017..de62ef5bb6ef3903dcd816130e4034a1508a1057 100644 (file)
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -60,6 +60,10 @@
     #include "wx/fontmap.h"         // for CharsetToEncoding()
 #endif
 
     #include "wx/fontmap.h"         // for CharsetToEncoding()
 #endif
 

+#if defined(__WXMAC__)
+  #include  "wx/mac/private.h"  // includes mac headers
+#endif
+

 // ----------------------------------------------------------------------------
 // simple types
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // simple types
 // ----------------------------------------------------------------------------


@@ -1240,7 +1244,7 @@ wxString wxLocale::GetSystemEncodingName()
 {
     wxString encname;
 
 {
     wxString encname;
 

-#ifdef __WIN32__
+#if defined(__WIN32__) && !defined(__WXMICROWIN__)

     // FIXME: what is the error return value for GetACP()?
     UINT codepage = ::GetACP();
     encname.Printf(_T("windows-%u"), codepage);
     // FIXME: what is the error return value for GetACP()?
     UINT codepage = ::GetACP();
     encname.Printf(_T("windows-%u"), codepage);


@@ -1256,7 +1260,19 @@ wxString wxLocale::GetSystemEncodingName()
     free(oldLocale);
     if (alang)
     {
     free(oldLocale);
     if (alang)
     {

-        encname = wxConvLibc.cMB2WX(alang);
+#ifdef __SOLARIS__
+        // nl_langinfo() under Solaris returns 646 by default which stands for
+        // ISO-646, i.e. 7 bit ASCII and we should recognize it to avoid
+        // warnings about unrecognized encoding on each program startup
+        if ( strcmp(alang, "646") == 0 )
+        {
+            encname = _T("US-ASCII");
+        }
+        else
+#endif // __SOLARIS__
+        {
+            encname = wxConvLibc.cMB2WX(alang);
+        }

     }
     else
 #endif // HAVE_LANGINFO_H
     }
     else
 #endif // HAVE_LANGINFO_H


@@ -1292,7 +1308,7 @@ wxString wxLocale::GetSystemEncodingName()
 /* static */
 wxFontEncoding wxLocale::GetSystemEncoding()
 {
 /* static */
 wxFontEncoding wxLocale::GetSystemEncoding()
 {

-#ifdef __WIN32__
+#if defined(__WIN32__) && !defined(__WXMICROWIN__)

     UINT codepage = ::GetACP();
 
     // wxWindows only knows about CP1250-1257, 932, 936, 949, 950
     UINT codepage = ::GetACP();
 
     // wxWindows only knows about CP1250-1257, 932, 936, 949, 950


@@ -1324,8 +1340,20 @@ wxFontEncoding wxLocale::GetSystemEncoding()
     wxString encname = GetSystemEncodingName();
     if ( !encname.empty() )
     {
     wxString encname = GetSystemEncodingName();
     if ( !encname.empty() )
     {

-        return wxTheFontMapper->
+        wxFontEncoding enc = wxTheFontMapper->

             CharsetToEncoding(encname, FALSE /* not interactive */);
             CharsetToEncoding(encname, FALSE /* not interactive */);

+
+        // this should probably be considered as a bug in CharsetToEncoding():
+        // it shouldn't return wxFONTENCODING_DEFAULT at all - but it does it
+        // for US-ASCII charset
+        //
+        // we, OTOH, definitely shouldn't return it as it doesn't make sense at
+        // all (which encoding is it?)
+        if ( enc != wxFONTENCODING_DEFAULT )
+        {
+            return enc;
+        }
+        //else: return wxFONTENCODING_SYSTEM below

     }
 #endif // Win32/Unix
 
     }
 #endif // Win32/Unix
 


@@ -1364,7 +1392,7 @@ const wxMB2WXbuf wxLocale::GetString(const wxChar *szOrigString,
                                      const wxChar *szDomain) const
 {
   if ( wxIsEmpty(szOrigString) )
                                      const wxChar *szDomain) const
 {
   if ( wxIsEmpty(szOrigString) )

-      return szDomain;
+    return _T("");

 
   const char *pszTrans = NULL;
 #if wxUSE_UNICODE
 
   const char *pszTrans = NULL;
 #if wxUSE_UNICODE