From b9c536242e323b41f45e24c336d9fbade85d8b61 Mon Sep 17 00:00:00 2001
From: michael <michael@freepascal.org>
Date: Sun, 9 Nov 2003 21:23:10 +0000
Subject: [PATCH] + Patch from Micha Nelissen, fixing some Delphi compatibility
 issues

---
 fcl/db/dataset.inc   | 12 ++++++++++--
 fcl/db/db.pp         | 19 +++++++++++++++++--
 fcl/db/dbase/dbf.pas |  6 +-----
 3 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/fcl/db/dataset.inc b/fcl/db/dataset.inc
index 956c57df78..499e79808b 100644
--- a/fcl/db/dataset.inc
+++ b/fcl/db/dataset.inc
@@ -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
diff --git a/fcl/db/db.pp b/fcl/db/db.pp
index bfdbbee0fd..07752f6601 100644
--- a/fcl/db/db.pp
+++ b/fcl/db/db.pp
@@ -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
diff --git a/fcl/db/dbase/dbf.pas b/fcl/db/dbase/dbf.pas
index c853a07708..89e5798ee4 100644
--- a/fcl/db/dbase/dbf.pas
+++ b/fcl/db/dbase/dbf.pas
@@ -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}