X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cbe874bd32f35beb3ed8d019c5a24df21a219f8f..3ad70d312ed44871daaaa97be0ebcebadd9ae6ce:/src/msw/font.cpp

diff --git a/src/msw/font.cpp b/src/msw/font.cpp
index ba360fa3d4..9b40d9cb92 100644
--- a/src/msw/font.cpp
+++ b/src/msw/font.cpp
@@ -108,11 +108,14 @@ public:
     // constructors
     wxFontRefData()
     {
-        Init(-1, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL,
-             false, wxEmptyString, wxFONTENCODING_DEFAULT);
+        Init(-1, wxSize(0, 0), FALSE, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL,
+             wxFONTWEIGHT_NORMAL, FALSE, wxEmptyString,
+             wxFONTENCODING_DEFAULT);
     }
 
     wxFontRefData(int size,
+                  const wxSize& pixelSize,
+                  bool sizeUsingPixels,
                   int family,
                   int style,
                   int weight,
@@ -120,7 +123,8 @@ public:
                   const wxString& faceName,
                   wxFontEncoding encoding)
     {
-        Init(size, family, style, weight, underlined, faceName, encoding);
+        Init(size, pixelSize, sizeUsingPixels, family, style, weight,
+             underlined, faceName, encoding);
     }
 
     wxFontRefData(const wxNativeFontInfo& info, WXHFONT hFont = 0)
@@ -136,7 +140,8 @@ public:
         }
         else
         {
-            Init(data.m_pointSize, data.m_family, data.m_style, data.m_weight,
+            Init(data.m_pointSize, data.m_pixelSize, data.m_sizeUsingPixels,
+                 data.m_family, data.m_style, data.m_weight,
                  data.m_underlined, data.m_faceName, data.m_encoding);
         }
     }
@@ -155,6 +160,17 @@ public:
                                   : m_pointSize;
     }
 
