paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-11 15:36:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

LCL: TGraphic.LoadFromResourceID: PtrUInt to PtrInt for Delphi compatibility

Browse Source 
git-svn-id: trunk@27869 -
This commit is contained in:
mattias 2010-10-26 07:32:58 +00:00
parent c17c45c439
commit c10f6e5365
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/lazcontrols/Makefile.compiled
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<CONFIG> <CONFIG>
<Makefile Value="True"/> <Makefile Value="True"/>
<Params Value=" -MObjFPC -Scghi -O1 -gl -vewnhi -l -Fu..\..\lcl\units\%(CPU_TARGET)-%(OS_TARGET);..\..\lcl\units\%(CPU_TARGET)-%(OS_TARGET)\%(LCL_PLATFORM);..\..\packager\units\%(CPU_TARGET)-%(OS_TARGET);. -Fi. -dLCL -dLCL%(LCL_PLATFORM)"/> <Params Value=" -MObjFPC -Scghi -O1 -gl -vewnhi -l -Fu../../lcl/units/%(CPU_TARGET)-%(OS_TARGET);../../lcl/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../../packager/units/%(CPU_TARGET)-%(OS_TARGET);. -Fi. -dLCL -dLCL%(LCL_PLATFORM)"/>
</CONFIG> </CONFIG>

4
lcl/graphics.pp
View File

@ -795,7 +795,7 @@ type
procedure LoadFromMimeStream(AStream: TStream; const AMimeType: string); virtual; procedure LoadFromMimeStream(AStream: TStream; const AMimeType: string); virtual;
procedure LoadFromLazarusResource(const ResName: String); virtual; procedure LoadFromLazarusResource(const ResName: String); virtual;
procedure LoadFromResourceName(Instance: THandle; const ResName: String); virtual; procedure LoadFromResourceName(Instance: THandle; const ResName: String); virtual;
procedure LoadFromResourceID(Instance: THandle; ResID: PtrUInt); virtual; procedure LoadFromResourceID(Instance: THandle; ResID: PtrInt); virtual;
procedure LoadFromClipboardFormat(FormatID: TClipboardFormat); virtual; procedure LoadFromClipboardFormat(FormatID: TClipboardFormat); virtual;
procedure LoadFromClipboardFormatID(ClipboardType: TClipboardType; procedure LoadFromClipboardFormatID(ClipboardType: TClipboardType;
FormatID: TClipboardFormat); virtual; FormatID: TClipboardFormat); virtual;
@ -1626,7 +1626,7 @@ type
class function GetFileExtensions: string; override; class function GetFileExtensions: string; override;
function LazarusResourceTypeValid(const ResourceType: string): boolean; override; function LazarusResourceTypeValid(const ResourceType: string): boolean; override;
procedure LoadFromResourceName(Instance: THandle; const ResName: String); override; procedure LoadFromResourceName(Instance: THandle; const ResName: String); override;
procedure LoadFromResourceID(Instance: THandle; ResID: PtrUInt); override; procedure LoadFromResourceID(Instance: THandle; ResID: PtrInt); override;
procedure LoadFromResourceHandle(Instance: THandle; ResHandle: TFPResourceHandle); procedure LoadFromResourceHandle(Instance: THandle; ResHandle: TFPResourceHandle);
function BitmapHandleAllocated: boolean; override; function BitmapHandleAllocated: boolean; override;
function MaskHandleAllocated: boolean; override; function MaskHandleAllocated: boolean; override;

2
lcl/include/graphic.inc
View File

@ -150,7 +150,7 @@ begin
raise EInvalidGraphic.Create(ClassName+': Unsupported MimeType: ' + AMimeType); raise EInvalidGraphic.Create(ClassName+': Unsupported MimeType: ' + AMimeType);
end; end;
procedure TGraphic.LoadFromResourceID(Instance: THandle; ResID: PtrUInt); procedure TGraphic.LoadFromResourceID(Instance: THandle; ResID: PtrInt);
var var
Stream: TResourceStream; Stream: TResourceStream;
ResType: TResourceType; ResType: TResourceType;

2
lcl/include/icon.inc
View File

@ -682,7 +682,7 @@ begin
LoadFromResourceHandle(Instance, ResHandle); LoadFromResourceHandle(Instance, ResHandle);
end; end;
procedure TCustomIcon.LoadFromResourceID(Instance: THandle; ResID: PtrUInt); procedure TCustomIcon.LoadFromResourceID(Instance: THandle; ResID: PtrInt);
var var
ResType: TResourceType; ResType: TResourceType;
ResHandle: TFPResourceHandle; ResHandle: TFPResourceHandle;