Changeset 760 for trunk/src/user32/new/window.cpp

Timestamp:

Aug 31, 1999, 7:14:52 PM (26 years ago)

Author:

sandervl

Message:

MDI + menu changes

File:

• trunk/src/user32/new/window.cpp (modified) (6 diffs)

trunk/src/user32/new/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.20 1999-08-31 10:36:24 sandervl Exp $ */
+/* $Id: window.cpp,v 1.21 1999-08-31 17:14:52 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -19 +19 @@
 #include <misc.h>
 #include <win32wbase.h>
+#include <win32wmdiclient.h>
 #include <oslibwin.h>
 #include <oslibgdi.h>
@@ -40 +41 @@
         return CreateMDIWindowA(className, windowName, style, x, y, width, height, parent, instance, (LPARAM)data);
 
+    //TODO: According to the docs className can be a 16 bits atom
+    //      Wine seems to assume it's a string though...
     /* Find the class atom */
     if (!(classAtom = GlobalFindAtomA(className)))
@@ -66 +69 @@
     cs.dwExStyle      = exStyle;
     dprintf(("CreateWindowExA: (%d,%d) (%d,%d), %x %x", x, y, width, height, style, exStyle));
-    window = new Win32BaseWindow( &cs, classAtom, FALSE );
+
+    //TODO: According to the docs className can be a 16 bits atom
+    //      Wine seems to assume it's a string though...
+    if(!stricmp(className, MDICLIENTCLASSNAMEA)) {
+        window = (Win32BaseWindow *) new Win32MDIClientWindow(&cs, classAtom, FALSE);
+    }
+    else {
+        window = new Win32BaseWindow( &cs, classAtom, FALSE );
+    }
     if(window == NULL)
     {
@@ -95 +106 @@
         return CreateMDIWindowW(className, windowName, style, x, y, width, height, parent, instance, (LPARAM)data);
 
+    //TODO: According to the docs className can be a 16 bits atom
+    //      Wine seems to assume it's a string though...
     /* Find the class atom */
     if (!(classAtom = GlobalFindAtomW(className)))
@@ -120 +133 @@
     cs.lpszClass      = (LPSTR)className;
     cs.dwExStyle      = exStyle;
-    window = new Win32BaseWindow( &cs, classAtom, TRUE );
+
+    //TODO: According to the docs className can be a 16 bits atom
+    //      Wine seems to assume it's a string though...
+    if(!lstrcmpW(className, (LPWSTR)MDICLIENTCLASSNAMEW)) {
+        window = (Win32BaseWindow *) new Win32MDIClientWindow(&cs, classAtom, TRUE);
+    }
+    else {
+        window = new Win32BaseWindow( &cs, classAtom, TRUE );
+    }
     if(window == NULL)
     {