Changeset 2406 for trunk/src

Timestamp:

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

Author:

sandervl

Message:

Lots of menu fixes

Location:

trunk/src/user32/new

Files:

• menu.cpp (modified) (5 diffs)
• oslibmsg.cpp (modified) (3 diffs)
• oslibwin.cpp (modified) (2 diffs)
• oslibwin.h (modified) (2 diffs)
• win32wbase.cpp (modified) (3 diffs)
• win32wbasenonclient.cpp (modified) (2 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();

trunk/src/user32/new/oslibmsg.cpp

@@ -1 @@
-/* $Id: oslibmsg.cpp,v 1.12 2000-01-10 23:29:12 sandervl Exp $ */
+/* $Id: oslibmsg.cpp,v 1.13 2000-01-11 13:06:25 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -220 +220 @@
         MsgThreadPtr->msg  = 0;
         MsgThreadPtr->hwnd = 0;
-        return (pMsg->message == WINWM_QUIT);
+        return (pMsg->message != WINWM_QUIT);
   }
 
@@ -231 +231 @@
         while(rc == FALSE);
 
-        return (pMsg->message == WINWM_QUIT);
+        return (pMsg->message != WINWM_QUIT);
   }
   else

trunk/src/user32/new/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.33 2000-01-05 21:25:04 cbratschi Exp $ */
+/* $Id: oslibwin.cpp,v 1.34 2000-01-11 13:06:25 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -1162 +1162 @@
   return WinGetLastError(GetThreadHAB()) & 0xFFFF;
 }
+//******************************************************************************
+//******************************************************************************
+void OSLibWinShowTaskList(HWND hwndFrame)
+{
+  WinPostMsg(NULLHANDLE, WM_SYSCOMMAND, (MPARAM)SC_TASKMANAGER, MPFROM2SHORT(CMDSRC_MENU, TRUE));
+}
+//******************************************************************************
+//******************************************************************************

trunk/src/user32/new/oslibwin.h

@@ -1 @@
-/* $Id: oslibwin.h,v 1.28 2000-01-02 19:30:43 cbratschi Exp $ */
+/* $Id: oslibwin.h,v 1.29 2000-01-11 13:06:26 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -288 +288 @@
 ULONG OSLibWinGetLastError();
 
+void  OSLibWinShowTaskList(HWND hwndFrame);
+
 #endif //__OSLIBWIN_H__

trunk/src/user32/new/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.31 2000-01-11 10:38:34 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.32 2000-01-11 13:06:26 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -654 +654 @@
   {
         if (cs->hMenu) {
-            SetMenu(cs->hMenu);
+            ::SetMenu(getWindowHandle(), cs->hMenu);
         }
         else {
                 if (windowClass->getMenuNameA()) {
                         cs->hMenu = LoadMenuA(cs->hInstance, windowClass->getMenuNameA());
-                        if (cs->hMenu) SetMenu(cs->hMenu );
+                        if (cs->hMenu) ::SetMenu(getWindowHandle(), cs->hMenu );
                 }
         }
@@ -1673 +1673 @@
 
     default:
-        if(Msg > WM_USER) {
-            return 0;
-        }
-        return 1; //CB: shouldn't this be 0?
+        return 0;
     }
 }

trunk/src/user32/new/win32wbasenonclient.cpp

@@ -1 @@
-/* $Id: win32wbasenonclient.cpp,v 1.1 2000-01-11 10:39:00 sandervl Exp $ */
+/* $Id: win32wbasenonclient.cpp,v 1.2 2000-01-11 13:06:27 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2 (non-client methods)
@@ -1208 +1208 @@
 
     case SC_TASKLIST:
-        WinExec("taskman.exe",SW_SHOWNORMAL);
+        OSLibWinShowTaskList(getOS2FrameWindowHandle());
         break;