Changeset 2410 for trunk/src

Timestamp:

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

Author:

cbratschi

Message:

fixed dialog rect

Location:

trunk/src/user32/new

Files:

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

trunk/src/user32/new/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.35 2000-01-11 13:52:18 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.36 2000-01-11 17:34:43 cbratschi Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -26 +26 @@
 #include "oslibgdi.h"
 #include "pmwindow.h"
-
-#define HAS_3DFRAME(exStyle) \
-    ((exStyle & WS_EX_CLIENTEDGE_W) || (exStyle & WS_EX_STATICEDGE_W) || (exStyle & WS_EX_WINDOWEDGE_W))
 
 //******************************************************************************

trunk/src/user32/new/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.33 2000-01-11 13:52:19 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.34 2000-01-11 17:34:43 cbratschi Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -5 +5 @@
  * Copyright 1998-2000 Sander van Leeuwen (sandervl@xs4all.nl)
  * Copyright 1999      Daniela Engert (dani@ngrt.de)
- * Copyright 2000      Christoph Bratschi (cbratschi@datacomm.ch)
+ * Copyright 1999-2000 Christoph Bratschi (cbratschi@datacomm.ch)
  *
  * Parts based on Wine Windows code (windows\win.c)
@@ -51 +51 @@
 #define SC_PUTMARK              (SC_SCREENSAVE+2)
 
-#define HAS_DLGFRAME(style,exStyle) \
-    (((exStyle) & WS_EX_DLGMODALFRAME) || \
-     (((style) & WS_DLGFRAME) && !((style) & WS_THICKFRAME)))
-
-#define HAS_THICKFRAME(style,exStyle) \
-    (((style) & WS_THICKFRAME) && \
-     !((exStyle) & WS_EX_DLGMODALFRAME) && \
-     !((style) & WS_CHILD))
-
-#define HAS_THINFRAME(style) \
-    (((style) & WS_BORDER) || !((style) & (WS_CHILD | WS_POPUP)))
-
-#define HAS_BIGFRAME(style,exStyle) \
-    (((style) & (WS_THICKFRAME | WS_DLGFRAME)) || \
-     ((exStyle) & WS_EX_DLGMODALFRAME))
-
-#define HAS_ANYFRAME(style,exStyle) \
-    (((style) & (WS_THICKFRAME | WS_DLGFRAME | WS_BORDER)) || \
-     ((exStyle) & WS_EX_DLGMODALFRAME) || \
-     !((style) & (WS_CHILD | WS_POPUP)))
-
-#define HAS_3DFRAME(exStyle) \
-    ((exStyle & WS_EX_CLIENTEDGE) || (exStyle & WS_EX_STATICEDGE) || (exStyle & WS_EX_WINDOWEDGE))
-
-#define HAS_BORDER(style, exStyle) \
-    ((style & WS_BORDER) || HAS_THICKFRAME(style) || HAS_DLGFRAME(style,exStyle))
-
-#define IS_OVERLAPPED(style) \
-    !(style & (WS_CHILD | WS_POPUP))
-
-#define HAS_MENU() (!(getStyle() & WS_CHILD) && (GetMenu() != 0))
-
 /* bits in the dwKeyData */
 #define KEYDATA_ALT         0x2000
@@ -1090 +1058 @@
 //dprintf(("CB: %d %d %d %d",rect.left,rect.top,rect.bottom,rect.right));
     DeleteObject(hrgn);
-    //CB: todo: check if intersection with client
+    //CB: todo: check if intersection with client, what does PM's frame???
 
     return rc;
