[1/2]user32: remove unnecessary code (try 2)

André Hentschel nerv at dawncrow.de
Thu Sep 16 13:40:27 CDT 2010


that code is in an else-case of an other "if (!(uFlags & DFCS_TRANSPARENT))"

try 2:
 patch 2/2 still applies
 thanks Juan Lang for spotting the superfluous ternary stuff
---
 dlls/user32/uitools.c |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/dlls/user32/uitools.c b/dlls/user32/uitools.c
index 2b63118..030b558 100644
--- a/dlls/user32/uitools.c
+++ b/dlls/user32/uitools.c
@@ -692,15 +692,9 @@ static BOOL UITOOLS95_DFC_ButtonPush(HDC dc, LPRECT r, UINT uFlags)
     else
     {
         if(uFlags & DFCS_MONO)
-        {
             UITOOLS95_DrawRectEdge(dc, &myr, edge, BF_MONO|BF_RECT|BF_ADJUST);
-	    if (!(uFlags & DFCS_TRANSPARENT))
-                FillRect(dc, &myr, GetSysColorBrush(COLOR_BTNFACE));
-        }
         else
-        {
-            UITOOLS95_DrawRectEdge(dc, r, edge, (uFlags & DFCS_FLAT) | ((uFlags & DFCS_TRANSPARENT) ? 0 : BF_MIDDLE) | BF_RECT | BF_SOFT);
-        }
+            UITOOLS95_DrawRectEdge(dc, r, edge, (uFlags & DFCS_FLAT) | BF_RECT | BF_SOFT);
     }
 
     /* Adjust rectangle if asked */
-- 

Best Regards, André Hentschel



More information about the wine-patches mailing list