[wxGTK2] wxFont::Get* - Query native font for information, if the wxFont has an associated wxNativeFontInfo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35263 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		@@ -722,48 +722,79 @@ 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(), wxT(""), 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
 | 
			
		||||
    return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetFamily()
 | 
			
		||||
                                       : M_FONTDATA->m_family;
 | 
			
		||||
#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
 | 
			
		||||
{
 | 
			
		||||
    wxCHECK_MSG( Ok(), FALSE, wxT("invalid font") );
 | 
			
		||||
 | 
			
		||||
#if wxUSE_PANGO
 | 
			
		||||
    return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetUnderlined()
 | 
			
		||||
                                       : M_FONTDATA->m_underlined;
 | 
			
		||||
#else
 | 
			
		||||
    return M_FONTDATA->m_underlined;
 | 
			
		||||
#endif
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
wxFontEncoding wxFont::GetEncoding() const
 | 
			
		||||
{
 | 
			
		||||
    wxCHECK_MSG( Ok(), wxFONTENCODING_DEFAULT, wxT("invalid font") );
 | 
			
		||||
 | 
			
		||||
    // m_encoding is unused in wxGTK2, return encoding that the user set.
 | 
			
		||||
    return M_FONTDATA->m_encoding;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user