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

Timestamp:

Nov 3, 1999, 7:00:29 PM (26 years ago)

Author:

cbratschi

Message:

modal dialog fixes

File:

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

trunk/src/user32/win32dlg.cpp

@@ -1 @@
-/* $Id: win32dlg.cpp,v 1.27 1999-11-02 17:07:25 cbratschi Exp $ */
+/* $Id: win32dlg.cpp,v 1.28 1999-11-03 18:00:26 cbratschi Exp $ */
 /*
  * Win32 Dialog Code for OS/2
@@ -270 +270 @@
     if (!dialogFlags & DF_END) /* was EndDialog called in WM_INITDIALOG ? */
     {
-        topOwner->EnableWindow( FALSE );
-        //CB: todo: make modal, implement modeless, remove FCF_TASKLIST
-        //    emulate WinProcessDlg
-        ShowWindow( SW_SHOW );
+        HWND hwndOldDialog;
+        BOOL bOldOwner;
+
+        fIsModalDialog = TRUE;
+        topOwner->EnableWindow(FALSE);
+
+        bOldOwner = topOwner->IsModalDialogOwner();
+        topOwner->setModalDialogOwner(TRUE);
+        hwndOldDialog = topOwner->getOS2HwndModalDialog();
+        topOwner->setOS2HwndModalDialog(OS2HwndFrame);
+        ShowWindow(SW_SHOW);
 
         //CB: 100% CPU usage, need a better solution with OSLibWinGetMsg
@@ -327 +334 @@
         }
 #endif
-        topOwner->EnableWindow( TRUE );
+        topOwner->setModalDialogOwner(bOldOwner);
+        topOwner->setOS2HwndModalDialog(hwndOldDialog);
+        if (!bOldOwner) topOwner->EnableWindow(TRUE);
     }
     retval = idResult;