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

More bug fix updates.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13760 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2002-01-23 05:48:58 +00:00
parent 995c1788f5
commit 828621c2ea
3 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/os2/font.cpp
View File

@@ -362,13 +362,14 @@ bool wxFontRefData::Alloc(
)
{
wxString sFaceName;
long flId;
long flId = m_hFont;
if (!m_bNativeFontInfoOk)
{
wxFillLogFont( &m_vNativeFontInfo.fa
,&m_vNativeFontInfo.fn
,&m_hPS
,&m_bInternalPS
,&flId
,sFaceName
,pFont
@@ -381,25 +382,9 @@ bool wxFontRefData::Alloc(
,flId
,&m_vNativeFontInfo.fa
) != GPI_ERROR)
m_hFont = (WXHFONT)1;
m_hFont = (WXHFONT)flId;
m_nFontId = flId;
//
// We don't actuall keep the font around if using a temporary PS
//
if (m_bInternalPS)
{
if(m_hFont)
::GpiDeleteSetId( m_hPS
,flId
);
::WinReleasePS(m_hPS);
}
else
//
// Select the font into the Presentation space
//
::GpiSetCharSet(m_hPS, flId); // sets font for presentation space
if (!m_hFont)
{
wxLogLastError("CreateFont");
@@ -413,7 +398,6 @@ bool wxFontRefData::Alloc(
//
// Set refData members with the results
//
m_hFont = (WXHFONT)m_nFontId;
memcpy(&m_vFattrs, &m_vNativeFontInfo.fa, sizeof(m_vFattrs));
memcpy(&m_vFname, &m_vNativeFontInfo.fn, sizeof(m_vFname));
m_nPointSize = m_vNativeFontInfo.fm.lEmHeight;
@@ -462,6 +446,24 @@ bool wxFontRefData::Alloc(
m_bUnderlined = ((m_vNativeFontInfo.fa.fsSelection & FATTR_SEL_UNDERSCORE) != 0);
m_sFaceName = m_vNativeFontInfo.fa.szFacename;
m_vEncoding = wxGetFontEncFromCharSet(m_vNativeFontInfo.fa.usCodePage);
//
// We don't actuall keep the font around if using a temporary PS
//
if (m_bInternalPS)
{
if(m_hFont)
::GpiDeleteSetId( m_hPS
,flId
);
::WinReleasePS(m_hPS);
}
else
//
// Select the font into the Presentation space
//
::GpiSetCharSet(m_hPS, flId); // sets font for presentation space
return TRUE;
} // end of wxFontRefData::Alloc