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
This commit is contained in:
Vadim Zeitlin
2008-07-16 01:47:14 +00:00
parent 52d80ec642
commit b3f2ce1c3f

View File

@@ -29,6 +29,7 @@
#include "wx/statbmp.h" #include "wx/statbmp.h"
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/app.h"
#include "wx/window.h" #include "wx/window.h"
#include "wx/icon.h" #include "wx/icon.h"
#include "wx/dcclient.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 // GetBestSize will work properly now, so set the best size if needed
SetInitialSize(size); SetInitialSize(size);
// Win9x and 2000 don't draw correctly the images with alpha channel so we // Windows versions before XP (and even XP if the application has no
// need to draw them ourselves and it's easier to just always do it rather // manifest and so the old comctl32.dll is used) don't draw correctly the
// than check if we have an image with alpha or not // images with alpha channel so we need to draw them ourselves and it's
if ( wxGetWinVersion() <= wxWinVersion_2000 ) // 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));
} }