From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 25 Apr 2009 13:54:24 +0000 (+0000)
Subject: remove HasNativeFontInfo() which always returns true now but was left for some reason
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/7c6e85dc647eba193de52f39a5cf8ba89753b2c9

remove HasNativeFontInfo() which always returns true now but was left for some reason

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60346 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/msw/font.cpp b/src/msw/font.cpp
index 63afba3161..b9a5c35a21 100644
--- a/src/msw/font.cpp
+++ b/src/msw/font.cpp
@@ -264,9 +264,6 @@ public:
         m_nativeFontInfo.SetEncoding(encoding);
     }
 
-    // native font info
-    bool HasNativeFontInfo() const { return true; }
-
     const wxNativeFontInfo& GetNativeFontInfo() const
         { return m_nativeFontInfo; }
 
@@ -1031,8 +1028,7 @@ wxFontEncoding wxFont::GetEncoding() const
 
 const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
 {
-    return IsOk() && M_FONTDATA->HasNativeFontInfo() ? &(M_FONTDATA->GetNativeFontInfo())
-                                           : NULL;
+    return IsOk() ? &(M_FONTDATA->GetNativeFontInfo()) : NULL;
 }
 
 wxString wxFont::GetNativeFontInfoDesc() const
@@ -1057,15 +1053,10 @@ bool wxFont::IsFixedWidth() const
 {
     wxCHECK_MSG( IsOk(), false, wxT("invalid font") );
 
-    if ( M_FONTDATA->HasNativeFontInfo() )
-    {
-        // the two low-order bits specify the pitch of the font, the rest is
-        // family
-        BYTE pitch =
-            (BYTE)(M_FONTDATA->GetNativeFontInfo().lf.lfPitchAndFamily & PITCH_MASK);
-
-        return pitch == FIXED_PITCH;
-    }
+    // the two low-order bits specify the pitch of the font, the rest is
+    // family
+    BYTE pitch =
+        (BYTE)(M_FONTDATA->GetNativeFontInfo().lf.lfPitchAndFamily & PITCH_MASK);
 
-    return wxFontBase::IsFixedWidth();
+    return pitch == FIXED_PITCH;
 }