+    wxSize GetPixelSize() const
+    {
+        return m_nativeFontInfoOk ? m_nativeFontInfo.GetPixelSize()
+                                  : m_pixelSize;
+    }
+
+    bool IsUsingSizeInPixels() const
+    {
+        return m_nativeFontInfoOk ? true : m_sizeUsingPixels;
+    }
+
     int GetFamily() const
     {
         return m_family;
@@ -201,9 +217,27 @@ public:
     void SetPointSize(int pointSize)
     {
         if ( m_nativeFontInfoOk )
+        {
             m_nativeFontInfo.SetPointSize(pointSize);
+        }
         else
+        {
             m_pointSize = pointSize;
+            m_sizeUsingPixels = FALSE;
+        }
+    }
+
+    void SetPixelSize(const wxSize& pixelSize)
+    {
+        if ( m_nativeFontInfoOk )
+        {
+            m_nativeFontInfo.SetPixelSize(pixelSize);
+        }
+        else
+        {
+            m_pixelSize = pixelSize;
+            m_sizeUsingPixels = TRUE;
+        }
     }
 
     void SetFamily(int family)
@@ -260,6 +294,8 @@ public:
 protected:
     // common part of all ctors
     void Init(int size,
+              const wxSize& pixelSize,
+              bool sizeUsingPixels,
               int family,
               int style,
               int weight,
@@ -271,6 +307,8 @@ protected:
 
     // font characterstics
     int           m_pointSize;
+    wxSize        m_pixelSize;
+    bool          m_sizeUsingPixels;
     int           m_family;
     int           m_style;
     int           m_weight;
@@ -295,6 +333,8 @@ protected:
 // ----------------------------------------------------------------------------
 
 void wxFontRefData::Init(int pointSize,
+                         const wxSize& pixelSize,
+                         bool sizeUsingPixels,
                          int family,
                          int style,
                          int weight,
@@ -304,6 +344,8 @@ void wxFontRefData::Init(int pointSize,
 {
     m_style = style;
     m_pointSize = pointSize == -1 ? wxNORMAL_FONT->GetPointSize() : pointSize;
+    m_pixelSize = pixelSize;
+    m_sizeUsingPixels = sizeUsingPixels;
     m_family = family;
     m_style = style;
     m_weight = weight;
@@ -388,6 +430,14 @@ int wxNativeFontInfo::GetPointSize() const
     return (int) (((72.0*(double)abs(lf.lfHeight)) / (double) ppInch) + 0.5);
 }
 
+wxSize wxNativeFontInfo::GetPixelSize() const
+{
+    wxSize ret;
+    ret.SetHeight(lf.lfHeight);
+    ret.SetWidth(lf.lfWidth);
+    return ret;
+}
+
 wxFontStyle wxNativeFontInfo::GetStyle() const
 {
     return lf.lfItalic ? wxFONTSTYLE_ITALIC : wxFONTSTYLE_NORMAL;
@@ -456,18 +506,20 @@ wxFontEncoding wxNativeFontInfo::GetEncoding() const
 
 void wxNativeFontInfo::SetPointSize(int pointsize)
 {
-#if wxFONT_SIZE_COMPATIBILITY
-    // Incorrect, but compatible with old wxWidgets behaviour
-    lf.lfHeight = (pointSize*ppInch)/72;
-#else // wxFONT_SIZE_COMPATIBILITY
     // FIXME: using the screen here results in incorrect font size calculation
     //        for printing!
     const int ppInch = ::GetDeviceCaps(ScreenHDC(), LOGPIXELSY);
 
     lf.lfHeight = -(int)((pointsize*((double)ppInch)/72.0) + 0.5);
-#endif // wxFONT_SIZE_COMPATIBILITY/!wxFONT_SIZE_COMPATIBILITY
 }
 
+void wxNativeFontInfo::SetPixelSize(const wxSize& pixelSize)
+{
+    lf.lfHeight = pixelSize.GetHeight();
+    lf.lfWidth = pixelSize.GetWidth();
+}
+
+
 void wxNativeFontInfo::SetStyle(wxFontStyle style)
 {
     switch ( style )
@@ -521,7 +573,7 @@ void wxNativeFontInfo::SetFaceName(wxString facename)
 
 void wxNativeFontInfo::SetFamily(wxFontFamily family)
 {
-    int ff_family;
+    BYTE ff_family;
     wxString facename;
 
     switch ( family )
@@ -558,7 +610,7 @@ void wxNativeFontInfo::SetFamily(wxFontFamily family)
             facename = _T("MS Sans Serif");
     }
 
-    lf.lfPitchAndFamily = DEFAULT_PITCH | ff_family;
+    lf.lfPitchAndFamily = (BYTE)(DEFAULT_PITCH) | ff_family;
 
     if ( !wxStrlen(lf.lfFaceName) )
     {
@@ -590,7 +642,7 @@ void wxNativeFontInfo::SetEncoding(wxFontEncoding encoding)
         }
     }
 
-    lf.lfCharSet = info.charset;
+    lf.lfCharSet = (BYTE)info.charset;
 }
 
 bool wxNativeFontInfo::FromString(const wxString& s)
@@ -730,13 +782,15 @@ wxFont::wxFont(const wxString& fontdesc)
 /* Constructor for a font. Note that the real construction is done
  * in wxDC::SetFont, when information is available about scaling etc.
  */
-bool wxFont::Create(int pointSize,
-                    int family,
-                    int style,
-                    int weight,
-                    bool underlined,
-                    const wxString& faceName,
-                    wxFontEncoding encoding)
+bool wxFont::DoCreate(int pointSize,
+                      const wxSize& pixelSize,
+                      bool sizeUsingPixels,
+                      int family,
+                      int style,
+                      int weight,
+                      bool underlined,
+                      const wxString& faceName,
+                      wxFontEncoding encoding)
 {
     UnRef();
 
@@ -747,7 +801,8 @@ bool wxFont::Create(int pointSize,
         pointSize = wxNORMAL_FONT->GetPointSize();
     }
 
-    m_refData = new wxFontRefData(pointSize, family, style, weight,
+    m_refData = new wxFontRefData(pointSize, pixelSize, sizeUsingPixels,
+                                  family, style, weight,
                                   underlined, faceName, encoding);
 
     RealizeResource();
@@ -830,6 +885,15 @@ void wxFont::SetPointSize(int pointSize)
     RealizeResource();
 }
 
+void wxFont::SetPixelSize(const wxSize& pixelSize)
+{
+    Unshare();
+
+    M_FONTDATA->SetPixelSize(pixelSize);
+
+    RealizeResource();
+}
+
 void wxFont::SetFamily(int family)
 {
     Unshare();
@@ -906,6 +970,18 @@ int wxFont::GetPointSize() const
     return M_FONTDATA->GetPointSize();
 }
 
+wxSize wxFont::GetPixelSize() const
+{
+    return M_FONTDATA->GetPixelSize();
+}
+
+bool wxFont::IsUsingSizeInPixels() const
+{
+    wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
+
+    return M_FONTDATA->IsUsingSizeInPixels();
+}
+
 int wxFont::GetFamily() const
 {
     wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
@@ -960,8 +1036,8 @@ bool wxFont::IsFixedWidth() const
     {
         // the two low-order bits specify the pitch of the font, the rest is
         // family
-        BYTE pitch = M_FONTDATA->GetNativeFontInfo().
-                        lf.lfPitchAndFamily & PITCH_MASK;
+        BYTE pitch =
+            (BYTE)(M_FONTDATA->GetNativeFontInfo().lf.lfPitchAndFamily & PITCH_MASK);
 
         return pitch == FIXED_PITCH;
     }