fixes for current fpc 1.1

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

View File

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

View File

@ -34,7 +34,6 @@ begin
FLines := TMemoStrings.Create(Self);
FVertScrollbar := TMemoScrollBar.Create(Self, sbVertical);
FHorzScrollbar := TMemoScrollBar.Create(Self, sbHorizontal);
settext
SetBounds(0,0,185,90);
end;
@ -137,6 +136,9 @@ end;
{ =============================================================================
$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
fixed parsing records

View File

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