diff --git a/lcl/include/winapi.inc b/lcl/include/winapi.inc
index a792cf5a6d..c43f5f0796 100644
--- a/lcl/include/winapi.inc
+++ b/lcl/include/winapi.inc
@@ -619,24 +619,48 @@ begin
   Result := InterfaceObject.RequestInput(InputCaption, InputPrompt, MaskInput, Value);
 end;
 
+Procedure NotifyUser(const DialogMessage : String; DialogType : longint);
+begin
+  PromptUser('', DialogMessage, DialogType, [idButtonOK], -1, -1);
+end;
+
+Procedure NotifyUserAtXY(const DialogMessage : String; DialogType : longint; X, Y : Longint);
+begin
+  PromptUserAtXY('', DialogMessage, DialogType, [idButtonOK], -1, -1, X, Y);
+end;
+
 Procedure NotifyUser(const DialogCaption, DialogMessage : String; DialogType : longint);
 begin
-  InterfaceObject.NotifyUser(DialogCaption, DialogMessage, DialogType);
+  PromptUser(DialogCaption, DialogMessage, DialogType, [idButtonOK], -1, -1);
 end;
 
 Procedure NotifyUserAtXY(const DialogCaption, DialogMessage : String; DialogType : longint; X, Y : Longint);
 begin
-  InterfaceObject.NotifyUserAtXY(DialogCaption, DialogMessage, DialogType, X,Y);
+  PromptUserAtXY(DialogCaption, DialogMessage, DialogType, [idButtonOK], -1, -1, X, Y);
 end;
 
-Function PromptUser(const DialogCaption, DialogMessage : String; DialogType : longint; Buttons : Array of Longint) : Longint;
+Function PromptUser(const DialogMessage : String; DialogType : longint; Buttons : Array of Longint;
+  DefaultIndex, EscapeResult : Longint) : Longint;
 begin
-  Result := InterfaceObject.PromptUser(DialogCaption, DialogMessage, DialogType, Buttons);
+  Result := InterfaceObject.PromptUser('', DialogMessage, DialogType, Buttons, DefaultIndex, EscapeResult);
 end;
 
-Function PromptUserAtXY(const DialogCaption, DialogMessage : String; DialogType : longint; Buttons : Array of Longint; X, Y : Longint) : Longint;
+Function PromptUser(const DialogCaption, DialogMessage : String; DialogType : longint; Buttons : Array of Longint;
+  DefaultIndex, EscapeResult : Longint) : Longint;
 begin
-  Result := InterfaceObject.PromptUserAtXY(DialogCaption, DialogMessage, DialogType, Buttons, X, Y);
+  Result := InterfaceObject.PromptUser(DialogCaption, DialogMessage, DialogType, Buttons, DefaultIndex, EscapeResult);
+end;
+
+Function PromptUserAtXY(const DialogMessage : String; DialogType : longint; Buttons : Array of Longint;
+  DefaultIndex, EscapeResult : Longint; X, Y : Longint) : Longint;
+begin
+  Result := InterfaceObject.PromptUserAtXY('', DialogMessage, DialogType, Buttons, DefaultIndex, EscapeResult, X, Y);
+end;
+
+Function PromptUserAtXY(const DialogCaption, DialogMessage : String; DialogType : longint; Buttons : Array of Longint;
+  DefaultIndex, EscapeResult : Longint; X, Y : Longint) : Longint;
+begin
+  Result := InterfaceObject.PromptUserAtXY(DialogCaption, DialogMessage, DialogType, Buttons, DefaultIndex, EscapeResult, X, Y);
 end;
 
 function RightJustifyMenuItem(HndMenu: HMenu;
@@ -1329,6 +1353,9 @@ end;
 { =============================================================================
 
   $Log$
+  Revision 1.56  2002/10/14 18:36:57  lazarus
+  AJ: Improvements/Fixes to new PromptUser API
+
   Revision 1.55  2002/10/12 16:36:40  lazarus
   AJ: added new QueryUser/NotifyUser
 
diff --git a/lcl/include/winapih.inc b/lcl/include/winapih.inc
index e4f551c169..689a9c74ac 100644
--- a/lcl/include/winapih.inc
+++ b/lcl/include/winapih.inc
@@ -212,11 +212,19 @@ function ShowScrollBar(Handle: HWND; wBar: Integer; bShow: Boolean): Boolean; {$
 function StretchBlt(DestDC: HDC; X, Y, Width, Height: Integer; SrcDC: HDC; XSrc, YSrc, SrcWidth, SrcHeight: Integer; Rop: Cardinal): Boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
 function StretchMaskBlt(DestDC: HDC; X, Y, Width, Height: Integer; SrcDC: HDC; XSrc, YSrc, SrcWidth, SrcHeight: Integer; Mask: HBITMAP; XMask, YMask: Integer; Rop: DWORD): Boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
 
-Procedure NotifyUser(const DialogCaption, DialogMessage : String; DialogType : longint);{$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
+{$IFNDEF IF_BASE_MEMBER}
+Procedure NotifyUser(const DialogMessage : String; DialogType : longint);
+Procedure NotifyUserAtXY(const DialogMessage : String; DialogType : longint; X, Y : Longint);{$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
+
+Procedure NotifyUser(const DialogCaption, DialogMessage : String; DialogType : longint);
 Procedure NotifyUserAtXY(const DialogCaption, DialogMessage : String; DialogType : longint; X, Y : Longint);{$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
 
-Function PromptUser(const DialogCaption, DialogMessage : String; DialogType : longint; Buttons : Array of Longint) : Longint;{$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
-Function PromptUserAtXY(const DialogCaption, DialogMessage : String; DialogType : longint; Buttons : Array of Longint; X, Y : Longint) : Longint;{$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
+Function PromptUser(const DialogMessage : String; DialogType : longint; Buttons : Array of Longint; DefaultIndex, EscapeResult : Longint) : Longint;{$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
+Function PromptUserAtXY(const DialogMessage : String; DialogType : longint; Buttons : Array of Longint; DefaultIndex, EscapeResult : Longint; X, Y : Longint) : Longint;{$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
+{$EndIf}
+
+Function PromptUser(const DialogCaption, DialogMessage : String; DialogType : longint; Buttons : Array of Longint; DefaultIndex, EscapeResult : Longint) : Longint;{$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
+Function PromptUserAtXY(const DialogCaption, DialogMessage : String; DialogType : longint; Buttons : Array of Longint; DefaultIndex, EscapeResult : Longint; X, Y : Longint) : Longint;{$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
 
 Function RequestInput(const InputCaption, InputPrompt : String; MaskInput : Boolean; var Value : String) : Boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
 
@@ -319,6 +327,9 @@ Function RGB(R, G, B : Byte) : TColorRef;
 { =============================================================================
 
   $Log$
+  Revision 1.50  2002/10/14 18:36:57  lazarus
+  AJ: Improvements/Fixes to new PromptUser API
+
   Revision 1.49  2002/10/12 16:36:40  lazarus
   AJ: added new QueryUser/NotifyUser