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

Timestamp:

Jan 11, 2000, 6:34:44 PM (26 years ago)

Author:

cbratschi

Message:

fixed dialog rect

File:

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

trunk/src/user32/new/menu.cpp

@@ -1 @@
-/* $Id: menu.cpp,v 1.6 2000-01-11 13:06:24 sandervl Exp $*/
+/* $Id: menu.cpp,v 1.7 2000-01-11 17:34:42 cbratschi Exp $*/
 /*
  * Menu functions
@@ -20 +20 @@
  * This is probably not the meaning this style has in MS-Windows.
  */
-
-/*
- CB: not yet implemented:
- - Win32BaseWindow handling
- - message functions
-*/
 
 #include <assert.h>
@@ -1085 +1079 @@
             FillRect( hdc, &rect, GetSysColorBrush(COLOR_HIGHLIGHT) );
     else {
-        //SvL: TODO: Bug in GDI32; draws black rectangle instead of menu color
+        //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) );
+        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) );
     }
 
@@ -1789 +1783 @@
     /* Find where to insert new item */
 
-    if ((pos==(UINT)-1) || ((flags & MF_BYPOSITION) && (pos == menu->nItems))) 
+    if ((pos==(UINT)-1) || ((flags & MF_BYPOSITION) && (pos == menu->nItems)))
     {
         /* Special case: append to menu */
@@ -2123 +2117 @@
    {
         Win32BaseWindow *win32wnd = Win32BaseWindow::GetWindowFromHandle(menu->hWnd);
-        if(win32wnd==NULL)
-                DebugInt3();
+        if(win32wnd==NULL)
+                DebugInt3();
 
         ht = win32wnd->HandleNCHitTest(pt);