X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/82359764314f040ce4654583a89ac217d5b2634a..9a6aafe0039fef580ca1bfcf0e87c1ba8e2953ba:/src/common/fontmap.cpp

diff --git a/src/common/fontmap.cpp b/src/common/fontmap.cpp
index dca0806910..88f9add423 100644
--- a/src/common/fontmap.cpp
+++ b/src/common/fontmap.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        common/fontmap.cpp
+// Name:        src/common/fontmap.cpp
 // Purpose:     wxFontMapper class
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -26,10 +26,14 @@
 
 #if wxUSE_FONTMAP
 
+#include "wx/fontmap.h"
+
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/log.h"
     #include "wx/intl.h"
+    #include "wx/msgdlg.h"
+    #include "wx/choicdlg.h"
 #endif // PCH
 
 #if wxUSE_CONFIG
@@ -41,12 +45,9 @@
   #include  "wx/msw/winundef.h"
 #endif
 
-#include "wx/fontmap.h"
 #include "wx/fmappriv.h"
 #include "wx/fontutil.h"
-#include "wx/msgdlg.h"
 #include "wx/fontdlg.h"
-#include "wx/choicdlg.h"
 #include "wx/encinfo.h"
 
 #include "wx/encconv.h"
@@ -159,17 +160,17 @@ wxFontMapper::~wxFontMapper()
 {
 }
 
-bool wxFontMapper::IsWxFontMapper()
-{   return true; }
-
 /* static */
 wxFontMapper *wxFontMapper::Get()
 {
     wxFontMapperBase *fontmapper = wxFontMapperBase::Get();
-    wxASSERT_MSG(fontmapper->IsWxFontMapper(), wxT("GUI code requested a wxFontMapper but we only have a wxFontMapperBase."));
+    wxASSERT_MSG( !fontmapper->IsDummy(),
+                 wxT("GUI code requested a wxFontMapper but we only have a wxFontMapperBase.") );
+
     // Now return it anyway because there's a chance the GUI code might just
-    // only want to call wxFontMapperBase functions.
-    return (wxFontMapper*)fontmapper;
+    // only want to call wxFontMapperBase functions and it's better than
+    // crashing by returning NULL
+    return (wxFontMapper *)fontmapper;
 }
 
 wxFontEncoding
@@ -193,11 +194,11 @@ wxFontMapper::CharsetToEncoding(const wxString& charset, bool interactive)
         // the dialog title
         wxString title(m_titleDialog);
         if ( !title )
-            title << wxTheApp->GetAppName() << _(": unknown charset");
+            title << wxTheApp->GetAppDisplayName() << _(": unknown charset");
 
         // the message
         wxString msg;
-        msg.Printf(_("The charset '%s' is unknown. You may select\nanother charset to replace it with or choose\n[Cancel] if it cannot be replaced"), charset.c_str());
+        msg.Printf(_("The charset '%s' is unknown. You may select\nanother charset to replace it with or choose\n[Cancel] if it cannot be replaced"), charset);
 
         // the list of choices
         const size_t count = GetSupportedEncodingsCount();
@@ -239,7 +240,7 @@ wxFontMapper::CharsetToEncoding(const wxString& charset, bool interactive)
             long value = n == -1 ? (long)wxFONTENCODING_UNKNOWN : (long)encoding;
             if ( !config->Write(charset, value) )
             {
-                wxLogError(_("Failed to remember the encoding for the charset '%s'."), charset.c_str());
+                wxLogError(_("Failed to remember the encoding for the charset '%s'."), charset);
             }
         }
 #endif // wxUSE_CONFIG
@@ -371,7 +372,7 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
             else
             {
                 wxLogDebug(wxT("corrupted config data: string '%s' is not a valid font encoding info"),
-                           fontinfo.c_str());
+                           fontinfo);
             }
         }
         //else: there is no information in config about this encoding
@@ -407,7 +408,7 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
     {
         wxString title(m_titleDialog);
         if ( !title )
-            title << wxTheApp->GetAppName() << _(": unknown encoding");
+            title << wxTheApp->GetAppDisplayName() << _(": unknown encoding");
 
         // built the message
         wxString encDesc = GetEncodingDescription(encoding),
@@ -416,12 +417,12 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
         {
             // ask the user if he wants to override found alternative encoding
             msg.Printf(_("No font for displaying text in encoding '%s' found,\nbut an alternative encoding '%s' is available.\nDo you want to use this encoding (otherwise you will have to choose another one)?"),
-                       encDesc.c_str(), GetEncodingDescription(equivEncoding).c_str());
+                       encDesc, GetEncodingDescription(equivEncoding));
         }
         else
         {
             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)?"),
-                       encDesc.c_str());
+                       encDesc);
         }
 
         // the question is different in 2 cases so the answer has to be
@@ -471,8 +472,9 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
                 GetConfig()->Write
                              (
                                 configEntry,
-                                foundEquivEncoding ? info->ToString().c_str()
-                                                   : FONTMAPPER_FONT_DONT_ASK
+                                foundEquivEncoding
+                                    ? (const wxChar*)info->ToString().c_str()
+                                    : FONTMAPPER_FONT_DONT_ASK
                              );
             }
 #endif // wxUSE_CONFIG
@@ -494,12 +496,6 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
     wxCHECK_MSG( encodingAlt, false,
                     _T("wxFontEncoding::GetAltForEncoding(): NULL pointer") );
 
-#ifdef __WXGTK20__
-    // in GTK+ 2 we can always use UTF-8 for everything so just do it,
-    // especially as no other font encodings are currently supported
-    *encodingAlt = wxFONTENCODING_UTF8;
-    return true;
-#else // !wxGTK2
     wxNativeEncodingInfo info;
     if ( !GetAltForEncoding(encoding, &info, facename, interactive) )
         return false;
@@ -507,7 +503,6 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
     *encodingAlt = info.encoding;
 
     return true;
-#endif // wxGTK2/!wxGTK2
 }
 
 bool wxFontMapper::IsEncodingAvailable(wxFontEncoding encoding,