Changeset 1596 for trunk/src

Timestamp:

Nov 4, 1999, 7:52:44 PM (26 years ago)

Author:

sandervl

Message:

Put back Dani's WS_CLIPSIBLINGS fix

File:

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

trunk/src/user32/win32dlg.cpp

@@ -1 @@
-/* $Id: win32dlg.cpp,v 1.29 1999-11-03 19:51:43 sandervl Exp $ */
+/* $Id: win32dlg.cpp,v 1.30 1999-11-04 18:52:44 sandervl Exp $ */
 /*
  * Win32 Dialog Code for OS/2
@@ -628 +628 @@
 
         dprintf(("Create CONTROL %d", info.id));
-#if 0
-        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 {
-#endif
-            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);
-            }
-//        }
+        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,
+//SvL: Temporary workaround for painting problems in dialogs (WS_CLIPSIBLINGS)
+                                      info.style | WS_CHILD | WS_CLIPSIBLINGS,
+                                      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;