Changeset 2406 for trunk/src/user32/new/menu.cpp

Timestamp:

Jan 11, 2000, 2:06:27 PM (26 years ago)

Author:

sandervl

Message:

Lots of menu fixes

File:

• trunk/src/user32/new/menu.cpp (modified) (5 diffs)

trunk/src/user32/new/menu.cpp

@@ -1 @@
-/* $Id: menu.cpp,v 1.5 2000-01-10 17:18:08 cbratschi Exp $*/
+/* $Id: menu.cpp,v 1.6 2000-01-11 13:06:24 sandervl Exp $*/
 /*
  * Menu functions
@@ -1084 +1084 @@
         else
             FillRect( hdc, &rect, GetSysColorBrush(COLOR_HIGHLIGHT) );
-    else
-        FillRect( hdc, &rect, GetSysColorBrush(COLOR_MENU) );
+    else {
+        //SvL: TODO: Bug in GDI32; draws black rectangle instead of menu color
+        ///          for everything except the 1st menu item
+        RECT dummy = rect;
+        dummy.bottom = dummy.top+1;
+        dummy.right  = dummy.right+1;
+        FillRect( hdc, &dummy, GetSysColorBrush(COLOR_HIGHLIGHT) );
+        FillRect( hdc, &rect, GetSysColorBrush(COLOR_MENU) );
+    }
 
     SetBkMode( hdc, TRANSPARENT );
@@ -1782 +1789 @@
     /* Find where to insert new item */
 
-    if ((flags & MF_BYPOSITION) &&
-        ((pos == (UINT)-1) || (pos == menu->nItems)))
+    if ((pos==(UINT)-1) || ((flags & MF_BYPOSITION) && (pos == menu->nItems))) 
     {
         /* Special case: append to menu */
@@ -2117 +2123 @@
    {
         Win32BaseWindow *win32wnd = Win32BaseWindow::GetWindowFromHandle(menu->hWnd);
+        if(win32wnd==NULL)
+                DebugInt3();
 
         ht = win32wnd->HandleNCHitTest(pt);
@@ -3716 +3724 @@
 
 
-    if (GetWindowLongA(hWnd,GWL_STYLE) & WS_CHILD)
+    if (!(GetWindowLongA(hWnd,GWL_STYLE) & WS_CHILD))
     {
         if (GetCapture() == hWnd) ReleaseCapture();