New colour, font, theme and size code..

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

diff --git a/src/common/fontmap.cpp b/src/common/fontmap.cpp
index 4f1e9bd0cbd443326e8b1d6b9954eb2498288dca..05b1edd2abc9fdcfccb57be33b6955fe4f1adb05 100644 (file)
--- a/src/common/fontmap.cpp
+++ b/src/common/fontmap.cpp
@@ -40,6 +40,7 @@
 #include "wx/msgdlg.h"
 #include "wx/fontdlg.h"
 #include "wx/choicdlg.h"
+#include "wx/encconv.h"
 
 // ----------------------------------------------------------------------------
 // constants
@@ -146,7 +147,7 @@ static const wxChar* gs_encodingNames[] =
 static wxFontMapper gs_fontMapper;
 
 // and public pointer
-wxFontMapper * WXDLLEXPORT wxTheFontMapper = &gs_fontMapper;
+wxFontMapper * wxTheFontMapper = &gs_fontMapper;
 
 // ----------------------------------------------------------------------------
 // private classes
@@ -206,7 +207,7 @@ wxFontMapper::~wxFontMapper()
 void wxFontMapper::SetConfigPath(const wxString& prefix)
 {
     wxCHECK_RET( !prefix.IsEmpty() && prefix[0] == wxCONFIG_PATH_SEPARATOR,
-                 _T("an absolute path should be given to "
+                 wxT("an absolute path should be given to "
                      "wxFontMapper::SetConfigPath()") );
 
     m_configRootPath = prefix;
@@ -254,7 +255,7 @@ bool wxFontMapper::ChangePath(const wxString& pathNew, wxString *pathOld)
     }
 
     wxASSERT_MSG( !pathNew || (pathNew[0] != wxCONFIG_PATH_SEPARATOR),
-                  _T("should be a relative path") );
+                  wxT("should be a relative path") );
 
     path += pathNew;
 
