Applied [ 1223122 ] [wxMSW] Proper repainting when resizing - take 2

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

diff --git a/src/common/fontmap.cpp b/src/common/fontmap.cpp
index dc352cb0540de8aa054848b87088b151ab9a51d7..0febe2880ff1e8daeaecce47e03f602454371d03 100644 (file)
--- a/src/common/fontmap.cpp
+++ b/src/common/fontmap.cpp
@@ -51,62 +51,64 @@
 #include "wx/msgdlg.h"
 #include "wx/fontdlg.h"
 #include "wx/choicdlg.h"
 #include "wx/msgdlg.h"
 #include "wx/fontdlg.h"
 #include "wx/choicdlg.h"

+#include "wx/encinfo.h"

 
 #include "wx/encconv.h"
 
 #if wxUSE_EXTENDED_RTTI
 
 
 #include "wx/encconv.h"
 
 #if wxUSE_EXTENDED_RTTI
 

-WX_BEGIN_ENUM( wxFontEncoding )
-       WX_ENUM_MEMBER( wxFONTENCODING_SYSTEM )
-       WX_ENUM_MEMBER( wxFONTENCODING_DEFAULT )
-
-       WX_ENUM_MEMBER( wxFONTENCODING_ISO8859_1 )
-       WX_ENUM_MEMBER( wxFONTENCODING_ISO8859_2 )
-       WX_ENUM_MEMBER( wxFONTENCODING_ISO8859_3 )
-       WX_ENUM_MEMBER( wxFONTENCODING_ISO8859_4 )
-       WX_ENUM_MEMBER( wxFONTENCODING_ISO8859_5 )
-       WX_ENUM_MEMBER( wxFONTENCODING_ISO8859_6 )
-       WX_ENUM_MEMBER( wxFONTENCODING_ISO8859_7 )
-       WX_ENUM_MEMBER( wxFONTENCODING_ISO8859_8 )
-       WX_ENUM_MEMBER( wxFONTENCODING_ISO8859_9 )
-       WX_ENUM_MEMBER( wxFONTENCODING_ISO8859_10 )
-       WX_ENUM_MEMBER( wxFONTENCODING_ISO8859_11 )
-       WX_ENUM_MEMBER( wxFONTENCODING_ISO8859_12 )
-       WX_ENUM_MEMBER( wxFONTENCODING_ISO8859_13 )
-       WX_ENUM_MEMBER( wxFONTENCODING_ISO8859_14 )
-       WX_ENUM_MEMBER( wxFONTENCODING_ISO8859_15 )
-       WX_ENUM_MEMBER( wxFONTENCODING_ISO8859_MAX )
-       WX_ENUM_MEMBER( wxFONTENCODING_KOI8 )
-       WX_ENUM_MEMBER( wxFONTENCODING_ALTERNATIVE )
-       WX_ENUM_MEMBER( wxFONTENCODING_BULGARIAN )
-       WX_ENUM_MEMBER( wxFONTENCODING_CP437 )
-       WX_ENUM_MEMBER( wxFONTENCODING_CP850 )
-       WX_ENUM_MEMBER( wxFONTENCODING_CP852 )
-       WX_ENUM_MEMBER( wxFONTENCODING_CP855 )
-       WX_ENUM_MEMBER( wxFONTENCODING_CP866 )
-
-       WX_ENUM_MEMBER( wxFONTENCODING_CP874 )
-       WX_ENUM_MEMBER( wxFONTENCODING_CP932 )
-       WX_ENUM_MEMBER( wxFONTENCODING_CP936 )
-       WX_ENUM_MEMBER( wxFONTENCODING_CP949 )
-       WX_ENUM_MEMBER( wxFONTENCODING_CP950 )
-       WX_ENUM_MEMBER( wxFONTENCODING_CP1250 )
-       WX_ENUM_MEMBER( wxFONTENCODING_CP1251 )
-       WX_ENUM_MEMBER( wxFONTENCODING_CP1252 )
-       WX_ENUM_MEMBER( wxFONTENCODING_CP1253 )
-       WX_ENUM_MEMBER( wxFONTENCODING_CP1254 )
-       WX_ENUM_MEMBER( wxFONTENCODING_CP1255 )
-       WX_ENUM_MEMBER( wxFONTENCODING_CP1256 )
-       WX_ENUM_MEMBER( wxFONTENCODING_CP1257 )
-       WX_ENUM_MEMBER( wxFONTENCODING_CP12_MAX )
-       WX_ENUM_MEMBER( wxFONTENCODING_UTF7 )
-       WX_ENUM_MEMBER( wxFONTENCODING_UTF8 )
-       WX_ENUM_MEMBER( wxFONTENCODING_GB2312 )
-       WX_ENUM_MEMBER( wxFONTENCODING_BIG5 )
-       WX_ENUM_MEMBER( wxFONTENCODING_SHIFT_JIS )
-       WX_ENUM_MEMBER( wxFONTENCODING_EUC_JP )
-       WX_ENUM_MEMBER( wxFONTENCODING_UNICODE )
-WX_END_ENUM( wxFontEncoding )
+wxBEGIN_ENUM( wxFontEncoding )
+    wxENUM_MEMBER( wxFONTENCODING_SYSTEM )
+    wxENUM_MEMBER( wxFONTENCODING_DEFAULT )
+
+    wxENUM_MEMBER( wxFONTENCODING_ISO8859_1 )
+    wxENUM_MEMBER( wxFONTENCODING_ISO8859_2 )
+    wxENUM_MEMBER( wxFONTENCODING_ISO8859_3 )
+    wxENUM_MEMBER( wxFONTENCODING_ISO8859_4 )
+    wxENUM_MEMBER( wxFONTENCODING_ISO8859_5 )
+    wxENUM_MEMBER( wxFONTENCODING_ISO8859_6 )
+    wxENUM_MEMBER( wxFONTENCODING_ISO8859_7 )
+    wxENUM_MEMBER( wxFONTENCODING_ISO8859_8 )
+    wxENUM_MEMBER( wxFONTENCODING_ISO8859_9 )
+    wxENUM_MEMBER( wxFONTENCODING_ISO8859_10 )
+    wxENUM_MEMBER( wxFONTENCODING_ISO8859_11 )
+    wxENUM_MEMBER( wxFONTENCODING_ISO8859_12 )
+    wxENUM_MEMBER( wxFONTENCODING_ISO8859_13 )
+    wxENUM_MEMBER( wxFONTENCODING_ISO8859_14 )
+    wxENUM_MEMBER( wxFONTENCODING_ISO8859_15 )
+    wxENUM_MEMBER( wxFONTENCODING_ISO8859_MAX )
+    wxENUM_MEMBER( wxFONTENCODING_KOI8 )
+    wxENUM_MEMBER( wxFONTENCODING_KOI8_U )
+    wxENUM_MEMBER( wxFONTENCODING_ALTERNATIVE )
+    wxENUM_MEMBER( wxFONTENCODING_BULGARIAN )
+    wxENUM_MEMBER( wxFONTENCODING_CP437 )
+    wxENUM_MEMBER( wxFONTENCODING_CP850 )
+    wxENUM_MEMBER( wxFONTENCODING_CP852 )
+    wxENUM_MEMBER( wxFONTENCODING_CP855 )
+    wxENUM_MEMBER( wxFONTENCODING_CP866 )
+
+    wxENUM_MEMBER( wxFONTENCODING_CP874 )
+    wxENUM_MEMBER( wxFONTENCODING_CP932 )
+    wxENUM_MEMBER( wxFONTENCODING_CP936 )
+    wxENUM_MEMBER( wxFONTENCODING_CP949 )
+    wxENUM_MEMBER( wxFONTENCODING_CP950 )
+    wxENUM_MEMBER( wxFONTENCODING_CP1250 )
+    wxENUM_MEMBER( wxFONTENCODING_CP1251 )
+    wxENUM_MEMBER( wxFONTENCODING_CP1252 )
+    wxENUM_MEMBER( wxFONTENCODING_CP1253 )
+    wxENUM_MEMBER( wxFONTENCODING_CP1254 )
+    wxENUM_MEMBER( wxFONTENCODING_CP1255 )
+    wxENUM_MEMBER( wxFONTENCODING_CP1256 )
+    wxENUM_MEMBER( wxFONTENCODING_CP1257 )
+    wxENUM_MEMBER( wxFONTENCODING_CP12_MAX )
+    wxENUM_MEMBER( wxFONTENCODING_UTF7 )
+    wxENUM_MEMBER( wxFONTENCODING_UTF8 )
+    wxENUM_MEMBER( wxFONTENCODING_GB2312 )
+    wxENUM_MEMBER( wxFONTENCODING_BIG5 )
+    wxENUM_MEMBER( wxFONTENCODING_SHIFT_JIS )
+    wxENUM_MEMBER( wxFONTENCODING_EUC_JP )
+    wxENUM_MEMBER( wxFONTENCODING_UNICODE )
+wxEND_ENUM( wxFontEncoding )

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -161,6 +163,19 @@ 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."));
+    // Now return it anyway because there's a chance the GUI code might just
+    // only want to call wxFontMapperBase functions.
+    return (wxFontMapper*)fontmapper;
+}
+

 wxFontEncoding
 wxFontMapper::CharsetToEncoding(const wxString& charset, bool interactive)
 {
 wxFontEncoding
 wxFontMapper::CharsetToEncoding(const wxString& charset, bool interactive)
 {


@@ -174,6 +189,7 @@ wxFontMapper::CharsetToEncoding(const wxString& charset, bool interactive)
         // chosen to suppress this the last time)
         encoding = wxFONTENCODING_SYSTEM;
     }
         // chosen to suppress this the last time)
         encoding = wxFONTENCODING_SYSTEM;
     }

