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

don't call SelectObject() twice in SetPen() (slow!); don't do anything if setting the same pen and handle errors betters (should fix bug 811415)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25631 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-02-08 14:22:12 +00:00
parent 5c57bf07fa
commit b5371ab8cd
1 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/msw/dc.cpp
View File

@@ -1357,31 +1357,37 @@ void wxDC::SetPen(const wxPen& pen)
{ {
WXMICROWIN_CHECK_HDC WXMICROWIN_CHECK_HDC
// Set the old object temporarily, in case the assignment deletes an object if ( pen == m_pen )
// that's not yet selected out. return;
if (m_oldPen)
{
::SelectObject(GetHdc(), (HPEN) m_oldPen);
m_oldPen = 0;
}
m_pen = pen; if ( pen.Ok() )
if (!m_pen.Ok())
{ {
if (m_oldPen) HGDIOBJ hpen = ::SelectObject(GetHdc(), GetHpenOf(pen));
::SelectObject(GetHdc(), (HPEN) m_oldPen); if ( hpen == HGDI_ERROR )
m_oldPen = 0;
}
if (m_pen.Ok())
{
if (m_pen.GetResourceHandle())
{ {
HPEN p = (HPEN) ::SelectObject(GetHdc(), (HPEN)m_pen.GetResourceHandle()); wxLogLastError(_T("SelectObject(pen)"));
if (!m_oldPen)
m_oldPen = (WXHPEN) p;
} }
else // selected ok
{
if ( !m_oldPen )
m_oldPen = (WXHPEN)hpen;
m_pen = pen;
}
}
else // invalid pen, reset the current pen
{
if ( m_oldPen )
{
if ( ::SelectObject(GetHdc(), (HPEN) m_oldPen) == HGDI_ERROR )
{
wxLogLastError(_T("SelectObject(old pen)"));
}
m_oldPen = NULL;
}
m_pen = wxNullPen;
} }
} }