paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-15 23:49:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

+ Patch from Micha Nelissen, fixing some Delphi compatibility issues

Browse Source
This commit is contained in:
michael 2003-11-09 21:23:10 +00:00
parent 52dc153aa2
commit b9c536242e
3 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fcl/db/dataset.inc
View File

@ -437,6 +437,11 @@ begin
//!! To be implemented
end;
Function TDataset.GetDataSource: TDataSource;
begin
Result:=nil;
end;
Function TDataset.GetField (Index : Longint) : TField;
begin
@ -1558,7 +1563,7 @@ begin
end;
end;
Procedure TDataset.Translate(Src, Dest: PChar; ToOem: Boolean);
Function TDataset.Translate(Src, Dest: PChar; ToOem: Boolean): Integer;
begin
//!! To be implemented
@ -1685,7 +1690,10 @@ end;
{
$Log$
Revision 1.9 2003-10-06 17:04:28 florian
Revision 1.10 2003-11-09 21:23:10 michael
+ Patch from Micha Nelissen, fixing some Delphi compatibility issues
Revision 1.9 2003/10/06 17:04:28 florian
* small step towards calculated fields
Revision 1.8 2003/05/06 12:08:52 michael

19
fcl/db/db.pp
View File

@ -86,6 +86,16 @@ type
ftDataSet, ftOraBlob, ftOraClob, ftVariant, ftInterface,
ftIDispatch, ftGuid, ftTimeStamp, ftFMTBcd);
{ TDateTimeRec }
TDateTimeAlias = type TDateTime;
TDateTimeRec = record
case TFieldType of
ftDate: (Date: Longint);
ftTime: (Time: Longint);
ftDateTime: (DateTime: TDateTimeAlias);
end;
TFieldDef = class(TComponent)
Private
FDataType : TFieldType;
@ -896,6 +906,7 @@ type
procedure FreeRecordBuffer(var Buffer: PChar); virtual; abstract;
procedure GetBookmarkData(Buffer: PChar; Data: Pointer); virtual; abstract;
function GetBookmarkFlag(Buffer: PChar): TBookmarkFlag; virtual; abstract;
function GetDataSource: TDataSource; virtual;
function GetFieldData(Field: TField; Buffer: Pointer): Boolean; virtual; abstract;
function GetRecord(Buffer: PChar; GetMode: TGetMode; DoCheck: Boolean): TGetResult; virtual; abstract;
function GetRecordSize: Word; virtual; abstract;
@ -960,12 +971,13 @@ type
procedure Refresh;
procedure Resync(Mode: TResyncMode); virtual;
procedure SetFields(const Values: array of const);
procedure Translate(Src, Dest: PChar; ToOem: Boolean); virtual;
function Translate(Src, Dest: PChar; ToOem: Boolean): Integer; virtual;
procedure UpdateCursorPos;
procedure UpdateRecord;
property BOF: Boolean read FBOF;
property Bookmark: TBookmarkStr read GetBookmarkStr write SetBookmarkStr;
property CanModify: Boolean read GetCanModify;
property DataSource: TDataSource read GetDataSource;
property DefaultFields: Boolean read FDefaultFields;
property EOF: Boolean read FEOF;
property FieldCount: Longint read GetFieldCount;
@ -1462,7 +1474,10 @@ end.
{
$Log$
Revision 1.11 2003-10-06 17:04:27 florian
Revision 1.12 2003-11-09 21:23:10 michael
+ Patch from Micha Nelissen, fixing some Delphi compatibility issues
Revision 1.11 2003/10/06 17:04:27 florian
* small step towards calculated fields
Revision 1.10 2003/08/16 16:42:21 michael

6
fcl/db/dbase/dbf.pas
View File

@ -407,12 +407,8 @@ type
function CreateBlobStream(Field: TField; Mode: TBlobStreamMode): TStream; override; {virtual}
{$ifdef DELPHI_3}
procedure Translate(Src, Dest: PChar; ToOem: Boolean); override; {virtual}
{$else}
{$ifdef fpc}
procedure Translate(Src, Dest: PChar; ToOem: Boolean); override; {virtual}
{$else}
function Translate(Src, Dest: PChar; ToOem: Boolean): Integer; override; {virtual}
{$endif}
{$endif}
procedure ClearCalcFields(Buffer : PChar); override;
protected
@ -1813,7 +1809,7 @@ begin
end else result:=0;
end;
{$else}
procedure TDbf.Translate(Src, Dest: PChar; ToOem: Boolean); {override virtual}
function TDbf.Translate(Src, Dest: PChar; ToOem: Boolean): Integer; {override virtual}
begin
end;
{$endif}