From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 15 Feb 2000 09:49:16 +0000 (+0000)
Subject: fix for drawing bitmap buttons under Win95 (untested)
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/6148d1e6e921ce0bdeaf81bd02677bbf2c8a1afc

fix for drawing bitmap buttons under Win95 (untested)


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

diff --git a/src/msw/bmpbuttn.cpp b/src/msw/bmpbuttn.cpp
index 2cee20c982..4eb6795442 100644
--- a/src/msw/bmpbuttn.cpp
+++ b/src/msw/bmpbuttn.cpp
@@ -185,9 +185,8 @@ bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item)
         // (for a wxMask this means that this is a non transparent pixel), the
         // bg ROP is applied for all the others
 
-        wxColour colBg = GetBackgroundColour();
         HBRUSH hbrBackground =
-            ::CreateSolidBrush(RGB(colBg.Red(), colBg.Green(), colBg.Blue()));
+            ::CreateSolidBrush(wxColourToRGB(GetBackgroundColour()));
         HBRUSH hbrOld = (HBRUSH)::SelectObject(hDC, hbrBackground);
 
         ok = ::MaskBlt(
@@ -202,6 +201,13 @@ bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item)
         ::DeleteObject(hbrBackground);
     }
     else
+    {
+        // this will make the check below fail and BitBlt() will be used if
+        // MaskBlt() is not supported (for example, under Win95)
+        ok = FALSE;
+    }
+
+    if ( !ok )
 #endif // Win32
     {
         ok = ::BitBlt(hDC, x1, y1, wBmp, hBmp,  // dst