@@ -1610 +1578 @@
     case WM_SYSCHAR:
     {
-            int iMenuSysKey = 0;
-            if (wParam == VK_RETURN && (getStyle() & WS_MINIMIZE))
-        {
-                PostMessageA(getWindowHandle(), WM_SYSCOMMAND,
+            int iMenuSysKey = 0;
+            if (wParam == VK_RETURN && (getStyle() & WS_MINIMIZE))
+        {
+                PostMessageA(getWindowHandle(), WM_SYSCOMMAND,
                          (WPARAM)SC_RESTORE, 0L );
-                break;
-        }
-            if ((HIWORD(lParam) & KEYDATA_ALT) && wParam)
-        {
-                if (wParam == VK_TAB || wParam == VK_ESCAPE) break;
-                if (wParam == VK_SPACE && (getStyle() & WS_CHILD))
+                break;
+        }
+            if ((HIWORD(lParam) & KEYDATA_ALT) && wParam)
+        {
+                if (wParam == VK_TAB || wParam == VK_ESCAPE) break;
+                if (wParam == VK_SPACE && (getStyle() & WS_CHILD))
                 getParent()->SendMessageA(Msg, wParam, lParam );
-                else
+                else
                 SendMessageA(WM_SYSCOMMAND, (WPARAM)SC_KEYMENU, (LPARAM)(DWORD)wParam );
         }
-            else /* check for Ctrl-Esc */
+            else /* check for Ctrl-Esc */
             if (wParam != VK_ESCAPE) MessageBeep(0);
-            break;
+            break;
     }
 
@@ -2728 +2696 @@
   if(IsWindowDestroyed()) return;
 
-  //CB: todo: dwExStyle, creating new frame controls, destroy not used controls, WS_VISIBLE, WS_CHILD, ...
-  //    write test cases
   if ((dwStyle & 0xFFFF0000) != (oldStyle & 0xFFFF0000))
   {
-    //dprintf(("updateWindowStyle: %x %x",oldStyle,dwStyle));
-    OSLibSetWindowStyle(OS2HwndFrame, dwStyle, fTaskList);
+    //CB: update
+    //OSLibSetWindowStyle(OS2HwndFrame, dwStyle, fTaskList);
   }
 }

trunk/src/user32/new/win32wbase.h

@@ -1 @@
-/* $Id: win32wbase.h,v 1.23 2000-01-10 23:37:24 sandervl Exp $ */
+/* $Id: win32wbase.h,v 1.24 2000-01-11 17:34:44 cbratschi Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -56 +56 @@
 #define BROADCAST_SEND          0
 #define BROADCAST_POST          1
+
+#define HAS_DLGFRAME(style,exStyle) \
+    (((exStyle) & WS_EX_DLGMODALFRAME) || \
+     (((style) & WS_DLGFRAME) && !((style) & WS_THICKFRAME)))
+
+#define HAS_THICKFRAME(style,exStyle) \
+    (((style) & WS_THICKFRAME) && \
+     !((exStyle) & WS_EX_DLGMODALFRAME) && \
+     !((style) & WS_CHILD))
+
+#define HAS_THINFRAME(style) \
+    (((style) & WS_BORDER) || !((style) & (WS_CHILD | WS_POPUP)))
+
+#define HAS_BIGFRAME(style,exStyle) \
+    (((style) & (WS_THICKFRAME | WS_DLGFRAME)) || \
+     ((exStyle) & WS_EX_DLGMODALFRAME))
+
+#define HAS_ANYFRAME(style,exStyle) \
+    (((style) & (WS_THICKFRAME | WS_DLGFRAME | WS_BORDER)) || \
+     ((exStyle) & WS_EX_DLGMODALFRAME) || \
+     !((style) & (WS_CHILD | WS_POPUP)))
+
+#define HAS_3DFRAME(exStyle) \
+    ((exStyle & WS_EX_CLIENTEDGE) || (exStyle & WS_EX_STATICEDGE) || (exStyle & WS_EX_WINDOWEDGE))
+
+#define HAS_BORDER(style, exStyle) \
+    ((style & WS_BORDER) || HAS_THICKFRAME(style) || HAS_DLGFRAME(style,exStyle))
+
+#define IS_OVERLAPPED(style) \
+    !(style & (WS_CHILD | WS_POPUP))
+
+#define HAS_MENU() (!(getStyle() & WS_CHILD) && (GetMenu() != 0))
 
 class Win32BaseWindow : public GenericObject, public ChildWindow

trunk/src/user32/new/win32wbasepos.cpp

@@ -1 @@
-/* $Id: win32wbasepos.cpp,v 1.4 2000-01-10 17:18:11 cbratschi Exp $ */
+/* $Id: win32wbasepos.cpp,v 1.5 2000-01-11 17:34:44 cbratschi Exp $ */
 /*
  * Win32 Window Base Class for OS/2 (nonclient/position methods)
@@ -38 +38 @@
 #include "pmframe.h"
 #include "win32wdesktop.h"
-
-  /* Some useful macros */
-#define HAS_DLGFRAME(style,exStyle) \
-    (((exStyle) & WS_EX_DLGMODALFRAME) || \
-     (((style) & WS_DLGFRAME) && !((style) & WS_THICKFRAME)))
-
-#define HAS_THICKFRAME(style,exStyle) \
-    (((style) & WS_THICKFRAME) && \
-     !((exStyle) & WS_EX_DLGMODALFRAME))
-
-#define HAS_THINFRAME(style) \
-    (((style) & WS_BORDER) || !((style) & (WS_CHILD | WS_POPUP)))
-
-#define HAS_BIGFRAME(style,exStyle) \
-    (((style) & (WS_THICKFRAME | WS_DLGFRAME)) || \
-     ((exStyle) & WS_EX_DLGMODALFRAME))
-
-#define HAS_ANYFRAME(style,exStyle) \
-    (((style) & (WS_THICKFRAME | WS_DLGFRAME | WS_BORDER)) || \
-     ((exStyle) & WS_EX_DLGMODALFRAME) || \
-     !((style) & (WS_CHILD | WS_POPUP)))
-
-#define HAS_3DFRAME(exStyle) \
-    ((exStyle & WS_EX_CLIENTEDGE) || (exStyle & WS_EX_STATICEDGE) || (exStyle & WS_EX_WINDOWEDGE))
-
-#define HAS_BORDER(style, exStyle) \
-    ((style & WS_BORDER) || HAS_THICKFRAME(style) || HAS_DLGFRAME(style,exStyle))
-
-#define IS_OVERLAPPED(style) \
-    !(style & (WS_CHILD | WS_POPUP))
-
-#define HAS_MENU()  (!(getStyle() & WS_CHILD) && (GetMenu() != 0))
 
 /*******************************************************************

trunk/src/user32/new/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.29 2000-01-10 23:29:15 sandervl Exp $ */
+/* $Id: window.cpp,v 1.30 2000-01-11 17:34:44 cbratschi Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -5 +5 @@
  * Copyright 1999 Sander van Leeuwen
  * Copyright 1999 Daniela Engert (dani@ngrt.de)
+ * Copyright 2000 Christoph Bratschi (cbratschi@datacomm.ch)
  *
  * Parts based on Wine Windows code (windows\win.c)
@@ -807 +808 @@
         WS_EX_STATICEDGE | WS_EX_TOOLWINDOW);
     if (exStyle & WS_EX_DLGMODALFRAME) style &= ~WS_THICKFRAME;
-#if 0  //CB: todo
-    Win32BaseWindow::NC_AdjustRectOuter( rect, style, menu, exStyle );
-    Win32BaseWindow::NC_AdjustRectInner( rect, style, exStyle );
-#endif
+
+    //Adjust rect outer (Win32BaseWindow::AdjustRectOuter)
+    /* Decide if the window will be managed (see CreateWindowEx) */
+    //if (!WindowNeedsWMBorder()) //CB: check Options.managed
+    {
+      if (HAS_THICKFRAME(style,exStyle))
+        InflateRect( rect, GetSystemMetrics(SM_CXFRAME), GetSystemMetrics(SM_CYFRAME) );
+      else
+        if (HAS_DLGFRAME(style,exStyle))
+          InflateRect(rect, GetSystemMetrics(SM_CXDLGFRAME), GetSystemMetrics(SM_CYDLGFRAME) );
+        else
+          if (HAS_THINFRAME(style))
+            InflateRect( rect, GetSystemMetrics(SM_CXBORDER), GetSystemMetrics(SM_CYBORDER));
+
+      if ((style & WS_CAPTION) == WS_CAPTION)
+      {
+        if (exStyle & WS_EX_TOOLWINDOW)
+          rect->top -= GetSystemMetrics(SM_CYSMCAPTION);
+        else
+          rect->top -= GetSystemMetrics(SM_CYCAPTION);
+      }
+    }
+
+    if (menu)
+      rect->top -= GetSystemMetrics(SM_CYMENU);
+
+    //Adjust rect inner (Win32BaseWindow::AdjustRectInner)
+    if (exStyle & WS_EX_CLIENTEDGE)
+      InflateRect (rect, GetSystemMetrics(SM_CXEDGE), GetSystemMetrics(SM_CYEDGE));
+
+    if (exStyle & WS_EX_STATICEDGE)
+      InflateRect (rect, GetSystemMetrics(SM_CXBORDER), GetSystemMetrics(SM_CYBORDER));
+
+    if (style & WS_VSCROLL) rect->right  += GetSystemMetrics(SM_CXVSCROLL);
+    if (style & WS_HSCROLL) rect->bottom += GetSystemMetrics(SM_CYHSCROLL);
+
     dprintf(("AdjustWindowRectEx returned (%d,%d)(%d,%d)\n", rect->left, rect->top, rect->right, rect->bottom));
     return TRUE;