Changeset 431 for trunk

Timestamp:

Apr 28, 2022, 10:40:37 PM (3 years ago)

Author:

chronos

Message:

• Modified: Changed WindowMode numerical constants to enumeration.

Location:

trunk

Files:

• LocalPlayer/CityScreen.pas (modified) (4 diffs)
• LocalPlayer/CityType.pas (modified) (4 diffs)
• LocalPlayer/Diagram.pas (modified) (3 diffs)
• LocalPlayer/Draft.pas (modified) (3 diffs)
• LocalPlayer/Enhance.pas (modified) (3 diffs)
• LocalPlayer/Help.pas (modified) (4 diffs)
• LocalPlayer/NatStat.pas (modified) (2 diffs)
• LocalPlayer/Nego.pas (modified) (3 diffs)
• LocalPlayer/Rates.pas (modified) (2 diffs)
• LocalPlayer/Select.pas (modified) (5 diffs)
• LocalPlayer/Term.pas (modified) (2 diffs)
• LocalPlayer/UnitStat.pas (modified) (7 diffs)
• LocalPlayer/Wonders.pas (modified) (3 diffs)
• Packages/CevoComponents/BaseWin.pas (modified) (8 diffs)
• Packages/CevoComponents/ButtonA.pas (modified) (1 diff)
• Packages/CevoComponents/ButtonBase.pas (modified) (3 diffs)
• Packages/CevoComponents/ButtonC.pas (modified) (1 diff)

trunk/LocalPlayer/CityScreen.pas

@@ -96 +96 @@
     CloseAction: TCityCloseAction;
     procedure OffscreenPaint; override;
-    procedure ShowNewContent(NewMode, Loc: integer; ShowEvent: cardinal);
+    procedure ShowNewContent(NewMode: TWindowMode; Loc: integer; ShowEvent: cardinal);
     procedure Reset;
     procedure CheckAge;
@@ -1109 +1109 @@
 end;
 
-procedure TCityDlg.ShowNewContent(NewMode, Loc: integer; ShowEvent: cardinal);
+procedure TCityDlg.ShowNewContent(NewMode: TWindowMode; Loc: integer; ShowEvent: cardinal);
 begin
   if MyMap[Loc] and fOwned <> 0 then
@@ -1204 +1204 @@
         if iix >= 0 then
           if ssShift in Shift then
-            HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkImp, iix)
+            HelpDlg.ShowNewContent(WindowModePersistent(FWindowMode), hkImp, iix)
           else if (ClientMode < scContact) then
             with MessgExDlg do
@@ -1335 +1335 @@
           Loc1 := dLoc(cLoc, dx, dy);
           if (Loc1 >= 0) and (Loc1 < G.lx * G.ly) then
-            HelpOnTerrain(Loc1, FWindowMode or wmPersistent)
+            HelpOnTerrain(Loc1, WindowModePersistent(FWindowMode))
         end
         else if (ClientMode < scContact) and (cGov <> gAnarchy) and

trunk/LocalPlayer/CityType.pas

@@ -24 +24 @@
     procedure DeleteBtnClick(Sender: TObject);
   public
-    procedure ShowNewContent(NewMode: integer);
+    procedure ShowNewContent(NewMode: TWindowMode);
   protected
     procedure OffscreenPaint; override;
@@ -226 +226 @@
 end;
 
-procedure TCityTypeDlg.ShowNewContent(NewMode: integer);
+procedure TCityTypeDlg.ShowNewContent(NewMode: TWindowMode);
 begin
   inherited ShowNewContent(NewMode);
@@ -246 +246 @@
   begin
     if ssShift in Shift then
-      HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkImp,
+      HelpDlg.ShowNewContent(WindowModePersistent(FWindowMode), hkImp,
         MyData.ImpOrder[ctype, i])
     else
@@ -263 +263 @@
   begin
     if ssShift in Shift then
-      HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkImp, Pooliix[i])
+      HelpDlg.ShowNewContent(WindowModePersistent(FWindowMode), hkImp, Pooliix[i])
     else
     begin

trunk/LocalPlayer/Diagram.pas

@@ -23 +23 @@
   public
     procedure OffscreenPaint; override;
-    procedure ShowNewContent_Charts(NewMode: integer);
-    procedure ShowNewContent_Ship(NewMode: integer; p: integer = -1);
+    procedure ShowNewContent_Charts(NewMode: TWindowMode);
+    procedure ShowNewContent_Ship(NewMode: TWindowMode; p: integer = -1);
 
   private
@@ -299 +299 @@
 end;
 
