Changeset 5440 for trunk/src/user32

Timestamp:

Apr 2, 2001, 7:30:58 PM (24 years ago)

Author:

sandervl

Message:

DS_CONTROL fix + workaround for file open dialog in showwindow

Location:

trunk/src/user32

Files:

• win32dlg.cpp (modified) (2 diffs)
• win32wbase.cpp (modified) (4 diffs)

trunk/src/user32/win32dlg.cpp

@@ -1 @@
-/* $Id: win32dlg.cpp,v 1.59 2001-04-01 22:13:27 sandervl Exp $ */
+/* $Id: win32dlg.cpp,v 1.60 2001-04-02 17:30:58 sandervl Exp $ */
 /*
  * Win32 Dialog Code for OS/2
@@ -186 +186 @@
     cs.dwExStyle      = dlgInfo.exStyle;
     if (dlgInfo.style & DS_CONTEXTHELP) cs.dwExStyle |= WS_EX_CONTEXTHELP;
+
+    //Mask away WS_CAPTION style for dialogs with DS_CONTROL style
+    //(necessary for OFN_ENABLETEMPLATE file open dialogs) 
+    //(verified this behaviour in NT4, SP6)
+    if (dlgInfo.style & DS_CONTROL)     cs.style &= ~(WS_CAPTION);
 
     fIsDialog = TRUE;

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.248 2001-04-01 22:13:27 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.249 2001-04-02 17:30:58 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -1425 +1425 @@
         {
             setStyle(getStyle() | WS_VISIBLE);
+            dprintf(("Enable window update for %x", getWindowHandle()));
             OSLibWinEnableWindowUpdate(OS2Hwnd,TRUE);
         }
@@ -1432 +1433 @@
             {
                 setStyle(getStyle() & ~WS_VISIBLE);
+                dprintf(("Disable window update for %x", getWindowHandle()));
                 OSLibWinEnableWindowUpdate(OS2Hwnd,FALSE);
             }
@@ -2294 +2296 @@
         SendInternalMessageA(WM_MOVE,0,MAKELONG(rectClient.left,rectClient.top));
     }
+//testestest
+    //temporary workaround for file dialogs with template dialog child
+    //they don't redraw when switching directories 
+    //For some reason the new child's (syslistview32) update rectangle stays
+    //empty after its parent is made visible with ShowWindow
+    //TODO: find real cause
+    if(!wasVisible) {
+        InvalidateRect(getWindowHandle(), NULL, TRUE);
+    }
+//testestest
 END:
     fMinMaxChange = FALSE;