[JVCL-Checkins] dev/JVCL3/run JvWizard.pas,1.20,1.21 JvWizardCommon.pas,1.11,1.12 - - fixed incorrect tiling when ARect.TopLeft <> (0,0) - added

[Peter T. <pe...@us...>]

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

Modified Files:
	JvWizard.pas JvWizardCommon.pas 
Log Message:
- fixed incorrect tiling when ARect.TopLeft <> (0,0)
- added correct change notification for FPicture



Index: JvWizardCommon.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvWizardCommon.pas,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** JvWizardCommon.pas	3 Feb 2004 15:35:36 -0000	1.11
--- JvWizardCommon.pas	13 Feb 2004 11:00:49 -0000	1.12
***************
*** 224,232 ****
      Bmp.Canvas.Brush.Color := ACanvas.Brush.Color;
      Bmp.Canvas.FillRect(Bmp.Canvas.ClipRect);
!     AWidth := ARect.Left;
!     while AWidth <= ARect.Right do
      begin
!       AHeight := ARect.Top;
!       while AHeight <= ARect.Bottom do
        begin
          Bmp.Canvas.Draw(AWidth, AHeight, AGraphic);
--- 224,232 ----
      Bmp.Canvas.Brush.Color := ACanvas.Brush.Color;
      Bmp.Canvas.FillRect(Bmp.Canvas.ClipRect);
!     AWidth := 0;
!     while AWidth <= Bmp.Width do
      begin
!       AHeight := 0;
!       while AHeight <= Bmp.Height do
        begin
          Bmp.Canvas.Draw(AWidth, AHeight, AGraphic);

Index: JvWizard.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvWizard.pas,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** JvWizard.pas	11 Feb 2004 23:48:30 -0000	1.20
--- JvWizard.pas	13 Feb 2004 11:00:47 -0000	1.21
***************
*** 18,22 ****
  Peter Thörnqvist - converted to JVCL naming conventions on 2003-07-11
  
! Last Modified: 2004-02-03
  
  You may retrieve the latest version of this file at the Project JEDI's JVCL home page,
--- 18,22 ----
  Peter Thörnqvist - converted to JVCL naming conventions on 2003-07-11
  
! Last Modified: 2004-02-13
  
  You may retrieve the latest version of this file at the Project JEDI's JVCL home page,
***************
*** 476,481 ****
      function GetTransparent: Boolean;
      procedure SetTransparent(Value: Boolean);
-     procedure SetOnChange(Value: TNotifyEvent);
      procedure DoChange;
    protected
      procedure PaintTo(const ACanvas: TCanvas; ARect: TRect);
--- 476,481 ----
      function GetTransparent: Boolean;
      procedure SetTransparent(Value: Boolean);
      procedure DoChange;
+     procedure DoPictureChange(Sender:TObject);
    protected
      procedure PaintTo(const ACanvas: TCanvas; ARect: TRect);
***************
*** 483,487 ****
      constructor Create;
      destructor Destroy; override;
!     property OnChange: TNotifyEvent read FOnChange write SetOnChange;
    published
      property Picture: TPicture read FPicture write SetPicture;
--- 483,487 ----
      constructor Create;
      destructor Destroy; override;
!     property OnChange: TNotifyEvent read FOnChange write FOnChange;
    published
      property Picture: TPicture read FPicture write SetPicture;
***************
*** 1591,1594 ****
--- 1591,1595 ----
  begin
    FPicture := TPicture.Create;
+   FPicture.OnChange := DoPictureChange;
    FAlignment := iaStretch;
    FLayout := ilStretch;
***************
*** 1636,1645 ****
  end;
  
- procedure TJvWizardImage.SetOnChange(Value: TNotifyEvent);
- begin
-   FPicture.OnChange := Value;
-   FOnChange := Value;
- end;
- 
  function TJvWizardImage.GetTransparent: Boolean;
  var
--- 1637,1640 ----
***************
*** 1666,1669 ****
--- 1661,1669 ----
  end;
  
+ procedure TJvWizardImage.DoPictureChange(Sender: TObject);
+ begin
+   DoChange;
+ end;
+ 
  { TJvWizardGraphicObject }
  
***************
*** 1987,1993 ****
      OffsetRect(Result, ARect.Right - ARect.Left - AImages.Width - 4, 0);
    end;
-   OffsetRect(Result, FImageOffset, 0);
    if FImageAlignment = iaLeft then
    begin
      { YW - if right side of the image area still in the page header area
        then adjust the left side of title area. }
--- 1987,1993 ----
      OffsetRect(Result, ARect.Right - ARect.Left - AImages.Width - 4, 0);
    end;
    if FImageAlignment = iaLeft then
    begin
+     OffsetRect(Result, FImageOffset, 0);
      { YW - if right side of the image area still in the page header area
        then adjust the left side of title area. }
***************
*** 1997,2000 ****
--- 1997,2001 ----
    else // must be iaRight
    begin
+     OffsetRect(Result, -FImageOffset, 0);
      { YW - if left side of the image area still in the page header area
        then adjust the ride side of title area. }
***************
*** 2655,2658 ****
--- 2656,2660 ----
       invisible at startup until they are actived. }
    Result := nil;
+   Assert(Step <> 0);
    repeat
      Inc(PageIndex, Step);