wxUSE_PANGO is always 1 for wxGTK2 so there is no need to use #if wxUSE_PANGO in...

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

diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp
index 15b85db5665071da7c2a9423a2133b53edc5cbee..8dbe0064bd681b038678d339f613c2a913515575 100644 (file)
--- a/src/gtk/font.cpp
+++ b/src/gtk/font.cpp
@@ -418,31 +418,22 @@ int wxFont::GetPointSize() const
 {
     wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 
 {
     wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 

-#if wxUSE_PANGO

     return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetPointSize()
                                        : M_FONTDATA->m_pointSize;
     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") );
 
 }
 
 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;
     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") );
 
 }
 
 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
     int ret = M_FONTDATA->m_family;
     if (M_FONTDATA->HasNativeFont())
         // wxNativeFontInfo::GetFamily is expensive, must not call more than once


@@ -452,33 +443,22 @@ int wxFont::GetFamily() const
         ret = M_FONTDATA->m_family;
 
     return ret;
         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") );
 
 }
 
 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;
     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") );
 
 }
 
 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;
     return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetWeight()
                                        : M_FONTDATA->m_weight;

-#else
-    return M_FONTDATA->m_weight;
-#endif

 }
 
 bool wxFont::GetUnderlined() const
 }
 
 bool wxFont::GetUnderlined() const