Ensure there is valid context for DrawRectangle

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

diff --git a/src/msw/imaglist.cpp b/src/msw/imaglist.cpp
index 4820d044b6114bf5c4eec55a4e19440e9bc98ebc..266af3feb0f43572db73541ba7753ca5a056101e 100644 (file)
--- a/src/msw/imaglist.cpp
+++ b/src/msw/imaglist.cpp
@@ -40,6 +40,7 @@
 #include "wx/imaglist.h"
 #include "wx/dc.h"
 #include "wx/msw/dc.h"
 #include "wx/imaglist.h"
 #include "wx/dc.h"
 #include "wx/msw/dc.h"

+#include "wx/msw/dib.h"

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


@@ -139,16 +140,33 @@ bool wxImageList::GetSize(int WXUNUSED(index), int &width, int &height) const
 // 'bitmap' and 'mask'.
 int wxImageList::Add(const wxBitmap& bitmap, const wxBitmap& mask)
 {
 // 'bitmap' and 'mask'.
 int wxImageList::Add(const wxBitmap& bitmap, const wxBitmap& mask)
 {

-    HBITMAP hbmpMask = GetMaskForImage(bitmap, mask);
+    HBITMAP hbmp;

 
 

-    int index = ImageList_Add(GetHImageList(), GetHbitmapOf(bitmap), hbmpMask);
+#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);
+
+    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."));
     }
 
     if ( index == -1 )
     {
         wxLogError(_("Couldn't add an image to the image list."));
     }
 

-    ::DeleteObject(hbmpMask);
-

     return index;
 }
 
     return index;
 }
 


@@ -157,8 +175,23 @@ int wxImageList::Add(const wxBitmap& bitmap, const wxBitmap& mask)
 // 'bitmap'.
 int wxImageList::Add(const wxBitmap& bitmap, const wxColour& maskColour)
 {
 // 'bitmap'.
 int wxImageList::Add(const wxBitmap& bitmap, const wxColour& maskColour)
 {

+    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(),
     int index = ImageList_AddMasked(GetHImageList(),

-                                    GetHbitmapOf(bitmap),
+                                    hbmp,

                                     wxColourToRGB(maskColour));
     if ( index == -1 )
     {
                                     wxColourToRGB(maskColour));
     if ( index == -1 )
     {


@@ -184,20 +217,33 @@ int wxImageList::Add(const wxIcon& icon)
 // Note that wxImageList creates new bitmaps, so you may delete
 // 'bitmap' and 'mask'.
 bool wxImageList::Replace(int index,
 // 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)

 {
 {

-    HBITMAP hbmpMask = GetMaskForImage(bitmap, mask);
+    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(wxT("ImageList_Replace()"));
+        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;
+    if ( !ImageList_Replace(GetHImageList(), index, hbmp, hbmpMask) )
+    {
+        wxLogLastError(wxT("ImageList_Replace()"));
+        return false;
+    }
+
+    return true;

 }
 
 // Replaces a bitmap and mask from an icon.
 }
 
 // Replaces a bitmap and mask from an icon.


@@ -253,7 +299,7 @@ bool wxImageList::Draw(int index,
     if ( solidBackground )
     {
         const wxBrush& brush = dc.GetBackground();
     if ( solidBackground )
     {
         const wxBrush& brush = dc.GetBackground();

-        if ( brush.Ok() )
+        if ( brush.IsOk() )

         {
             clr = wxColourToRGB(brush.GetColour());
         }
         {
             clr = wxColourToRGB(brush.GetColour());
         }


@@ -353,7 +399,7 @@ static HBITMAP GetMaskForImage(const wxBitmap& bitmap, const wxBitmap& mask)
     wxMask *pMask;
     bool deleteMask = false;
 
     wxMask *pMask;
     bool deleteMask = false;
 

-    if ( mask.Ok() )
+    if ( mask.IsOk() )

     {
         hbmpMask = GetHbitmapOf(mask);
         pMask = NULL;
     {
         hbmpMask = GetHbitmapOf(mask);
         pMask = NULL;