+#if wxUSE_CHOICEDLG

     else if ( (encoding == wxFONTENCODING_SYSTEM) && interactive )
     {
         // prepare the dialog data
     else if ( (encoding == wxFONTENCODING_SYSTEM) && interactive )
     {
         // prepare the dialog data


@@ -224,7 +240,7 @@ wxFontMapper::CharsetToEncoding(const wxString& charset, bool interactive)
 
             // remember the alt encoding for this charset -- or remember that
             // we don't know it
 
             // remember the alt encoding for this charset -- or remember that
             // we don't know it

-            long value = n == -1 ? wxFONTENCODING_UNKNOWN : (long)encoding;
+            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());
             if ( !config->Write(charset, value) )
             {
                 wxLogError(_("Failed to remember the encoding for the charset '%s'."), charset.c_str());


@@ -232,6 +248,9 @@ wxFontMapper::CharsetToEncoding(const wxString& charset, bool interactive)
         }
 #endif // wxUSE_CONFIG
     }
         }
 #endif // wxUSE_CONFIG
     }

+#else
+    wxUnusedVar(interactive);
+#endif // wxUSE_CHOICEDLG

 
     return (wxFontEncoding)encoding;
 }
 
     return (wxFontEncoding)encoding;
 }


@@ -257,6 +276,8 @@ bool wxFontMapper::TestAltEncoding(const wxString& configEntry,
         {
             GetConfig()->Write(configEntry, info->ToString());
         }
         {
             GetConfig()->Write(configEntry, info->ToString());
         }

+#else
+        wxUnusedVar(configEntry);

 #endif // wxUSE_CONFIG
         return true;
     }
 #endif // wxUSE_CONFIG
         return true;
     }


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

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

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


@@ -333,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 && !!facename )
+        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 )
+        if ( !fontinfo.empty() )

         {
             if ( info->FromString(fontinfo) )
             {
         {
             if ( info->FromString(fontinfo) )
             {


@@ -422,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();


@@ -463,6 +483,8 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
         }
     }
     //else: we're in non-interactive mode
         }
     }
     //else: we're in non-interactive mode

+#else
+    wxUnusedVar(equivEncoding);

 #endif // wxUSE_FONTDLG
 
     return foundEquivEncoding;
 #endif // wxUSE_FONTDLG
 
     return foundEquivEncoding;