Changeset 492 for trunk/Sibyl/SPCC/FORMS.PAS

Timestamp:

Dec 28, 2023, 3:58:08 AM (20 months ago)

Author:

ataylor

Message:

Add system modal handling logic to TForm class and update NewView.

File:

• trunk/Sibyl/SPCC/FORMS.PAS (modified) (11 diffs)

trunk/Sibyl/SPCC/FORMS.PAS

@@ -7 +7 @@
  º                                                                          º
  ÈÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍŒ}
-                             
+
 Unit Forms;
 
@@ -2057 +2057 @@
          FOnCreate:TNotifyEvent;
          FOnDestroy:TNotifyEvent;
+         FSysModalWin:HWnd;      // [ALT 2023-12-27]
          Procedure CMRelease(Var Msg:TMessage); Message CM_RELEASE;
          Procedure CMEndModalState(Var Msg:TMessage); Message CM_ENDMODALSTATE;
@@ -2464 +2465 @@
 // This is not functionally needed but prevents unnecessary GpiDeleteSetId calls
 // which fail and therefore make it more difficult to test for real problems.
-// Probably not safe to leave in due to incompatibility between components 
+// Probably not safe to leave in due to incompatibility between components
 // and IDE  - AaronL
 //         FFontSet:boolean;
@@ -5416 +5417 @@
           Begin
                FFont.Destroy;
-               FFont := nil; // AaronL - need to set ffont to nil 
+               FFont := nil; // AaronL - need to set ffont to nil
           End;
      End;
@@ -6213 +6214 @@
    CurrentModalFrame:HWND=0;
    DesktopHWND:HWND=0;
-   ModalList:TList=NIL;   
+   ModalList:TList=NIL;
 
 {$HINTS OFF}
@@ -6274 +6275 @@
 Begin
      MyPID := GetCurrentProcessID;
-     
+
      // Get the count of switch list items
      SwitchListCount := WinQuerySwitchList( AppHandle, nil, 0 );
@@ -6281 +6282 @@
      // Allocate buffer
      GetMem( pSwitchListInfo, BufferSize );
-     
+
      // Call WinQuerySwitchList again to get the switch list items
      WinQuerySwitchList( AppHandle, pSwitchListInfo^, BufferSize );
-     
+
      for i := 0 to SwitchListCount - 1 do
      begin
@@ -6293 +6294 @@
                     // This switch entry is for this application
                     if swctl.hwnd = Exclude.FFrame.Handle then
-                         continue;                    
+                         continue;
                     // so show/hide it
                     if Show then
@@ -6301 +6302 @@
                     WinChangeSwitchEntry( hswitch,
                                           swctl );
-                                         
+
                end;
           end;
@@ -7965 +7966 @@
           If OnDismissDlg <> Nil Then OnDismissDlg(Self);
           If FModalResult <> cmNull Then EndModalState;
+
+          // [20231227 ALT] Restore any previous system-modal window
+          if FSysModalWin <> NULLHANDLE then
+              WinSetSysModalWindow( HWND_DESKTOP, FSysModalWin );
      End;
 End;
@@ -8508 +8513 @@
      Show;
      BringToFront;
+
+     // [ALT 20231227]
+     FSysModalWin := WinQuerySysModalWindow( HWND_DESKTOP );
+     if FSysModalWin <> NULLHANDLE then
+          WinSetSysModalWindow( HWND_DESKTOP, Frame.Handle );
 
 again: