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

wxNativeFontInfo changes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8949 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-12-18 21:15:16 +00:00
parent accb325754
commit 7826e2dd83
17 changed files with 265 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
samples/font/font.cpp
View File

@@ -415,22 +415,20 @@ void MyFrame::OnEnumerateFamiliesForEncoding(wxCommandEvent& WXUNUSED(event))
void MyFrame::OnCheckNativeToFromString(wxCommandEvent& WXUNUSED(event))
{
wxString fontInfo = m_canvas->GetTextFont().GetNativeFontInfo().ToString();
wxString fontInfo = m_canvas->GetTextFont().GetNativeFontInfoDesc();
if(fontInfo.IsEmpty())
wxMessageBox("Native font info string is empty!", "Font demo",
wxOK);
if ( fontInfo.IsEmpty() )
{
wxLogError("Native font info string is empty!");
}
else
{
wxNativeFontInfo info;
info.FromString(fontInfo);
wxFont font(info);
if(fontInfo == font.GetNativeFontInfo().ToString())
wxMessageBox("wxNativeFontInfo ToString()/FromString() works!",
"Font demo", wxOK);
wxFont *font = wxFont::New(fontInfo);
if ( fontInfo != font->GetNativeFontInfoDesc() )
wxLogError("wxNativeFontInfo ToString()/FromString() broken!");
else
wxMessageBox("wxNativeFontInfo ToString()/FromString() doesn't work!",
"Font demo", wxOK);
wxLogError("wxNativeFontInfo works: %s", fontInfo.c_str());
delete font;
}
}
@@ -678,11 +676,12 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
dc.DrawText(fontInfo, 5, 5);
if(m_font.Ok())
if ( m_font.Ok() )
{
dc.SetFont(wxFont(m_font.GetNativeFontInfo()));
fontInfo.Printf("Native font info: %s", m_font.GetNativeFontInfo().ToString().GetData());
dc.DrawText(fontInfo, 5, 5 + dc.GetCharHeight());
wxString fontDesc = m_font.GetNativeFontInfoDesc();
dc.SetFont(wxFont(fontDesc));
fontInfo.Printf("Native font info: %s", fontDesc.c_str());
dc.DrawText(fontInfo, 5, 5 + dc.GetCharHeight());
}
// prepare to draw the font