Changeset 5429 for trunk/src/user32/win32dlg.cpp

Timestamp:

Apr 2, 2001, 12:13:28 AM (24 years ago)

Author:

sandervl

Message:

create dialog controls with CreateWindowExW; use correct SendMessage during CreateWindow

File:

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

trunk/src/user32/win32dlg.cpp

@@ -1 @@
-/* $Id: win32dlg.cpp,v 1.58 2001-03-25 08:50:42 sandervl Exp $ */
+/* $Id: win32dlg.cpp,v 1.59 2001-04-01 22:13:27 sandervl Exp $ */
 /*
  * Win32 Dialog Code for OS/2
@@ -663 +663 @@
         dprintf(("Create CONTROL %d", info.id));
 
-        char *classNameA = NULL;
-        char *windowNameA = NULL;
-
-        if(HIWORD(info.className)) {
-             classNameA = UnicodeToAsciiString((LPWSTR)info.className);
-        }
-        else classNameA = (char *)info.className;
-
-        if(HIWORD(info.windowName)) {
-             windowNameA = UnicodeToAsciiString((LPWSTR)info.windowName);
-        }
-        else windowNameA = (char *)info.windowName;
-
-        hwndCtrl = ::CreateWindowExA( info.exStyle | WS_EX_NOPARENTNOTIFY,
-                                      classNameA,
-                                      windowNameA,
+        hwndCtrl = ::CreateWindowExW( info.exStyle | WS_EX_NOPARENTNOTIFY,
+                                      (LPWSTR)info.className,
+                                      (LPWSTR)info.windowName,
                                       info.style | WS_CHILD,
                                       MulDiv(info.x, xUnit, 4),
@@ -686 +673 @@
                                       getWindowHandle(), (HMENU)info.id,
                                       hInst, info.data );
-        if(HIWORD(classNameA)) {
-            FreeAsciiString(classNameA);
-        }
-        if(HIWORD(windowNameA)) {
-            FreeAsciiString(windowNameA);
-        }
 
         if (!hwndCtrl) return FALSE;