Changeset 2076 for trunk/src/user32/win32wmdichild.cpp

Timestamp:

Dec 14, 1999, 8:13:20 PM (26 years ago)

Author:

sandervl

Message:

MDI changes + WM_INITMENU support added + disabled experimental support for CS_PARENTDC style

File:

• trunk/src/user32/win32wmdichild.cpp (modified) (3 diffs)

trunk/src/user32/win32wmdichild.cpp

@@ -1 @@
-/* $Id: win32wmdichild.cpp,v 1.10 1999-12-09 00:53:38 sandervl Exp $ */
+/* $Id: win32wmdichild.cpp,v 1.11 1999-12-14 19:13:20 sandervl Exp $ */
 /*
  * Win32 MDI Child Window Class for OS/2
@@ -347 +347 @@
     className = (LPSTR)cs->szClass;
     /* Find the class atom */
-    if (!(classAtom = (client->IsUnicode() ? GlobalFindAtomW((LPWSTR)cs->szClass) :
-                                             GlobalFindAtomA(cs->szClass))))
-
+    classAtom = GlobalFindAtomA(cs->szClass);
+    if(classAtom == 0)
     {
         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;
-            }
+            sprintf(tmpClassA,"#%d", (int) className);
+            classAtom = GlobalFindAtomA(tmpClassA);
+            className = tmpClassA;
         }
         if (!classAtom)
@@ -380 +369 @@
     createstruct.lpszClass = className;
 
-    newchild = new Win32MDIChildWindow(&createstruct, classAtom, client->IsUnicode());
+    newchild = new Win32MDIChildWindow(&createstruct, classAtom, FALSE);
 
     if(newchild && GetLastError() == 0)