--- ibx/trunk/fbintf/testsuite/Test10.pas	2017/02/24 17:05:03	55
+++ ibx/trunk/fbintf/testsuite/Test10.pas	2017/03/06 10:20:02	56
@@ -1,7 +1,12 @@
 unit Test10;
+{$IFDEF MSWINDOWS} 
+{$DEFINE WINDOWS} 
+{$ENDIF}
 
-{$mode objfpc}{$H+}
+{$IFDEF FPC}
+{$mode delphi}
 {$codepage utf8}
+{$ENDIF}
 
 {Test 10: Event Handling}
 
@@ -38,8 +43,8 @@ type
     procedure EventReport(Sender: IEvents);
     procedure ShowEventCounts(Intf: IEvents);
   public
-    function TestTitle: string; override;
-    procedure RunTest(CharSet: string; SQLDialect: integer); override;
+    function TestTitle: AnsiString; override;
+    procedure RunTest(CharSet: AnsiString; SQLDialect: integer); override;
   end;
 
 
@@ -58,14 +63,14 @@ begin
   FEventSignalled := false;
   EventHandler := Attachment.GetEventHandler('TESTEVENT');
   writeln(OutFile,'Call Async Wait');
-  EventHandler.AsyncWaitForEvent(@EventReport);
+  EventHandler.AsyncWaitForEvent(EventReport);
   writeln(OutFile,'Async Wait Called');
   sleep(500);
   if FEventSignalled then
   begin
     writeln(OutFile,'First Event - usually ignored');
     FEventSignalled := false;
-    EventHandler.AsyncWaitForEvent(@EventReport);
+    EventHandler.AsyncWaitForEvent(EventReport);
     sleep(100);
     if FEventSignalled then
     begin
@@ -88,7 +93,7 @@ begin
     FEventSignalled := false
   end;
   writeln(OutFile,'Call Async Wait');
-  EventHandler.AsyncWaitForEvent(@EventReport);
+  EventHandler.AsyncWaitForEvent(EventReport);
   writeln(OutFile,'Async Wait Called');
   sleep(500);
   if FEventSignalled then
@@ -96,7 +101,7 @@ begin
     writeln(OutFile,'Deferred Events Caught');
     ShowEventCounts(EventHandler);
     FEventSignalled := false;
-    EventHandler.AsyncWaitForEvent(@EventReport);
+    EventHandler.AsyncWaitForEvent(EventReport);
     sleep(100);
     if FEventSignalled then
       writeln(OutFile,'Unexpected Event 3');
@@ -108,7 +113,7 @@ begin
 
   FEventSignalled := false;
   writeln(OutFile,'Async Wait: Test Cancel');
-  EventHandler.AsyncWaitForEvent(@EventReport);
+  EventHandler.AsyncWaitForEvent(EventReport);
   writeln(OutFile,'Async Wait Called');
   EventHandler.Cancel;
   writeln(OutFile,'Event Cancelled');
@@ -144,12 +149,12 @@ begin
     writeln(OutFile,'Event Counts: ',EventCounts[i].EventName,', Count = ',EventCounts[i].Count);
 end;
 
-function TTest10.TestTitle: string;
+function TTest10.TestTitle: AnsiString;
 begin
   Result := 'Test 10: Event Handling';
 end;
 
-procedure TTest10.RunTest(CharSet: string; SQLDialect: integer);
+procedure TTest10.RunTest(CharSet: AnsiString; SQLDialect: integer);
 var Attachment: IAttachment;
     DPB: IDPB;
 begin