fall back to wxAlphaBlend() if ::AlphaBlend() didn't work

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

diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
index eac0d93d08b1c03e5060cf80f17cb195696b4652..ad43d3aa01953a090d2cfade2d02701e1eaf7306 100644 (file)
--- a/src/msw/dc.cpp
+++ b/src/msw/dc.cpp
@@ -1004,21 +1004,21 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask
             bf.SourceConstantAlpha = 0xff;
             bf.AlphaFormat = AC_SRC_ALPHA;
 
             bf.SourceConstantAlpha = 0xff;
             bf.AlphaFormat = AC_SRC_ALPHA;
 

-            if ( !pfnAlphaBlend(GetHdc(), x, y, width, height,
-                                hdcMem, 0, 0, width, height,
-                                bf) )
+            if ( pfnAlphaBlend(GetHdc(), x, y, width, height,
+                               hdcMem, 0, 0, width, height,
+                               bf) )

             {
             {

-                wxLogLastError(_T("AlphaBlend"));
+                // skip wxAlphaBlend() call below
+                return;

             }
             }

+
+            wxLogLastError(_T("AlphaBlend"));

         }
         }

-        else // use our own (probably much slower) implementation
-        {
+
+        // use our own (probably much slower) implementation

 #ifdef wxHAVE_RAW_BITMAP
 #ifdef wxHAVE_RAW_BITMAP

-            wxAlphaBlend(*this, x, y, width, height, bmp);
-#else
-            wxLogLastError(_T("AlphaBlend not available with this compiler setup"));
-#endif //#ifdef wxHAVE_RAW_BITMAP
-        }
+        wxAlphaBlend(*this, x, y, width, height, bmp);
+#endif // wxHAVE_RAW_BITMAP

 
         return;
     }
 
         return;
     }