Changeset 493 for trunk

Timestamp:

Dec 29, 2023, 2:09:06 AM (20 months ago)

Author:

ataylor

Message:

Undo TForm changes (rollback r492). Opening when window is system-modal now
simply clears system-modality for the lifetime of the NewView application, and
restores it on exit.

Location:

trunk

Files:

• NewView/MainForm.pas (modified) (6 diffs)
• NewView/VersionUnit.pas (modified) (1 diff)
• Sibyl/SPCC/FORMS.PAS (modified) (11 diffs)

trunk/NewView/MainForm.pas

@@ -521 +521 @@
 
     // ALT 2023-12-24
-    Procedure CheckSetSysModal(FormWindow: TForm);
-    Procedure CheckUnsetSysModal;
+    Procedure CheckSaveSysModal(FormWindow: TForm);
+    Procedure CheckReturnSysModal;
 
     // Bookmarks ------------------------------------------
@@ -3746 +3746 @@
   end;
   }
-  CheckUnsetSysModal;
+  CheckReturnSysModal;
 
   // TODO rbri maybe we have to do this
@@ -4379 +4379 @@
   }
   // [ALT 2023-12-26] move above to procedure
-  CheckSetSysModal(Self);
+  CheckSaveSysModal(Self);
 
   LogEvent(LogStartup, 'RUN PROGRAM');
@@ -4701 +4701 @@
     EndUpdate;
   end;
-//  CheckSetSysModal(InformationForm);
+//  CheckSaveSysModal(InformationForm);
   InformationForm.ShowModal;
-//  CheckSetSysModal(Self);
+//  CheckSaveSysModal(Self);
 End;
 
@@ -7217 +7217 @@
 end;
 
-
-Procedure TMainForm.CheckSetSysModal(FormWindow: TForm);
+Procedure TMainForm.CheckSaveSysModal(FormWindow: TForm);
 begin
   // Override any existing system-modal state
   if g_LastSysModalWindow <> NULLHANDLE then
   begin
-    WinSetSysModalWindow( HWND_DESKTOP, FormWindow.Frame.Handle );
-  end;
-end;
-
-
-Procedure TMainForm.CheckUnsetSysModal;
+    //WinSetSysModalWindow( HWND_DESKTOP, FormWindow.Frame.Handle );
+    WinSetSysModalWindow( HWND_DESKTOP, NULLHANDLE );
+    WinSetActiveWindow( HWND_DESKTOP, FormWindow.Frame.Handle );
+  end;
+end;
+
+Procedure TMainForm.CheckReturnSysModal;
 begin
   // Restore any previous system-modal window state
@@ -7234 +7234 @@
   begin
     WinSetSysModalWindow( HWND_DESKTOP, g_LastSysModalWindow );
+    WinSetActiveWindow( HWND_DESKTOP, g_LastSysModalWindow );
   end;
 end;

trunk/NewView/VersionUnit.pas

@@ -17 +17 @@
 
 const
-  Version =        'V2.19.8d';  // $SS_REQUIRE_NEW_VERSION$
-  BldLevelVersion = '2.19.8d';  // Embedded for IBM BLDLEVEL tool
+  Version =        'V2.19.8e';  // $SS_REQUIRE_NEW_VERSION$
+  BldLevelVersion = '2.19.8e';  // Embedded for IBM BLDLEVEL tool
   CopyrightMsg = 'Copyright 2005 Aaron Lawrence; 2006-2019 Ronald Brill';
   LicenseMsg   = 'Licensed under the GNU Public License';

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;
@@ -2465 +2464 @@
 // 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;
@@ -5417 +5416 @@
           Begin
                FFont.Destroy;
-               FFont := nil; // AaronL - need to set ffont to nil
+               FFont := nil; // AaronL - need to set ffont to nil 
           End;
      End;
@@ -6214 +6213 @@
    CurrentModalFrame:HWND=0;
    DesktopHWND:HWND=0;
-   ModalList:TList=NIL;
+   ModalList:TList=NIL;   
 
 {$HINTS OFF}
@@ -6275 +6274 @@
 Begin
      MyPID := GetCurrentProcessID;
-
+     
      // Get the count of switch list items
      SwitchListCount := WinQuerySwitchList( AppHandle, nil, 0 );
@@ -6282 +6281 @@
      // 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
@@ -6294 +6293 @@
                     // This switch entry is for this application
                     if swctl.hwnd = Exclude.FFrame.Handle then
-                         continue;
+                         continue;                    
                     // so show/hide it
                     if Show then
@@ -6302 +6301 @@
                     WinChangeSwitchEntry( hswitch,
                                           swctl );
-
+                                         
                end;
           end;
@@ -7966 +7965 @@
           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;
@@ -8513 +8508 @@
      Show;
      BringToFront;
-
-     // [ALT 20231227]
-     FSysModalWin := WinQuerySysModalWindow( HWND_DESKTOP );
-     if FSysModalWin <> NULLHANDLE then
-          WinSetSysModalWindow( HWND_DESKTOP, Frame.Handle );
 
 again: