m_nativeFontInfoOk = TRUE;
m_nativeFontInfo = info;
+ // This is the best we can do since we don't have the
+ // correct information at this point.
+ m_family = wxSWISS;
}
wxFontRefData::~wxFontRefData()
// fall through
case wxFONTSTYLE_NORMAL:
+ lf.lfItalic = FALSE;
break;
case wxFONTSTYLE_ITALIC:
if ( !wxGetNativeFontEncoding(encoding, &info) )
{
#if wxUSE_FONTMAP
- if ( wxTheFontMapper->GetAltForEncoding(encoding, &info) )
+ if ( wxFontMapper::Get()->GetAltForEncoding(encoding, &info) )
{
if ( !info.facename.empty() )
{
{
wxString s;
- s.Printf(_T("%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%s"),
+ s.Printf(_T("%d;%ld;%ld;%ld;%ld;%ld;%d;%d;%d;%d;%d;%d;%d;%d;%s"),
0, // version, in case we want to change the format later
lf.lfHeight,
lf.lfWidth,
return FALSE;
}
-WXHANDLE wxFont::GetResourceHandle()
+WXHANDLE wxFont::GetResourceHandle() const
{
- return GetHFONT();
+ return (WXHANDLE)GetHFONT();
}
WXHFONT wxFont::GetHFONT() const
RealizeResource();
}
-void wxFont::SetNativeFontInfo(const wxNativeFontInfo& info)
+void wxFont::DoSetNativeFontInfo(const wxNativeFontInfo& info)
{
Unshare();