[JVCL-Checkins] dev/JVCL3/run JvAddPrinter.pas,1.8,1.9 JvAirBrush.pas,1.11,1.12 JvAlarms.pas,1.13,1.14 JvAnimTitle.pas,1.10,1.11 JvAppAnimatedIcon.pas,1.10,1.11 JvGIF.pas,1.19,1.20 JvJVCLUtils.pas,1.115,1.116 JvObjectPickerDialog.pas,1.13,1.14 JvStartMenuButton.pas,1.10,1.11 JvgCheckVersionInfoForm.pas,1.14,1.15 JvgQPrintPreviewForm.pas,1.14,1.15 - changed use of internal F property implementors to property,

[Robert M. <mar...@us...>]

Update of /cvsroot/jvcl/dev/JVCL3/run
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19097/JVCL3/run

Modified Files:
	JvAddPrinter.pas JvAirBrush.pas JvAlarms.pas JvAnimTitle.pas 
	JvAppAnimatedIcon.pas JvGIF.pas JvJVCLUtils.pas 
	JvObjectPickerDialog.pas JvStartMenuButton.pas 
	JvgCheckVersionInfoForm.pas JvgQPrintPreviewForm.pas 
Log Message:
changed use of internal F property implementors to property, $R+/- replaced by RANGECHECKS ON/OFF


Index: JvAppAnimatedIcon.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvAppAnimatedIcon.pas,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** JvAppAnimatedIcon.pas	23 May 2004 13:41:51 -0000	1.10
--- JvAppAnimatedIcon.pas	25 May 2004 15:06:22 -0000	1.11
***************
*** 85,98 ****
  {$ENDIF VisualCLX}
  begin
!   if (FIcons <> nil) and (FIcons.Count <> 0) then
    begin
!     FNumber := (FNumber + 1) mod FIcons.Count;
      {$IFDEF VCL}
!     FIcons.GetIcon(FNumber, Application.Icon);
      {$ENDIF VCL}
      {$IFDEF VisualCLX}
      TmpBmp := TBitmap.Create;
      try
!       FIcons.GetBitmap(FNumber, TmpBmp);
        Application.Icon.Assign(TmpBmp);
      finally
--- 85,98 ----
  {$ENDIF VisualCLX}
  begin
!   if (Icons <> nil) and (Icons.Count <> 0) then
    begin
!     FNumber := (FNumber + 1) mod Icons.Count;
      {$IFDEF VCL}
!     Icons.GetIcon(FNumber, Application.Icon);
      {$ENDIF VCL}
      {$IFDEF VisualCLX}
      TmpBmp := TBitmap.Create;
      try
!       Icons.GetBitmap(FNumber, TmpBmp);
        Application.Icon.Assign(TmpBmp);
      finally

Index: JvgCheckVersionInfoForm.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvgCheckVersionInfoForm.pas,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** JvgCheckVersionInfoForm.pas	31 Mar 2004 07:43:20 -0000	1.14
--- JvgCheckVersionInfoForm.pas	25 May 2004 15:06:23 -0000	1.15
***************
*** 68,72 ****
  
  uses
!   ShellApi,
    {$IFDEF USEJVCL}
    JvResources,
--- 68,72 ----
  
  uses
!   ShellAPI,
    {$IFDEF USEJVCL}
    JvResources,

Index: JvJVCLUtils.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvJVCLUtils.pas,v
retrieving revision 1.115
retrieving revision 1.116
diff -C2 -d -r1.115 -r1.116
*** JvJVCLUtils.pas	25 May 2004 06:37:53 -0000	1.115
--- JvJVCLUtils.pas	25 May 2004 15:06:23 -0000	1.116
***************
*** 4334,4338 ****
          TJvNastyForm(Form).FWindowState := WinState
        else
!         {$ENDIF VCL}
          WindowState := WinState;
      end;
--- 4334,4338 ----
          TJvNastyForm(Form).FWindowState := WinState
        else
!       {$ENDIF VCL}
          WindowState := WinState;
      end;

