Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxUSE_PANGO is always 1 for wxGTK2 so there is no need to use #if wxUSE_PANGO in GTK2-only code

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40136 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-07-16 20:00:42 +00:00
parent 789367e10d
commit 177df6c5f6
1 changed files with 0 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/gtk/font.cpp
View File

@@ -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() return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetPointSize()
: M_FONTDATA->m_pointSize; : M_FONTDATA->m_pointSize;
#else
return M_FONTDATA->m_pointSize;
#endif
} }
wxString wxFont::GetFaceName() const wxString wxFont::GetFaceName() const
{ {
wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid font") ); wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid font") );
#if wxUSE_PANGO
return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetFaceName() return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetFaceName()
: M_FONTDATA->m_faceName; : M_FONTDATA->m_faceName;
#else
return M_FONTDATA->m_faceName;
#endif
} }
int wxFont::GetFamily() const int wxFont::GetFamily() const
{ {
wxCHECK_MSG( Ok(), 0, wxT("invalid font") ); wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
#if wxUSE_PANGO
int ret = M_FONTDATA->m_family; int ret = M_FONTDATA->m_family;
if (M_FONTDATA->HasNativeFont()) if (M_FONTDATA->HasNativeFont())
// wxNativeFontInfo::GetFamily is expensive, must not call more than once // wxNativeFontInfo::GetFamily is expensive, must not call more than once
@@ -452,33 +443,22 @@ int wxFont::GetFamily() const
ret = M_FONTDATA->m_family; ret = M_FONTDATA->m_family;
return ret; return ret;
#else
return M_FONTDATA->m_family;
#endif
} }
int wxFont::GetStyle() const int wxFont::GetStyle() 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.GetStyle() return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetStyle()
: M_FONTDATA->m_style; : M_FONTDATA->m_style;
#else
return M_FONTDATA->m_style;
#endif
} }
int wxFont::GetWeight() const int wxFont::GetWeight() 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.GetWeight() return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetWeight()
: M_FONTDATA->m_weight; : M_FONTDATA->m_weight;
#else
return M_FONTDATA->m_weight;
#endif
} }
bool wxFont::GetUnderlined() const bool wxFont::GetUnderlined() const