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

wxBitmapButton transparency fixed by using wxDC API at all times

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6373 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Guillermo Rodriguez Garcia
2000-03-01 14:57:33 +00:00
parent 68be9f090f
commit 47e92c4137
1 changed files with 26 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
src/msw/bmpbuttn.cpp
View File

@@ -23,6 +23,7 @@
#ifndef WX_PRECOMP
#include "wx/bmpbuttn.h"
#include "wx/log.h"
#include "wx/dcmemory.h"
#endif
#include "wx/msw/private.h"
@@ -115,12 +116,15 @@ bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item)
#endif
LPDRAWITEMSTRUCT lpDIS = (LPDRAWITEMSTRUCT) item;
// choose the bitmap to use depending on the buttons state
wxBitmap* bitmap;
HDC hDC = lpDIS->hDC;
UINT state = lpDIS->itemState;
bool isSelected = (state & ODS_SELECTED) != 0;
bool autoDraw = (GetWindowStyleFlag() & wxBU_AUTODRAW) != 0;
// choose the bitmap to use depending on the button state
wxBitmap* bitmap;
if ( isSelected && m_buttonBitmapSelected.Ok() )
bitmap = &m_buttonBitmapSelected;
else if ((state & ODS_FOCUS) && m_buttonBitmapFocus.Ok())
@@ -133,38 +137,13 @@ bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item)
if ( !bitmap->Ok() )
return FALSE;
// draw it on the memory DC
HDC hDC = lpDIS->hDC;
HDC memDC = ::CreateCompatibleDC(hDC);
HBITMAP old = (HBITMAP) ::SelectObject(memDC, (HBITMAP) bitmap->GetHBITMAP());
if (!old)
{
wxLogLastError(_T("SelectObject"));
return FALSE;
}
// centre the bitmap in the control area
int x = lpDIS->rcItem.left;
int y = lpDIS->rcItem.top;
int width = lpDIS->rcItem.right - x;
int height = lpDIS->rcItem.bottom - y;
int wBmp = bitmap->GetWidth(),
hBmp = bitmap->GetHeight();
// Draw the face, if auto-drawing
bool autoDraw = (GetWindowStyleFlag() & wxBU_AUTODRAW) != 0;
if ( autoDraw )
{
DrawFace((WXHDC) hDC,
lpDIS->rcItem.left, lpDIS->rcItem.top,
lpDIS->rcItem.right, lpDIS->rcItem.bottom,
isSelected);
}
// Centre the bitmap in the control area
int wBmp = bitmap->GetWidth();
int hBmp = bitmap->GetHeight();
int x1 = x + (width - wBmp) / 2;
int y1 = y + (height - hBmp) / 2;
@@ -174,52 +153,21 @@ bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item)
y1++;
}
BOOL ok;
// no MaskBlt() under Win16
#ifdef __WIN32__
wxMask *mask = bitmap->GetMask();
if ( mask )
// draw the face, if auto-drawing
if ( autoDraw )
{
// the fg ROP is applied for the pixels of the mask bitmap which are 1
// (for a wxMask this means that this is a non transparent pixel), the
// bg ROP is applied for all the others
HBRUSH hbrBackground =
::CreateSolidBrush(wxColourToRGB(GetBackgroundColour()));
HBRUSH hbrOld = (HBRUSH)::SelectObject(hDC, hbrBackground);
ok = ::MaskBlt(
hDC, x1, y1, wBmp, hBmp, // dst
memDC, 0, 0, // src
(HBITMAP)mask->GetMaskBitmap(), 0, 0, // mask
MAKEROP4(SRCCOPY, // fg ROP
PATCOPY) // bg ROP
);
::SelectObject(hDC, hbrOld);
::DeleteObject(hbrBackground);
}
else
{
// this will make the check below fail and BitBlt() will be used if
// MaskBlt() is not supported (for example, under Win95)
ok = FALSE;
DrawFace((WXHDC) hDC,
lpDIS->rcItem.left, lpDIS->rcItem.top,
lpDIS->rcItem.right, lpDIS->rcItem.bottom,
isSelected);
}
if ( !ok )
#endif // Win32
{
ok = ::BitBlt(hDC, x1, y1, wBmp, hBmp, // dst
memDC, 0, 0, // src
SRCCOPY); // ROP
}
if ( !ok )
{
wxLogLastError(_T("Mask/BitBlt()"));
}
// draw the bitmap
wxDC dst;
dst.SetHDC((WXHDC) hDC, FALSE);
dst.DrawBitmap(*bitmap, x1, y1, TRUE);
// draw focus / disabled state, if auto-drawing
if ( (state & ODS_DISABLED) && autoDraw )
{
DrawButtonDisable((WXHDC) hDC,
@@ -237,10 +185,6 @@ bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item)
isSelected);
}
::SelectObject(memDC, old);
::DeleteDC(memDC);
return TRUE;
}