Changeset 1572 for trunk/src

Timestamp:

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

Author:

cbratschi

Message:

modal dialog fixes

Location:

trunk/src/user32

Files:

• pmframe.cpp (modified) (5 diffs)
• win32dlg.cpp (modified) (3 diffs)
• win32wbase.cpp (modified) (5 diffs)
• win32wbase.h (modified) (6 diffs)

trunk/src/user32/pmframe.cpp

@@ -1 @@
-/* $Id: pmframe.cpp,v 1.17 1999-11-02 17:07:25 cbratschi Exp $ */
+/* $Id: pmframe.cpp,v 1.18 1999-11-03 18:00:25 cbratschi Exp $ */
 /*
  * Win32 Frame Managment Code for OS/2
@@ -241 +241 @@
         dprintf(("PMFRAME: WM_ADJUSTWINDOWPOS %x %x %x (%d,%d) (%d,%d)", win32wnd->getWindowHandle(), pswp->hwnd, pswp->fl, pswp->x, pswp->y, pswp->cx, pswp->cy));
 
+        //CB: show dialog in front of owner
+        if (win32wnd->IsModalDialogOwner())
+        {
+          pswp->fl |= SWP_ZORDER;
+          pswp->hwndInsertBehind = win32wnd->getOS2HwndModalDialog();
+          if (pswp->fl & SWP_ACTIVATE)
+          {
+            pswp->fl &= ~SWP_ACTIVATE;
+            WinSetWindowPos(win32wnd->getOS2HwndModalDialog(),0,0,0,0,0,SWP_ACTIVATE);
+          }
+        }
+
         if ((pswp->fl & (SWP_SIZE | SWP_MOVE | SWP_ZORDER)) == 0)
             goto RunDefFrameProc;
@@ -394 +406 @@
         return rc;
     }
+
     case WM_ACTIVATE:
     {
@@ -406 +419 @@
         WinSetWindowUShort(hwnd,QWS_FLAGS,mp1 ? (flags | FF_ACTIVE):(flags & ~FF_ACTIVE));
 
+        //CB: show owner behind the dialog
+        if (win32wnd->IsModalDialog())
+        {
+          Win32BaseWindow *topOwner = win32wnd->getOwner()->getTopParent();
+
+          if (topOwner) WinSetWindowPos(topOwner->getOS2FrameWindowHandle(),hwnd,0,0,0,0,SWP_ZORDER);
+        }
 
         RestoreOS2TIB();
@@ -433 +453 @@
        dprintf(("PMFRAME: WM_BUTTON1DOWN"));
       #endif
+
       if (InSizeBox(win32wnd,(POINTS*)&mp1))
       {

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;

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.72 1999-11-02 17:07:25 cbratschi Exp $ */
+/* $Id: win32wbase.cpp,v 1.73 1999-11-03 18:00:27 cbratschi Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -135 +135 @@
   fFirstShow       = TRUE;
   fIsDialog        = FALSE;
+  fIsModalDialogOwner = FALSE;
+  OS2HwndModalDialog  = 0;
   fInternalMsg     = FALSE;
   fNoSizeMsg       = FALSE;
@@ -213 +215 @@
         }
     }
-    else 
+    else
     if(fDestroyAll) {
-        dprintf(("Destroying window %x %s", getWindowHandle(), windowNameA));
+        dprintf(("Destroying window %x %s", getWindowHandle(), windowNameA));
         setParent(NULL);  //or else we'll crash in the dtor of the ChildWindow class
     }
@@ -433 +435 @@
   if(WIDGETS_IsControl(this, BUTTON_CONTROL) && ((dwStyle & 0x0f) == BS_GROUPBOX))
   {
-        hwndLinkAfter = HWND_BOTTOM;
-        dwStyle |= WS_CLIPSIBLINGS;
-  }
-  else 
+        hwndLinkAfter = HWND_BOTTOM;
+        dwStyle |= WS_CLIPSIBLINGS;
+  }
+  else
   if(WIDGETS_IsControl(this, STATIC_CONTROL) && !(dwStyle & WS_GROUP)) {
-        dwStyle |= WS_CLIPSIBLINGS;
+        dwStyle |= WS_CLIPSIBLINGS;
   }
 
@@ -1992 +1994 @@
     /* We can't activate a child window (WINE) */
     if(getStyle() & WS_CHILD)
-        showstate &= ~SWPOS_ACTIVATE;
+        showstate &= ~SWPOS_ACTIVATE;
 
     if(showstate & SWPOS_SHOW) {

trunk/src/user32/win32wbase.h

@@ -1 @@
-/* $Id: win32wbase.h,v 1.38 1999-11-01 19:11:45 sandervl Exp $ */
+/* $Id: win32wbase.h,v 1.39 1999-11-03 18:00:29 cbratschi Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -148 +148 @@
          BOOL   ShowWindow(ULONG nCmdShow);
          BOOL   SetWindowPos(HWND hwndInsertAfter, int x, int y, int cx, int cy, UINT fuFlags);
-         BOOL   SetWindowPlacement(WINDOWPLACEMENT *winpos);
+         BOOL   SetWindowPlacement(WINDOWPLACEMENT *winpos);
          BOOL   DestroyWindow();
          HWND   SetActiveWindow();
@@ -165 +165 @@
          BOOL   IsWindow()                    { return TRUE; };
          BOOL   IsDialog()                    { return fIsDialog; };
+         BOOL   IsModalDialog()               { return fIsModalDialog; };
+         BOOL   IsModalDialogOwner()          { return fIsModalDialogOwner; };
+         VOID   setModalDialogOwner(BOOL fMDO)    { fIsModalDialogOwner = fMDO; };
+         VOID   setOS2HwndModalDialog(HWND aHwnd) { OS2HwndModalDialog = aHwnd; };
+         HWND   getOS2HwndModalDialog()       { return OS2HwndModalDialog; };
          BOOL   CanReceiveSizeMsgs()          { return !fNoSizeMsg; };
          BOOL   IsWindowDestroyed()           { return fIsDestroyed; };
@@ -223 +228 @@
        ULONG getBorderHeight() { return borderHeight; };
 
-static  void  NC_AdjustRectInner(LPRECT rect, DWORD style, DWORD exStyle);
-static  void  NC_AdjustRectOuter(LPRECT rect, DWORD style, BOOL menu, DWORD exStyle);
-static  BOOL  WindowNeedsWMBorder( DWORD style, DWORD exStyle );
+static  void  NC_AdjustRectInner(LPRECT rect, DWORD style, DWORD exStyle);
+static  void  NC_AdjustRectOuter(LPRECT rect, DWORD style, BOOL menu, DWORD exStyle);
+static  BOOL  WindowNeedsWMBorder( DWORD style, DWORD exStyle );
 
        PVOID getOldWndProc() { return pOldWndProc; }
@@ -265 +270 @@
         BOOL    fFirstShow;
         BOOL    fIsDialog;
+        BOOL    fIsModalDialog;
+        BOOL    fIsModalDialogOwner;
+        HWND    OS2HwndModalDialog;
         BOOL    fInternalMsg;           //Used to distinguish between messages
                                         //sent by PM and those sent by apps
@@ -308 +316 @@
 #ifndef OS2_INCLUDED
         void  GetMinMaxInfo(POINT *maxSize, POINT *maxPos, POINT *minTrack, POINT *maxTrack );
-        LONG  HandleWindowPosChanging(WINDOWPOS *winpos);
+        LONG  HandleWindowPosChanging(WINDOWPOS *winpos);
         LONG  HandleSysCommand(WPARAM wParam, POINT *pt32);