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

Timestamp:

Oct 17, 1999, 5:46:10 PM (26 years ago)

Author:

sandervl

Message:

Dialog fixes + ported Wine apis

File:

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

trunk/src/user32/win32dlg.cpp

@@ -1 @@
-/* $Id: win32dlg.cpp,v 1.16 1999-10-17 12:17:44 cbratschi Exp $ */
+/* $Id: win32dlg.cpp,v 1.17 1999-10-17 15:46:09 sandervl Exp $ */
 /*
  * Win32 Dialog Code for OS/2
@@ -605 +605 @@
 
         dprintf(("Create CONTROL %d", info.id));
-        hwndCtrl = CreateWindowExW( info.exStyle | WS_EX_NOPARENTNOTIFY,
-                                    (LPCWSTR)info.className,
-                                    (LPCWSTR)info.windowName,
-                                    info.style | WS_CHILD,
-                                    info.x * xUnit / 4,
-                                    info.y * yUnit / 8,
-                                    info.cx * xUnit / 4,
-                                    info.cy * yUnit / 8,
-                                    getWindowHandle(), (HMENU)info.id,
-                                    hInst, info.data );
+        if(isUnicode) {
+            hwndCtrl = ::CreateWindowExW( info.exStyle | WS_EX_NOPARENTNOTIFY,
+                                        (LPCWSTR)info.className,
+                                        (LPCWSTR)info.windowName,
+                                        info.style | WS_CHILD,
+                                        info.x * xUnit / 4,
+                                        info.y * yUnit / 8,
+                                        info.cx * xUnit / 4,
+                                        info.cy * yUnit / 8,
+                                        getWindowHandle(), (HMENU)info.id,
+                                        hInst, info.data );
+        }
+        else {
+            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);
+            }
+            hwndCtrl = ::CreateWindowExA( info.exStyle | WS_EX_NOPARENTNOTIFY,
+                                        classNameA,
+                                        windowNameA,
+                                        info.style | WS_CHILD,
+                                        info.x * xUnit / 4,
+                                        info.y * yUnit / 8,
+                                        info.cx * xUnit / 4,
+                                        info.cy * yUnit / 8,
+                                        getWindowHandle(), (HMENU)info.id,
+                                        hInst, info.data );
+            if(HIWORD(classNameA)) {
+                FreeAsciiString(classNameA);
+            }
+            if(windowNameA) {
+                FreeAsciiString(windowNameA);
+            }
+        }
 
         if (!hwndCtrl) return FALSE;