#endif
#ifndef WX_PRECOMP
+ #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
#include "wx/window.h"
#include "wx/icon.h"
#include "wx/dc.h"
#include "wx/dcmemory.h"
#include "wx/intl.h"
#include "wx/log.h"
-
+ #include "wx/image.h"
#include <stdio.h>
#endif
-#include "wx/image.h"
-
-#include "wx/msw/imaglist.h"
+#include "wx/imaglist.h"
+#include "wx/dc.h"
+#include "wx/msw/dc.h"
+#include "wx/msw/dib.h"
#include "wx/msw/private.h"
-// include <commctrl.h> "properly"
-#include "wx/msw/wrapcctl.h"
-
// ----------------------------------------------------------------------------
// wxWin macros
// ----------------------------------------------------------------------------
{
UINT flags = 0;
- // set appropriate color depth
+ // as we want to be able to use 32bpp bitmaps in the image lists, we always
+ // use ILC_COLOR32, even if the display resolution is less -- the system
+ // will make the best effort to show the bitmap if we do this resulting in
+ // quite acceptable display while using a lower depth ILC_COLOR constant
+ // (e.g. ILC_COLOR16) shows completely broken bitmaps
#ifdef __WXWINCE__
flags |= ILC_COLOR;
#else
- int dd = wxDisplayDepth();
-
- if (dd <= 4) flags |= ILC_COLOR; // 16 color
- else if (dd <= 8) flags |= ILC_COLOR8; // 256 color
- else if (dd <= 16) flags |= ILC_COLOR16; // 64k hi-color
- else if (dd <= 24) flags |= ILC_COLOR24; // 16m truecolor
- else if (dd <= 32) flags |= ILC_COLOR32; // 16m truecolor
+ flags |= ILC_COLOR32;
#endif
if ( mask )
// Returns the number of images in the image list.
int wxImageList::GetImageCount() const
{
- wxASSERT_MSG( m_hImageList, _T("invalid image list") );
+ wxASSERT_MSG( m_hImageList, wxT("invalid image list") );
return ImageList_GetImageCount(GetHImageList());
}
// Returns the size (same for all images) of the images in the list
bool wxImageList::GetSize(int WXUNUSED(index), int &width, int &height) const
{
- wxASSERT_MSG( m_hImageList, _T("invalid image list") );
+ wxASSERT_MSG( m_hImageList, wxT("invalid image list") );
return ImageList_GetIconSize(GetHImageList(), &width, &height) != 0;
}
// 'bitmap' and 'mask'.
int wxImageList::Add(const wxBitmap& bitmap, const wxBitmap& mask)
{
- HBITMAP hbmpMask = GetMaskForImage(bitmap, mask);
+ HBITMAP hbmp;
+
+#if wxUSE_WXDIB && wxUSE_IMAGE
+ // wxBitmap normally stores alpha in pre-multiplied format but
+ // ImageList_Draw() does pre-multiplication internally so we need to undo
+ // the pre-multiplication here. Converting back and forth like this is, of
+ // course, very inefficient but it's better than wrong appearance so we do
+ // this for now until a better way can be found.
+ AutoHBITMAP hbmpRelease;
+ if ( bitmap.HasAlpha() )
+ {
+ hbmp = wxDIB(bitmap.ConvertToImage(),
+ wxDIB::PixelFormat_NotPreMultiplied).Detach();
+ hbmpRelease.Init(hbmp);
+ }
+ else
+#endif // wxUSE_WXDIB && wxUSE_IMAGE
+ hbmp = GetHbitmapOf(bitmap);
- int index = ImageList_Add(GetHImageList(), GetHbitmapOf(bitmap), hbmpMask);
+ AutoHBITMAP hbmpMask(GetMaskForImage(bitmap, mask));
+
+ int index = ImageList_Add(GetHImageList(), hbmp, hbmpMask);
if ( index == -1 )
{
wxLogError(_("Couldn't add an image to the image list."));
}
- ::DeleteObject(hbmpMask);
-
return index;
}
// 'bitmap'.
int wxImageList::Add(const wxBitmap& bitmap, const wxColour& maskColour)
{
+ HBITMAP hbmp;
+
+#if wxUSE_WXDIB && wxUSE_IMAGE
+ // See the comment in overloaded Add() above.
+ AutoHBITMAP hbmpRelease;
+ if ( bitmap.HasAlpha() )
+ {
+ hbmp = wxDIB(bitmap.ConvertToImage(),
+ wxDIB::PixelFormat_NotPreMultiplied).Detach();
+ hbmpRelease.Init(hbmp);
+ }
+ else
+#endif // wxUSE_WXDIB && wxUSE_IMAGE
+ hbmp = GetHbitmapOf(bitmap);
+
int index = ImageList_AddMasked(GetHImageList(),
- GetHbitmapOf(bitmap),
+ hbmp,
wxColourToRGB(maskColour));
if ( index == -1 )
{
// Note that wxImageList creates new bitmaps, so you may delete
// 'bitmap' and 'mask'.
bool wxImageList::Replace(int index,
- const wxBitmap& bitmap, const wxBitmap& mask)
+ const wxBitmap& bitmap,
+ const wxBitmap& mask)
{
- HBITMAP hbmpMask = GetMaskForImage(bitmap, mask);
+ HBITMAP hbmp;
- bool ok = ImageList_Replace(GetHImageList(), index,
- GetHbitmapOf(bitmap), hbmpMask) != 0;
- if ( !ok )
+#if wxUSE_WXDIB && wxUSE_IMAGE
+ // See the comment in Add() above.
+ AutoHBITMAP hbmpRelease;
+ if ( bitmap.HasAlpha() )
{
- wxLogLastError(wxT("ImageList_Replace()"));
+ hbmp = wxDIB(bitmap.ConvertToImage(),
+ wxDIB::PixelFormat_NotPreMultiplied).Detach();
+ hbmpRelease.Init(hbmp);
}
+ else
+#endif // wxUSE_WXDIB && wxUSE_IMAGE
+ hbmp = GetHbitmapOf(bitmap);
- ::DeleteObject(hbmpMask);
+ AutoHBITMAP hbmpMask(GetMaskForImage(bitmap, mask));
- return ok;
+ if ( !ImageList_Replace(GetHImageList(), index, hbmp, hbmpMask) )
+ {
+ wxLogLastError(wxT("ImageList_Replace()"));
+ return false;
+ }
+
+ return true;
}
// Replaces a bitmap and mask from an icon.
bool wxImageList::RemoveAll()
{
// don't use ImageList_RemoveAll() because mingw32 headers don't have it
- int count = ImageList_GetImageCount(GetHImageList());
- for ( int i = 0; i < count; i++ )
- {
- // the image indexes are shifted, so we should always remove the first
- // one
- (void)Remove(0);
- }
-
- return true;
+ return Remove(-1);
}
// Draws the given image on a dc at the specified position.
int flags,
bool solidBackground)
{
- HDC hDC = GetHdcOf(dc);
- wxCHECK_MSG( hDC, false, _T("invalid wxDC in wxImageList::Draw") );
+ wxDCImpl *impl = dc.GetImpl();
+ wxMSWDCImpl *msw_impl = wxDynamicCast( impl, wxMSWDCImpl );
+ if (!msw_impl)
+ return false;
+
+ HDC hDC = GetHdcOf(*msw_impl);
+ wxCHECK_MSG( hDC, false, wxT("invalid wxDC in wxImageList::Draw") );
COLORREF clr = CLR_NONE; // transparent by default
if ( solidBackground )
// Get the bitmap
wxBitmap wxImageList::GetBitmap(int index) const
{
-#if wxUSE_WXDIB
+#if wxUSE_WXDIB && wxUSE_IMAGE
int bmp_width = 0, bmp_height = 0;
GetSize(index, bmp_width, bmp_height);
static HBITMAP GetMaskForImage(const wxBitmap& bitmap, const wxBitmap& mask)
{
+#if wxUSE_IMAGE
+ wxBitmap bitmapWithMask;
+#endif // wxUSE_IMAGE
+
HBITMAP hbmpMask;
wxMask *pMask;
bool deleteMask = false;
else
{
pMask = bitmap.GetMask();
+
+#if wxUSE_IMAGE
+ // check if we don't have alpha in this bitmap -- we can create a mask
+ // from it (and we need to do it for the older systems which don't
+ // support 32bpp bitmaps natively)
+ if ( !pMask )
+ {
+ wxImage img(bitmap.ConvertToImage());
+ if ( img.HasAlpha() )
+ {
+ img.ConvertAlphaToMask();
+ bitmapWithMask = wxBitmap(img);
+ pMask = bitmapWithMask.GetMask();
+ }
+ }
+#endif // wxUSE_IMAGE
+
if ( !pMask )
{
// use the light grey count as transparent: the trouble here is
projects / wxWidgets.git / blobdiff