GitHub-Mirror/x2cl
1
0
Fork 0
mirror of synced 2024-11-22 01:53:50 +00:00
Code Issues Projects Releases Wiki Activity

Potential fix for "Invalid ImageList Index"

Browse Source 
Dropped D6 compatibility in favor of losing an ugly hack
This commit is contained in:
Mark van Renswoude 2010-07-12 07:37:54 +00:00
parent e1c32b70e5
commit 388f91d1d0
1 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Source/X2CLGraphicList.pas
View File

@ -170,7 +170,9 @@ type
procedure SetEnabled(const Value: Boolean); procedure SetEnabled(const Value: Boolean);
procedure SetStretchMode(const Value: TX2GLStretchMode); procedure SetStretchMode(const Value: TX2GLStretchMode);
protected protected
procedure DefineProperties(Filer: TFiler); override; procedure ReadData(Stream: TStream); override;
procedure WriteData(Stream: TStream); override;
procedure Notification(AComponent: TComponent; Operation: TOperation); override; procedure Notification(AComponent: TComponent; Operation: TOperation); override;
function DrawGraphic(const AIndex: Integer; function DrawGraphic(const AIndex: Integer;
@ -739,6 +741,9 @@ var
listIndex: Integer; listIndex: Integer;
begin begin
if csDestroying in ComponentState then
Exit;
graphicIndex := AGraphic.Index; graphicIndex := AGraphic.Index;
if graphicIndex > -1 then if graphicIndex > -1 then
@ -1327,26 +1332,13 @@ end;
{========================= TX2GraphicList {========================= TX2GraphicList
Properties Properties
========================================} ========================================}
procedure TX2GraphicList.DefineProperties(Filer: TFiler); procedure TX2GraphicList.ReadData(Stream: TStream);
var begin
pType: TClass; end;
procedure TX2GraphicList.WriteData(Stream: TStream);
begin begin
// TCustomImageList defines the Bitmap property, we don't want that
// (since the ImageList will be generated from a GraphicContainer).
// Erik's solution was to override Read/WriteData, but in Delphi 6 those
// aren't virtual yet. Instead we skip TCustomImageList's DefineProperties.
//
// The trick here is to modify the ClassType so the VMT of descendants
// (include ourself!) is ignored and only TComponent.DefineProperties
// is called...
pType := Self.ClassType;
PClass(Self)^ := TComponent;
try
DefineProperties(Filer);
finally
PClass(Self)^ := pType;
end;
end; end;
@ -1354,7 +1346,7 @@ procedure TX2GraphicList.Notification(AComponent: TComponent;
Operation: TOperation); Operation: TOperation);
begin begin
if (Operation = opRemove) and (AComponent = FContainer) then if (Operation = opRemove) and (AComponent = FContainer) then
FContainer := nil; SetContainer(nil);
inherited; inherited;
end; end;