diff --git a/components/ideintf/objectinspector.pp b/components/ideintf/objectinspector.pp
index 01e2f476c6..906616c745 100644
--- a/components/ideintf/objectinspector.pp
+++ b/components/ideintf/objectinspector.pp
@@ -243,9 +243,7 @@ type
   );
 
   TOIPropertyHint = function(Sender: TObject; PointedRow: TOIPropertyGridRow;
-            ScreenPos: TPoint; aHintWindow: THintWindow;
-            out HintWinRect: TRect; out AHint: string
-             ): boolean of object;
+            out AHint: string): boolean of object;
 
   TOIEditorFilterEvent = procedure(Sender: TObject; aEditor: TPropertyEditor;
             var aShow: boolean) of object;
@@ -711,8 +709,7 @@ type
     procedure OnGridModified(Sender: TObject);
     procedure OnGridSelectionChange(Sender: TObject);
     function OnGridPropertyHint(Sender: TObject; PointedRow: TOIPropertyGridRow;
-      ScreenPos: TPoint; aHintWindow: THintWindow;
-      out HintWinRect: TRect; out AHint: string): boolean;
+      out AHint: string): boolean;
     procedure SetAvailComboBoxText;
     procedure HookGetSelection(const ASelection: TPersistentSelectionList);
     procedure HookSetSelection(const ASelection: TPersistentSelectionList);
@@ -3223,9 +3220,8 @@ var
   procedure HintByHandler;
   var
     AHint: String;
-    HintRect : TRect;
   begin
-    if OnPropertyHint(Self, PointedRow, Position, FHintManager.HintWindow, HintRect, AHint)
+    if OnPropertyHint(Self, PointedRow, AHint)
     then begin
       FHintIndex := Index;
       FShowingLongHint := True;
@@ -4705,13 +4701,11 @@ begin
 end;
 
 function TObjectInspectorDlg.OnGridPropertyHint(Sender: TObject;
-  PointedRow: TOIPropertyGridRow; ScreenPos: TPoint; aHintWindow: THintWindow;
-  out HintWinRect: TRect; out AHint: string): boolean;
+  PointedRow: TOIPropertyGridRow; out AHint: string): boolean;
 begin
   Result := False;
   if Assigned(FOnPropertyHint) then
-    Result := FOnPropertyHint(Sender, PointedRow, ScreenPos,
-       aHintWindow, HintWinRect, AHint);
+    Result := FOnPropertyHint(Sender, PointedRow, AHint);
 end;
 
 procedure TObjectInspectorDlg.SetAvailComboBoxText;
diff --git a/ide/main.pp b/ide/main.pp
index dd7308ef0b..fe1829f5dc 100644
--- a/ide/main.pp
+++ b/ide/main.pp
@@ -499,15 +499,13 @@ type
     procedure OIOnViewRestricted(Sender: TObject);
     procedure OIOnDestroy(Sender: TObject);
     procedure OIOnAutoShow(Sender: TObject);
-    procedure OIRemainingKeyDown(Sender: TObject; var Key: Word;
-       Shift: TShiftState);
+    procedure OIRemainingKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
     procedure OIOnAddToFavorites(Sender: TObject);
     procedure OIOnRemoveFromFavorites(Sender: TObject);
     procedure OIOnFindDeclarationOfProperty(Sender: TObject);
     procedure OIOnSelectionChange(Sender: TObject);
     function OIOnPropertyHint(Sender: TObject; PointedRow: TOIPropertyGridRow;
-            ScreenPos: TPoint; aHintWindow: THintWindow;
-            out HintWinRect: TRect; out AHint: string): boolean;
+       out AHint: string): boolean;
     procedure OIOnUpdateRestricted(Sender: TObject);
     function OnPropHookGetMethodName(const Method: TMethod;
                                      PropOwner: TObject): String;
@@ -1812,9 +1810,8 @@ begin
     OIChangedTimer.AutoEnabled:=true;
 end;
 
-function TMainIDE.OIOnPropertyHint(Sender: TObject;
-  PointedRow: TOIPropertyGridRow; ScreenPos: TPoint; aHintWindow: THintWindow;
-  out HintWinRect: TRect; out AHint: string): boolean;
+function TMainIDE.OIOnPropertyHint(Sender: TObject; PointedRow: TOIPropertyGridRow;
+  out AHint: string): boolean;
 var
   Code: TCodeBuffer;
   Caret: TPoint;
@@ -1823,7 +1820,6 @@ var
 begin
   Result:=false;
   AHint:='';
-  HintWinRect:=Rect(0,0,0,0);
   if (ObjectInspector1=nil) or not BeginCodeTools then exit;
   Result:=FindDeclarationOfOIProperty(ObjectInspector1,PointedRow,Code,Caret,NewTopLine)
     and (TIDEHelpManager(HelpBoss).GetHintForSourcePosition(Code.Filename,Caret,