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

backport fixes for the fix for transparency in static bitmaps (r51824) from trunk (r54651 and r54652)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@54653 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-07-16 01:54:58 +00:00
parent c5c703efea
commit 6cc415390f
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/msw/statbmp.cpp
View File

@@ -29,6 +29,7 @@
#include "wx/statbmp.h"
#ifndef WX_PRECOMP
#include "wx/app.h"
#include "wx/window.h"
#include "wx/icon.h"
#include "wx/dcclient.h"
@@ -169,12 +170,14 @@ bool wxStaticBitmap::Create(wxWindow *parent,
// GetBestSize will work properly now, so set the best size if needed
SetInitialSize(size);
// Win9x and 2000 don't draw correctly the images with alpha channel so we
// need to draw them ourselves and it's easier to just always do it rather
// than check if we have an image with alpha or not
if ( wxGetWinVersion() <= wxWinVersion_2000 )
// Windows versions before XP (and even XP if the application has no
// manifest and so the old comctl32.dll is used) don't draw correctly the
// images with alpha channel so we need to draw them ourselves and it's
// easier to just always do it rather than check if we have an image with
// alpha or not
if ( wxTheApp->GetComCtl32Version() < 600 )
{
Connect(wxEVT_PAINT, wxPaintEventHandler(wxStaticBitmap::DoPaintManually));
Connect(wxEVT_PAINT, wxPaintEventHandler(wxStaticBitmap::DoPaintManually));
}
return true;
@@ -261,8 +264,11 @@ void wxStaticBitmap::DoPaintManually(wxPaintEvent& WXUNUSED(event))
const wxSize size(GetSize());
const wxBitmap bmp(GetBitmap());
// Clear the background
dc.SetBrush(GetBackgroundColour());
// Clear the background: notice that we're supposed to be transparent, so
// use the parent background colour if we don't have our own instead of
// falling back to the default
const wxWindow *win = UseBgCol() ? this : GetParent();
dc.SetBrush(win->GetBackgroundColour());
dc.SetPen(*wxTRANSPARENT_PEN);
dc.DrawRectangle(0, 0, size.GetWidth(), size.GetHeight());