fixed wxEVT_CONTEXT_MENU generation (it works differently under w2k/XP than under...

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

diff --git a/src/msw/gdiimage.cpp b/src/msw/gdiimage.cpp
index d5b356119edc320fc299cb15dd016c6efbed35b7..26cabaa71c197710b2bb639a90f129f46e1de1a5 100644 (file)
--- a/src/msw/gdiimage.cpp
+++ b/src/msw/gdiimage.cpp
@@ -356,6 +356,9 @@ bool wxBMPResourceHandler::LoadFile(wxBitmap *bitmap,
     bitmap->SetHeight(bm.bmHeight);
     bitmap->SetDepth(bm.bmBitsPixel);
 
+    // use 0xc0c0c0 as transparent colour by default
+    bitmap->SetMask(new wxMask(*bitmap, *wxLIGHT_GREY));
+
     return true;
 }
 
@@ -369,7 +372,8 @@ bool wxBMPFileHandler::LoadFile(wxBitmap *bitmap,
 
     wxDIB dib(name);
 
-    return dib.IsOk() && bitmap->CopyFromDIB(dib);
+    bool ok = dib.IsOk() && bitmap->CopyFromDIB(dib);
+    return ok;
 #else
   WXHBITMAP hBitmap = (WXHBITMAP)wxLoadBMP(name);
   if(hBitmap) {