[Win32SS]

- Fix hilite text with objects. Mirror changes.

svn path=/trunk/; revision=68936

diff --git a/reactos/win32ss/user/ntuser/draw.c b/reactos/win32ss/user/ntuser/draw.c
index bd72837..7046453 100644 (file)
--- a/reactos/win32ss/user/ntuser/draw.c
+++ b/reactos/win32ss/user/ntuser/draw.c
@@ -988,13 +988,20 @@ BOOL FASTCALL UITOOLS95_DrawFrameMenu(HDC dc, LPRECT r, UINT uFlags)
     hFont = GreCreateFontIndirectW(&lf);
     /* save font */
     hOldFont = NtGdiSelectFont(dc, hFont);
-    if(uFlags & DFCS_INACTIVE)
+
+    if ((uFlags & 0xff) == DFCS_MENUARROWUP ||
+        (uFlags & 0xff) == DFCS_MENUARROWDOWN )
     {
-        /* draw shadow */
-        IntGdiSetTextColor(dc, IntGetSysColor(COLOR_BTNHIGHLIGHT));
-        GreTextOutW(dc, r->left + 1, r->top + 1, &Symbol, 1);
+#if 0
+       if (uFlags & DFCS_INACTIVE)
+       {
+           /* draw shadow */
+           IntGdiSetTextColor(dc, IntGetSysColor(COLOR_BTNHIGHLIGHT));
+           GreTextOutW(dc, r->left + 1, r->top + 1, &Symbol, 1);
+       }
+#endif
+       IntGdiSetTextColor(dc, IntGetSysColor((uFlags & DFCS_INACTIVE) ? COLOR_BTNSHADOW : COLOR_BTNTEXT));
     }
-    IntGdiSetTextColor(dc, IntGetSysColor((uFlags & DFCS_INACTIVE) ? COLOR_BTNSHADOW : COLOR_BTNTEXT));
     /* draw selected symbol */
     GreTextOutW(dc, r->left, r->top, &Symbol, 1);
     /* restore previous settings */

diff --git a/reactos/win32ss/user/user32/windows/draw.c b/reactos/win32ss/user/user32/windows/draw.c
index 585b0c7..ead0404 100644 (file)
--- a/reactos/win32ss/user/user32/windows/draw.c
+++ b/reactos/win32ss/user/user32/windows/draw.c
@@ -1019,16 +1019,20 @@ static BOOL UITOOLS95_DrawFrameMenu(HDC dc, LPRECT r, UINT uFlags)
     hFont = CreateFontIndirect(&lf);
     /* save font */
     hOldFont = SelectObject(dc, hFont);
-    // FIXME selecting color doesn't work
-#if 0
-    if(uFlags & DFCS_INACTIVE)
+
+    if ((uFlags & 0xff) == DFCS_MENUARROWUP ||  
+        (uFlags & 0xff) == DFCS_MENUARROWDOWN ) 
     {
-        /* draw shadow */
-        SetTextColor(dc, GetSysColor(COLOR_BTNHIGHLIGHT));
-        TextOut(dc, r->left + 1, r->top + 1, &Symbol, 1);
-    }
-    SetTextColor(dc, GetSysColor((uFlags & DFCS_INACTIVE) ? COLOR_BTNSHADOW : COLOR_BTNTEXT));
+#if 0
+       if (uFlags & DFCS_INACTIVE)
+       {
+           /* draw shadow */
+           SetTextColor(dc, GetSysColor(COLOR_BTNHIGHLIGHT));
+           TextOut(dc, r->left + 1, r->top + 1, &Symbol, 1);
+       }
 #endif
+       SetTextColor(dc, GetSysColor((uFlags & DFCS_INACTIVE) ? COLOR_BTNSHADOW : COLOR_BTNTEXT));
+    }
     /* draw selected symbol */
     TextOut(dc, r->left, r->top, &Symbol, 1);
     /* restore previous settings */