use wxWindows zlib.h instead of Mac OS X system zlib.h directly

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

diff --git a/src/common/fontmap.cpp b/src/common/fontmap.cpp
index 9ea0196dd7336a7ee1bca8171527db6feaa9e293..0ef4622bdf1255edbb79e6c1aa50bfd5b0e247ea 100644 (file)
--- a/src/common/fontmap.cpp
+++ b/src/common/fontmap.cpp
@@ -28,13 +28,14 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_FONTMAP
+

 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/log.h"
     #include "wx/intl.h"
 #endif // PCH
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/log.h"
     #include "wx/intl.h"
 #endif // PCH
 

-#include "wx/fontutil.h"

 #include "wx/fontmap.h"
 
 #if wxUSE_CONFIG
 #include "wx/fontmap.h"
 
 #if wxUSE_CONFIG


@@ -43,6 +44,7 @@
 #endif
 
 #if wxUSE_GUI
 #endif
 
 #if wxUSE_GUI

+    #include "wx/fontutil.h"

     #include "wx/msgdlg.h"
     #include "wx/fontdlg.h"
     #include "wx/choicdlg.h"
     #include "wx/msgdlg.h"
     #include "wx/fontdlg.h"
     #include "wx/choicdlg.h"


@@ -55,12 +57,17 @@
 // ----------------------------------------------------------------------------
 
 // the config paths we use
 // ----------------------------------------------------------------------------
 
 // the config paths we use

+#if wxUSE_CONFIG

 static const wxChar* FONTMAPPER_ROOT_PATH = wxT("/wxWindows/FontMapper");
 static const wxChar* FONTMAPPER_CHARSET_PATH = wxT("Charsets");
 static const wxChar* FONTMAPPER_CHARSET_ALIAS_PATH = wxT("Aliases");
 static const wxChar* FONTMAPPER_ROOT_PATH = wxT("/wxWindows/FontMapper");
 static const wxChar* FONTMAPPER_CHARSET_PATH = wxT("Charsets");
 static const wxChar* FONTMAPPER_CHARSET_ALIAS_PATH = wxT("Aliases");

+
+// we only ask questions in GUI mode

 #if wxUSE_GUI
     static const wxChar* FONTMAPPER_FONT_FROM_ENCODING_PATH = wxT("Encodings");
 #if wxUSE_GUI
     static const wxChar* FONTMAPPER_FONT_FROM_ENCODING_PATH = wxT("Encodings");

+    static const wxChar* FONTMAPPER_FONT_DONT_ASK = wxT("none");

 #endif // wxUSE_GUI
 #endif // wxUSE_GUI

+#endif // wxUSE_CONFIG

 
 // encodings supported by GetEncodingDescription
 static wxFontEncoding gs_encodings[] =
 
 // encodings supported by GetEncodingDescription
 static wxFontEncoding gs_encodings[] =


@@ -90,16 +97,18 @@ static wxFontEncoding gs_encodings[] =
     wxFONTENCODING_CP1256,
     wxFONTENCODING_CP1257,
     wxFONTENCODING_CP437,
     wxFONTENCODING_CP1256,
     wxFONTENCODING_CP1257,
     wxFONTENCODING_CP437,

