Changeset 1322

Timestamp:

Oct 16, 1999, 4:51:43 PM (26 years ago)

Author:

sandervl

Message:

isFrameWindow bugfix + MDI creation & WM_NCCALCSIZE bugfix

Location:

trunk/src/user32

Files:

• win32wbase.cpp (modified) (2 diffs)
• win32wbase.h (modified) (2 diffs)
• win32wbasepos.cpp (modified) (3 diffs)
• win32wmdichild.cpp (modified) (7 diffs)
• win32wmdichild.h (modified) (2 diffs)

trunk/src/user32/win32wbase.cpp ¶

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.46 1999-10-16 10:28:31 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.47 1999-10-16 14:51:42 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -1163 +1163 @@
 //******************************************************************************
 //******************************************************************************
+BOOL Win32BaseWindow::isMDIChild()
+{
+    return FALSE;
+}
+//******************************************************************************
+//TODO: Not complete
+//******************************************************************************
 BOOL Win32BaseWindow::isFrameWindow()
 {
-    if((getParent() == NULL || getParent() == windowDesktop) && ((dwStyle & WS_CAPTION) == WS_CAPTION))
+//    if(isMDIChild() || IsDialog() || (getParent() == NULL || getParent() == windowDesktop) && ((dwStyle & WS_CAPTION) == WS_CAPTION))
+    if((dwStyle & WS_CAPTION) == WS_CAPTION || dwStyle & (WS_VSCROLL|WS_HSCROLL))
         return TRUE;
 

trunk/src/user32/win32wbase.h ¶

@@ -1 @@
-/* $Id: win32wbase.h,v 1.24 1999-10-16 10:28:31 sandervl Exp $ */
+/* $Id: win32wbase.h,v 1.25 1999-10-16 14:51:43 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -108 +108 @@
          BOOL   isFrameWindow();
 virtual  BOOL   isMDIClient();
+virtual  BOOL   isMDIChild();
 
 Win32BaseWindow *getParent()                    { return (Win32BaseWindow *)ChildWindow::GetParent(); };

trunk/src/user32/win32wbasepos.cpp ¶

@@ -1 @@
-/* $Id: win32wbasepos.cpp,v 1.1 1999-10-13 14:24:49 sandervl Exp $ */
+/* $Id: win32wbasepos.cpp,v 1.2 1999-10-16 14:51:43 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2 (nonclient/position methods)
@@ -277 +277 @@
         if (getStyle() & CS_HREDRAW) result |= WVR_HREDRAW;
 
-        if(!isFrameWindow())  return result;
-
 //TODO: Wine calculates new size of client area even when window is iconic (client edges)
         if(!(getStyle() & (WS_MINIMIZE | WS_ICONIC)))
@@ -295 +293 @@
         }
 #if 0
-//TODO: Docs say app should return 0 when fCalcValidRects == 0, Wine doesn't do this
+//TODO: Docs say app should return 0 when fCalcValidRects == 0; Wine doesn't do this
         if(wParam == 0) //fCalcValidRects
             return 0;

trunk/src/user32/win32wmdichild.cpp ¶

@@ -1 @@
-/* $Id: win32wmdichild.cpp,v 1.4 1999-10-12 14:47:24 sandervl Exp $ */
+/* $Id: win32wmdichild.cpp,v 1.5 1999-10-16 14:51:43 sandervl Exp $ */
 /*
  * Win32 MDI Child Window Class for OS/2
@@ -45 +45 @@
 //******************************************************************************
 Win32MDIChildWindow::Win32MDIChildWindow(CREATESTRUCTA *lpCreateStructA, ATOM classAtom, BOOL isUnicode)
-                : Win32BaseWindow(lpCreateStructA, classAtom, isUnicode)
+                    : Win32BaseWindow(lpCreateStructA, classAtom, isUnicode)
 {
 }
@@ -80 +80 @@
     }
     else return 1;
+}
+//******************************************************************************
+//******************************************************************************
+BOOL Win32MDIChildWindow::isMDIChild()
+{
+    return TRUE;
 }
 //******************************************************************************
@@ -277 +283 @@
 HWND Win32MDIChildWindow::createChild(Win32MDIClientWindow *client, LPMDICREATESTRUCTA cs )
 {
-    POINT        pos[2];
-    DWORD        style = cs->style | (WS_CHILD | WS_CLIPSIBLINGS);
-    HWND         hwnd;
-    WORD         wIDmenu = client->getFirstChildId() + client->getNrOfChildren();
-    char         lpstrDef[]="junk!";
-    Win32MDIChildWindow *maximizedChild, *newchild;
+  POINT        pos[2];
+  DWORD        style = cs->style | (WS_CHILD | WS_CLIPSIBLINGS);
+  WORD         wIDmenu = client->getFirstChildId() + client->getNrOfChildren();
+  char         lpstrDef[]="junk!";
+  Win32MDIChildWindow *maximizedChild, *newchild;
+  CREATESTRUCTA createstruct;
+  ATOM         classAtom;
+  char         tmpClassA[20] = "";
+  WCHAR        tmpClassW[20];
+  LPSTR        className;
 
     dprintf(("Win32MDIChildWindow::createChild %i,%i - dim %i,%i, style %08x\n",
@@ -326 +336 @@
     }
 
-    if(!client->IsUnicode())
-        hwnd = ::CreateWindowA(cs->szClass, cs->szTitle, style,
-                               cs->x, cs->y, cs->cx, cs->cy, client->getWindowHandle(),
-                               (HMENU)wIDmenu, cs->hOwner, cs );
-    else
-        hwnd = ::CreateWindowW((LPWSTR)cs->szClass, (LPWSTR)cs->szTitle, style,
-                               cs->x, cs->y, cs->cx, cs->cy, client->getWindowHandle(),
-                               (HMENU)wIDmenu, cs->hOwner, cs );
-
-    /* MDI windows are WS_CHILD so they won't be activated by CreateWindow */
-    newchild = (Win32MDIChildWindow *)GetWindowFromHandle(hwnd);
-    if (hwnd && newchild)
+    createstruct.lpszName  = cs->szTitle;
+    createstruct.style     = style;
+    createstruct.dwExStyle = 0;
+    createstruct.x         = cs->x;
+    createstruct.y         = cs->y;
+    createstruct.cx        = cs->cx;
+    createstruct.cy        = cs->cy;
+    createstruct.hInstance = cs->hOwner;
+    createstruct.hMenu     = wIDmenu;
+    createstruct.hwndParent= client->getWindowHandle();
+    createstruct.lpCreateParams = (LPVOID)cs;
+
+    className = (LPSTR)cs->szClass;
+    /* Find the class atom */
+    if (!(classAtom = (client->IsUnicode() ? GlobalFindAtomW((LPWSTR)cs->szClass) :
+                                             GlobalFindAtomA(cs->szClass))))
+    {
+        if (!HIWORD(cs->szClass))
+        {
+            if(!client->IsUnicode())
+            {
+                sprintf(tmpClassA,"#%d", (int) className);
+                classAtom = GlobalFindAtomA(tmpClassA);
+                className = tmpClassA;
+            }
+            else
+            {
+              sprintf(tmpClassA,"#%d", (int) className);
+              AsciiToUnicode(tmpClassA, tmpClassW);
+              classAtom = GlobalFindAtomW(tmpClassW);
+              className = (LPSTR)tmpClassW;
+            }
+        }
+        if (!classAtom)
+        {
+          if (!HIWORD(cs->szClass)) {
+                  dprintf(("createChild: bad class name %04x\n", LOWORD(className)));
+          }
+          else    dprintf(("createChild: bad class name '%s'\n", tmpClassA ));
+
+          SetLastError(ERROR_INVALID_PARAMETER);
+          return 0;
+        }
+    }
+    createstruct.lpszClass = className;
+
+    newchild = new Win32MDIChildWindow(&createstruct, classAtom, client->IsUnicode());
+
+    if(newchild && GetLastError() == 0)
     {
         newchild->menuModifyItem();
@@ -368 +415 @@
                     client->setMaximizedChild(newchild);
 #if 0
-                    MDI_AugmentFrameMenu( ci, w->parent, hwnd );
+                    MDI_AugmentFrameMenu( ci, w->parent, newchild->getWindowHandle() );
 #endif
                     client->updateFrameText(MDI_REPAINTFRAME, NULL );
@@ -387 +434 @@
         if( maximizedChild && maximizedChild->IsWindow() )
             maximizedChild->ShowWindow(SW_SHOWMAXIMIZED);
-    }
-    return hwnd;
+
+        dprintf(("MDI child creation failed!!"));
+        return 0;
+    }
+    return newchild->getWindowHandle();
 }
 /**********************************************************************

trunk/src/user32/win32wmdichild.h ¶

@@ -1 @@
-/* $Id: win32wmdichild.h,v 1.2 1999-09-29 09:16:32 sandervl Exp $ */
+/* $Id: win32wmdichild.h,v 1.3 1999-10-16 14:51:43 sandervl Exp $ */
 /*
  * Win32 MDI Client Window Class for OS/2
@@ -32 +32 @@
            BOOL menuDeleteItem();
 
+virtual  BOOL   isMDIChild();
+
         LRESULT DefMDIChildProcA(UINT Msg, WPARAM wParam, LPARAM lParam);
         LRESULT DefMDIChildProcW(UINT Msg, WPARAM wParam, LPARAM lParam);