paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-25 23:09:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

LCL: fixed visibility of implemented interfaces

Browse Source 
git-svn-id: trunk@37067 -
This commit is contained in:
mattias 2012-04-28 18:16:59 +00:00
parent 61d8834f62
commit 5957631f25
2 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lcl/buttons.pp
View File

@ -91,7 +91,7 @@ type
procedure SetNumGlyphs(Value: TNumGlyphs); procedure SetNumGlyphs(Value: TNumGlyphs);
procedure SetShowMode(const AValue: TGlyphShowMode); procedure SetShowMode(const AValue: TGlyphShowMode);
procedure ClearImages; procedure ClearImages;
protected public
// IUnknown // IUnknown
{$IFDEF FPC_HAS_CONSTREF} {$IFDEF FPC_HAS_CONSTREF}
function QueryInterface(constref iid: TGuid; out obj): LongInt; {$IFDEF WINDOWS}stdcall{$ELSE}cdecl{$ENDIF}; function QueryInterface(constref iid: TGuid; out obj): LongInt; {$IFDEF WINDOWS}stdcall{$ELSE}cdecl{$ENDIF};
@ -102,11 +102,10 @@ type
function _AddRef: LongInt; stdcall; function _AddRef: LongInt; stdcall;
function _Release: LongInt; stdcall; function _Release: LongInt; stdcall;
{$ENDIF} {$ENDIF}
// IImageCacheListener // IImageCacheListener
procedure CacheSetImageList(AImageList: TCustomImageList); procedure CacheSetImageList(AImageList: TCustomImageList);
procedure CacheSetImageIndex(AIndex, AImageIndex: Integer); procedure CacheSetImageIndex(AIndex, AImageIndex: Integer);
protected
procedure GlyphChanged(Sender: TObject); procedure GlyphChanged(Sender: TObject);
procedure SetTransparentMode(AValue: TGlyphTransparencyMode); procedure SetTransparentMode(AValue: TGlyphTransparencyMode);

37
lcl/intfgraphics.pas
View File

