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

Bitmap updates

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15192 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2002-04-18 05:12:36 +00:00
parent d7fa7eaa2d
commit c354beeafa
3 changed files with 134 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/os2/dc.cpp
View File

@@ -1200,16 +1200,48 @@ void wxDC::DoDrawBitmap(
, bool bUseMask
)
{
POINTL vPoint = {vX, vY};
if (!bUseMask && !IsKindOf(CLASSINFO(wxPrinterDC)))
{
HBITMAP hBitmap = (HBITMAP)rBmp.GetHBITMAP();
wxBitmap vNewBitmap( rBmp.GetWidth()
,rBmp.GetHeight()
,rBmp.GetDepth()
);
HBITMAP hBitmapOld = ::GpiSetBitmap((HPS)GetHPS(), vNewBitmap.GetHBITMAP());
LONG lOldTextground = ::GpiQueryColor((HPS)GetHPS());
LONG lOldBackground = ::GpiQueryBackColor((HPS)GetHPS());
::WinDrawBitmap( GetHPS()
,(HBITMAP)GetHbitmapOf(rBmp)
,NULL
,&vPoint
,0L
,0L
,DBM_NORMAL
);
if (m_textForegroundColour.Ok())
{
::GpiSetColor( (HPS)GetHPS()
,m_textForegroundColour.GetPixel()
);
}
if (m_textBackgroundColour.Ok())
{
::GpiSetBackColor( (HPS)GetHPS()
,m_textBackgroundColour.GetPixel()
);
}
vY = OS2Y(vY,rBmp.GetHeight());
POINTL vPoint[4] = { vX, vY + rBmp.GetHeight()
,vX + rBmp.GetWidth(), vY
,0, 0
,rBmp.GetWidth(), rBmp.GetHeight()
};
::GpiWCBitBlt( (HPS)GetHPS()
,hBitmap
,4
,vPoint
,ROP_SRCCOPY
,BBO_IGNORE
);
::GpiSetBitmap((HPS)GetHPS(), hBitmapOld);
::GpiSetColor((HPS)GetHPS(), lOldTextground);
::GpiSetBackColor((HPS)GetHPS(), lOldBackground);
}
} // end of wxDC::DoDrawBitmap
void wxDC::DoDrawText(