X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6c9a19aabab3a878b565e6c2a5f2a3824277c4dc..a9fdf82418221608fca0259a586a7a6c13d133c8:/src/msw/imaglist.cpp diff --git a/src/msw/imaglist.cpp b/src/msw/imaglist.cpp index 09c344d1d9..317bc0f788 100644 --- a/src/msw/imaglist.cpp +++ b/src/msw/imaglist.cpp @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "imaglist.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -28,28 +24,22 @@ #pragma hdrstop #endif -#if defined(__WIN95__) - #ifndef WX_PRECOMP + #include "wx/msw/wrapcctl.h" // include "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 #endif -#include "wx/log.h" -#include "wx/intl.h" - -#include "wx/msw/imaglist.h" +#include "wx/imaglist.h" #include "wx/msw/private.h" -#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__)) - #include -#endif - // ---------------------------------------------------------------------------- // wxWin macros // ---------------------------------------------------------------------------- @@ -85,12 +75,17 @@ bool wxImageList::Create(int width, int height, bool mask, int initial) UINT flags = 0; // set appropriate color depth +#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 + + 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 +#endif if ( mask ) flags |= ILC_MASK; @@ -162,10 +157,6 @@ int wxImageList::Add(const wxBitmap& bitmap, const wxBitmap& mask) // 'bitmap'. int wxImageList::Add(const wxBitmap& bitmap, const wxColour& maskColour) { -#ifdef __TWIN32__ - wxFAIL_MSG(_T("ImageList_AddMasked not implemented in TWIN32")); - return -1; -#else int index = ImageList_AddMasked(GetHImageList(), GetHbitmapOf(bitmap), wxColourToRGB(maskColour)); @@ -175,7 +166,6 @@ int wxImageList::Add(const wxBitmap& bitmap, const wxColour& maskColour) } return index; -#endif } // Adds a bitmap and mask from an icon. @@ -196,29 +186,24 @@ int wxImageList::Add(const wxIcon& icon) bool wxImageList::Replace(int index, const wxBitmap& bitmap, const wxBitmap& mask) { -#ifdef __TWIN32__ - wxFAIL_MSG(_T("ImageList_Replace not implemented in TWIN32")); - return FALSE; -#else HBITMAP hbmpMask = GetMaskForImage(bitmap, mask); bool ok = ImageList_Replace(GetHImageList(), index, GetHbitmapOf(bitmap), hbmpMask) != 0; if ( !ok ) { - wxLogLastError(wxT("ImageList_Add()")); + wxLogLastError(wxT("ImageList_Replace()")); } ::DeleteObject(hbmpMask); return ok; -#endif } // 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(wxT("ImageList_ReplaceIcon()")); @@ -230,10 +215,6 @@ bool wxImageList::Replace(int i, const wxIcon& icon) // 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 ) { @@ -241,26 +222,17 @@ bool wxImageList::Remove(int index) } 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, @@ -269,20 +241,16 @@ 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") ); + wxCHECK_MSG( hDC, false, _T("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()); } } @@ -305,7 +273,65 @@ bool wxImageList::Draw(int index, } return ok; +} + +// Get the bitmap +wxBitmap wxImageList::GetBitmap(int index) const +{ +#if wxUSE_WXDIB + 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; } // ---------------------------------------------------------------------------- @@ -314,9 +340,13 @@ bool wxImageList::Draw(int index, static HBITMAP GetMaskForImage(const wxBitmap& bitmap, const wxBitmap& mask) { +#if wxUSE_IMAGE + wxBitmap bitmapWithMask; +#endif // wxUSE_IMAGE + HBITMAP hbmpMask; wxMask *pMask; - bool deleteMask = FALSE; + bool deleteMask = false; if ( mask.Ok() ) { @@ -326,6 +356,23 @@ static HBITMAP GetMaskForImage(const wxBitmap& bitmap, const wxBitmap& mask) 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 @@ -337,13 +384,13 @@ static HBITMAP GetMaskForImage(const wxBitmap& bitmap, const wxBitmap& mask) pMask = new wxMask(bitmap, col); - deleteMask = TRUE; + deleteMask = true; } hbmpMask = (HBITMAP)pMask->GetMaskBitmap(); } - // windows mask convention is opposite to the wxWindows one + // windows mask convention is opposite to the wxWidgets one HBITMAP hbmpMaskInv = wxInvertMask(hbmpMask); if ( deleteMask ) @@ -353,6 +400,3 @@ static HBITMAP GetMaskForImage(const wxBitmap& bitmap, const wxBitmap& mask) return hbmpMaskInv; } - -#endif // Win95 -