@ -392,9 +392,9 @@ type
FPixelToColorTree: TArrayNodesTree; FPixelToColorTree: TArrayNodesTree;
FContinue: Boolean; FContinue: Boolean;
FUpdateDescription: Boolean; // If set, update rawimagedescription FUpdateDescription: Boolean; // If set, update rawimagedescription
public
function GetUpdateDescription: Boolean; function GetUpdateDescription: Boolean;
procedure SetUpdateDescription(AValue: Boolean); procedure SetUpdateDescription(AValue: Boolean);
protected
{$IFDEF FPC_HAS_CONSTREF} {$IFDEF FPC_HAS_CONSTREF}
function QueryInterface(constref iid: TGuid; out obj): LongInt; {$IFDEF WINDOWS}stdcall{$ELSE}cdecl{$ENDIF}; function QueryInterface(constref iid: TGuid; out obj): LongInt; {$IFDEF WINDOWS}stdcall{$ELSE}cdecl{$ENDIF};
function _AddRef: LongInt; {$IFDEF WINDOWS}stdcall{$ELSE}cdecl{$ENDIF}; function _AddRef: LongInt; {$IFDEF WINDOWS}stdcall{$ELSE}cdecl{$ENDIF};
@ -494,10 +494,9 @@ type
function RGBToFPColor(const AColor: TColorRGB): TFPcolor; function RGBToFPColor(const AColor: TColorRGB): TFPcolor;
function RGBToFPColor(const AColor: Word): TFPcolor; function RGBToFPColor(const AColor: Word): TFPcolor;
public
function GetUpdateDescription: Boolean; function GetUpdateDescription: Boolean;
procedure SetUpdateDescription(AValue: Boolean); procedure SetUpdateDescription(AValue: Boolean);
protected
{$IFDEF FPC_HAS_CONSTREF} {$IFDEF FPC_HAS_CONSTREF}
function QueryInterface(constref iid: TGuid; out obj): LongInt; {$IFDEF WINDOWS}stdcall{$ELSE}cdecl{$ENDIF}; function QueryInterface(constref iid: TGuid; out obj): LongInt; {$IFDEF WINDOWS}stdcall{$ELSE}cdecl{$ENDIF};
function _AddRef: LongInt; {$IFDEF WINDOWS}stdcall{$ELSE}cdecl{$ENDIF}; function _AddRef: LongInt; {$IFDEF WINDOWS}stdcall{$ELSE}cdecl{$ENDIF};
@ -544,8 +543,7 @@ type
{ TLazWriterBMP } { TLazWriterBMP }
TLazWriterBMP = class(TFPWriterBMP, ILazImageWriter) TLazWriterBMP = class(TFPWriterBMP, ILazImageWriter)
private public
protected
{$IFDEF FPC_HAS_CONSTREF} {$IFDEF FPC_HAS_CONSTREF}
function QueryInterface(constref iid: TGuid; out obj): LongInt; {$IFDEF WINDOWS}stdcall{$ELSE}cdecl{$ENDIF}; function QueryInterface(constref iid: TGuid; out obj): LongInt; {$IFDEF WINDOWS}stdcall{$ELSE}cdecl{$ENDIF};
function _AddRef: LongInt; {$IFDEF WINDOWS}stdcall{$ELSE}cdecl{$ENDIF}; function _AddRef: LongInt; {$IFDEF WINDOWS}stdcall{$ELSE}cdecl{$ENDIF};
@ -576,9 +574,9 @@ type
private private
FAlphaPalette: Boolean; FAlphaPalette: Boolean;
FUpdateDescription: Boolean; FUpdateDescription: Boolean;
public
function GetUpdateDescription: Boolean; function GetUpdateDescription: Boolean;
procedure SetUpdateDescription(AValue: Boolean); procedure SetUpdateDescription(AValue: Boolean);
protected
{$IFDEF FPC_HAS_CONSTREF} {$IFDEF FPC_HAS_CONSTREF}
function QueryInterface(constref iid: TGuid; out obj): LongInt; {$IFDEF WINDOWS}stdcall{$ELSE}cdecl{$ENDIF}; function QueryInterface(constref iid: TGuid; out obj): LongInt; {$IFDEF WINDOWS}stdcall{$ELSE}cdecl{$ENDIF};
function _AddRef: LongInt; {$IFDEF WINDOWS}stdcall{$ELSE}cdecl{$ENDIF}; function _AddRef: LongInt; {$IFDEF WINDOWS}stdcall{$ELSE}cdecl{$ENDIF};
@ -599,8 +597,7 @@ type
{ TLazWriterPNG } { TLazWriterPNG }
TLazWriterPNG = class(TFPWriterPNG, ILazImageWriter) TLazWriterPNG = class(TFPWriterPNG, ILazImageWriter)
private public
protected
{$IFDEF FPC_HAS_CONSTREF} {$IFDEF FPC_HAS_CONSTREF}
function QueryInterface(constref iid: TGuid; out obj): LongInt; {$IFDEF WINDOWS}stdcall{$ELSE}cdecl{$ENDIF}; function QueryInterface(constref iid: TGuid; out obj): LongInt; {$IFDEF WINDOWS}stdcall{$ELSE}cdecl{$ENDIF};
function _AddRef: LongInt; {$IFDEF WINDOWS}stdcall{$ELSE}cdecl{$ENDIF}; function _AddRef: LongInt; {$IFDEF WINDOWS}stdcall{$ELSE}cdecl{$ENDIF};
@ -631,10 +628,10 @@ type
// the OnCreateImage event is "abused" to update the description after the // the OnCreateImage event is "abused" to update the description after the
// format and before the image is read // format and before the image is read
FOrgEvent: TTiffCreateCompatibleImgEvent; FOrgEvent: TTiffCreateCompatibleImgEvent;
procedure CreateImageHook(Sender: TFPReaderTiff; var NewImage: TFPCustomImage);
public
function GetUpdateDescription: Boolean; function GetUpdateDescription: Boolean;
procedure SetUpdateDescription(AValue: Boolean); procedure SetUpdateDescription(AValue: Boolean);
procedure CreateImageHook(Sender: TFPReaderTiff; var NewImage: TFPCustomImage);
protected
{$IFDEF FPC_HAS_CONSTREF} {$IFDEF FPC_HAS_CONSTREF}
function QueryInterface(constref iid: TGuid; out obj): LongInt; {$IFDEF WINDOWS}stdcall{$ELSE}cdecl{$ENDIF}; function QueryInterface(constref iid: TGuid; out obj): LongInt; {$IFDEF WINDOWS}stdcall{$ELSE}cdecl{$ENDIF};
function _AddRef: LongInt; {$IFDEF WINDOWS}stdcall{$ELSE}cdecl{$ENDIF}; function _AddRef: LongInt; {$IFDEF WINDOWS}stdcall{$ELSE}cdecl{$ENDIF};
@ -653,8 +650,7 @@ type
{ TLazWriterTiff } { TLazWriterTiff }
TLazWriterTiff = class(TFPWriterTiff, ILazImageWriter) TLazWriterTiff = class(TFPWriterTiff, ILazImageWriter)
private public
protected
{$IFDEF FPC_HAS_CONSTREF} {$IFDEF FPC_HAS_CONSTREF}
function QueryInterface(constref iid: TGuid; out obj): LongInt; {$IFDEF WINDOWS}stdcall{$ELSE}cdecl{$ENDIF}; function QueryInterface(constref iid: TGuid; out obj): LongInt; {$IFDEF WINDOWS}stdcall{$ELSE}cdecl{$ENDIF};
function _AddRef: LongInt; {$IFDEF WINDOWS}stdcall{$ELSE}cdecl{$ENDIF}; function _AddRef: LongInt; {$IFDEF WINDOWS}stdcall{$ELSE}cdecl{$ENDIF};
@ -687,6 +683,15 @@ type
protected protected
function InternalCheck(Str:TStream): boolean; override; function InternalCheck(Str:TStream): boolean; override;
procedure InternalRead(Stream: TStream; Img: TFPCustomImage); override; procedure InternalRead(Stream: TStream; Img: TFPCustomImage); override;
procedure SetupRead(AWidth, AHeight, ADepth: Integer; IsMask: Boolean);
function Create256ColorPalette: TFPPalette;
procedure DoReadRaw;
procedure DoReadRLE;
procedure DoReadJpeg2000;
procedure DoReadMask;
public
function GetUpdateDescription: Boolean;
procedure SetUpdateDescription(AValue: Boolean);
{$IFDEF FPC_HAS_CONSTREF} {$IFDEF FPC_HAS_CONSTREF}
function QueryInterface(constref iid: TGuid; out obj): LongInt; {$IFDEF WINDOWS}stdcall{$ELSE}cdecl{$ENDIF}; function QueryInterface(constref iid: TGuid; out obj): LongInt; {$IFDEF WINDOWS}stdcall{$ELSE}cdecl{$ENDIF};
function _AddRef: LongInt; {$IFDEF WINDOWS}stdcall{$ELSE}cdecl{$ENDIF}; function _AddRef: LongInt; {$IFDEF WINDOWS}stdcall{$ELSE}cdecl{$ENDIF};
@ -696,14 +701,6 @@ type
function _AddRef: LongInt; stdcall; function _AddRef: LongInt; stdcall;
function _Release: LongInt; stdcall; function _Release: LongInt; stdcall;
{$ENDIF} {$ENDIF}
function GetUpdateDescription: Boolean;
procedure SetUpdateDescription(AValue: Boolean);
procedure SetupRead(AWidth, AHeight, ADepth: Integer; IsMask: Boolean);
function Create256ColorPalette: TFPPalette;
procedure DoReadRaw;
procedure DoReadRLE;
procedure DoReadJpeg2000;
procedure DoReadMask;
public public
constructor Create; override; constructor Create; override;
destructor Destroy; override; destructor Destroy; override;