Minor parts from FM's wxDataViewCtrl patch.

[wxWidgets.git] / src / msw / imaglist.cpp

diff --git a/src/msw/imaglist.cpp b/src/msw/imaglist.cpp
index e8188e82ba79ad43579b837bf491c94b19762f68..317bc0f788f390e55bc011c613c668511d0ee9b8 100644 (file)
--- a/src/msw/imaglist.cpp
+++ b/src/msw/imaglist.cpp
@@ -25,25 +25,21 @@
 #endif
 
 #ifndef WX_PRECOMP
 #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/string.h"
     #include "wx/dcmemory.h"
     #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 <stdio.h>
 #endif
 

-#include "wx/log.h"
-#include "wx/intl.h"
-#include "wx/image.h"
-
-#include "wx/msw/imaglist.h"
+#include "wx/imaglist.h"

 #include "wx/msw/private.h"
 
 #include "wx/msw/private.h"
 

-// include <commctrl.h> "properly"
-#include "wx/msw/wrapcctl.h"
-

 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------


@@ -232,15 +228,7 @@ bool wxImageList::Remove(int index)
 bool wxImageList::RemoveAll()
 {
     // don't use ImageList_RemoveAll() because mingw32 headers don't have it
 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.
 }
 
 // Draws the given image on a dc at the specified position.


@@ -323,8 +311,8 @@ wxBitmap wxImageList::GetBitmap(int index) const
     bitmap = wxBitmap(image);
 #else
     wxBitmap bitmap;
     bitmap = wxBitmap(image);
 #else
     wxBitmap bitmap;

-    return bitmap;

 #endif
 #endif

+    return bitmap;

 }
 
 // Get the icon
 }
 
 // Get the icon


@@ -352,6 +340,10 @@ wxIcon wxImageList::GetIcon(int index) const
 
 static HBITMAP GetMaskForImage(const wxBitmap& bitmap, const wxBitmap& mask)
 {
 
 static HBITMAP GetMaskForImage(const wxBitmap& bitmap, const wxBitmap& mask)
 {

+#if wxUSE_IMAGE
+    wxBitmap bitmapWithMask;
+#endif // wxUSE_IMAGE
+

     HBITMAP hbmpMask;
     wxMask *pMask;
     bool deleteMask = false;
     HBITMAP hbmpMask;
     wxMask *pMask;
     bool deleteMask = false;


@@ -364,6 +356,23 @@ static HBITMAP GetMaskForImage(const wxBitmap& bitmap, const wxBitmap& mask)
     else
     {
         pMask = bitmap.GetMask();
     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
         if ( !pMask )
         {
             // use the light grey count as transparent: the trouble here is