-procedure TDiaDlg.ShowNewContent_Charts(NewMode: integer);
+procedure TDiaDlg.ShowNewContent_Charts(NewMode: TWindowMode);
 begin
   Kind := dkChart;
@@ -309 +309 @@
 end;
 
-procedure TDiaDlg.ShowNewContent_Ship(NewMode, p: integer);
+procedure TDiaDlg.ShowNewContent_Ship(NewMode: TWindowMode; p: integer);
 begin
   Kind := dkShip;

trunk/LocalPlayer/Draft.pas

@@ -28 +28 @@
       Shift: TShiftState; x, y: integer);
   public
-    procedure ShowNewContent(NewMode: integer);
+    procedure ShowNewContent(NewMode: TWindowMode);
   protected
     procedure OffscreenPaint; override;
@@ -502 +502 @@
 end;
 
-procedure TDraftDlg.ShowNewContent(NewMode: integer);
+procedure TDraftDlg.ShowNewContent(NewMode: TWindowMode);
 begin
   inherited ShowNewContent(NewMode);
@@ -532 +532 @@
       i := (y - yFeature) div LinePitch;
       if (x >= xFeature - 21) and (x < ClientWidth) and (ssShift in Shift) then
-        HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkFeature, code[i])
+        HelpDlg.ShowNewContent(WindowModePersistent(FWindowMode), hkFeature, code[i])
       else if not(code[i] in AutoFeature) then
       begin

trunk/LocalPlayer/Enhance.pas

@@ -39 +39 @@
     NoMap: TIsoMap;
   public
-    procedure ShowNewContent(NewMode: integer; TerrType: integer = -1);
+    procedure ShowNewContent(NewMode: TWindowMode; TerrType: integer = -1);
   protected
     Page: integer;
@@ -117 +117 @@
 end;
 
-procedure TEnhanceDlg.ShowNewContent(NewMode, TerrType: integer);
+procedure TEnhanceDlg.ShowNewContent(NewMode: TWindowMode; TerrType: integer);
 begin
   if (TerrType < fGrass) or (TerrType > fMountains) then
@@ -384 +384 @@
   ShortCut := KeyToShortCut(Key, Shift);
   if BHelp.Test(ShortCut) then
-    HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkText,
+    HelpDlg.ShowNewContent(WindowModePersistent(FWindowMode), hkText,
       HelpDlg.TextIndex('MACRO'))
 end;

trunk/LocalPlayer/Help.pas

@@ -108 +108 @@
     procedure Line(ca: TCanvas; i: Integer; lit: Boolean);
     procedure Prepare(sbPos: Integer = 0);
-    procedure ShowNewContentProcExecute(NewMode: Integer; HelpContext: string);
+    procedure ShowNewContentProcExecute(NewMode: TWindowMode; HelpContext: string);
     procedure WaterSign(x0, y0, iix: Integer);
     procedure Search(SearchString: string);
@@ -117 +117 @@
     Difficulty: Integer;
     procedure ClearHistory;
-    procedure ShowNewContent(NewMode, Category, Index: Integer);
+    procedure ShowNewContent(NewMode: TWindowMode; Category, Index: Integer);
     function TextIndex(Item: string): Integer;
   end;
@@ -316 +316 @@
 end;
 
