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

More bitmap and imaging updates

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15276 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2002-04-26 22:26:08 +00:00
parent 3dc0174140
commit b1b054dad6
2 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/os2/dcmemory.cpp
View File

@@ -204,7 +204,7 @@ void wxMemoryDC::DoDrawRectangle(
{
unsigned char* pucData = NULL;
unsigned char* pucBits;
int nBytesPerLine = vWidth * 3;
int nBytesPerLine = m_vSelectedBitmap.GetWidth() * 3;
LONG lScans = 0L;
POINTL vPoint;
LONG lColor;
@@ -231,14 +231,13 @@ void wxMemoryDC::DoDrawRectangle(
pucBits = pucData;
for (int i = 0; i < m_vSelectedBitmap.GetHeight(); i++)
{
for (int j = vX; j < m_vSelectedBitmap.GetWidth(); j++)
for (int j = 0; j < m_vSelectedBitmap.GetWidth(); j++)
{
if (i >= vY && j >= vX && i < vHeight && j < vWidth)
{
vPoint.x = j; vPoint.y = i;
if (i == vY || j == vX ||
i == m_vSelectedBitmap.GetWidth() -1 ||
j == m_vSelectedBitmap.GetHeight()
j == m_vSelectedBitmap.GetHeight() - 1
)
lColor = m_pen.GetColour().GetPixel();
else