Update of /cvsroot/jvcl/dev/JVCL3/run
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13350/dev/JVCL3/run
Modified Files:
JvListView.pas
Log Message:
Added missing Assign method in TJvListExtendedColumn and prevented a design time error when migrating old projects.
Index: JvListView.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvListView.pas,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** JvListView.pas 19 Sep 2005 16:43:44 -0000 1.59
--- JvListView.pas 20 Sep 2005 10:21:37 -0000 1.60
***************
*** 104,107 ****
--- 104,109 ----
public
constructor Create(Collection: TCollection); override;
+
+ procedure Assign(AValue: TPersistent); override;
published
property SortMethod: TJvSortMethod read GetSortMethod write SetSortMethod default smAutomatic;
***************
*** 387,390 ****
--- 389,403 ----
{ TJvListExtendedColumn }
+ procedure TJvListExtendedColumn.Assign(AValue: TPersistent);
+ begin
+ if AValue is TJvListExtendedColumn then
+ begin
+ FSortMethod := TJvListExtendedColumn(AValue). SortMethod;
+ FUseParentSortMethod := TJvListExtendedColumn(AValue).UseParentSortMethod;
+ end
+ else
+ inherited Assign(AValue);
+ end;
+
constructor TJvListExtendedColumn.Create(Collection: TCollection);
begin
***************
*** 631,635 ****
// (Salvatore)
! SortKind := TJvListView(Parm.Sender).ExtendedColumns[Parm.Index].SortMethod;
if Assigned(TJvListView(Parm.Sender).OnAutoSort) then
TJvListView(Parm.Sender).OnAutoSort(Parm.Sender, Parm.Index, SortKind);
--- 644,652 ----
// (Salvatore)
! if Parm.Index < TJvListView(Parm.Sender).ExtendedColumns.Count then
! SortKind := TJvListView(Parm.Sender).ExtendedColumns[Parm.Index].SortMethod
! else
! SortKind := TJvListView(Parm.Sender).SortMethod;
!
if Assigned(TJvListView(Parm.Sender).OnAutoSort) then
TJvListView(Parm.Sender).OnAutoSort(Parm.Sender, Parm.Index, SortKind);
***************
*** 1573,1577 ****
begin
inherited;
! FExtendedColumns.Delete(Msg.WParam);
end;
--- 1590,1598 ----
begin
inherited;
! // This may happen at design time, especially when migrating
! // a project that uses an old version of TJvListView that did
! // not the ExtendedColumns
! if Msg.WParam < FExtendedColumns.Count then
! FExtendedColumns.Delete(Msg.WParam);
end;
|