Changeset 531 for trunk/Packages

Timestamp:

Mar 27, 2024, 12:31:14 PM (7 weeks ago)

Author:

chronos

Message:

• Modified: Code cleanup.

Location:

trunk/Packages

Files:

• CevoComponents/ButtonA.pas (modified) (1 diff)
• CevoComponents/ButtonB.pas (modified) (2 diffs)
• CevoComponents/ButtonBase.pas (modified) (1 diff)
• CevoComponents/ButtonC.pas (modified) (1 diff)
• CevoComponents/ButtonN.pas (modified) (2 diffs)
• CevoComponents/DrawDlg.pas (modified) (2 diffs)
• CevoComponents/EOTButton.pas (modified) (3 diffs)
• CevoComponents/ScreenTools.pas (modified) (1 diff)
• CevoComponents/Sound.pas (modified) (1 diff)
• Common/Common.pas (modified) (2 diffs)

trunk/Packages/CevoComponents/ButtonA.pas

@@ -14 +14 @@
     procedure SetCaption(Text: string);
     procedure SetFont(const Font: TFont);
+  protected
+    procedure Paint; override;
+  public
+    property Font: TFont write SetFont;
   published
     property Visible;
     property Caption: string read FCaption write SetCaption;
     property OnClick;
-  public
-    property Font: TFont write SetFont;
-  protected
-    procedure Paint; override;
   end;
 

trunk/Packages/CevoComponents/ButtonB.pas

@@ -14 +14 @@
     FIndex: Integer;
     procedure SetIndex(Text: Integer);
+  protected
+    procedure Paint; override;
   public
     property Mask: TBitmap read FMask write FMask;
@@ -20 +22 @@
     property ButtonIndex: Integer read FIndex write SetIndex;
     property OnClick;
-  protected
-    procedure Paint; override;
   end;
 

trunk/Packages/CevoComponents/ButtonBase.pas

@@ -140 +140 @@
 // procedure TButtonBase.PlayDownSound;
 // begin
-// if DownSound<>'' then SndPlaySound(pchar(DownSound),SND_ASYNC)
+// if DownSound<>'' then SndPlaySound(PChar(DownSound),SND_ASYNC)
 // end;
 
 // procedure TButtonBase.PlayUpSound;
 // begin
-// if UpSound<>'' then SndPlaySound(pchar(UpSound),SND_ASYNC)
+// if UpSound<>'' then SndPlaySound(PChar(UpSound),SND_ASYNC)
 // end;
 

trunk/Packages/CevoComponents/ButtonC.pas

@@ -12 +12 @@
     FIndex: Integer;
     procedure SetIndex(Text: Integer);
+  protected
+    procedure Paint; override;
   published
     property Visible;
     property ButtonIndex: Integer read FIndex write SetIndex;
     property OnClick;
-  protected
-    procedure Paint; override;
   end;
 

trunk/Packages/CevoComponents/ButtonN.pas

@@ -20 +20 @@
     procedure SetIndex(X: Integer);
     procedure SetSmartHint(X: string);
+  protected
+    procedure Paint; override;
+    procedure MouseDown(Button: TMouseButton; Shift: TShiftState;
+      X, Y: Integer); override;
   published
     property Possible: Boolean read FPossible write SetPossible;
@@ -29 +33 @@
     property ButtonIndex: Integer read FIndex write SetIndex;
     property OnClick: TNotifyEvent read ChangeProc write ChangeProc;
-  protected
-    procedure Paint; override;
-    procedure MouseDown(Button: TMouseButton; Shift: TShiftState;
-      X, Y: Integer); override;
   end;
 

trunk/Packages/CevoComponents/DrawDlg.pas

@@ -43 +43 @@
     procedure FormCreate(Sender: TObject);
     procedure FormPaint(Sender: TObject);
-  public
-    MessgText: string;
   protected
     Lines: Integer;
@@ -50 +48 @@
     procedure SplitText(Preview: Boolean);
     procedure CorrectHeight;
+  public
+    MessgText: string;
   end;
 

trunk/Packages/CevoComponents/EOTButton.pas

@@ -17 +17 @@
   // EndOfTurn button
   TEOTButton = class(TButtonBase)
+  private
+    FTemplate: TBitmap;
+    FIndex: Integer;
+    procedure SetIndex(X: Integer);
+  protected
+    Buffer, Back: TBitmap;
+    procedure Paint; override;
   public
     constructor Create(aOwner: TComponent); override;
@@ -22 +29 @@
     procedure SetButtonIndexFast(X: Integer);
     procedure SetBack(Canvas: TCanvas; X, Y: Integer);
-  private
-    FTemplate: TBitmap;
-    FIndex: Integer;
-    procedure SetIndex(X: Integer);
-  public
     property Template: TBitmap read FTemplate write FTemplate;
   published
@@ -32 +34 @@
     property ButtonIndex: Integer read FIndex write SetIndex;
     property OnClick;
-  protected
-    Buffer, Back: TBitmap;
-    procedure Paint; override;
   end;
 

trunk/Packages/CevoComponents/ScreenTools.pas

@@ -1040 +1040 @@
       else begin
         DstPtr.NextPixel;
-        continue;
+        Continue;
       end;
       if R = 0 then

trunk/Packages/CevoComponents/Sound.pas

@@ -315 +315 @@
   Result := (WavFileName <> '') and (WavFileName[1] <> '[') and (WavFileName <> '*');
   if Result then
-    // SndPlaySound(pchar(GetSoundsDir + DirectorySeparator + WavFileName + '.wav'), SND_ASYNC)
+    // SndPlaySound(PChar(GetSoundsDir + DirectorySeparator + WavFileName + '.wav'), SND_ASYNC)
     PlaySound(GetSoundsDir + DirectorySeparator + WavFileName);
 end;

trunk/Packages/Common/Common.pas

@@ -184 +184 @@
 (*function DelTree(DirName : string): Boolean;
 var
-  SHFileOpStruct : TSHFileOpStruct;
-  DirBuf : array [0..255] of char;
+  SHFileOpStruct: TSHFileOpStruct;
+  DirBuf: array [0..255] of char;
 begin
   DirName := UTF8Decode(DirName);
   try
-    Fillchar(SHFileOpStruct,Sizeof(SHFileOpStruct),0) ;
-    FillChar(DirBuf, Sizeof(DirBuf), 0 ) ;
-    StrPCopy(DirBuf, DirName) ;
+    FillChar(SHFileOpStruct, Sizeof(SHFileOpStruct), 0);
+    FillChar(DirBuf, Sizeof(DirBuf), 0 );
+    StrPCopy(DirBuf, DirName);
     with SHFileOpStruct do begin
       Wnd := 0;
@@ -200 +200 @@
       fFlags := fFlags or FOF_SILENT;
     end;
-    Result := (SHFileOperation(SHFileOpStruct) = 0) ;
+    Result := (SHFileOperation(SHFileOpStruct) = 0);
   except
-     Result := False;
+    Result := False;
   end;
 end;*)