Index: JvAddPrinter.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvAddPrinter.pas,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** JvAddPrinter.pas	16 May 2004 17:55:27 -0000	1.8
--- JvAddPrinter.pas	25 May 2004 15:06:22 -0000	1.9
***************
*** 33,37 ****
  
  uses
!   Windows, ActiveX, ShlObj, ShellApi, SysUtils, Classes,
    JvBaseDlg;
  
--- 33,37 ----
  
  uses
!   Windows, ActiveX, ShlObj, ShellAPI, SysUtils, Classes,
    JvBaseDlg;
  

Index: JvAnimTitle.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvAnimTitle.pas,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** JvAnimTitle.pas	31 Mar 2004 07:43:14 -0000	1.10
--- JvAnimTitle.pas	25 May 2004 15:06:22 -0000	1.11
***************
*** 44,50 ****
    private
      FTimer: TTimer;
!     FEnable: Boolean;
!     FInitialTitle: string;
      FTitle: string;
      FDelay: Integer;
      FSens: Boolean;
--- 44,50 ----
    private
      FTimer: TTimer;
!     FEnabled: Boolean;
      FTitle: string;
+     FCurrentTitle: string;
      FDelay: Integer;
      FSens: Boolean;
***************
*** 53,59 ****
      FBlinked: Integer;
      FBlinking: Boolean;
!     procedure ChangeTitle(const NewTitle: string);
!     procedure EnableChange(NewEnable: Boolean);
!     procedure ChangeDelay(NewDelay: Integer);
      procedure AnimateTitle(Sender: TObject);
    public
--- 53,59 ----
      FBlinked: Integer;
      FBlinking: Boolean;
!     procedure SetTitle(const NewTitle: string);
!     procedure SetEnabled(NewEnable: Boolean);
!     procedure SetDelay(NewDelay: Integer);
      procedure AnimateTitle(Sender: TObject);
    public
***************
*** 61,67 ****
      destructor Destroy; override;
    published
!     property Title: string read FInitialTitle write ChangeTitle;
!     property Enabled: Boolean read FEnable write EnableChange default False;
!     property Delay: Integer read FDelay write ChangeDelay default 50;
      property Blink: Integer read FBlink write FBlink default 5;
    end;
--- 61,67 ----
      destructor Destroy; override;
    published
!     property Title: string read FTitle write SetTitle;
!     property Enabled: Boolean read FEnabled write SetEnabled default False;
!     property Delay: Integer read FDelay write SetDelay default 50;
      property Blink: Integer read FBlink write FBlink default 5;
    end;
***************
*** 72,87 ****
  begin
    inherited Create(AOwner);
!   FEnable := False;
    FDelay := 50;
    FBlink := 5;
    FForm := GetParentForm(TControl(AOwner));
!   FInitialTitle := FForm.Caption;
    FSens := True;
    FBlinking := False;
    FBlinked := 0;
-   FDelay := 100;
  
    FTimer := TTimer.Create(Self);
!   FTimer.Enabled := FEnable;
    FTimer.Interval := FDelay;
    FTimer.OnTimer := AnimateTitle;
--- 72,86 ----
  begin
    inherited Create(AOwner);
!   FEnabled := False;
    FDelay := 50;
    FBlink := 5;
    FForm := GetParentForm(TControl(AOwner));
!   FTitle := FForm.Caption;
    FSens := True;
    FBlinking := False;
    FBlinked := 0;
  
    FTimer := TTimer.Create(Self);
!   FTimer.Enabled := FEnabled;
    FTimer.Interval := FDelay;
    FTimer.OnTimer := AnimateTitle;
***************
*** 92,96 ****
    FTimer.Free;
    if not (csDestroying in FForm.ComponentState) then
!     FForm.Caption := FInitialTitle;
    inherited Destroy;
  end;
--- 91,95 ----
    FTimer.Free;
    if not (csDestroying in FForm.ComponentState) then
!     FForm.Caption := FTitle;
    inherited Destroy;
  end;
