X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..ab5ebf521fca1ddff1de556db7c53b25b501cdeb:/src/msw/imaglist.cpp

diff --git a/src/msw/imaglist.cpp b/src/msw/imaglist.cpp
index 48bd3c57a2..c31e18afbe 100644
--- a/src/msw/imaglist.cpp
+++ b/src/msw/imaglist.cpp
@@ -5,8 +5,8 @@
 // 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
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "imaglist.h"
 #endif
 
@@ -46,7 +46,7 @@
 #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
 
@@ -64,7 +64,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxImageList, wxObject)
 
 // 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
@@ -86,11 +86,15 @@ bool wxImageList::Create(int width, int height, bool mask, int initial)
 
     // set appropriate color depth
     int dd = wxDisplayDepth();
+#ifdef __WXWINCE__
+    flags |= ILC_COLOR;
+#else
     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;
@@ -144,8 +148,7 @@ bool wxImageList::GetSize(int WXUNUSED(index), int &width, int &height) const
 // '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 )
@@ -163,10 +166,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));
@@ -176,7 +175,6 @@ int wxImageList::Add(const wxBitmap& bitmap, const wxColour& maskColour)
     }
 
     return index;
-#endif
 }
 
 // Adds a bitmap and mask from an icon.
@@ -197,12 +195,7 @@ 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
-    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;
@@ -214,7 +207,6 @@ bool wxImageList::Replace(int index,
     ::DeleteObject(hbmpMask);
 
     return ok;
-#endif
 }
 
 // Replaces a bitmap and mask from an icon.
@@ -232,10 +224,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 )
     {
@@ -243,7 +231,6 @@ bool wxImageList::Remove(int index)
     }
 
     return ok;
-#endif
 }
 
 // Remove all images
@@ -271,10 +258,6 @@ 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") );
 
@@ -307,43 +290,52 @@ bool wxImageList::Draw(int index,
     }
 
     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 wxWindows 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