X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f030b28c933f208267afe0cab185116d7c6b644b..722f74cec895bbc284ba7b7a7213ee5cf2a1ab95:/src/msw/font.cpp?ds=sidebyside

diff --git a/src/msw/font.cpp b/src/msw/font.cpp
index d7fcfe9b9f..f2ff677d8a 100644
--- a/src/msw/font.cpp
+++ b/src/msw/font.cpp
@@ -39,6 +39,10 @@
 #include "wx/fontutil.h"
 #include "wx/fontmap.h"
 
+#ifndef __WXWINCE__
+    #include "wx/sysopt.h"
+#endif
+
 #include "wx/tokenzr.h"
 
 #if wxUSE_EXTENDED_RTTI
@@ -145,7 +149,7 @@ public:
     virtual ~wxFontRefData();
 
     // operations
-    bool Alloc(wxFont *font);
+    bool Alloc(const wxFont *font);
 
     void Free();
 
@@ -207,11 +211,26 @@ public:
                                   : m_encoding;
     }
 
-    WXHFONT GetHFONT() const { return m_hFont; }
+    WXHFONT GetHFONT(const wxFont *font) const
+    {
+        if ( !m_hFont )
+            wx_const_cast(wxFontRefData *, this)->Alloc(font);
+
+        return (WXHFONT)m_hFont;
+    }
 