***************
*** 102,112 ****
      // (rom) this is a bad implementation better try to manipulate
      // (rom) the WM_GETTEXT and WM_SETTEXT to the Form window
!     if FForm.Caption = FInitialTitle then
        FForm.Caption := ''
      else
      begin
!       FForm.Caption := FInitialTitle;
        Inc(FBlinked);
!       if FBlinked >= FBlink then
        begin
          FBlinking := False;
--- 101,111 ----
      // (rom) this is a bad implementation better try to manipulate
      // (rom) the WM_GETTEXT and WM_SETTEXT to the Form window
!     if FForm.Caption = Title then
        FForm.Caption := ''
      else
      begin
!       FForm.Caption := Title;
        Inc(FBlinked);
!       if FBlinked >= Blink then
        begin
          FBlinking := False;
***************
*** 119,159 ****
      if FSens then
      begin
!       if Length(FTitle) = Length(FInitialTitle) then
        begin
          FSens := False;
!         if FBlink > 0 then
            FBlinking := True;
        end
        else
!         FTitle := FTitle + FInitialTitle[Length(FTitle) + 1];
      end
      else
!     if FTitle = '' then
        FSens := True
      else
!       SetLength(FTitle, Length(FTitle) - 1);
      {$IFDEF LINUX}
!     if FTitle = '' then
        FForm.Caption := ' '   // else caption becomes <1>
      else
      {$ENDIF LINUX}
!     FForm.Caption := FTitle;
    end;
  end;
  
! procedure TJvAnimTitle.ChangeTitle(const NewTitle: string);
  begin
!   FInitialTitle := NewTitle;
!   FTitle := '';
    FSens := True;
  end;
  
! procedure TJvAnimTitle.EnableChange(NewEnable: Boolean);
  begin
!   FEnable := NewEnable;
!   FTimer.Enabled := FEnable;
  end;
  
! procedure TJvAnimTitle.ChangeDelay(NewDelay: Integer);
  begin
    FDelay := NewDelay;
--- 118,158 ----
      if FSens then
      begin
!       if Length(FCurrentTitle) = Length(Title) then
        begin
          FSens := False;
!         if Blink > 0 then
            FBlinking := True;
        end
        else
!         FCurrentTitle := FCurrentTitle + Title[Length(FCurrentTitle) + 1];
      end
      else
!     if FCurrentTitle = '' then
        FSens := True
      else
!       SetLength(FCurrentTitle, Length(FCurrentTitle) - 1);
      {$IFDEF LINUX}
!     if FCurrentTitle = '' then
        FForm.Caption := ' '   // else caption becomes <1>
      else
      {$ENDIF LINUX}
!     FForm.Caption := FCurrentTitle;
    end;
  end;
  
! procedure TJvAnimTitle.SetTitle(const NewTitle: string);
  begin
!   FTitle := NewTitle;
!   FCurrentTitle := '';
    FSens := True;
  end;
  
! procedure TJvAnimTitle.SetEnabled(NewEnable: Boolean);
  begin
!   FEnabled := NewEnable;
!   FTimer.Enabled := FEnabled;
  end;
  
! procedure TJvAnimTitle.SetDelay(NewDelay: Integer);
  begin
    FDelay := NewDelay;

Index: JvObjectPickerDialog.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvObjectPickerDialog.pas,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** JvObjectPickerDialog.pas	17 May 2004 14:56:54 -0000	1.13
--- JvObjectPickerDialog.pas	25 May 2004 15:06:23 -0000	1.14
***************
*** 619,626 ****
      for I := 0 to FSelections^.cItems - 1 do
      begin
!       {$R-}
        Selection := @FSelections^.aDsSelection[I];
        {$IFDEF RANGECHECKS_ON}
