Changeset 2396 for trunk/src/user32/new/win32wbase.cpp

Timestamp:

Jan 10, 2000, 6:18:13 PM (26 years ago)

Author:

cbratschi

Message:

activated menu code

File:

• trunk/src/user32/new/win32wbase.cpp (modified) (22 diffs)

trunk/src/user32/new/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.27 2000-01-09 17:13:39 cbratschi Exp $ */
+/* $Id: win32wbase.cpp,v 1.28 2000-01-10 17:18:09 cbratschi Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -32 +32 @@
 #include "oslibgdi.h"
 #include "oslibres.h"
-#include "oslibmenu.h"
 #include "oslibdos.h"
 #include "syscolor.h"
@@ -45 +44 @@
 #include <win\hook.h>
 #include <shellapi.h>
+#include <menu.h>
 #define INCL_TIMERWIN32
 #include "timer.h"
@@ -81 +81 @@
     !(style & (WS_CHILD | WS_POPUP))
 
-#define HAS_MENU(w) (!((w)->getStyle() & WS_CHILD) && ((w)->getWindowId() != 0))
+#define HAS_MENU() (!(getStyle() & WS_CHILD) && (GetMenu() != 0))
 
 /* bits in the dwKeyData */
@@ -674 +674 @@
   if ((dwStyle & (WS_CAPTION | WS_CHILD)) == WS_CAPTION )
   {
-#if 0 //CB: todo
         if (cs->hMenu) {
             SetMenu(cs->hMenu);
@@ -684 +683 @@
                 }
         }
-#endif
   }
   else
@@ -690 +688 @@
         setWindowId((DWORD)cs->hMenu);
   }
+  hSysMenu = (dwStyle & WS_SYSMENU) ? MENU_GetSysMenu(Win32Hwnd,0):0;
 
   // Subclass frame
@@ -1257 +1256 @@
       return;
     /* Check if the sysmenu item for minimize is there  */
-#if 0 //CB: todo
     state = GetMenuState(hSysMenu,SC_MINIMIZE,MF_BYCOMMAND);
-#endif
   } else
   {
@@ -1266 +1263 @@
       return;
     /* Check if the sysmenu item for maximize is there  */
-#if 0 //CB: todo
     state = GetMenuState(hSysMenu, SC_MAXIMIZE, MF_BYCOMMAND);
-#endif
   }
   SetCapture(Win32Hwnd);
@@ -1314 +1309 @@
   UINT state;
 
-#if 0 //CB: todo
   if (hSysMenu == 0)
     return;
   state = GetMenuState(hSysMenu, SC_CLOSE, MF_BYCOMMAND);
-#else
-state = 0;
-#endif
   /* If the item close of the sysmenu is disabled or not there do nothing */
   if((state & MF_DISABLED) || (state & MF_GRAYED) || (state == 0xFFFFFFFF))
