Browse Source

* Fix for 4168 A few typechanges weren't propagated to the demo

git-svn-id: trunk@789 -
marco 20 years ago
parent
commit
c22271cff2
1 changed files with 4 additions and 4 deletions
  1. 4 4
      packages/base/sqlite/sqlitedb.pas

+ 4 - 4
packages/base/sqlite/sqlitedb.pas

@@ -8,7 +8,7 @@ interface
 uses  Classes,strings,sqlite;
 uses  Classes,strings,sqlite;
 
 
 type
 type
-  TSQLiteExecCallback = function(Sender: TObject; Columns: Integer; ColumnValues: Pointer; ColumnNames: Pointer): integer of object; cdecl;
+  TSQLiteExecCallback = function(Sender: pointer; Columns: Integer; ColumnValues: ppchar; ColumnNames: ppchar): integer of object; cdecl;
   TSQLiteBusyCallback = function(Sender: TObject; ObjectName: PChar; BusyCount: integer): integer of object; cdecl;
   TSQLiteBusyCallback = function(Sender: TObject; ObjectName: PChar; BusyCount: integer): integer of object; cdecl;
   TOnData = Procedure(Sender: TObject; Columns: Integer; ColumnNames, ColumnValues: String)  of object;
   TOnData = Procedure(Sender: TObject; Columns: Integer; ColumnNames, ColumnValues: String)  of object;
   TOnBusy = Procedure(Sender: TObject; ObjectName: String; BusyCount: integer; var Cancel: Boolean) of object;
   TOnBusy = Procedure(Sender: TObject; ObjectName: String; BusyCount: integer; var Cancel: Boolean) of object;
@@ -185,14 +185,14 @@ begin
   end;
   end;
 end;
 end;
 
 
-function ExecCallback(Sender: TObject; Columns: Integer; ColumnValues: Pointer; ColumnNames: Pointer): integer; cdecl;
+function ExecCallback(Sender: Pointer; Columns: Integer; ColumnValues: PPChar; ColumnNames: PPchar): integer; cdecl;
 var
 var
   PVal, PName: ^PChar;
   PVal, PName: ^PChar;
   n: integer;
   n: integer;
   sVal, sName: String;
   sVal, sName: String;
 begin
 begin
   Result := 0;
   Result := 0;
-  with Sender as TSQLite do
+  with TObject(Sender) as TSQLite do
   begin
   begin
     if (Assigned(fOnData) or Assigned(fTable)) then
     if (Assigned(fOnData) or Assigned(fTable)) then
     begin
     begin
@@ -213,7 +213,7 @@ begin
       sVal := fLstVal.CommaText;
       sVal := fLstVal.CommaText;
       sName := fLstName.CommaText;
       sName := fLstName.CommaText;
       if Assigned(fOnData) then
       if Assigned(fOnData) then
-        fOnData(Sender, Columns, sName, sVal);
+        fOnData(TObject(Sender), Columns, sName, sVal);
       if Assigned(fTable) then
       if Assigned(fTable) then
       begin
       begin
         if fTable.Count = 0 then
         if fTable.Count = 0 then