// 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__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "imaglist.h"
#endif
#include "wx/msw/imaglist.h"
#include "wx/msw/private.h"
-#if !defined(__GNUWIN32_OLD__) && !defined(__TWIN32__)
+#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__))
#include <commctrl.h>
#endif
// 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
+#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;
initial, 1);
if ( !m_hImageList )
{
- wxLogLastError("ImageList_Create()");
+ wxLogLastError(wxT("ImageList_Create()"));
}
return m_hImageList != 0;
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") );
+
+ 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 hbmpMask = GetMaskForImage(bitmap, mask);
int index = ImageList_Add(GetHImageList(), GetHbitmapOf(bitmap), hbmpMask);
if ( index == -1 )
// '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));
}
return index;
-#endif
}
// Adds a bitmap and mask from an 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
- wxBitmap bmpMask = GetMaskForImage(bitmap, mask);
- HBITMAP hbmpMask = wxInvertMask(GetHbitmapOf(bmpMask));
+ HBITMAP hbmpMask = GetMaskForImage(bitmap, mask);
bool ok = ImageList_Replace(GetHImageList(), index,
GetHbitmapOf(bitmap), hbmpMask) != 0;
if ( !ok )
{
- wxLogLastError("ImageList_Add()");
+ wxLogLastError(wxT("ImageList_Add()"));
}
::DeleteObject(hbmpMask);
return ok;
-#endif
}
// Replaces a bitmap and mask from an icon.
bool ok = ImageList_ReplaceIcon(GetHImageList(), i, GetHiconOf(icon)) != 0;
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
(void)Remove(0);
}
- return TRUE;
+ return true;
}
// 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") );
+ 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());
}
}
bool ok = ImageList_Draw(GetHImageList(), index, hDC, x, y, style) != 0;
if ( !ok )
{
- wxLogLastError("ImageList_Draw()");
+ wxLogLastError(wxT("ImageList_Draw()"));
}
return ok;
-#endif
}
// ----------------------------------------------------------------------------
// helpers
// ----------------------------------------------------------------------------
-static wxBitmap GetMaskForImage(const wxBitmap& bitmap, const wxBitmap& mask)
+static HBITMAP GetMaskForImage(const wxBitmap& bitmap, const wxBitmap& mask)
{
- wxBitmap bmpMask;
+ 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 ( !pMask )
{
- bmpMask.SetHBITMAP(pMask->GetMaskBitmap());
+ // 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