@@ -1532 +1523 @@
   if(!(dwStyle & WS_MINIMIZE))
   {
-    AdjustRectOuter(&tmpRect,FALSE); //CB: todo: menu
+    AdjustRectOuter(&tmpRect,FALSE);
 
     clientRect->left   -= tmpRect.left;
@@ -1539 +1530 @@
     clientRect->bottom -= tmpRect.bottom;
 
-    if (HAS_MENU(this))
-    {
-#if 0 //CB: todo
-      winRect->top +=
+    if (HAS_MENU())
+    {
+      clientRect->top +=
                 MENU_GetMenuBarHeight(Win32Hwnd,
                                        winRect->right - winRect->left,
                                        -tmpRect.left, -tmpRect.top ) + 1;
-#endif
     }
 
@@ -1693 +1682 @@
   /* Check menu bar */
 
-  if (HAS_MENU(this))
+  if (HAS_MENU())
   {
     if ((pt.y < 0) && (pt.x >= 0) && (pt.x < rect.right))
@@ -1795 +1784 @@
 
     return (hIcon != 0);
+  }
+  return FALSE;
+}
+//******************************************************************************
+//******************************************************************************
+BOOL Win32BaseWindow::GetSysPopupPos(RECT* rect)
+{
+  if(hSysMenu)
+  {
+      if(dwStyle & WS_MINIMIZE )
+        *rect = rectWindow;
+      else
+      {
+          GetInsideRect(rect );
+          OffsetRect( rect, rectWindow.left, rectWindow.top);
+          if ((dwStyle & WS_CHILD) && getParent())
+              ClientToScreen(getParent()->getWindowHandle(), (POINT *)rect );
+          rect->right = rect->left + GetSystemMetrics(SM_CYCAPTION) - 1;
+          rect->bottom = rect->top + GetSystemMetrics(SM_CYCAPTION) - 1;
+      }
+      return TRUE;
   }
   return FALSE;
@@ -1938 +1948 @@
   char  buffer[256];
   HPEN  hPrevPen;
-  HMENU hSysMenu;
 
   if (flags & WIN_MANAGED) return;
@@ -1947 +1956 @@
   SelectObject( hdc, hPrevPen );
   r.bottom--;
-
-  //CB: todo:
-   //COLOR_GRADIENTACTIVECAPTION
-   //COLOR_GRADIENTINACTIVECAPTION
-   //-> end color
 
   if (SYSCOLOR_GetUseWinColors())
@@ -2006 +2010 @@
   {
     UINT state;
-#if 0 //CB: todo
+
     /* Go get the sysmenu */
     state = GetMenuState(hSysMenu, SC_CLOSE, MF_BYCOMMAND);
-#else
-state = 0;
-#endif
+
     /* Draw a grayed close button if disabled and a normal one if SC_CLOSE is not there */
     DrawCloseButton(hdc, FALSE,
@@ -2115 +2117 @@
     }
   }
-#if 0 //CB: todo
-  if (HAS_MENU(wndPtr))
+  if (HAS_MENU())
   {
     RECT r = rect;
     r.bottom = rect.top + GetSystemMetrics(SM_CYMENU);
 
-    rect.top += MENU_DrawMenuBar( hdc, &r, hwnd, suppress_menupaint ) + 1;
-  }
-#endif
+    rect.top += MENU_DrawMenuBar( hdc, &r, Win32Hwnd, suppress_menupaint ) + 1;
+  }
 
   if (dwExStyle & WS_EX_CLIENTEDGE)
@@ -2319 +2319 @@
         TrackScrollBar(wParam,*pt32);
         break;
-#if 0
+
     case SC_MOUSEMENU:
-        MENU_TrackMouseMenuBar( wndPtr, wParam & 0x000F, pt32 );
+        MENU_TrackMouseMenuBar(Win32Hwnd,wParam & 0x000F,*pt32);
         break;
 
     case SC_KEYMENU:
-        MENU_TrackKbdMenuBar( wndPtr , wParam , pt.x );
+        MENU_TrackKbdMenuBar(Win32Hwnd,wParam,pt32->x);
         break;
-#endif
+
     case SC_TASKLIST:
         WinExec("taskman.exe",SW_SHOWNORMAL);
@@ -2573 +2573 @@
           switch(LOWORD(lParam))
           {
+            case HTCLIENT:
+              hCursor = windowClass ? windowClass->getCursor():LoadCursorA(0,IDC_ARROWA);
+              break;
+
             case HTLEFT:
             case HTRIGHT:
@@ -2594 +2598 @@
 
             default:
-              hCursor = windowClass ? windowClass->getCursor():LoadCursorA(0,IDC_ARROWA);
+              hCursor = LoadCursorA(0,IDC_ARROWA);
               break;
           }
@@ -2769 +2773 @@
 
     case WM_CANCELMODE:
-        //if (getParent() == windowDesktop) EndMenu();
+        if (getParent() == windowDesktop) EndMenu();
         if (GetCapture() == Win32Hwnd) ReleaseCapture();
         return 0;