From b3f2ce1c3fb3f43004ba9ee4844034fdf29c4865 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 16 Jul 2008 01:47:14 +0000 Subject: [PATCH] check for comctl32.dll version and not OS one as an app running XP without manifest is still incapable of drawing bitmaps with alpha (still related to #8684) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54652 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/statbmp.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/msw/statbmp.cpp b/src/msw/statbmp.cpp index c362c714f6..17d3ea364e 100644 --- a/src/msw/statbmp.cpp +++ b/src/msw/statbmp.cpp @@ -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,10 +170,12 @@ 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)); } -- 2.45.2