-procedure THelpDlg.ShowNewContentProcExecute(NewMode: Integer;
+procedure THelpDlg.ShowNewContentProcExecute(NewMode: TWindowMode;
   HelpContext: string);
 begin
@@ -1931 +1931 @@
 end;
 
-procedure THelpDlg.ShowNewContent(NewMode, Category, Index: Integer);
+procedure THelpDlg.ShowNewContent(NewMode: TWindowMode; Category, Index: Integer);
 begin
   if (Category <> Kind) or (Index <> no) or (Category = hkMisc) and

trunk/LocalPlayer/NatStat.pas

@@ -32 +32 @@
   public
     procedure CheckAge;
-    procedure ShowNewContent(NewMode: integer; p: integer = -1);
+    procedure ShowNewContent(NewMode: TWindowMode; p: integer = -1);
     procedure EcoChange;
   protected
@@ -145 +145 @@
 end;
 
-procedure TNatStatDlg.ShowNewContent(NewMode, p: integer);
+procedure TNatStatDlg.ShowNewContent(NewMode: TWindowMode; p: integer);
 begin
   if p < 0 then

trunk/LocalPlayer/Nego.pas

@@ -75 +75 @@
     procedure Start; // next turn of negotiation
     procedure OffscreenPaint; override;
-    procedure ShowNewContent(NewMode: integer);
+    procedure ShowNewContent(NewMode: TWindowMode);
 
   private
@@ -192 +192 @@
 end;
 
-procedure TNegoDlg.ShowNewContent(NewMode: integer);
+procedure TNegoDlg.ShowNewContent(NewMode: TWindowMode);
 begin
   inherited ShowNewContent(NewMode);
@@ -648 +648 @@
   if (X >= xNationPicture0) and (X < xNationPicture0 + 64) and
     (Y >= yNationPicture) and (Y < yNationPicture + 48) then
-    NatStatDlg.ShowNewContent(FWindowMode or wmPersistent, DipMem[me].pContact)
+    NatStatDlg.ShowNewContent(WindowModePersistent(FWindowMode), DipMem[me].pContact)
   else if (X >= xNationPicture1) and (X < xNationPicture1 + 64) and
     (Y >= yNationPicture) and (Y < yNationPicture + 48) then
-    NatStatDlg.ShowNewContent(FWindowMode or wmPersistent, me)
+    NatStatDlg.ShowNewContent(WindowModePersistent(FWindowMode), me)
 end;
 

trunk/LocalPlayer/Rates.pas

@@ -23 +23 @@
   public
     procedure OffscreenPaint; override;
-    procedure ShowNewContent(NewMode: integer);
+    procedure ShowNewContent(NewMode: TWindowMode);
   end;
 
@@ -157 +157 @@
 end;
 
-procedure TRatesDlg.ShowNewContent(NewMode: integer);
+procedure TRatesDlg.ShowNewContent(NewMode: TWindowMode);
 begin
   inherited ShowNewContent(NewMode);

trunk/LocalPlayer/Select.pas

@@ -74 +74 @@
     // -2=empty, -1=ambiguous, other=only choice
     procedure OffscreenPaint; override;
-    procedure ShowNewContent(NewMode: integer; ListKind: TListKind);
-    procedure ShowNewContent_CityProject(NewMode, cix: integer);
-    procedure ShowNewContent_MilReport(NewMode, p: integer);
+    procedure ShowNewContent(NewMode: TWindowMode; ListKind: TListKind);
+    procedure ShowNewContent_CityProject(NewMode: TWindowMode; cix: integer);
+    procedure ShowNewContent_MilReport(NewMode: TWindowMode; p: integer);
     procedure EcoChange;
     procedure TechChange;
@@ -928 +928 @@
         kModels, kChooseModel:
           if lix <> mixAll then
-            UnitStatDlg.ShowNewContent_OwnModel(FWindowMode or
-              wmPersistent, lix);
+            UnitStatDlg.ShowNewContent_OwnModel(wmPersistent, lix);
         kEModels:
-          UnitStatDlg.ShowNewContent_EnemyModel(FWindowMode or wmPersistent,
+          UnitStatDlg.ShowNewContent_EnemyModel(wmPersistent,
             code[1, sb.Position + Sel]);
         kAllEModels, kChooseEModel:
           if lix <> mixAll then
-            UnitStatDlg.ShowNewContent_EnemyModel(FWindowMode or
-              wmPersistent, lix);
+            UnitStatDlg.ShowNewContent_EnemyModel(wmPersistent, lix);
         kAdvance, kFarAdvance, kScience, kChooseTech, kChooseETech, kStealTech:
           if lix = adMilitary then
-            HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkText,
+            HelpDlg.ShowNewContent(wmPersistent, hkText,
               HelpDlg.TextIndex('MILRES'))
           else if lix < adMilitary then
-            HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkAdv, lix);
+            HelpDlg.ShowNewContent(wmPersistent, hkAdv, lix);
         kProject:
           if lix = cpImp + imTrGoods then
-            HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkText,
+            HelpDlg.ShowNewContent(wmPersistent, hkText,
               HelpDlg.TextIndex('TRADINGGOODS'))
           else if lix and (cpImp + cpType) = 0 then
-            UnitStatDlg.ShowNewContent_OwnModel(FWindowMode or wmPersistent,
+            UnitStatDlg.ShowNewContent_OwnModel(wmPersistent,
               lix and cpIndex)
           else if (lix and cpType = 0) and (lix <> cpImp + imTrGoods) then
-            HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkImp,
+            HelpDlg.ShowNewContent(wmPersistent, hkImp,
               lix and cpIndex);
         kGov:
-          HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkMisc,
+          HelpDlg.ShowNewContent(wmPersistent, hkMisc,
             miscGovList);
         kShipPart, kEShipPart:
@@ -1655 +1653 @@
 end;
 
-procedure TListDlg.ShowNewContent(NewMode: integer; ListKind: TListKind);
+procedure TListDlg.ShowNewContent(NewMode: TWindowMode; ListKind: TListKind);
 var
   i: integer;
@@ -1740 +1738 @@
 end; // ShowNewContent
 
-procedure TListDlg.ShowNewContent_CityProject(NewMode, cix: integer);
+procedure TListDlg.ShowNewContent_CityProject(NewMode: TWindowMode; cix: integer);
 begin
   cixProject := cix;
@@ -1746 +1744 @@
 end;
 
-procedure TListDlg.ShowNewContent_MilReport(NewMode, p: integer);
+procedure TListDlg.ShowNewContent_MilReport(NewMode: TWindowMode; p: integer);
 begin
   pView := p;

trunk/LocalPlayer/Term.pas

@@ -573 +573 @@
 procedure ImpImage(ca: TCanvas; x, y, iix: integer; Government: integer = -1;
   IsControl: boolean = false);
-procedure HelpOnTerrain(Loc, NewMode: integer);
+procedure HelpOnTerrain(Loc: Integer; NewMode: TWindowMode);
 
 
@@ -748 +748 @@
 end;
 
-procedure HelpOnTerrain(Loc, NewMode: integer);
+procedure HelpOnTerrain(Loc: Integer; NewMode: TWindowMode);
 begin
   if MyMap[Loc] and fDeadLands <> 0 then

trunk/LocalPlayer/UnitStat.pas

@@ -28 +28 @@
   public
     procedure CheckAge;
-    procedure ShowNewContent_OwnModel(NewMode, mix: integer);
-    procedure ShowNewContent_OwnUnit(NewMode, uix: integer);
-    procedure ShowNewContent_EnemyUnit(NewMode, euix: integer);
-    procedure ShowNewContent_EnemyLoc(NewMode, Loc: integer);
-    procedure ShowNewContent_EnemyModel(NewMode, emix: integer);
-    procedure ShowNewContent_EnemyCity(NewMode, Loc: integer);
+    procedure ShowNewContent_OwnModel(NewMode: TWindowMode; mix: integer);
+    procedure ShowNewContent_OwnUnit(NewMode: TWindowMode; uix: integer);
+    procedure ShowNewContent_EnemyUnit(NewMode: TWindowMode; euix: integer);
+    procedure ShowNewContent_EnemyLoc(NewMode: TWindowMode; Loc: integer);
+    procedure ShowNewContent_EnemyModel(NewMode: TWindowMode; emix: integer);
+    procedure ShowNewContent_EnemyCity(NewMode: TWindowMode; Loc: integer);
 
   protected
@@ -218 +218 @@
 end;
 
-procedure TUnitStatDlg.ShowNewContent_OwnModel(NewMode, mix: integer);
+procedure TUnitStatDlg.ShowNewContent_OwnModel(NewMode: TWindowMode; mix: integer);
 begin
   Kind := dkOwnModel;
@@ -225 +225 @@
 end;
 
-procedure TUnitStatDlg.ShowNewContent_OwnUnit(NewMode, uix: integer);
+procedure TUnitStatDlg.ShowNewContent_OwnUnit(NewMode: TWindowMode; uix: integer);
 begin
   Kind := dkOwnUnit;
@@ -232 +232 @@
 end;
 
-procedure TUnitStatDlg.ShowNewContent_EnemyUnit(NewMode, euix: integer);
+procedure TUnitStatDlg.ShowNewContent_EnemyUnit(NewMode: TWindowMode; euix: integer);
 begin
   Kind := dkEnemyUnit;
@@ -240 +240 @@
 end;
 
-procedure TUnitStatDlg.ShowNewContent_EnemyLoc(NewMode, Loc: integer);
+procedure TUnitStatDlg.ShowNewContent_EnemyLoc(NewMode: TWindowMode; Loc: integer);
 begin
   Kind := dkEnemyUnit;
@@ -248 +248 @@
 end;
 
-procedure TUnitStatDlg.ShowNewContent_EnemyModel(NewMode, emix: integer);
+procedure TUnitStatDlg.ShowNewContent_EnemyModel(NewMode: TWindowMode; emix: integer);
 begin
   Kind := dkEnemyModel;
@@ -255 +255 @@
 end;
 
-procedure TUnitStatDlg.ShowNewContent_EnemyCity(NewMode, Loc: integer);
+procedure TUnitStatDlg.ShowNewContent_EnemyCity(NewMode: TWindowMode; Loc: integer);
 begin
   if MyMap[Loc] and fUnit <> 0 then

trunk/LocalPlayer/Wonders.pas

@@ -28 +28 @@
   public
     procedure OffscreenPaint; override;
-    procedure ShowNewContent(NewMode: Integer);
+    procedure ShowNewContent(NewMode: TWindowMode);
   end;
 
@@ -81 +81 @@
 end;
 
-procedure TWondersDlg.ShowNewContent(NewMode: Integer);
+procedure TWondersDlg.ShowNewContent(NewMode: TWindowMode);
 begin
   inherited ShowNewContent(NewMode);
@@ -351 +351 @@
 begin
   if Selection >= 0 then
-    HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkImp, Selection);
+    HelpDlg.ShowNewContent(WindowModePersistent(FWindowMode), hkImp, Selection);
 end;
 

trunk/Packages/CevoComponents/BaseWin.pas

@@ -8 +8 @@
 
 type
-  TShowNewContent = procedure (NewMode: Integer; HelpContext: string) of object;
+  TWindowMode = (wmNone, wmModal, wmPersistent, wmSubmodal);
+  TShowNewContent = procedure (NewMode: TWindowMode; HelpContext: string) of object;
 
   { TBufferedDrawDlg }
@@ -25 +26 @@
     procedure StayOnTop_Workaround;
   protected
-    FWindowMode: Integer;
+    FWindowMode: TWindowMode;
     ModalFrameIndent: Integer;
     HelpContext: string;
-    procedure ShowNewContent(NewMode: Integer; ForceClose: Boolean = False);
+    procedure ShowNewContent(NewMode: TWindowMode; ForceClose: Boolean = False);
     procedure MarkUsedOffscreen(xMax, yMax: Integer);
     procedure OffscreenPaint; virtual;
@@ -37 +38 @@
     Offscreen: TBitmap;
     OffscreenUser: TForm;
-    property WindowMode: integer read FWindowMode;
+    property WindowMode: TWindowMode read FWindowMode;
   end;
 
@@ -64 +65 @@
 
 const
-  // window modes
-  wmNone = 0;
-  wmModal = $1;
-  wmPersistent = $2;
-  wmSubmodal = $3;
-
   yUnused = 161;
   NarrowFrame = 11;
@@ -76 +71 @@
 
 procedure CreateOffscreen(var Offscreen: TBitmap);
+function WindowModePersistent(Mode: TWindowMode): TWindowMode;
 procedure Register;
 
@@ -83 +79 @@
 uses
   ButtonBase, Area;
+
+function WindowModeMakePersistent(Mode: TWindowMode): TWindowMode;
+begin
+  if Mode = wmModal then Result := wmSubmodal
+    else Result := wmPersistent;
+end;
 
 procedure Register;
@@ -142 +144 @@
   if Key = VK_F1 then begin
     if Assigned(ShowNewContentProc) then
-      ShowNewContentProc(FWindowMode or wmPersistent, HelpContext);
+      ShowNewContentProc(WindowModePersistent(FWindowMode), HelpContext);
   end else
   if FWindowMode = wmPersistent then begin
@@ -168 +170 @@
 end;
 
-procedure TBufferedDrawDlg.ShowNewContent(NewMode: Integer;
+procedure TBufferedDrawDlg.ShowNewContent(NewMode: TWindowMode;
   ForceClose: Boolean);
 begin

trunk/Packages/CevoComponents/ButtonA.pas

@@ -54 +54 @@
     end else begin
       Brush.Color := $0000FF;
-      FrameRect(Rect(0, 0, 100, 25))
+      FrameRect(Rect(0, 0, 100, 25));
     end;
 end;

trunk/Packages/CevoComponents/ButtonBase.pas

@@ -9 +9 @@
   TButtonBase = class(TGraphicControl)
   protected
-    FDown, FPermanent: boolean;
+    FDown: Boolean;
+    FPermanent: Boolean;
     FGraphic: TBitmap;
     // FDownSound, FUpSound: string;
@@ -59 +60 @@
 begin
   Active := true;
-  MouseMove(Shift, x, y)
+  MouseMove(Shift, x, y);
 end;
 
@@ -93 +94 @@
         DownChangedProc(self);
     end;
-  end
+  end;
 end;
 

trunk/Packages/CevoComponents/ButtonC.pas

@@ -46 +46 @@
     begin
       Brush.Color := $0000FF;
-      FrameRect(Rect(0, 0, 12, 12))
+      FrameRect(Rect(0, 0, 12, 12));
     end;
 end;