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

fixed fpc 1.0.10 compilation

Browse Source 
git-svn-id: trunk@5798 -
This commit is contained in:
mattias 2004-08-15 22:31:51 +00:00
parent 089b41a7db
commit 444c86b6f5
3 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lcl/dbctrls.pp
View File

@ -521,7 +521,7 @@ Type
procedure SetDataSource(const AValue: TDataSource); procedure SetDataSource(const AValue: TDataSource);
procedure SetReadOnly(const AValue: Boolean); procedure SetReadOnly(const AValue: Boolean);
protected protected
function WordWrapIsStored: boolean; virtual; function WordWrapIsStored: boolean; override;
procedure DataChange(Sender: TObject); virtual; procedure DataChange(Sender: TObject); virtual;
procedure EditingChange(Sender: TObject); virtual; procedure EditingChange(Sender: TObject); virtual;
procedure Notification(AComponent: TComponent; procedure Notification(AComponent: TComponent;
@ -1248,6 +1248,9 @@ end.
{ ============================================================================= { =============================================================================
$Log$ $Log$
Revision 1.18 2004/08/15 22:31:51 mattias
fixed fpc 1.0.10 compilation
Revision 1.17 2004/08/13 16:40:47 mazen Revision 1.17 2004/08/13 16:40:47 mazen
+ TCharater type used to allow UTF8 keyboard with gtk2 + TCharater type used to allow UTF8 keyboard with gtk2

22
lcl/lresources.pp
View File

@ -34,7 +34,7 @@ unit LResources;
interface interface
uses uses
Classes, SysUtils, FPCAdds, TypInfo, RTLConst, LCLProc, LCLStrConsts; Classes, SysUtils, FPCAdds, TypInfo, LCLProc, LCLStrConsts;
type type
{ TLResourceList } { TLResourceList }
@ -1289,8 +1289,12 @@ procedure LRSObjectBinaryToText(Input, Output: TStream);
ext: Extended; ext: Extended;
ASingle: single; ASingle: single;
ADate: TDateTime; ADate: TDateTime;
{$ifdef HASCURRENCY}
ACurrency: Currency; ACurrency: Currency;
{$endif HASCURRENCY}
{$ifdef HASWIDESTRING}
AWideString: WideString; AWideString: WideString;
{$endif HASWIDESTRING}
begin begin
case ValueType of case ValueType of
@ -1366,14 +1370,18 @@ procedure LRSObjectBinaryToText(Input, Output: TStream);
ADate:=TDateTime(ReadLRSDouble(Input)); ADate:=TDateTime(ReadLRSDouble(Input));
OutLn(FloatToStr(ADate)); OutLn(FloatToStr(ADate));
end; end;
{$ifdef HASCURRENCY}
vaCurrency: begin vaCurrency: begin
ACurrency:=ReadLRSCurrency(Input); ACurrency:=ReadLRSCurrency(Input);
OutLn(FloatToStr(ACurrency)); OutLn(FloatToStr(ACurrency));
end; end;
{$endif HASCURRENCY}
{$ifdef HASWIDESTRING}
vaWString: begin vaWString: begin
AWideString:=ReadLRSWideString(Input); AWideString:=ReadLRSWideString(Input);
OutLn(AWideString); OutLn(AWideString);
end; end;
{$endif HASWIDESTRING}
else begin else begin
debugln('Unknown ValueType=',dbgs(Ord(ValueType)),' vaInt16=',dbgs(Ord(vaInt16))); debugln('Unknown ValueType=',dbgs(Ord(ValueType)),' vaInt16=',dbgs(Ord(vaInt16)));
Stop(IntToStr(Ord(ValueType))); Stop(IntToStr(Ord(ValueType)));
@ -1427,7 +1435,7 @@ procedure LRSObjectBinaryToText(Input, Output: TStream);
end; end;
begin begin
if Input.ReadDWord <> PLongWord(@FilerSignature[1])^ then if Input.ReadDWord <> PCardinal(@FilerSignature[1])^ then
raise EReadError.Create('Illegal stream image' {###SInvalidImage}); raise EReadError.Create('Illegal stream image' {###SInvalidImage});
ReadObject(''); ReadObject('');
end; end;
@ -1672,7 +1680,7 @@ var
parser.NextToken; parser.NextToken;
end; end;
else else
parser.Error(SInvalidProperty); parser.Error('Invalid Property');
end; end;
end; end;
@ -2160,7 +2168,7 @@ begin
begin begin
FBufEnd := FStream.Read(FBuffer^, FBufSize); FBufEnd := FStream.Read(FBuffer^, FBufSize);
if FBufEnd = 0 then if FBufEnd = 0 then
raise EReadError.Create(SReadError); raise EReadError.Create('Read Error');
FBufPos := 0; FBufPos := 0;
end; end;
CopyNow := FBufEnd - FBufPos; CopyNow := FBufEnd - FBufPos;
@ -2235,7 +2243,7 @@ begin
{ Read filer signature } { Read filer signature }
Read(Signature,4); Read(Signature,4);
if Signature <> LongInt(FilerSignature) then if Signature <> LongInt(FilerSignature) then
raise EReadError.Create(SInvalidImage); raise EReadError.Create('Invalid Filer Signature');
end; end;
procedure TLRSObjectReader.BeginComponent(var Flags: TFilerFlags; procedure TLRSObjectReader.BeginComponent(var Flags: TFilerFlags;
@ -2261,7 +2269,7 @@ begin
vaInt32: vaInt32:
AChildPos := ReadInt32; AChildPos := ReadInt32;
else else
raise EReadError.Create(SInvalidPropertyValue); raise EReadError.Create('Invalid Property Value');
end; end;
end; end;
end; end;
@ -2392,7 +2400,7 @@ begin
break; break;
Value := GetEnumValue(PTypeInfo(EnumType), Name); Value := GetEnumValue(PTypeInfo(EnumType), Name);
if Value = -1 then if Value = -1 then
raise EReadError.Create(SInvalidPropertyValue); raise EReadError.Create('Invalid Property Value');
Result := Result or (1 shl Value); Result := Result or (1 shl Value);
end; end;
except except

5
lcl/stdctrls.pp
View File

@ -606,7 +606,7 @@ type
procedure SetScrollBars(const Value : TScrollStyle); procedure SetScrollBars(const Value : TScrollStyle);
procedure InitializeWnd; override; procedure InitializeWnd; override;
procedure Loaded; override; procedure Loaded; override;
function WordWrapIsStored: boolean; function WordWrapIsStored: boolean; virtual;
procedure ControlKeyDown(var Key: Word; Shift : TShiftState); override; procedure ControlKeyDown(var Key: Word; Shift : TShiftState); override;
public public
constructor Create(AOwner: TComponent); override; constructor Create(AOwner: TComponent); override;
@ -1158,6 +1158,9 @@ end.
{ ============================================================================= { =============================================================================
$Log$ $Log$
Revision 1.159 2004/08/15 22:31:51 mattias
fixed fpc 1.0.10 compilation
Revision 1.158 2004/08/13 16:40:47 mazen Revision 1.158 2004/08/13 16:40:47 mazen
+ TCharater type used to allow UTF8 keyboard with gtk2 + TCharater type used to allow UTF8 keyboard with gtk2