+    wxFONTENCODING_UTF7,
+    wxFONTENCODING_UTF8,

 };
 
 // the descriptions for them
 static const wxChar* gs_encodingDescs[] =
 {
 };
 
 // the descriptions for them
 static const wxChar* gs_encodingDescs[] =
 {

-    wxTRANSLATE( "Western European (ISO-8859-1/Latin 1)" ),
-    wxTRANSLATE( "Central European (ISO-8859-2/Latin 2)" ),
+    wxTRANSLATE( "Western European (ISO-8859-1)" ),
+    wxTRANSLATE( "Central European (ISO-8859-2)" ),

     wxTRANSLATE( "Esperanto (ISO-8859-3)" ),
     wxTRANSLATE( "Baltic (old) (ISO-8859-4)" ),
     wxTRANSLATE( "Esperanto (ISO-8859-3)" ),
     wxTRANSLATE( "Baltic (old) (ISO-8859-4)" ),

-    wxTRANSLATE( "Cyrillic (Latin 5)" ),
+    wxTRANSLATE( "Cyrillic (ISO-8859-5)" ),

     wxTRANSLATE( "Arabic (ISO-8859-6)" ),
     wxTRANSLATE( "Greek (ISO-8859-7)" ),
     wxTRANSLATE( "Hebrew (ISO-8859-8)" ),
     wxTRANSLATE( "Arabic (ISO-8859-6)" ),
     wxTRANSLATE( "Greek (ISO-8859-7)" ),
     wxTRANSLATE( "Hebrew (ISO-8859-8)" ),


@@ -109,7 +118,7 @@ static const wxChar* gs_encodingDescs[] =
     wxTRANSLATE( "Indian (ISO-8859-12)" ),
     wxTRANSLATE( "Baltic (ISO-8859-13)" ),
     wxTRANSLATE( "Celtic (ISO-8859-14)" ),
     wxTRANSLATE( "Indian (ISO-8859-12)" ),
     wxTRANSLATE( "Baltic (ISO-8859-13)" ),
     wxTRANSLATE( "Celtic (ISO-8859-14)" ),

-    wxTRANSLATE( "Western European with Euro (ISO-8859-15/Latin 0)" ),
+    wxTRANSLATE( "Western European with Euro (ISO-8859-15)" ),

     wxTRANSLATE( "KOI8-R" ),
     wxTRANSLATE( "Windows Central European (CP 1250)" ),
     wxTRANSLATE( "Windows Cyrillic (CP 1251)" ),
     wxTRANSLATE( "KOI8-R" ),
     wxTRANSLATE( "Windows Central European (CP 1250)" ),
     wxTRANSLATE( "Windows Cyrillic (CP 1251)" ),


@@ -120,36 +129,40 @@ static const wxChar* gs_encodingDescs[] =
     wxTRANSLATE( "Windows Arabic (CP 1256)" ),
     wxTRANSLATE( "Windows Baltic (CP 1257)" ),
     wxTRANSLATE( "Windows/DOS OEM (CP 437)" ),
     wxTRANSLATE( "Windows Arabic (CP 1256)" ),
     wxTRANSLATE( "Windows Baltic (CP 1257)" ),
     wxTRANSLATE( "Windows/DOS OEM (CP 437)" ),

+    wxTRANSLATE( "Unicode 7 bit (UTF-7)" ),
+    wxTRANSLATE( "Unicode 8 bit (UTF-8)" ),

 };
 
 };
 

-// and the internal names
+// and the internal names (these are not translated on purpose!)

 static const wxChar* gs_encodingNames[] =
 {
 static const wxChar* gs_encodingNames[] =
 {

-    wxT( "iso8859-1" ),
-    wxT( "iso8859-2" ),
-    wxT( "iso8859-3" ),
-    wxT( "iso8859-4" ),
-    wxT( "iso8859-5" ),
-    wxT( "iso8859-6" ),
-    wxT( "iso8859-7" ),
-    wxT( "iso8859-8" ),
-    wxT( "iso8859-9" ),
-    wxT( "iso8859-10" ),
-    wxT( "iso8859-11" ),
-    wxT( "iso8859-12" ),
-    wxT( "iso8859-13" ),
-    wxT( "iso8859-14" ),
-    wxT( "iso8859-15" ),
+    wxT( "iso-8859-1" ),
+    wxT( "iso-8859-2" ),
+    wxT( "iso-8859-3" ),
+    wxT( "iso-8859-4" ),
+    wxT( "iso-8859-5" ),
+    wxT( "iso-8859-6" ),
+    wxT( "iso-8859-7" ),
+    wxT( "iso-8859-8" ),
+    wxT( "iso-8859-9" ),
+    wxT( "iso-8859-10" ),
+    wxT( "iso-8859-11" ),
+    wxT( "iso-8859-12" ),
+    wxT( "iso-8859-13" ),
+    wxT( "iso-8859-14" ),
+    wxT( "iso-8859-15" ),

     wxT( "koi8-r" ),
     wxT( "koi8-r" ),

-    wxT( "windows1250" ),
-    wxT( "windows1251" ),
-    wxT( "windows1252" ),
-    wxT( "windows1253" ),
-    wxT( "windows1254" ),
-    wxT( "windows1255" ),
-    wxT( "windows1256" ),
-    wxT( "windows1257" ),
-    wxT( "windows437" ),
+    wxT( "windows-1250" ),
+    wxT( "windows-1251" ),
+    wxT( "windows-1252" ),
+    wxT( "windows-1253" ),
+    wxT( "windows-1254" ),
+    wxT( "windows-1255" ),
+    wxT( "windows-1256" ),
+    wxT( "windows-1257" ),
+    wxT( "windows-437" ),
+    wxT( "utf-7" ),
+    wxT( "utf-8" ),

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -202,6 +215,7 @@ wxFontMapper::wxFontMapper()
 {
 #if wxUSE_CONFIG
     m_config = NULL;
 {
 #if wxUSE_CONFIG
     m_config = NULL;

+    m_configIsDummy = FALSE;

 #endif // wxUSE_CONFIG
 
 #if wxUSE_GUI
 #endif // wxUSE_CONFIG
 
 #if wxUSE_GUI


@@ -251,10 +265,27 @@ wxConfigBase *wxFontMapper::GetConfig()
             // but will allow us to remember the results of the questions at
             // least during this run
             m_config = new wxMemoryConfig;
             // but will allow us to remember the results of the questions at
             // least during this run
             m_config = new wxMemoryConfig;

-            wxConfig::Set(m_config);
+            m_configIsDummy = TRUE;
+            // VS: we can't call wxConfig::Set(m_config) here because that would
+            //     disable automatic wxConfig instance creation if this code was
+            //     called before wxApp::OnInit (this happens in wxGTK -- it sets
+            //     default wxFont encoding in wxApp::Initialize())

         }
     }
 
         }
     }
 