-    // ... and setters
+    bool HasHFONT() const
+    {
+        return m_hFont != 0;
+    }
+
+    // ... and setters: notice that all of them invalidate the currently
+    // allocated HFONT, if any, so that the next call to GetHFONT() recreates a
+    // new one
     void SetPointSize(int pointSize)
     {
+        Free();
+
         if ( m_nativeFontInfoOk )
         {
             m_nativeFontInfo.SetPointSize(pointSize);
@@ -225,6 +244,8 @@ public:
 
     void SetPixelSize(const wxSize& pixelSize)
     {
+        Free();
+
         if ( m_nativeFontInfoOk )
         {
             m_nativeFontInfo.SetPixelSize(pixelSize);
@@ -238,11 +259,15 @@ public:
 
     void SetFamily(int family)
     {
+        Free();
+
         m_family = family;
     }
 
     void SetStyle(int style)
     {
+        Free();
+
         if ( m_nativeFontInfoOk )
             m_nativeFontInfo.SetStyle((wxFontStyle)style);
         else
@@ -251,6 +276,8 @@ public:
 
     void SetWeight(int weight)
     {
+        Free();
+
         if ( m_nativeFontInfoOk )
             m_nativeFontInfo.SetWeight((wxFontWeight)weight);
         else
@@ -259,6 +286,8 @@ public:
 
     bool SetFaceName(const wxString& faceName)
     {
+        Free();
+
         if ( m_nativeFontInfoOk )
             return m_nativeFontInfo.SetFaceName(faceName);
 
@@ -268,6 +297,8 @@ public:
 
     void SetUnderlined(bool underlined)
     {
+        Free();
+
         if ( m_nativeFontInfoOk )
             m_nativeFontInfo.SetUnderlined(underlined);
         else
@@ -276,18 +307,28 @@ public:
 
     void SetEncoding(wxFontEncoding encoding)
     {
+        Free();
+
         if ( m_nativeFontInfoOk )
             m_nativeFontInfo.SetEncoding(encoding);
         else
             m_encoding = encoding;
     }
 
-    // native font info tests
+    // native font info
     bool HasNativeFontInfo() const { return m_nativeFontInfoOk; }
 
     const wxNativeFontInfo& GetNativeFontInfo() const
         { return m_nativeFontInfo; }
 
+    void SetNativeFontInfo(const wxNativeFontInfo& nativeFontInfo)
+    {
+        Free();
+
+        m_nativeFontInfo = nativeFontInfo;
+        m_nativeFontInfoOk = true;
+    }
+
 protected:
     // common part of all ctors
     void Init(int size,
@@ -302,7 +343,7 @@ protected:
 
     void Init(const wxNativeFontInfo& info, WXHFONT hFont = 0);
 
-    // font characterstics
+    // font characteristics
     int           m_pointSize;
     wxSize        m_pixelSize;
     bool          m_sizeUsingPixels;
@@ -313,8 +354,8 @@ protected:
     wxString      m_faceName;
     wxFontEncoding m_encoding;
 
-    // Windows font handle
-    WXHFONT       m_hFont;
+    // Windows font handle, created on demand in GetHFONT()
+    HFONT         m_hFont;
 
     // Native font info
     wxNativeFontInfo m_nativeFontInfo;
@@ -363,7 +404,7 @@ void wxFontRefData::Init(const wxNativeFontInfo& info, WXHFONT hFont)
     // use the exact font created in the underlying system
     // (for example where we can't guarantee conversion from HFONT
     // to LOGFONT back to HFONT)
-    m_hFont = hFont;
+    m_hFont = (HFONT)hFont;
 
     m_nativeFontInfoOk = true;
     m_nativeFontInfo = info;
@@ -377,7 +418,7 @@ wxFontRefData::~wxFontRefData()
     Free();
 }
 
-bool wxFontRefData::Alloc(wxFont *font)
+bool wxFontRefData::Alloc(const wxFont *font)
 {
     if ( !m_nativeFontInfoOk )
     {
@@ -385,14 +426,13 @@ bool wxFontRefData::Alloc(wxFont *font)
         m_nativeFontInfoOk = true;
     }
 
-    HFONT hfont = ::CreateFontIndirect(&m_nativeFontInfo.lf);
-    if ( !hfont )
+    m_hFont = ::CreateFontIndirect(&m_nativeFontInfo.lf);
+    if ( !m_hFont )
     {
         wxLogLastError(wxT("CreateFont"));
         return false;
     }
 
-    m_hFont = (WXHFONT)hfont;
     return true;
 }
 
@@ -400,7 +440,7 @@ void wxFontRefData::Free()
 {
     if ( m_hFont )
     {
-        if ( !::DeleteObject((HFONT) m_hFont) )
+        if ( !::DeleteObject(m_hFont) )
         {
             wxLogLastError(wxT("DeleteObject(font)"));
         }
@@ -417,12 +457,16 @@ void wxNativeFontInfo::Init()
 {
     wxZeroMemory(lf);
 
-    // we get better font quality if we use this instead of DEFAULT_QUALITY
-    // apparently without any drawbacks
+    // we get better font quality if we use PROOF_QUALITY instead of
+    // DEFAULT_QUALITY but some fonts (e.g. "Terminal 6pt") are not available
+    // then so we allow to set a global option to choose between quality and
+    // wider font selection
 #ifdef __WXWINCE__
     lf.lfQuality = CLEARTYPE_QUALITY;
 #else
-    lf.lfQuality = PROOF_QUALITY;
+    lf.lfQuality = wxSystemOptions::GetOptionInt(_T("msw.font.no-proof-quality"))
+                    ? DEFAULT_QUALITY
+                    : PROOF_QUALITY;
 #endif
 }
 
@@ -432,13 +476,14 @@ int wxNativeFontInfo::GetPointSize() const
     //        for printing!
     const int ppInch = ::GetDeviceCaps(ScreenHDC(), LOGPIXELSY);
 
-    return (int) (((72.0*(double)abs(lf.lfHeight)) / (double) ppInch) + 0.5);
+    // BC++ 2007 doesn't provide abs(long) overload, hence the cast
+    return (int) (((72.0*abs((int)lf.lfHeight)) / (double) ppInch) + 0.5);
 }
 
 wxSize wxNativeFontInfo::GetPixelSize() const
 {
     wxSize ret;
-    ret.SetHeight(lf.lfHeight);
+    ret.SetHeight(abs((int)lf.lfHeight));
     ret.SetWidth(lf.lfWidth);
     return ret;
 }
@@ -791,7 +836,7 @@ wxString wxNativeFontInfo::ToString() const
              lf.lfClipPrecision,
              lf.lfQuality,
              lf.lfPitchAndFamily,
-             lf.lfFaceName);
+             (const wxChar*)lf.lfFaceName);
 
     return s;
 }
@@ -806,9 +851,7 @@ bool wxFont::Create(const wxNativeFontInfo& info, WXHFONT hFont)
 
     m_refData = new wxFontRefData(info, hFont);
 
-    RealizeResource();
-
-    return true;
+    return RealizeResource();
 }
 
 wxFont::wxFont(const wxString& fontdesc)
@@ -818,9 +861,6 @@ wxFont::wxFont(const wxString& fontdesc)
         (void)Create(info);
 }
 
-/* Constructor for a font. Note that the real construction is done
- * in wxDC::SetFont, when information is available about scaling etc.
- */
 bool wxFont::DoCreate(int pointSize,
                       const wxSize& pixelSize,
                       bool sizeUsingPixels,
@@ -844,9 +884,7 @@ bool wxFont::DoCreate(int pointSize,
                                   family, style, weight,
                                   underlined, faceName, encoding);
 
-    RealizeResource();
-
-    return true;
+    return RealizeResource();
 }
 
 wxFont::~wxFont()
@@ -857,38 +895,33 @@ wxFont::~wxFont()
 // real implementation
 // ----------------------------------------------------------------------------
 
-wxObjectRefData *wxFont::CreateRefData() const
+wxGDIRefData *wxFont::CreateGDIRefData() const
 {
     return new wxFontRefData();
 }
 
-wxObjectRefData *wxFont::CloneRefData(const wxObjectRefData *data) const
+wxGDIRefData *wxFont::CloneGDIRefData(const wxGDIRefData *data) const
 {
     return new wxFontRefData(*wx_static_cast(const wxFontRefData *, data));
 }
 
 bool wxFont::RealizeResource()
 {
-    if ( GetResourceHandle() )
-    {
-        // VZ: the old code returned false in this case, but it doesn't seem
-        //     to make sense because the font _was_ created
+    // don't do anything if we already have a valid font
+    if ( GetHFONT() )
         return true;
-    }
 
     return M_FONTDATA->Alloc(this);
 }
 
 bool wxFont::FreeResource(bool WXUNUSED(force))
 {
-    if ( GetResourceHandle() )
-    {
-        M_FONTDATA->Free();
+    if ( !GetHFONT() )
+        return false;
 
-        return true;
-    }
+    M_FONTDATA->Free();
 
-    return false;
+    return true;
 }
 
 WXHANDLE wxFont::GetResourceHandle() const
@@ -898,12 +931,12 @@ WXHANDLE wxFont::GetResourceHandle() const
 
 WXHFONT wxFont::GetHFONT() const
 {
-    return M_FONTDATA ? M_FONTDATA->GetHFONT() : 0;
+    return M_FONTDATA ? M_FONTDATA->GetHFONT(this) : 0;
 }
 
 bool wxFont::IsFree() const
 {
-    return M_FONTDATA && (M_FONTDATA->GetHFONT() == 0);
+    return M_FONTDATA && !M_FONTDATA->HasHFONT();
 }
 
 // ----------------------------------------------------------------------------
@@ -914,9 +947,8 @@ void wxFont::SetPointSize(int pointSize)
 {
     AllocExclusive();
 
+    M_FONTDATA->Free();
     M_FONTDATA->SetPointSize(pointSize);
-
-    RealizeResource();
 }
 
 void wxFont::SetPixelSize(const wxSize& pixelSize)
@@ -924,8 +956,6 @@ void wxFont::SetPixelSize(const wxSize& pixelSize)
     AllocExclusive();
 
     M_FONTDATA->SetPixelSize(pixelSize);
-
-    RealizeResource();
 }
 
 void wxFont::SetFamily(int family)
@@ -933,8 +963,6 @@ void wxFont::SetFamily(int family)
     AllocExclusive();
 
     M_FONTDATA->SetFamily(family);
-
-    RealizeResource();
 }
 
 void wxFont::SetStyle(int style)
@@ -942,8 +970,6 @@ void wxFont::SetStyle(int style)
     AllocExclusive();
 
     M_FONTDATA->SetStyle(style);
-
-    RealizeResource();
 }
 
 void wxFont::SetWeight(int weight)
@@ -951,17 +977,14 @@ void wxFont::SetWeight(int weight)
     AllocExclusive();
 
     M_FONTDATA->SetWeight(weight);
-
-    RealizeResource();
 }
 
 bool wxFont::SetFaceName(const wxString& faceName)
 {
     AllocExclusive();
 
-    bool refdataok = M_FONTDATA->SetFaceName(faceName);
-
-    RealizeResource();
+    if ( !M_FONTDATA->SetFaceName(faceName) )
+        return false;
 
     // NB: using win32's GetObject() API on M_FONTDATA->GetHFONT()
     //     to retrieve a LOGFONT and then compare lf.lfFaceName
@@ -970,7 +993,7 @@ bool wxFont::SetFaceName(const wxString& faceName)
     //     without any validity check.
     //     Thus we use wxFontBase::SetFaceName to check if facename
     //     is valid...
-    return refdataok && wxFontBase::SetFaceName(faceName);
+    return wxFontBase::SetFaceName(faceName);
 }
 
 void wxFont::SetUnderlined(bool underlined)
@@ -978,8 +1001,6 @@ void wxFont::SetUnderlined(bool underlined)
     AllocExclusive();
 
     M_FONTDATA->SetUnderlined(underlined);
-
-    RealizeResource();
 }
 
 void wxFont::SetEncoding(wxFontEncoding encoding)
@@ -987,17 +1008,13 @@ void wxFont::SetEncoding(wxFontEncoding encoding)
     AllocExclusive();
 
     M_FONTDATA->SetEncoding(encoding);
-
-    RealizeResource();
 }
 
 void wxFont::DoSetNativeFontInfo(const wxNativeFontInfo& info)
 {
     AllocExclusive();
 
-    *M_FONTDATA = wxFontRefData(info);
-
-    RealizeResource();
+    M_FONTDATA->SetNativeFontInfo(info);
 }
 
 // ----------------------------------------------------------------------------