diff --git a/lcl/interfaces/gtk3/gtk3wsfactory.pas b/lcl/interfaces/gtk3/gtk3wsfactory.pas index 7d7355b3d6..a4296594f4 100644 --- a/lcl/interfaces/gtk3/gtk3wsfactory.pas +++ b/lcl/interfaces/gtk3/gtk3wsfactory.pas @@ -147,8 +147,8 @@ uses function RegisterCustomImageListResolution: Boolean; alias : 'WSRegisterCustomImageListResolution'; begin // RegisterWSComponent(TImageList, TGtk3WSImageList); - RegisterWSComponent(TCustomImageListResolution, TGtk3WSCustomImageListResolution); - Result := True; + //RegisterWSComponent(TCustomImageListResolution, TGtk3WSCustomImageListResolution); + Result := False; end; // controls diff --git a/lcl/interfaces/gtk3/gtk3wsimglist.pp b/lcl/interfaces/gtk3/gtk3wsimglist.pp index f5ba949080..840fdcf495 100644 --- a/lcl/interfaces/gtk3/gtk3wsimglist.pp +++ b/lcl/interfaces/gtk3/gtk3wsimglist.pp @@ -33,89 +33,18 @@ interface // the uses clause of the XXXintf.pp //////////////////////////////////////////////////// uses - Classes, GraphType, Graphics, IntfGraphics, ImgList, LCLType, LCLIntf, - WSLCLClasses, WSProc, WSReferences, WSFactory, WSImgList; + WSImgList, WSLCLClasses; type { TGtk3WSCustomImageListResolution } TGtk3WSCustomImageListResolution = class(TWSCustomImageListResolution) - published - class procedure Clear(AList: TCustomImageListResolution); override; - class function CreateReference(AList: TCustomImageListResolution; ACount, AGrow, AWidth, - AHeight: Integer; AData: PRGBAQuad): TWSCustomImageListReference; override; - - class procedure Delete(AList: TCustomImageListResolution; AIndex: Integer); override; - class procedure DestroyReference(AComponent: TComponent); override; - class procedure Draw(AList: TCustomImageListResolution; AIndex: Integer; ACanvas: TCanvas; - ABounds: TRect; ABkColor, ABlendColor: TColor; ADrawEffect: TGraphicsDrawEffect; AStyle: TDrawingStyle; AImageType: TImageType); override; - - class procedure Insert(AList: TCustomImageListResolution; AIndex: Integer; AData: PRGBAQuad); override; - - class procedure Move(AList: TCustomImageListResolution; ACurIndex, ANewIndex: Integer); override; - - class procedure Replace(AList: TCustomImageListResolution; AIndex: Integer; AData: PRGBAQuad); override; + private + protected + public end; - TGtk3WSCustomImageListResolutionClass = class of TGtk3WSCustomImageListResolution; implementation -uses gtk3objects,lazgdkpixbuf2; - -{ TGtk3WSCustomImageListResolution } - -class procedure TGtk3WSCustomImageListResolution.Clear(AList: TCustomImageListResolution); -begin - inherited Clear(AList); -end; - -class function TGtk3WSCustomImageListResolution.CreateReference(AList: TCustomImageListResolution; - ACount, AGrow, AWidth, AHeight: Integer; AData: PRGBAQuad - ): TWSCustomImageListReference; -begin - Result:=inherited CreateReference(AList, ACount, AGrow, AWidth, AHeight, AData - ); -end; - -class procedure TGtk3WSCustomImageListResolution.Delete(AList: TCustomImageListResolution; - AIndex: Integer); -begin - inherited Delete(AList, AIndex); -end; - -class procedure TGtk3WSCustomImageListResolution.DestroyReference(AComponent: TComponent); -begin - inherited DestroyReference(AComponent); -end; - -class procedure TGtk3WSCustomImageListResolution.Draw(AList: TCustomImageListResolution; - AIndex: Integer; ACanvas: TCanvas; ABounds: TRect; ABkColor, - ABlendColor: TColor; ADrawEffect: TGraphicsDrawEffect; AStyle: TDrawingStyle; - AImageType: TImageType); -begin - inherited Draw(AList, AIndex, ACanvas, ABounds, ABkColor, ABlendColor, - ADrawEffect, AStyle, AImageType); -{ TGtk3DeviceContext(ACanvas.Handle).drawImglistRes(AList, - AIndex,ABounds,ABkColor, - ABlendColor,ADrawEffect,AStyle, AImageType);} -end; - -class procedure TGtk3WSCustomImageListResolution.Insert(AList: TCustomImageListResolution; - AIndex: Integer; AData: PRGBAQuad); -begin - inherited Insert(AList, AIndex, AData); -end; - -class procedure TGtk3WSCustomImageListResolution.Move(AList: TCustomImageListResolution; ACurIndex, - ANewIndex: Integer); -begin - inherited Move(AList, ACurIndex, ANewIndex); -end; - -class procedure TGtk3WSCustomImageListResolution.Replace(AList: TCustomImageListResolution; - AIndex: Integer; AData: PRGBAQuad); -begin - inherited Replace(AList, AIndex, AData); -end; end.