pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

* Remove checks for stream version in TVirtualTreeColumn, TVirtualTreeColumns, TBaseVirtualTree

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@1062 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
blikblum
2009-12-15 22:46:46 +00:00
parent 82dce35e12
commit 0416a5645e
1 changed files with 18 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
components/virtualtreeview-new/trunk/VirtualTrees.pas
View File

@ -7652,31 +7652,6 @@ end;
procedure TVirtualTreeColumn.LoadFromStream(const Stream: TStream; Version: Integer); procedure TVirtualTreeColumn.LoadFromStream(const Stream: TStream; Version: Integer);
//--------------- local function --------------------------------------------
function ConvertOptions(Value: Cardinal): TVTColumnOptions;
// Converts the given raw value which represents column options for possibly older
// formats to the current format.
//todo_lcl_check
begin
if Version >= 3 then
Result := TVTColumnOptions(Word(Value and $FFFF))
else
if Version = 2 then
Result := TVTColumnOptions(Word(Value and $FF))
else
begin
// In version 2 coParentColor has been added. This needs an option shift for older stream formats.
// The first (lower) 4 options remain as they are.
Result := TVTColumnOptions(Word(Value) and $F);
Value := (Value and not $F) shl 1;
Result := Result + TVTColumnOptions(Word(Value and $FF));
end;
end;
//--------------- end local function ----------------------------------------
var var
Dummy: Integer; Dummy: Integer;
S: String; S: String;
@ -7711,30 +7686,22 @@ begin
BiDiMode := TBiDiMode(Dummy); BiDiMode := TBiDiMode(Dummy);
ReadBuffer(Dummy, SizeOf(Dummy)); ReadBuffer(Dummy, SizeOf(Dummy));
Options := ConvertOptions(Dummy); Options := TVTColumnOptions(Word(Dummy and $FFFF));
if Version > 0 then // Parts which have been introduced/changed with header stream version 1+.
// LCL port started with header stream version 6 so no need to do the check here
ReadBuffer(Dummy, SizeOf(Dummy));
Tag := Dummy;
ReadBuffer(Dummy, SizeOf(Dummy));
Alignment := TAlignment(Dummy);
ReadBuffer(Dummy, SizeOf(Dummy));
Color := TColor(Dummy);
if coUseCaptionAlignment in FOptions then
begin begin
// Parts which have been introduced/changed with header stream version 1+.
ReadBuffer(Dummy, SizeOf(Dummy)); ReadBuffer(Dummy, SizeOf(Dummy));
Tag := Dummy; CaptionAlignment := TAlignment(Dummy);
ReadBuffer(Dummy, SizeOf(Dummy));
Alignment := TAlignment(Dummy);
if Version > 1 then
begin
ReadBuffer(Dummy, SizeOf(Dummy));
Color := TColor(Dummy);
end;
if Version > 5 then
begin
if coUseCaptionAlignment in FOptions then
begin
ReadBuffer(Dummy, SizeOf(Dummy));
CaptionAlignment := TAlignment(Dummy);
end;
end;
end; end;
end; end;
end; end;
@ -9058,8 +9025,8 @@ begin
end; end;
// Data introduced with header stream version 5 // Data introduced with header stream version 5
if Version > 4 then // LCL port started with header stream version 6 so no need to do the check here
Stream.ReadBuffer(FDefaultWidth, SizeOf(FDefaultWidth)); Stream.ReadBuffer(FDefaultWidth, SizeOf(FDefaultWidth));
end; end;
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
@ -11268,7 +11235,7 @@ begin
ReadBuffer(Dummy, SizeOf(Dummy)); ReadBuffer(Dummy, SizeOf(Dummy));
Style := TFontStyles(LongWord(Dummy)); Style := TFontStyles(LongWord(Dummy));
end; end;
// LCL port started with stream version 6 so no need to do the check here // LCL port started with header stream version 6 so no need to do the check here
// Read data introduced by stream version 1+. // Read data introduced by stream version 1+.
ReadBuffer(Dummy, SizeOf(Dummy)); ReadBuffer(Dummy, SizeOf(Dummy));
MainColumn := Dummy; MainColumn := Dummy;
@ -28557,10 +28524,8 @@ begin
begin begin
BeginUpdate; BeginUpdate;
try try
if Version < 2 then // LCL port started with tree stream version 2 so no need to do the check here
Count := MaxInt Stream.ReadBuffer(Count, SizeOf(Count));
else
Stream.ReadBuffer(Count, SizeOf(Count));
while (Stream.Position < Stream.Size) and (Count > 0) do while (Stream.Position < Stream.Size) and (Count > 0) do
begin begin