Blind fix

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27185 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2004-05-09 12:45:50 +00:00
parent e6cea1d392
commit 9da483994b

View File

@@ -526,7 +526,7 @@ bool wxDC::CanGetTextExtent() const
int wxDC::GetDepth() const int wxDC::GetDepth() const
{ {
LONG lArray[CAPS_COLOR_BITCOUNT]; LONG lArray[CAPS_COLOR_BITCOUNT];
int nBitsPerPixel; int nBitsPerPixel = 0;
if(::DevQueryCaps( GetHDC() if(::DevQueryCaps( GetHDC()
,CAPS_FAMILY ,CAPS_FAMILY
@@ -972,8 +972,8 @@ void wxDC::DoDrawLines(
{ {
int i; int i;
CalcBoundingBox( vPoints[i].x CalcBoundingBox( vPoints[0].x
,vPoints[i].y ,vPoints[0].y
); );
vPoint.x = vPoints[0].x; vPoint.x = vPoints[0].x;
vPoint.y = OS2Y(vPoints[0].y,0); vPoint.y = OS2Y(vPoints[0].y,0);
@@ -1397,7 +1397,7 @@ void wxDC::DoDrawBitmap(
lColor = pWindowDC->m_pCanvas->GetBackgroundColour().GetPixel(); lColor = pWindowDC->m_pCanvas->GetBackgroundColour().GetPixel();
} }
else if (GetBrush() != wxNullBrush) else if (GetBrush().Ok())
lColor = GetBrush().GetColour().GetPixel(); lColor = GetBrush().GetColour().GetPixel();
else else
lColor = m_textBackgroundColour.GetPixel(); lColor = m_textBackgroundColour.GetPixel();