X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0fba44b4103530bd7904c4b5720b7568b753daec..e015e7f3acef09b57bcd34e8f6780a19afdfd97b:/src/os2/dc.cpp diff --git a/src/os2/dc.cpp b/src/os2/dc.cpp index 7c82a9c6c1..55670b238d 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( @@ -1397,7 +1387,7 @@ void wxDC::DoDrawBitmap( lColor = m_textBackgroundColour.GetPixel(); // - // Bitmap must be ina double-word alligned address so we may + // Bitmap must be in a double-word aligned address so we may // have some padding to worry about // if (nLineBoundary > 0)