// Modified by:
// Created: 04/01/98
// RCS-ID: $Id$
-// Copyright: (c) Julian Smart and Markus Holzem
-// Licence: wxWindows license
+// Copyright: (c) Julian Smart
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
- #pragma implementation "imaglist.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#pragma hdrstop
#endif
-#if defined(__WIN95__)
-
#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/string.h"
#include "wx/dcmemory.h"
-
+ #include "wx/intl.h"
+ #include "wx/log.h"
+ #include "wx/image.h"
#include <stdio.h>
#endif
-#include "wx/log.h"
-#include "wx/intl.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"
-#if !defined(__GNUWIN32_OLD__) && !defined(__TWIN32__)
- #include <commctrl.h>
-#endif
-
// ----------------------------------------------------------------------------
// wxWin macros
// ----------------------------------------------------------------------------
// returns the mask if it's valid, otherwise the bitmap mask and, if it's not
// valid neither, a "solid" mask (no transparent zones at all)
-static wxBitmap GetMaskForImage(const wxBitmap& bitmap, const wxBitmap& mask);
+static HBITMAP GetMaskForImage(const wxBitmap& bitmap, const wxBitmap& mask);
// ============================================================================
// implementation
{
UINT flags = 0;
- // set appropriate color depth
- 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
+ // 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
+ flags |= ILC_COLOR32;
+#endif
if ( mask )
flags |= ILC_MASK;
initial, 1);
if ( !m_hImageList )
{
- wxLogLastError("ImageList_Create()");
+ wxLogLastError(wxT("ImageList_Create()"));
}
return m_hImageList != 0;
// 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, wxT("invalid image list") );
+
+ return ImageList_GetIconSize(GetHImageList(), &width, &height) != 0;
+}
+
// ----------------------------------------------------------------------------
// wxImageList operations
// ----------------------------------------------------------------------------
// 'bitmap' and 'mask'.
int wxImageList::Add(const wxBitmap& bitmap, const wxBitmap& mask)
{
- wxBitmap bmpMask = GetMaskForImage(bitmap, mask);
- HBITMAP hbmpMask = wxInvertMask(GetHbitmapOf(bmpMask));
+ 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)
{
-#ifdef __TWIN32__
- wxFAIL_MSG(_T("ImageList_AddMasked not implemented in TWIN32"));
- return -1;
-#else
+ 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 )
{
}
return index;
-#endif
}
// Adds a bitmap and mask from an icon.
// 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)
{
-#ifdef __TWIN32__
- wxFAIL_MSG(_T("ImageList_Replace not implemented in TWIN32"));
- return FALSE;
-#else
- wxBitmap bmpMask = GetMaskForImage(bitmap, mask);
- HBITMAP hbmpMask = wxInvertMask(GetHbitmapOf(bmpMask));
+ 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("ImageList_Add()");
+ 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;
-#endif
+ 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::Replace(int i, const wxIcon& icon)
{
- bool ok = ImageList_ReplaceIcon(GetHImageList(), i, GetHiconOf(icon)) != 0;
+ bool ok = ImageList_ReplaceIcon(GetHImageList(), i, GetHiconOf(icon)) != -1;
if ( !ok )
{
- wxLogLastError("ImageList_ReplaceIcon()");
+ wxLogLastError(wxT("ImageList_ReplaceIcon()"));
}
return ok;
// Removes the image at the given index.
bool wxImageList::Remove(int index)
{
-#ifdef __TWIN32__
- wxFAIL_MSG(_T("ImageList_Replace not implemented in TWIN32"));
- return FALSE;
-#else
bool ok = ImageList_Remove(GetHImageList(), index) != 0;
if ( !ok )
{
- wxLogLastError("ImageList_Remove()");
+ wxLogLastError(wxT("ImageList_Remove()"));
}
return ok;
-#endif
}
// Remove all images
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.
-// If 'solidBackground' is TRUE, Draw sets the image list background
+// If 'solidBackground' is true, Draw sets the image list background
// colour to the background colour of the wxDC, to speed up
// drawing by eliminating masked drawing where possible.
bool wxImageList::Draw(int index,
int flags,
bool solidBackground)
{
-#ifdef __TWIN32__
- wxFAIL_MSG(_T("ImageList_Replace not implemented in TWIN32"));
- return FALSE;
-#else
- 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 )
{
- wxBrush *brush = & dc.GetBackground();
- if ( brush && brush->Ok() )
+ const wxBrush& brush = dc.GetBackground();
+ if ( brush.Ok() )
{
- clr = wxColourToRGB(brush->GetColour());
+ clr = wxColourToRGB(brush.GetColour());
}
}
bool ok = ImageList_Draw(GetHImageList(), index, hDC, x, y, style) != 0;
if ( !ok )
{
- wxLogLastError("ImageList_Draw()");
+ wxLogLastError(wxT("ImageList_Draw()"));
}
return ok;
+}
+
+// Get the bitmap
+wxBitmap wxImageList::GetBitmap(int index) const
+{
+#if wxUSE_WXDIB && wxUSE_IMAGE
+ int bmp_width = 0, bmp_height = 0;
+ GetSize(index, bmp_width, bmp_height);
+
+ wxBitmap bitmap(bmp_width, bmp_height);
+ wxMemoryDC dc;
+ dc.SelectObject(bitmap);
+
+ // draw it the first time to find a suitable mask colour
+ ((wxImageList*)this)->Draw(index, dc, 0, 0, wxIMAGELIST_DRAW_TRANSPARENT);
+ dc.SelectObject(wxNullBitmap);
+
+ // find the suitable mask colour
+ wxImage image = bitmap.ConvertToImage();
+ unsigned char r = 0, g = 0, b = 0;
+ image.FindFirstUnusedColour(&r, &g, &b);
+
+ // redraw whole image and bitmap in the mask colour
+ image.Create(bmp_width, bmp_height);
+ image.Replace(0, 0, 0, r, g, b);
+ bitmap = wxBitmap(image);
+
+ // redraw icon over the mask colour to actually draw it
+ dc.SelectObject(bitmap);
+ ((wxImageList*)this)->Draw(index, dc, 0, 0, wxIMAGELIST_DRAW_TRANSPARENT);
+ dc.SelectObject(wxNullBitmap);
+
+ // get the image, set the mask colour and convert back to get transparent bitmap
+ image = bitmap.ConvertToImage();
+ image.SetMaskColour(r, g, b);
+ bitmap = wxBitmap(image);
+#else
+ wxBitmap bitmap;
#endif
+ return bitmap;
+}
+
+// Get the icon
+wxIcon wxImageList::GetIcon(int index) const
+{
+ HICON hIcon = ImageList_ExtractIcon(0, GetHImageList(), index);
+ if (hIcon)
+ {
+ wxIcon icon;
+ icon.SetHICON((WXHICON)hIcon);
+
+ int iconW, iconH;
+ GetSize(index, iconW, iconH);
+ icon.SetSize(iconW, iconH);
+
+ return icon;
+ }
+ else
+ return wxNullIcon;
}
// ----------------------------------------------------------------------------
// helpers
// ----------------------------------------------------------------------------
-static wxBitmap GetMaskForImage(const wxBitmap& bitmap, const wxBitmap& mask)
+static HBITMAP GetMaskForImage(const wxBitmap& bitmap, const wxBitmap& mask)
{
- wxBitmap bmpMask;
+#if wxUSE_IMAGE
+ wxBitmap bitmapWithMask;
+#endif // wxUSE_IMAGE
+
+ HBITMAP hbmpMask;
+ wxMask *pMask;
+ bool deleteMask = false;
if ( mask.Ok() )
{
- bmpMask = mask;
+ hbmpMask = GetHbitmapOf(mask);
+ pMask = NULL;
}
else
{
- wxMask *pMask = bitmap.GetMask();
- if ( pMask )
+ 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 )
{
- bmpMask.SetHBITMAP(pMask->GetMaskBitmap());
+ 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
+ // that the light grey might have been changed by Windows behind
+ // our back, so use the standard colour map to get its real value
+ wxCOLORMAP *cmap = wxGetStdColourMap();
+ wxColour col;
+ wxRGBToColour(col, cmap[wxSTD_COL_BTNFACE].from);
+
+ pMask = new wxMask(bitmap, col);
+
+ deleteMask = true;
+ }
+
+ hbmpMask = (HBITMAP)pMask->GetMaskBitmap();
}
- if ( !bmpMask.Ok() )
+ // windows mask convention is opposite to the wxWidgets one
+ HBITMAP hbmpMaskInv = wxInvertMask(hbmpMask);
+
+ if ( deleteMask )
{
- // create a non transparent mask - apparently, this is needed under
- // Win9x (it doesn't behave correctly if it's passed 0 mask)
- bmpMask.Create(bitmap.GetWidth(), bitmap.GetHeight(), 1);
-
- wxMemoryDC dcMem;
- dcMem.SelectObject(bmpMask);
- dcMem.Clear();
- dcMem.SelectObject(wxNullBitmap);
+ delete pMask;
}
- return bmpMask;
+ return hbmpMaskInv;
}
-
-#endif // Win95
-
projects / wxWidgets.git / blobdiff