Gtk2: TGtk2WidgetSet.PromptUser() fixed wrong mapping of ignore button to gtk-remove stock id. Now it's mapped to gtk-cancel since gtk2 doesn't have "ignore" as stock id. Fixes #17812.

git-svn-id: trunk@28058 -
This commit is contained in:
zeljko 2010-11-03 14:53:49 +00:00
parent 6f951c6cc6
commit e7da031bee

View File

@ -1,4 +1,4 @@
{%MainUnit gtk2int.pp} {%MainUnit gtk2int.pas}
{ $Id$ } { $Id$ }
{****************************************************************************** {******************************************************************************
All GTK2 interface communication implementations. All GTK2 interface communication implementations.
@ -906,7 +906,7 @@ var
idButtonClose : Result := GTK_RESPONSE_CLOSE; idButtonClose : Result := GTK_RESPONSE_CLOSE;
idButtonAbort : Result := GTK_RESPONSE_CANCEL; idButtonAbort : Result := GTK_RESPONSE_CANCEL;
idButtonRetry : Result := GTK_RESPONSE_ACCEPT; idButtonRetry : Result := GTK_RESPONSE_ACCEPT;
idButtonIgnore : Result := GTK_RESPONSE_CLOSE; idButtonIgnore : Result := GTK_RESPONSE_CANCEL;
idButtonNoToAll : Result := GTK_RESPONSE_APPLY; idButtonNoToAll : Result := GTK_RESPONSE_APPLY;
idButtonYesToAll : Result := GTK_RESPONSE_REJECT; idButtonYesToAll : Result := GTK_RESPONSE_REJECT;
end; end;
@ -954,7 +954,7 @@ begin
idButtonClose : CreateButton('gtk-close', GTK_RESPONSE_CLOSE); idButtonClose : CreateButton('gtk-close', GTK_RESPONSE_CLOSE);
idButtonAbort : CreateButton('gtk-stop', GTK_RESPONSE_REJECT); idButtonAbort : CreateButton('gtk-stop', GTK_RESPONSE_REJECT);
idButtonRetry : CreateButton('gtk-refresh', GTK_RESPONSE_ACCEPT); idButtonRetry : CreateButton('gtk-refresh', GTK_RESPONSE_ACCEPT);
idButtonIgnore : CreateButton('gtk-remove', GTK_RESPONSE_CLOSE); idButtonIgnore : CreateButton('gtk-cancel', GTK_RESPONSE_CLOSE);
idButtonNoToAll : CreateButton('gtk-no', GTK_RESPONSE_REJECT); idButtonNoToAll : CreateButton('gtk-no', GTK_RESPONSE_REJECT);
idButtonYesToAll : CreateButton('gtk-apply', GTK_RESPONSE_APPLY); idButtonYesToAll : CreateButton('gtk-apply', GTK_RESPONSE_APPLY);
end; end;