From: Stefan Neis Date: Mon, 16 May 2005 16:22:05 +0000 (+0000) Subject: Fixed DoFloodFill's return value. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/1a0c7d558e91aa27b08319f2c2b5e6e1d85d2fd5 Fixed DoFloodFill's return value. Fixed DoGetPixel. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34082 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/os2/dc.cpp b/src/os2/dc.cpp index 7c82a9c6c1..9252f9cde9 100644 --- a/src/os2/dc.cpp +++ b/src/os2/dc.cpp @@ -578,7 +578,7 @@ bool wxDC::DoFloodFill( if ((lHits = ::GpiFloodFill(m_hPS, lOptions, lColor)) != GPI_ERROR) bSuccess = true; - return true; + return bSuccess; } // end of wxDC::DoFloodFill bool wxDC::DoGetPixel( @@ -592,17 +592,7 @@ bool wxDC::DoGetPixel( vPoint.x = vX; vPoint.y = OS2Y(vY,0); - lColor = ::GpiSetPel(m_hPS, &vPoint); - - // - // Get the color of the pen - // - LONG lPencolor = 0x00ffffff; - - if (m_pen.Ok()) - { - lPencolor = m_pen.GetColour().GetPixel(); - } + lColor = ::GpiQueryPel(m_hPS, &vPoint); // // return the color of the pixel @@ -612,7 +602,7 @@ bool wxDC::DoGetPixel( ,GetGValue(lColor) ,GetBValue(lColor) ); - return(lColor == lPencolor); + return true; } // end of wxDC::DoGetPixel void wxDC::DoCrossHair(