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

More updates for gdi

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15209 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2002-04-19 21:40:05 +00:00
parent c690ae86db
commit 1d0edc0f73
9 changed files with 84 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/os2/dc.cpp
View File

@@ -557,7 +557,7 @@ void wxDC::Clear()
::GpiErase(m_hPS);
} // end of wxDC::Clear
void wxDC::DoFloodFill(
bool wxDC::DoFloodFill(
wxCoord vX
, wxCoord vY
, const wxColour& rCol
@@ -567,6 +567,8 @@ void wxDC::DoFloodFill(
POINTL vPtlPos;
LONG lColor;
LONG lOptions;
LONG lHits;
bool bSuccess = FALSE;
vPtlPos.x = vX; // Loads x-coordinate
vPtlPos.y = OS2Y(vY,0); // Loads y-coordinate
@@ -576,8 +578,9 @@ void wxDC::DoFloodFill(
if(wxFLOOD_SURFACE == nStyle)
lOptions = FF_SURFACE;
::GpiFloodFill(m_hPS, lOptions, lColor);
if ((lHits = ::GpiFloodFill(m_hPS, lOptions, lColor)) != GPI_ERROR)
bSuccess = TRUE;
return TRUE;
} // end of wxDC::DoFloodFill
bool wxDC::DoGetPixel(
@@ -975,7 +978,14 @@ void wxDC::DoDrawRectangle(
LONG lBorderColor;
int nIsTRANSPARENT = 0;
vY = OS2Y(vY,vHeight);
//
// Might be a memory DC with no Paint rect
//
if (!(m_vRclPaint.yTop == 0 &&
m_vRclPaint.yBottom == 0 &&
m_vRclPaint.xRight == 0 &&
m_vRclPaint.xLeft == 0))
vY = OS2Y(vY,vHeight);
wxCoord vX2 = vX + vWidth;
wxCoord vY2 = vY + vHeight;
@@ -1030,6 +1040,17 @@ void wxDC::DoDrawRectangle(
,0L
,0L
);
//
// Debug testing:
//
for (int i = 0; i < vHeight; i++)
{
for (int j = 0; j < vHeight; j++)
{
vPoint[0].x = j; vPoint[0].y = i;
lColor = ::GpiQueryPel(m_hPS, &vPoint[0]);
}
}
}
CalcBoundingBox(vX, vY);
CalcBoundingBox(vX2, vY2);