@@ -278,7 +279,7 @@ wxString wxFontMapper::GetEncodingDescription(wxFontEncoding encoding)
     size_t count = WXSIZEOF(gs_encodingDescs);
 
     wxASSERT_MSG( count == WXSIZEOF(gs_encodings),
-                  _T("inconsitency detected - forgot to update one of "
+                  wxT("inconsitency detected - forgot to update one of "
                      "the arrays?") );
 
     for ( size_t i = 0; i < count; i++ )
@@ -301,7 +302,7 @@ wxString wxFontMapper::GetEncodingName(wxFontEncoding encoding)
     size_t count = WXSIZEOF(gs_encodingNames);
 
     wxASSERT_MSG( count == WXSIZEOF(gs_encodings),
-                  _T("inconsitency detected - forgot to update one of "
+                  wxT("inconsitency detected - forgot to update one of "
                      "the arrays?") );
 
     for ( size_t i = 0; i < count; i++ )
@@ -342,7 +343,7 @@ wxFontEncoding wxFontMapper::CharsetToEncoding(const wxString& charset,
             }
             else
             {
-                wxLogDebug(_T("corrupted config data - invalid encoding %ld "
+                wxLogDebug(wxT("corrupted config data - invalid encoding %ld "
                               "for charset '%s'"), value, charset.c_str());
             }
         }
@@ -368,20 +369,20 @@ wxFontEncoding wxFontMapper::CharsetToEncoding(const wxString& charset,
     {
         cs.MakeUpper();
 
-        if ( !cs || cs == _T("US-ASCII") )
+        if ( !cs || cs == wxT("US-ASCII") )
             encoding = wxFONTENCODING_DEFAULT;
-        else if ( cs == _T("KOI8-R") || cs == _T("KOI8-U") )
+        else if ( cs == wxT("KOI8-R") || cs == wxT("KOI8-U") )
             encoding = wxFONTENCODING_KOI8;
-        else if ( cs.Left(3) == _T("ISO") )
+        else if ( cs.Left(3) == wxT("ISO") )
         {
             // the dash is optional (or, to be exact, it is not, but
             // several brokenmails "forget" it)
             const wxChar *p = cs.c_str() + 3;
-            if ( *p == _T('-') )
+            if ( *p == wxT('-') )
                 p++;
 
             unsigned int value;
-            if ( wxSscanf(p, _T("8859-%u"), &value) == 1 )
+            if ( wxSscanf(p, wxT("8859-%u"), &value) == 1 )
             {
                 if ( value < wxFONTENCODING_ISO8859_MAX -
                              wxFONTENCODING_ISO8859_1 )
@@ -392,7 +393,7 @@ wxFontEncoding wxFontMapper::CharsetToEncoding(const wxString& charset,
                 }
             }
         }
-        else if ( cs.Left(8) == _T("WINDOWS-") )
+        else if ( cs.Left(8) == wxT("WINDOWS-") )
         {
             int value;
             if ( wxSscanf(cs.c_str() + 8, wxT("%u"), &value) == 1 )
@@ -433,7 +434,7 @@ wxFontEncoding wxFontMapper::CharsetToEncoding(const wxString& charset,
         size_t count = WXSIZEOF(gs_encodingDescs);
 
         wxASSERT_MSG( count == WXSIZEOF(gs_encodings),
-                      _T("inconsitency detected - forgot to update one of "
+                      wxT("inconsitency detected - forgot to update one of "
                          "the arrays?") );
 
         wxString *encodingNamesTranslated = new wxString[count];
@@ -499,7 +500,7 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
                                      wxNativeEncodingInfo *info,
                                      bool interactive)
 {
-    wxCHECK_MSG( info, FALSE, _T("bad pointer in GetAltForEncoding") );
+    wxCHECK_MSG( info, FALSE, wxT("bad pointer in GetAltForEncoding") );
 
     if ( encoding == wxFONTENCODING_DEFAULT )
     {
@@ -542,7 +543,7 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
             }
             else
             {
-                wxLogDebug(_T("corrupted config data: string '%s' is not "
+                wxLogDebug(wxT("corrupted config data: string '%s' is not "
                               "a valid font encoding info"), fontinfo.c_str());
             }
         }
@@ -598,71 +599,13 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
     }
     //else: we're in non-interactive mode
 
-    // now try the default mappings
-    switch ( encoding )
-    {
-        case wxFONTENCODING_ISO8859_15:
-            // iso8859-15 is slightly modified iso8859-1
-            if ( TestAltEncoding(configEntry, wxFONTENCODING_ISO8859_1, info) )
-                return TRUE;
-            // fall through
-
-        case wxFONTENCODING_ISO8859_1:
-            // iso8859-1 is identical to CP1252
-            if ( TestAltEncoding(configEntry, wxFONTENCODING_CP1252, info) )
-                return TRUE;
-
-            break;
-
-        case wxFONTENCODING_CP1252:
-            if ( TestAltEncoding(configEntry, wxFONTENCODING_ISO8859_1, info) )
-                return TRUE;
-
-            break;
-
-        // iso8859-13 is quite similar to WinBaltic
-        case wxFONTENCODING_ISO8859_13:
-            if ( TestAltEncoding(configEntry, wxFONTENCODING_CP1257, info) )
-                return TRUE;
-
-            break;
-
-        case wxFONTENCODING_CP1257:
-            if ( TestAltEncoding(configEntry, wxFONTENCODING_ISO8859_13, info) )
-                return TRUE;
-
-            break;
 
-        // iso8859-8 is almost identical to WinHebrew
-        case wxFONTENCODING_ISO8859_8:
-            if ( TestAltEncoding(configEntry, wxFONTENCODING_CP1255, info) )
-                return TRUE;
-
-            break;
-
-        case wxFONTENCODING_CP1255:
-            if ( TestAltEncoding(configEntry, wxFONTENCODING_ISO8859_8, info) )
-                return TRUE;
-
-            break;
-
-        // and iso8859-7 is not too different from WinGreek
-        case wxFONTENCODING_ISO8859_7:
-            if ( TestAltEncoding(configEntry, wxFONTENCODING_CP1253, info) )
-                return TRUE;
-
-            break;
-
-        case wxFONTENCODING_CP1253:
-            if ( TestAltEncoding(configEntry, wxFONTENCODING_ISO8859_7, info) )
-                return TRUE;
-
-            break;
-
-        default:
-           // TODO add other mappings...
-           ;
-    }
+    // now try the default mappings:
+    
+    wxFontEncodingArray equiv = wxEncodingConverter::GetAllEquivalents(encoding);
+    for ( unsigned i = (equiv[0] == encoding) ? 1 : 0; i < equiv.GetCount(); i++ )
+        if ( TestAltEncoding(configEntry, equiv[i], info) )
+            return TRUE;
 
     return FALSE;
 }