+    if ( m_configIsDummy && wxConfig::Get(FALSE) != NULL )
+    {
+        // VS: in case we created dummy m_config (see above), we want to switch back
+        //     to the real one as soon as one becomes available.
+        m_config = wxConfig::Get(FALSE);
+        m_configIsDummy = FALSE;
+        // FIXME: ideally, we should add keys from dummy config to the real one now,
+        //        but it is a low-priority task because typical wxWin application
+        //        either doesn't use wxConfig at all or creates wxConfig object in 
+        //        wxApp::OnInit(), before any real interaction with the user takes 
+        //        place...
+    }
+

     return m_config;
 }
 
     return m_config;
 }
 


@@ -313,6 +344,11 @@ void wxFontMapper::RestorePath(const wxString& pathOld)
 /* static */
 wxString wxFontMapper::GetEncodingDescription(wxFontEncoding encoding)
 {
 /* static */
 wxString wxFontMapper::GetEncodingDescription(wxFontEncoding encoding)
 {

+    if ( encoding == wxFONTENCODING_DEFAULT )
+    {
+        return _("Default encoding");
+    }
+

     size_t count = WXSIZEOF(gs_encodingDescs);
 
     wxASSERT_MSG( count == WXSIZEOF(gs_encodings),
     size_t count = WXSIZEOF(gs_encodingDescs);
 
     wxASSERT_MSG( count == WXSIZEOF(gs_encodings),


@@ -335,6 +371,11 @@ wxString wxFontMapper::GetEncodingDescription(wxFontEncoding encoding)
 /* static */
 wxString wxFontMapper::GetEncodingName(wxFontEncoding encoding)
 {
 /* static */
 wxString wxFontMapper::GetEncodingName(wxFontEncoding encoding)
 {

+    if ( encoding == wxFONTENCODING_DEFAULT )
+    {
+        return _("default");
+    }
+

     size_t count = WXSIZEOF(gs_encodingNames);
 
     wxASSERT_MSG( count == WXSIZEOF(gs_encodings),
     size_t count = WXSIZEOF(gs_encodingNames);
 
     wxASSERT_MSG( count == WXSIZEOF(gs_encodings),


@@ -344,7 +385,7 @@ wxString wxFontMapper::GetEncodingName(wxFontEncoding encoding)
     {
         if ( gs_encodings[i] == encoding )
         {
     {
         if ( gs_encodings[i] == encoding )
         {

-            return wxGetTranslation(gs_encodingNames[i]);
+            return gs_encodingNames[i];

         }
     }
 
         }
     }
 


@@ -357,6 +398,12 @@ wxString wxFontMapper::GetEncodingName(wxFontEncoding encoding)
 wxFontEncoding wxFontMapper::CharsetToEncoding(const wxString& charset,
                                                bool interactive)
 {
 wxFontEncoding wxFontMapper::CharsetToEncoding(const wxString& charset,
                                                bool interactive)
 {

+    // a special pseudo encoding which means "don't ask me about this charset
+    // any more" - we need it to avoid driving the user crazy with asking him
+    // time after time about the same charset which he [presumably] doesn't
+    // have the fonts fot
+    static const int wxFONTENCODING_UNKNOWN = -2;
+

     wxFontEncoding encoding = wxFONTENCODING_SYSTEM;
 
     // we're going to modify it, make a copy
     wxFontEncoding encoding = wxFONTENCODING_SYSTEM;
 
     // we're going to modify it, make a copy


@@ -373,6 +420,12 @@ wxFontEncoding wxFontMapper::CharsetToEncoding(const wxString& charset,
         long value = config->Read(charset, -1l);
         if ( value != -1 )
         {
         long value = config->Read(charset, -1l);
         if ( value != -1 )
         {

+            if ( value == wxFONTENCODING_UNKNOWN )
+            {
+                // don't try to find it, in particular don't ask the user
+                return wxFONTENCODING_SYSTEM;
+            }
+

             if ( value >= 0 && value <= wxFONTENCODING_MAX )
             {
                 encoding = (wxFontEncoding)value;
             if ( value >= 0 && value <= wxFONTENCODING_MAX )
             {
                 encoding = (wxFontEncoding)value;


@@ -399,11 +452,15 @@ wxFontEncoding wxFontMapper::CharsetToEncoding(const wxString& charset,
 
         RestorePath(pathOld);
     }
 
         RestorePath(pathOld);
     }

-#endif
+#endif // wxUSE_CONFIG

 
 

-    // if didn't find it there, try to reckognise it ourselves
+    // if didn't find it there, try to recognize it ourselves

     if ( encoding == wxFONTENCODING_SYSTEM )
     {
     if ( encoding == wxFONTENCODING_SYSTEM )
     {

+        // trim any spaces
+        cs.Trim(TRUE);
+        cs.Trim(FALSE);
+

         // discard the optional quotes
         if ( !!cs )
         {
         // discard the optional quotes
         if ( !!cs )
         {


@@ -416,9 +473,26 @@ wxFontEncoding wxFontMapper::CharsetToEncoding(const wxString& charset,
         cs.MakeUpper();
 
         if ( !cs || cs == wxT("US-ASCII") )
         cs.MakeUpper();
 
         if ( !cs || cs == wxT("US-ASCII") )

+        {

             encoding = wxFONTENCODING_DEFAULT;
             encoding = wxFONTENCODING_DEFAULT;

-        else if ( cs == wxT("KOI8-R") || cs == wxT("KOI8-U") )
+        }
+        else if ( cs == wxT("UTF-7") )
+        {
+            encoding = wxFONTENCODING_UTF7;
+        }
+        else if ( cs == wxT("UTF-8") )
+        {
+            encoding = wxFONTENCODING_UTF8;
+        }
+        else if ( cs == wxT("KOI8-R") ||
+                  cs == wxT("KOI8-U") ||
+                  cs == wxT("KOI8-RU") )
+        {
+            // although koi8-ru is not strictly speaking the same as koi8-r,
+            // they are similar enough to make mapping it to koi8 better than
+            // not reckognizing it at all

             encoding = wxFONTENCODING_KOI8;
             encoding = wxFONTENCODING_KOI8;

+        }

         else if ( cs.Left(3) == wxT("ISO") )
         {
             // the dash is optional (or, to be exact, it is not, but
         else if ( cs.Left(3) == wxT("ISO") )
         {
             // the dash is optional (or, to be exact, it is not, but


@@ -430,29 +504,53 @@ wxFontEncoding wxFontMapper::CharsetToEncoding(const wxString& charset,
             unsigned int value;
             if ( wxSscanf(p, wxT("8859-%u"), &value) == 1 )
             {
             unsigned int value;
             if ( wxSscanf(p, wxT("8859-%u"), &value) == 1 )
             {

-                if ( value < wxFONTENCODING_ISO8859_MAX -
-                             wxFONTENCODING_ISO8859_1 )
+                // make it 0 based and check that it is strictly positive in
+                // the process (no such thing as iso8859-0 encoding)
+                if ( (value-- > 0) &&
+                     (value < wxFONTENCODING_ISO8859_MAX -
+                              wxFONTENCODING_ISO8859_1) )

                 {
                     // it's a valid ISO8859 encoding
                 {
                     // it's a valid ISO8859 encoding

-                    value += wxFONTENCODING_ISO8859_1 - 1;
+                    value += wxFONTENCODING_ISO8859_1;

                     encoding = (wxFontEncoding)value;
                 }
             }
         }
                     encoding = (wxFontEncoding)value;
                 }
             }
         }

-        else if ( cs.Left(8) == wxT("WINDOWS-") )
+        else // check for Windows charsets

         {
         {

-            int value;
-            if ( wxSscanf(cs.c_str() + 8, wxT("%u"), &value) == 1 )
+            size_t len;
+            if ( cs.Left(7) == wxT("WINDOWS") )
+            {
+                len = 7;
+            }
+            else if ( cs.Left(2) == wxT("CP") )

             {
             {

-                if ( value >= 1250 )
+                len = 2;
+            }
+            else // not a Windows encoding
+            {
+                len = 0;
+            }
+
+            if ( len )
+            {
+                const wxChar *p = cs.c_str() + len;
+                if ( *p == wxT('-') )
+                    p++;
+
+                int value;
+                if ( wxSscanf(p, wxT("%u"), &value) == 1 )

                 {
                 {

-                    value -= 1250;
-                    if ( value < wxFONTENCODING_CP12_MAX -
-                                 wxFONTENCODING_CP1250 )
+                    if ( value >= 1250 )

                     {
                     {

-                        // a valid Windows code page
-                        value += wxFONTENCODING_CP1250;
-                        encoding = (wxFontEncoding)value;
+                        value -= 1250;
+                        if ( value < wxFONTENCODING_CP12_MAX -
+                                     wxFONTENCODING_CP1250 )
+                        {
+                            // a valid Windows code page
+                            value += wxFONTENCODING_CP1250;
+                            encoding = (wxFontEncoding)value;
+                        }

                     }
                 }
             }
                     }
                 }
             }


@@ -504,24 +602,25 @@ wxFontEncoding wxFontMapper::CharsetToEncoding(const wxString& charset,
         if ( n != -1 )
         {
             encoding = gs_encodings[n];
         if ( n != -1 )
         {
             encoding = gs_encodings[n];

+        }

 
 #if wxUSE_CONFIG
         // save the result in the config now
 
 #if wxUSE_CONFIG
         // save the result in the config now

-            if ( ChangePath(FONTMAPPER_CHARSET_PATH, &pathOld) )
-            {
-                wxConfigBase *config = GetConfig();
-
-                // remember the alt encoding for this charset
-                if ( !config->Write(charset, (long)encoding) )
-                {
-                    wxLogError(_("Failed to remember the encoding for the charset '%s'."), charset.c_str());
-                }
+        if ( ChangePath(FONTMAPPER_CHARSET_PATH, &pathOld) )
+        {
+            wxConfigBase *config = GetConfig();

 
 

-                RestorePath(pathOld);
+            // remember the alt encoding for this charset - or remember that
+            // we don't know it
+            long value = n == -1 ? wxFONTENCODING_UNKNOWN : (long)encoding;
+            if ( !config->Write(charset, value) )
+            {
+                wxLogError(_("Failed to remember the encoding for the charset '%s'."), charset.c_str());

             }
             }

-#endif // wxUSE_CONFIG
+
+            RestorePath(pathOld);

         }
         }

-        //else: cancelled
+#endif // wxUSE_CONFIG

     }
 #endif // wxUSE_GUI
 
     }
 #endif // wxUSE_GUI
 


@@ -613,7 +712,8 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
         // wxFatalError doesn't return
     }
 
         // wxFatalError doesn't return
     }
 

-    wxString configEntry, encName = GetEncodingName(encoding);
+    wxString configEntry,
+             encName = GetEncodingName(encoding);

     if ( !!facename )
     {
         configEntry = facename + _T("_");
     if ( !!facename )
     {
         configEntry = facename + _T("_");


@@ -631,33 +731,46 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
 
         RestorePath(pathOld);
 
 
         RestorePath(pathOld);
 

-        if ( !!fontinfo && !!facename )
+        // this special value means that we don't know of fonts for this
+        // encoding but, moreover, have already asked the user as well and he
+        // didn't specify any font neither
+        if ( fontinfo == FONTMAPPER_FONT_DONT_ASK )

         {
         {

-            // we tried to find a match with facename - now try without it
-            fontinfo = config->Read(encName);
+            interactive = FALSE;

         }
         }

-
-        if ( !!fontinfo )
+        else // use the info entered the last time

         {
         {

-            if ( info->FromString(fontinfo) )
+            if ( !!fontinfo && !!facename )

             {
             {

-                if ( wxTestFontEncoding(*info) )
-                {
-                    // ok, got something
-                    return TRUE;
-                }
-                //else: no such fonts, look for something else
+                // we tried to find a match with facename - now try without it
+                fontinfo = config->Read(encName);

             }
             }

-            else
+
+            if ( !!fontinfo )

             {
             {

-                wxLogDebug(wxT("corrupted config data: string '%s' is not a valid font encoding info"), fontinfo.c_str());
+                if ( info->FromString(fontinfo) )
+                {
+                    if ( wxTestFontEncoding(*info) )
+                    {
+                        // ok, got something
+                        return TRUE;
+                    }
+                    //else: no such fonts, look for something else
+                    //      (should we erase the outdated value?)
+                }
+                else
+                {
+                    wxLogDebug(wxT("corrupted config data: string '%s' is not a valid font encoding info"),
+                               fontinfo.c_str());
+                }

             }
             }

+            //else: there is no information in config about this encoding

         }
         }

-        //else: there is no information in config about this encoding

     }
 #endif // wxUSE_CONFIG
 
     // ask the user
     }
 #endif // wxUSE_CONFIG
 
     // ask the user

+#if wxUSE_FONTDLG

     if ( interactive )
     {
         wxString title(m_titleDialog);
     if ( interactive )
     {
         wxString title(m_titleDialog);


@@ -666,7 +779,7 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
 
         // the message
         wxString msg;
 
         // the message
         wxString msg;

-        msg.Printf(_("The encoding '%s' is unknown.\nWould you like to select a font to be used for this encoding\n(otherwise the text in this encoding will not be shown correctly)?"),
+        msg.Printf(_("No font for displaying text in encoding '%s' found.\nWould you like to select a font to be used for this encoding\n(otherwise the text in this encoding will not be shown correctly)?"),

                      GetEncodingDescription(encoding).c_str());
 
         wxWindow *parent = m_windowParent;
                      GetEncodingDescription(encoding).c_str());
 
         wxWindow *parent = m_windowParent;


@@ -686,7 +799,7 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
                 wxFont font = retData.GetChosenFont();
 
                 *info = retData.EncodingInfo();
                 wxFont font = retData.GetChosenFont();
 
                 *info = retData.EncodingInfo();

-                info->encoding = retData.GetEncoding();
+                info -> encoding = retData.GetEncoding();

 
 #if wxUSE_CONFIG
                 // remember this in the config
 
 #if wxUSE_CONFIG
                 // remember this in the config


@@ -696,15 +809,28 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
 
                     RestorePath(pathOld);
                 }
 
                     RestorePath(pathOld);
                 }

-#endif
+#endif // wxUSE_CONFIG

 
                 return TRUE;
             }
             //else: the user canceled the font selection dialog
         }
 
                 return TRUE;
             }
             //else: the user canceled the font selection dialog
         }

-        //else: the user doesn't want to select a font
+        else
+        {
+            // the user doesn't want to select a font for this encoding,
+            // remember it to avoid asking the same question again later
+#if wxUSE_CONFIG
+            if ( ChangePath(FONTMAPPER_FONT_FROM_ENCODING_PATH, &pathOld) )
+            {
+                GetConfig()->Write(configEntry, FONTMAPPER_FONT_DONT_ASK);
+
+                RestorePath(pathOld);
+            }
+#endif // wxUSE_CONFIG
+        }

     }
     //else: we're in non-interactive mode
     }
     //else: we're in non-interactive mode

+#endif // wxUSE_FONTDLG

 
     // now try the default mappings:
     wxFontEncodingArray equiv = wxEncodingConverter::GetAllEquivalents(encoding);
 
     // now try the default mappings:
     wxFontEncodingArray equiv = wxEncodingConverter::GetAllEquivalents(encoding);


@@ -747,3 +873,5 @@ bool wxFontMapper::IsEncodingAvailable(wxFontEncoding encoding,
 }
 
 #endif // wxUSE_GUI
 }
 
 #endif // wxUSE_GUI

+
+#endif // wxUSE_FONTMAP