Fix toolbar background painting whem comctl32 < 6

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

diff --git a/src/common/fontmap.cpp b/src/common/fontmap.cpp
index 0febe2880ff1e8daeaecce47e03f602454371d03..449fe5cd2643f4992e253419a5056b57a5dcd5bb 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:


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -30,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


@@ -45,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"


@@ -163,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


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


@@ -468,9 +465,9 @@ 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
                              (
             {
                 GetConfig()->Write
                              (


@@ -495,13 +492,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;