!       {$R+}
        {$ENDIF RANGECHECKS_ON}
        FItems[I] := TObjectPickerSelection.Create(Selection,
--- 619,626 ----
      for I := 0 to FSelections^.cItems - 1 do
      begin
!       {$RANGECHECKS OFF}
        Selection := @FSelections^.aDsSelection[I];
        {$IFDEF RANGECHECKS_ON}
!       {$RANGECHECKS ON}
        {$ENDIF RANGECHECKS_ON}
        FItems[I] := TObjectPickerSelection.Create(Selection,

Index: JvGIF.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvGIF.pas,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** JvGIF.pas	25 May 2004 06:37:52 -0000	1.19
--- JvGIF.pas	25 May 2004 15:06:22 -0000	1.20
***************
*** 256,260 ****
    JvJCLUtils, JvJVCLUtils, JvAni, JvConsts, JvResources, JvTypes;
  
! {$R-}
  
  procedure JvGif_Dummy;
--- 256,260 ----
    JvJCLUtils, JvJVCLUtils, JvAni, JvConsts, JvResources, JvTypes;
  
! {$RANGECHECKS OFF}
  
  procedure JvGif_Dummy;
***************
*** 274,278 ****
  
  {$IFDEF RANGECHECKS_ON}
! {$R+}
  {$ENDIF RANGECHECKS_ON}
  
--- 274,278 ----
  
  {$IFDEF RANGECHECKS_ON}
! {$RANGECHECKS ON}
  {$ENDIF RANGECHECKS_ON}
  

Index: JvAlarms.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvAlarms.pas,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** JvAlarms.pas	24 May 2004 06:54:23 -0000	1.13
--- JvAlarms.pas	25 May 2004 15:06:22 -0000	1.14
***************
*** 129,133 ****
    if (ATime >= Now) or (AKind <> tkOneShot) then
    begin
!     with FAlarms.Add do
      begin
        Name := AName;
--- 129,133 ----
    if (ATime >= Now) or (AKind <> tkOneShot) then
    begin
!     with Alarms.Add do
      begin
        Name := AName;
***************
*** 142,148 ****
  procedure TJvAlarms.Delete(const Idx: Cardinal);
  begin
!   FAlarms.Delete(Idx);
    // (p3)
!   FRunning := Active and (FAlarms.Count > 0);
    FTimer.Enabled := Running;
  end;
--- 142,148 ----
  procedure TJvAlarms.Delete(const Idx: Cardinal);
  begin
!   Alarms.Delete(Idx);
    // (p3)
!   FRunning := Active and (Alarms.Count > 0);
    FTimer.Enabled := Running;
  end;
***************
*** 171,175 ****
      FBusy := True;
      try
!       if FAlarms.Count >= 0 then
        begin
          Current := Now;
--- 171,175 ----
      FBusy := True;
      try
!       if Alarms.Count >= 0 then
        begin
          Current := Now;
***************
*** 179,183 ****
          begin
            FLast := Stamp;
!           for I := FAlarms.Count - 1 downto 0 do
            begin
              Alarm := Alarms[I];
--- 179,183 ----
          begin
            FLast := Stamp;
!           for I := Alarms.Count - 1 downto 0 do
            begin
              Alarm := Alarms[I];
***************
*** 233,237 ****
  begin
    FActive := Value;
!   FRunning := FActive and (FAlarms.Count > 0);
    FTimer.Enabled := Running;
  end;
--- 233,237 ----
  begin
    FActive := Value;
!   FRunning := FActive and (Alarms.Count > 0);
    FTimer.Enabled := Running;
  end;

Index: JvAirBrush.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvAirBrush.pas,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** JvAirBrush.pas	31 Mar 2004 07:43:14 -0000	1.11
--- JvAirBrush.pas	25 May 2004 15:06:22 -0000	1.12
***************
*** 130,140 ****
    with FBitmap do
    begin
!     Width := FSize;
!     Height := FSize;
      Canvas.Brush.Color := clWhite;
      Canvas.FillRect(Rect(0, 0, Width, Height));
      Canvas.Pen.Style := psClear;
!     Canvas.Brush.Color := FColor;
!     case FShape of
        absRound:
          Canvas.Ellipse(0, 0, Width, Height);
--- 130,140 ----
    with FBitmap do
    begin
!     Width := Size;
!     Height := Size;
      Canvas.Brush.Color := clWhite;
      Canvas.FillRect(Rect(0, 0, Width, Height));
      Canvas.Pen.Style := psClear;
!     Canvas.Brush.Color := Color;
!     case Shape of
        absRound:
          Canvas.Ellipse(0, 0, Width, Height);
***************
*** 182,186 ****
          if (Sqr(X - X2) + Sqr(Y - Y2)) < Sqr(X2) then
            if ((X mod 3) = 0) and ((Y mod 3) = 0) then
!             Pixels[X, Y] := FColor;
  end;
  
--- 182,186 ----
          if (Sqr(X - X2) + Sqr(Y - Y2)) < Sqr(X2) then
            if ((X mod 3) = 0) and ((Y mod 3) = 0) then
!             Pixels[X, Y] := Color;
  end;
  
***************
*** 192,198 ****
  begin
    //  MakeBrush;
!   CLeft := X - (FSize div 2);
!   CTop := Y - (FSize div 2);
!   RPaint := Rect(CLeft, CTop, CLeft + FSize, CTop + FSize);
    Bmp := TBitmap.Create;
    Bmp.Width := FBitmap.Width;
--- 192,198 ----
  begin
    //  MakeBrush;
!   CLeft := X - (Size div 2);
!   CTop := Y - (Size div 2);
!   RPaint := Rect(CLeft, CTop, CLeft + Size, CTop + Size);
    Bmp := TBitmap.Create;
    Bmp.Width := FBitmap.Width;
***************
*** 207,211 ****
      FBitmap.PixelFormat := pf24bit;
      Dst.PixelFormat := pf24bit;
!     TJvPaintFX.Blend2(Bmp, FBitmap, Dst, FIntensity / 100);
      Dst.TransparentColor := clWhite;
      Dst.Transparent := True;
--- 207,211 ----
      FBitmap.PixelFormat := pf24bit;
      Dst.PixelFormat := pf24bit;
!     TJvPaintFX.Blend2(Bmp, FBitmap, Dst, Intensity / 100);
      Dst.TransparentColor := clWhite;
      Dst.Transparent := True;
***************
*** 230,234 ****
  function TJvAirBrush.GetAir: Boolean;
  begin
!   if Integer(GetTickCount - FCounter) > FInterval then
    begin
      Result := True;
--- 230,234 ----
  function TJvAirBrush.GetAir: Boolean;
  begin
!   if Integer(GetTickCount - FCounter) > Interval then
    begin
      Result := True;

Index: JvStartMenuButton.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvStartMenuButton.pas,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** JvStartMenuButton.pas	15 May 2004 13:51:38 -0000	1.10
--- JvStartMenuButton.pas	25 May 2004 15:06:23 -0000	1.11
***************
*** 71,75 ****
  
  uses
!   ShellApi,
    JvJVCLUtils, JvResources;
  
--- 71,75 ----
  
  uses
!   ShellAPI,
    JvJVCLUtils, JvResources;
  

Index: JvgQPrintPreviewForm.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvgQPrintPreviewForm.pas,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** JvgQPrintPreviewForm.pas	31 Mar 2004 07:43:21 -0000	1.14
--- JvgQPrintPreviewForm.pas	25 May 2004 15:06:23 -0000	1.15
***************
*** 35,39 ****
    Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms,
    Dialogs, ExtCtrls, QuickRpt, QRCtrls, QRPrntr, ComCtrls, ToolWin,
!   ImgList, ShellApi, StdCtrls,
    JvgQRLabel, JvgBevel, JvgLabel, JvComponent, JvExControls;
  
--- 35,39 ----
    Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms,
    Dialogs, ExtCtrls, QuickRpt, QRCtrls, QRPrntr, ComCtrls, ToolWin,
!   ImgList, ShellAPI, StdCtrls,
    JvgQRLabel, JvgBevel, JvgLabel, JvComponent, JvExControls;