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

fixes for current fpc 1.1

Browse Source 
git-svn-id: trunk@3989 -
This commit is contained in:
mattias 2003-03-31 10:57:40 +00:00
parent 1122af8535
commit 977dec59dc
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lcl/forms.pp
View File

@ -714,7 +714,7 @@ function KeysToShiftState(Keys:Word): TShiftState;
function KeyDataToShiftState(KeyData: Longint): TShiftState; function KeyDataToShiftState(KeyData: Longint): TShiftState;
type type
TFocusState = type Pointer; TFocusState = Pointer;
function SaveFocusState: TFocusState; function SaveFocusState: TFocusState;
procedure RestoreFocusState(FocusState: TFocusState); procedure RestoreFocusState(FocusState: TFocusState);

4
lcl/include/custommemo.inc
View File

@ -34,7 +34,6 @@ begin
FLines := TMemoStrings.Create(Self); FLines := TMemoStrings.Create(Self);
FVertScrollbar := TMemoScrollBar.Create(Self, sbVertical); FVertScrollbar := TMemoScrollBar.Create(Self, sbVertical);
FHorzScrollbar := TMemoScrollBar.Create(Self, sbHorizontal); FHorzScrollbar := TMemoScrollBar.Create(Self, sbHorizontal);
settext
SetBounds(0,0,185,90); SetBounds(0,0,185,90);
end; end;
@ -137,6 +136,9 @@ end;
{ ============================================================================= { =============================================================================
$Log$ $Log$
Revision 1.14 2003/03/31 10:57:40 mattias
fixes for current fpc 1.1
Revision 1.13 2003/03/31 10:49:50 mattias Revision 1.13 2003/03/31 10:49:50 mattias
fixed parsing records fixed parsing records

9
lcl/utrace.pp
View File

@ -23,16 +23,17 @@ uses sysutils;
type type
TAssertErrorProc = procedure(Const Msg,FN :ShortString; TAssertErrorProc = procedure(Const Msg,FN :ShortString;
LineNo,TheAddr : Longint); LineNo: LongInt; TheAddr: {$IFDEF New1_1}Pointer{$ELSE}Longint{$ENDIF});
var var
TraceFileName : string; TraceFileName : string;
OldProcPointer : Pointer; // the current Assert Error Handler OldProcPointer : TAssertErrorProc; // the current Assert Error Handler
implementation implementation
procedure TraceAssertHandler(Const Msg,FN : ShortString;LineNo,TheAddr : Longint); procedure TraceAssertHandler(Const Msg,FN : ShortString;
LineNo: LongInt; TheAddr: {$IFDEF New1_1}Pointer{$ELSE}Longint{$ENDIF});
var var
fileH : Text; fileH : Text;
begin begin
@ -57,7 +58,7 @@ begin
{$I+} {$I+}
end end
else else
TAssertErrorProc(oldProcPointer)(Msg, FN, LineNo, TheAddr); oldProcPointer(Msg, FN, LineNo, TheAddr);
end; end;