X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e74d06a33b48f4335bf628da028c2a02676a92a6..02bcd285fac7124a41292d905609220005f51087:/src/common/fontmap.cpp

diff --git a/src/common/fontmap.cpp b/src/common/fontmap.cpp
index 87b28c7bd2..19d2394762 100644
--- a/src/common/fontmap.cpp
+++ b/src/common/fontmap.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "fontmap.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -163,14 +159,17 @@ wxFontMapper::~wxFontMapper()
 {
 }
 
+bool wxFontMapper::IsWxFontMapper()
+{   return true; }
+
 /* static */
-// Declared as returning wxFontMapper when wxUSE_GUI=1.  Unfortunately, it's
-// only implemented in wxBase library.  Note that if the last resort
-// is taken and GUI code tries to treat it as a real wxFontMapper
-// then you'd be in trouble.
 wxFontMapper *wxFontMapper::Get()
 {
-    return (wxFontMapper*)wxFontMapperBase::Get();
+    wxFontMapperBase *fontmapper = wxFontMapperBase::Get();
+    wxASSERT_MSG(fontmapper->IsWxFontMapper(), 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;
 }
 
 wxFontEncoding
@@ -327,7 +326,7 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
 
     wxString configEntry,
              encName = GetEncodingName(encoding);
-    if ( !facename.IsEmpty() )
+    if ( !facename.empty() )
     {
         configEntry = facename + _T("_");
     }
@@ -351,13 +350,13 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
     }
     else // use the info entered the last time
     {
-        if ( !fontinfo.IsEmpty() && !facename.IsEmpty() )
+        if ( !fontinfo.empty() && !facename.empty() )
         {
             // we tried to find a match with facename -- now try without it
             fontinfo = GetConfig()->Read(encName);
         }
 
-        if ( !fontinfo.IsEmpty() )
+        if ( !fontinfo.empty() )
         {
             if ( info->FromString(fontinfo) )
             {
@@ -440,7 +439,6 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
             if ( dialog.ShowModal() == wxID_OK )
             {
                 wxFontData retData = dialog.GetFontData();
-                wxFont font = retData.GetChosenFont();
 
                 *info = retData.EncodingInfo();
                 info->encoding = retData.GetEncoding();