clipboard handler must be extern C (Sun CC warning)

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

diff --git a/src/common/fontmap.cpp b/src/common/fontmap.cpp
index 87b28c7bd244b972de657748b0773c14683f144d..0febe2880ff1e8daeaecce47e03f602454371d03 100644 (file)
--- a/src/common/fontmap.cpp
+++ b/src/common/fontmap.cpp
@@ -163,14 +163,17 @@ wxFontMapper::~wxFontMapper()
 {
 }
 
 {
 }
 

+bool wxFontMapper::IsWxFontMapper()
+{   return true; }
+

 /* static */
 /* 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()
 {
 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
 }
 
 wxFontEncoding


@@ -327,7 +330,7 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
 
     wxString configEntry,
              encName = GetEncodingName(encoding);
 
     wxString configEntry,
              encName = GetEncodingName(encoding);

-    if ( !facename.IsEmpty() )
+    if ( !facename.empty() )

     {
         configEntry = facename + _T("_");
     }
     {
         configEntry = facename + _T("_");
     }


@@ -351,13 +354,13 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
     }
     else // use the info entered the last time
     {
     }
     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);
         }
 
         {
             // 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) )
             {
         {
             if ( info->FromString(fontinfo) )
             {


@@ -440,7 +443,6 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
             if ( dialog.ShowModal() == wxID_OK )
             {
                 wxFontData retData = dialog.GetFontData();
             if ( dialog.ShowModal() == wxID_OK )
             {
                 wxFontData retData = dialog.GetFontData();

-                wxFont font = retData.GetChosenFont();

 
                 *info = retData.EncodingInfo();
                 info->encoding = retData.GetEncoding();
 
                 *info = retData.EncodingInfo();
                 info->encoding = retData.GetEncoding();