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

Timestamp:

Feb 8, 2001, 7:17:16 PM (25 years ago)

Author:

sandervl

Message:

dialog control creation fix

File:

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

trunk/src/user32/win32dlg.cpp

@@ -1 @@
-/* $Id: win32dlg.cpp,v 1.55 2001-02-02 19:04:02 sandervl Exp $ */
+/* $Id: win32dlg.cpp,v 1.56 2001-02-08 18:17:16 sandervl Exp $ */
 /*
  * Win32 Dialog Code for OS/2
@@ -659 +659 @@
         dprintf(("Create CONTROL %d", info.id));
 
-        hwndCtrl = ::CreateWindowExW( info.exStyle | WS_EX_NOPARENTNOTIFY,
-                                      (LPCWSTR)info.className,
-                                      (LPCWSTR)info.windowName,
+        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,
                                       info.style | WS_CHILD,
                                       MulDiv(info.x, xUnit, 4),
@@ -669 +682 @@
                                       getWindowHandle(), (HMENU)info.id,
                                       hInst, info.data );
+        if(HIWORD(classNameA)) {
+            FreeAsciiString(classNameA);
+        }
+        if(HIWORD(windowNameA)) {
+            FreeAsciiString(windowNameA);
+        }
 
         if (!hwndCtrl) return FALSE;