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

Font updates for OS/2

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8906 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2000-12-11 04:36:46 +00:00
parent 2f2dc32851
commit e99762c031
8 changed files with 994 additions and 721 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/os2/dc.cpp
View File

@@ -146,13 +146,12 @@ wxDC::wxDC(void)
m_nDCCount = 0;
m_hOldPS = NULL;
m_hPS = NULL;
m_bIsPaintTime = FALSE;// True at Paint Time
};
m_bIsPaintTime = FALSE; // True at Paint Time
}
wxDC::~wxDC(void)
{
// TODO:
};
}
// This will select current objects out of the DC,
// which is what you have to do before deleting the
@@ -425,19 +424,13 @@ void wxDC::DoDrawArc(
dAnglmid = (dAngl1 + dAngl2)/2. + M_PI;
vXm = vXc + dRadius * cos(dAnglmid);
vYm = vYc + dRadius * sin(dAnglmid);
DoDrawArc( vX1
,vY1
,vXm
,vYm
,vXc
,vYc
DoDrawArc( vX1, vY1
,vXm, vYm
,vXc, vYc
);
DoDrawArc( vXm
,vYm
,vX2
,vY2
,vXc
,vYc
DoDrawArc( vXm, vYm
,vX2, vY2
,vXc, vYc
);
return;
}
@@ -461,8 +454,8 @@ void wxDC::DoDrawArc(
vPtlPos.x = vX1; // Loads x-coordinate
vPtlPos.y = vY1; // Loads y-coordinate
::GpiMove(m_hPS, &vPtlPos); // Sets current position
vPtlArc[0].x = vXm;
vPtlArc[0].y = vYm;
vPtlArc[0].x = vXm;
vPtlArc[0].y = vYm;
vPtlArc[1].x = vX2;
vPtlArc[1].y = vY2;
::GpiPointArc(m_hPS, vPtlArc); // Draws the arc
@@ -962,22 +955,19 @@ void wxDC::SetFont(
//
if (m_hOldFont)
{
// ::SelectObject(GetHdc(), (HFONT) m_hOldFont);
m_hOldFont = 0;
}
m_font = rFont;
if (!rFont.Ok())
{
if (m_hOldFont)
// ::SelectObject(GetHdc(), (HFONT) m_hOldFont);
m_hOldFont = 0;
}
if (m_font.Ok() && m_font.GetResourceHandle())
m_font.SetPS(m_hPS); // this will realize the font
if (m_font.Ok())
{
HFONT hFont = (HFONT)0; //::SelectObject(GetHdc(), (HFONT) m_font.GetResourceHandle());
HFONT hFont = m_font.GetResourceHandle();
if (hFont == (HFONT) NULL)
{
wxLogDebug(wxT("::SelectObject failed in wxDC::SetFont."));
@@ -985,7 +975,7 @@ void wxDC::SetFont(
if (!m_hOldFont)
m_hOldFont = (WXHFONT) hFont;
}
}
} // end of wxDC::SetFont
void wxDC::SetPen(
const wxPen& rPen