Fixed DoFloodFill's return value.
Fixed DoGetPixel. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34082 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -578,7 +578,7 @@ bool wxDC::DoFloodFill(
|
|||||||
if ((lHits = ::GpiFloodFill(m_hPS, lOptions, lColor)) != GPI_ERROR)
|
if ((lHits = ::GpiFloodFill(m_hPS, lOptions, lColor)) != GPI_ERROR)
|
||||||
bSuccess = true;
|
bSuccess = true;
|
||||||
|
|
||||||
return true;
|
return bSuccess;
|
||||||
} // end of wxDC::DoFloodFill
|
} // end of wxDC::DoFloodFill
|
||||||
|
|
||||||
bool wxDC::DoGetPixel(
|
bool wxDC::DoGetPixel(
|
||||||
@@ -592,17 +592,7 @@ bool wxDC::DoGetPixel(
|
|||||||
|
|
||||||
vPoint.x = vX;
|
vPoint.x = vX;
|
||||||
vPoint.y = OS2Y(vY,0);
|
vPoint.y = OS2Y(vY,0);
|
||||||
lColor = ::GpiSetPel(m_hPS, &vPoint);
|
lColor = ::GpiQueryPel(m_hPS, &vPoint);
|
||||||
|
|
||||||
//
|
|
||||||
// Get the color of the pen
|
|
||||||
//
|
|
||||||
LONG lPencolor = 0x00ffffff;
|
|
||||||
|
|
||||||
if (m_pen.Ok())
|
|
||||||
{
|
|
||||||
lPencolor = m_pen.GetColour().GetPixel();
|
|
||||||
}
|
|
||||||
|
|
||||||
//
|
//
|
||||||
// return the color of the pixel
|
// return the color of the pixel
|
||||||
@@ -612,7 +602,7 @@ bool wxDC::DoGetPixel(
|
|||||||
,GetGValue(lColor)
|
,GetGValue(lColor)
|
||||||
,GetBValue(lColor)
|
,GetBValue(lColor)
|
||||||
);
|
);
|
||||||
return(lColor == lPencolor);
|
return true;
|
||||||
} // end of wxDC::DoGetPixel
|
} // end of wxDC::DoGetPixel
|
||||||
|
|
||||||
void wxDC::DoCrossHair(
|
void wxDC::DoCrossHair(
|
||||||
|
Reference in New Issue
Block a user