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

merged 2.2 branch

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2000-07-15 19:51:35 +00:00
parent 8a693e6e04
commit f6bcfd974e
1835 changed files with 237729 additions and 67990 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/msw/font.cpp
View File

@@ -143,7 +143,7 @@ wxFontRefData::~wxFontRefData()
{
if ( !::DeleteObject((HFONT) m_hFont) )
{
wxLogLastError("DeleteObject(font)");
wxLogLastError(wxT("DeleteObject(font)"));
}
}
}
@@ -203,7 +203,7 @@ bool wxFont::RealizeResource()
M_FONTDATA->m_faceName = lf.lfFaceName;
if ( !M_FONTDATA->m_hFont )
{
wxLogLastError("CreateFont");
wxLogLastError(wxT("CreateFont"));
return FALSE;
}
@@ -217,7 +217,7 @@ bool wxFont::FreeResource(bool force)
{
if ( !::DeleteObject((HFONT) M_FONTDATA->m_hFont) )
{
wxLogLastError("DeleteObject(font)");
wxLogLastError(wxT("DeleteObject(font)"));
}
M_FONTDATA->m_hFont = 0;
@@ -228,6 +228,11 @@ bool wxFont::FreeResource(bool force)
}
WXHANDLE wxFont::GetResourceHandle()
{
return GetHFONT();
}
WXHFONT wxFont::GetHFONT() const
{
if ( !M_FONTDATA )
return 0;