Added missing wxNativeFontInfo::GetFamily(). I think I did it right
but somebody who knows should check it. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13391 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -399,6 +399,45 @@ wxString wxNativeFontInfo::GetFaceName() const
|
|||||||
return lf.lfFaceName;
|
return lf.lfFaceName;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
wxFontFamily wxNativeFontInfo::GetFamily() const
|
||||||
|
{
|
||||||
|
// extract family from pitch-and-family
|
||||||
|
int lfFamily = lf.lfPitchAndFamily;
|
||||||
|
int family;
|
||||||
|
|
||||||
|
if ( lfFamily & FIXED_PITCH )
|
||||||
|
lfFamily -= FIXED_PITCH;
|
||||||
|
if ( lfFamily & VARIABLE_PITCH )
|
||||||
|
lfFamily -= VARIABLE_PITCH;
|
||||||
|
|
||||||
|
switch ( lfFamily )
|
||||||
|
{
|
||||||
|
case FF_ROMAN:
|
||||||
|
family = wxROMAN;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case FF_SWISS:
|
||||||
|
family = wxSWISS;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case FF_SCRIPT:
|
||||||
|
family = wxSCRIPT;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case FF_MODERN:
|
||||||
|
family = wxMODERN;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case FF_DECORATIVE:
|
||||||
|
family = wxDECORATIVE;
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
family = wxSWISS;
|
||||||
|
}
|
||||||
|
return (wxFontFamily)family;
|
||||||
|
}
|
||||||
|
|
||||||
wxFontEncoding wxNativeFontInfo::GetEncoding() const
|
wxFontEncoding wxNativeFontInfo::GetEncoding() const
|
||||||
{
|
{
|
||||||
return wxGetFontEncFromCharSet(lf.lfCharSet);
|
return wxGetFontEncFromCharSet(lf.lfCharSet);
|
||||||
|
Reference in New Issue
Block a user