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

fixed ord ptr conversion hints

Browse Source 
git-svn-id: trunk@5603 -
This commit is contained in:
mattias 2004-06-28 08:54:20 +00:00
parent fc4cbe8641
commit 34c8d220cf
4 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/synedit/syneditexport.pas
View File

@ -425,7 +425,11 @@ begin
// Size is ReadOnly in Delphi 2 // Size is ReadOnly in Delphi 2
fBuffer.SetSize((SizeNeeded + $1800) and not $FFF); // increment in pages fBuffer.SetSize((SizeNeeded + $1800) and not $FFF); // increment in pages
Dest := fBuffer.Memory; Dest := fBuffer.Memory;
Inc(Dest, Len); {$IFDEF SYN_LAZARUS}
Dest:=Dest+Len;
{$ELSE}
inc(Dest,Len);
{$ENDIF}
Move(fBuffer.Memory^, Dest^, TCompareMemSize(ToMove)); Move(fBuffer.Memory^, Dest^, TCompareMemSize(ToMove));
fBuffer.Position := 0; fBuffer.Position := 0;
fBuffer.Write(AText[1], TMemStreamSeekType(Len)); fBuffer.Write(AText[1], TMemStreamSeekType(Len));

4
lcl/controls.pp
View File

@ -949,6 +949,7 @@ type
procedure RemoveControlHandler(HandlerType: TControlHandlerType; procedure RemoveControlHandler(HandlerType: TControlHandlerType;
AMethod: TMethod); AMethod: TMethod);
procedure DoContextPopup(const MousePos: TPoint; var Handled: Boolean); virtual; procedure DoContextPopup(const MousePos: TPoint; var Handled: Boolean); virtual;
function GetTextBufWithoutOverride: boolean;
protected protected
// actions // actions
function GetActionLinkClass: TControlActionLinkClass; dynamic; function GetActionLinkClass: TControlActionLinkClass; dynamic;
@ -2322,6 +2323,9 @@ end.
{ ============================================================================= { =============================================================================
$Log$ $Log$
Revision 1.213 2004/06/28 08:54:19 mattias
fixed ord ptr conversion hints
Revision 1.212 2004/06/24 17:59:18 mattias Revision 1.212 2004/06/24 17:59:18 mattias
fixed compilation for fpc 1.0.10 fixed compilation for fpc 1.0.10

12
lcl/include/control.inc
View File

@ -1301,6 +1301,11 @@ begin
FOnContextPopup(Self, MousePos, Handled); FOnContextPopup(Self, MousePos, Handled);
end; end;
function TControl.GetTextBufWithoutOverride: boolean;
begin
Result:= TMethod(@Self.GetTextBuf).Code=Pointer(@TControl.GetTextBuf);
end;
procedure TControl.ActionChange(Sender: TObject; CheckDefaults: Boolean); procedure TControl.ActionChange(Sender: TObject; CheckDefaults: Boolean);
begin begin
if Sender is TCustomAction then if Sender is TCustomAction then
@ -2017,7 +2022,7 @@ var
begin begin
// Check if GetTextBuf is overridden, otherwise // Check if GetTextBuf is overridden, otherwise
// we can call RealGetText directly // we can call RealGetText directly
if Integer(@Self.GetTextBuf) = Integer(@TControl.GetTextBuf) if GetTextBufWithoutOverride
then begin then begin
Result := RealGetText; Result := RealGetText;
end end
@ -2968,7 +2973,7 @@ begin
// Check if SetTextBuf is overridden, otherwise // Check if SetTextBuf is overridden, otherwise
// we can call RealSetText directly // we can call RealSetText directly
if Integer(@Self.SetTextBuf) = Integer(@TControl.SetTextBuf) if GetTextBufWithoutOverride
then begin then begin
RealSetText(Value); RealSetText(Value);
end end
@ -3190,6 +3195,9 @@ end;
{ ============================================================================= { =============================================================================
$Log$ $Log$
Revision 1.197 2004/06/28 08:54:19 mattias
fixed ord ptr conversion hints
Revision 1.196 2004/06/24 17:59:18 mattias Revision 1.196 2004/06/24 17:59:18 mattias
fixed compilation for fpc 1.0.10 fixed compilation for fpc 1.0.10

5
lcl/interfaces/gtk/gtkobject.inc
View File

@ -3109,7 +3109,7 @@ begin
begin begin
// change cursor // change cursor
if Sender is TWinControl then if Sender is TWinControl then
gtkproc.SetCursor(TWinControl(Sender), TCursor(Data)); gtkproc.SetCursor(TWinControl(Sender), TCursor(cardinal(Data)));
end; end;
LM_RECREATEWND : Result := RecreateWnd(sender); LM_RECREATEWND : Result := RecreateWnd(sender);
@ -9197,6 +9197,9 @@ end;
{ ============================================================================= { =============================================================================
$Log$ $Log$
Revision 1.510 2004/06/28 08:54:20 mattias
fixed ord ptr conversion hints
Revision 1.509 2004/06/22 23:55:51 marc Revision 1.509 2004/06/22 23:55:51 marc
* Fixed RawImage.Description.AlphaLineEnd (it is not always dword based) * Fixed RawImage.Description.AlphaLineEnd (it is not always dword based)