Changeset 431 for trunk/Packages/CevoComponents

Timestamp:

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

Author:

chronos

Message:

• Modified: Changed WindowMode numerical constants to enumeration.

Location:

trunk/Packages/CevoComponents

Files:

• BaseWin.pas (modified) (8 diffs)
• ButtonA.pas (modified) (1 diff)
• ButtonBase.pas (modified) (3 diffs)
• ButtonC.pas (modified) (1 diff)

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;