From 462deb5dcef1bd194c08a6e9206cec901e3edc0c Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 16 Jul 2006 20:03:03 +0000
Subject: [PATCH] wxUSE_PANGO is always 0 for wxGTK1 so there is no need to use
 #if wxUSE_PANGO in GTK1-only code

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40137 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/gtk1/font.cpp | 32 --------------------------------
 1 file changed, 32 deletions(-)

diff --git a/src/gtk1/font.cpp b/src/gtk1/font.cpp
index f2334339a0..03e3fd5521 100644
--- a/src/gtk1/font.cpp
+++ b/src/gtk1/font.cpp
@@ -542,67 +542,35 @@ int wxFont::GetPointSize() const
 {
     wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 
-#if wxUSE_PANGO
-    return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetPointSize()
-                                       : M_FONTDATA->m_pointSize;
-#else
     return M_FONTDATA->m_pointSize;
-#endif
 }
 
 wxString wxFont::GetFaceName() const
 {
     wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid font") );
 
-#if wxUSE_PANGO
-    return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetFaceName()
-                                       : M_FONTDATA->m_faceName;
-#else
     return M_FONTDATA->m_faceName;
-#endif
 }
 
 int wxFont::GetFamily() const
 {
     wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 
-#if wxUSE_PANGO
-    int ret = M_FONTDATA->m_family;
-    if (M_FONTDATA->HasNativeFont())
-        // wxNativeFontInfo::GetFamily is expensive, must not call more than once
-        ret = M_FONTDATA->m_nativeFontInfo.GetFamily();
-
-    if (ret == wxFONTFAMILY_DEFAULT)
-        ret = M_FONTDATA->m_family;
-
-    return ret;
-#else
     return M_FONTDATA->m_family;
-#endif
 }
 
 int wxFont::GetStyle() const
 {
     wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 
-#if wxUSE_PANGO
-    return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetStyle()
-                                       : M_FONTDATA->m_style;
-#else
     return M_FONTDATA->m_style;
-#endif
 }
 
 int wxFont::GetWeight() const
 {
     wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 
-#if wxUSE_PANGO
-    return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetWeight()
-                                       : M_FONTDATA->m_weight;
-#else
     return M_FONTDATA->m_weight;
-#endif
 }
 
 bool wxFont::GetUnderlined() const