mac cleanup, pure cgcolor

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

diff --git a/src/common/fontmap.cpp b/src/common/fontmap.cpp
index 19d2394762a8c7aad6a1b4c41e0b35582f010b06..88f9add4233dbe7c6b0dc8d5c7d623d7b5b3371a 100644 (file)
--- 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:
 // Purpose:     wxFontMapper class
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -26,10 +26,14 @@
 
 #if wxUSE_FONTMAP
 
 
 #if wxUSE_FONTMAP
 

+#include "wx/fontmap.h"
+

 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/log.h"
     #include "wx/intl.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
 #endif // PCH
 
 #if wxUSE_CONFIG


@@ -41,12 +45,9 @@
   #include  "wx/msw/winundef.h"
 #endif
 
   #include  "wx/msw/winundef.h"
 #endif
 

-#include "wx/fontmap.h"

 #include "wx/fmappriv.h"
 #include "wx/fontutil.h"
 #include "wx/fmappriv.h"
 #include "wx/fontutil.h"

-#include "wx/msgdlg.h"

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

-#include "wx/choicdlg.h"

 #include "wx/encinfo.h"
 
 #include "wx/encconv.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();
 /* 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
     // 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
 }
 
 wxFontEncoding


@@ -193,11 +194,11 @@ wxFontMapper::CharsetToEncoding(const wxString& charset, bool interactive)
         // the dialog title
         wxString title(m_titleDialog);
         if ( !title )
         // the dialog title
         wxString title(m_titleDialog);
         if ( !title )

-            title << wxTheApp->GetAppName() << _(": unknown charset");
+            title << wxTheApp->GetAppDisplayName() << _(": unknown charset");

 
         // the message
         wxString msg;
 
         // 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();
 
         // 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) )
             {
             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
             }
         }
 #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"),
             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
             }
         }
         //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 )
     {
         wxString title(m_titleDialog);
         if ( !title )

-            title << wxTheApp->GetAppName() << _(": unknown encoding");
+            title << wxTheApp->GetAppDisplayName() << _(": unknown encoding");

 
         // built the message
         wxString encDesc = GetEncodingDescription(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)?"),
         {
             // 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)?"),
         }
         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
         }
 
         // the question is different in 2 cases so the answer has to be


@@ -445,9 +446,9 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
 
 #if wxUSE_CONFIG && wxUSE_FILECONFIG
                 // remember this in the config
 
 #if wxUSE_CONFIG && wxUSE_FILECONFIG
                 // remember this in the config

-                wxFontMapperPathChanger path(this,
-                                             FONTMAPPER_FONT_FROM_ENCODING_PATH);
-                if ( path.IsOk() )
+                wxFontMapperPathChanger path2(this,
+                                              FONTMAPPER_FONT_FROM_ENCODING_PATH);
+                if ( path2.IsOk() )

                 {
                     GetConfig()->Write(configEntry, info->ToString());
                 }
                 {
                     GetConfig()->Write(configEntry, info->ToString());
                 }


@@ -464,15 +465,16 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
             //
             // remember it to avoid asking the same question again later
 #if wxUSE_CONFIG && wxUSE_FILECONFIG
             //
             // remember it to avoid asking the same question again later
 #if wxUSE_CONFIG && wxUSE_FILECONFIG

-            wxFontMapperPathChanger path(this,
-                                         FONTMAPPER_FONT_FROM_ENCODING_PATH);
-            if ( path.IsOk() )
+            wxFontMapperPathChanger path2(this,
+                                          FONTMAPPER_FONT_FROM_ENCODING_PATH);
+            if ( path2.IsOk() )

             {
                 GetConfig()->Write
                              (
                                 configEntry,
             {
                 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
                              );
             }
 #endif // wxUSE_CONFIG


@@ -491,13 +493,13 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
                                      const wxString& facename,
                                      bool interactive)
 {
                                      const wxString& facename,
                                      bool interactive)
 {

+    wxCHECK_MSG( encodingAlt, false,
+                    _T("wxFontEncoding::GetAltForEncoding(): NULL pointer") );
+

     wxNativeEncodingInfo info;
     if ( !GetAltForEncoding(encoding, &info, facename, interactive) )
         return false;
 
     wxNativeEncodingInfo info;
     if ( !GetAltForEncoding(encoding, &info, facename, interactive) )
         return false;
 

-    wxCHECK_MSG( encodingAlt, false,
-                    _T("wxFontEncoding::GetAltForEncoding(): NULL pointer") );
-

     *encodingAlt = info.encoding;
 
     return true;
     *encodingAlt = info.encoding;
 
     return true;