1. fixed wxStaticBox background erasing (or, rather, restored the old bug)

2. fixed the mask code in wxBitmap(const wxIcon&) - now it really works (Win32)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4559 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/msw/bitmap.cpp

@@ -140,10 +140,8 @@ bool wxBitmap::CopyFromIcon(const wxIcon& icon)
 
     HBITMAP hbitmap = iconInfo.hbmColor;
 
-    wxBitmap bmpMask(width, height, 1);
-    bmpMask.SetHBITMAP((WXHBITMAP)iconInfo.hbmMask);
-
-    SetMask(new wxMask(bmpMask));
+    wxMask *mask = new wxMask;
+    mask->SetMaskBitmap((WXHBITMAP)iconInfo.hbmMask);
 #endif // Win16/32
 
     m_refData = new wxBitmapRefData;
@@ -155,6 +153,10 @@ bool wxBitmap::CopyFromIcon(const wxIcon& icon)
     M_BITMAPDATA->m_hBitmap = (WXHBITMAP)hbitmap;
     M_BITMAPDATA->m_ok = TRUE;
 
+#ifndef __WIN16__
+    SetMask(mask);
+#endif // !Win16
+
     return TRUE;
 }
 
@@ -162,8 +164,6 @@ wxBitmap::~wxBitmap()
 {
     if (wxTheBitmapList)
         wxTheBitmapList->DeleteObject(this);
-
-    delete GetMask();
 }
 
 bool wxBitmap::FreeResource(bool WXUNUSED(force))