paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-14 12:19:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

LCL-GTK3: Do not HTML encode text in MessageBox. Issue #37804, patch from Anton Kavalenka.

Browse Source 
git-svn-id: trunk@63928 -
This commit is contained in:
juha 2020-09-27 16:32:48 +00:00
parent 0172124a42
commit eda286fd37
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lcl/interfaces/gtk3/gtk3boxes.pas
View File

@ -38,6 +38,7 @@ type
procedure run;
function btn_coll_info(ndx:integer):longint;
function btn_ptr_info(ndx:integer):longint;
procedure set_message_text(const msg:string;const is_pango_markup:boolean=false);
procedure update_widget_list(const func:TBtnListFunction);
procedure CreateButton(const ALabel : String; const AResponse: Integer;
const AImageHint: Integer = -1);
@ -265,7 +266,7 @@ begin
Dialog := gtk_message_dialog_new(nil, GTK_DIALOG_MODAL, GtkDialogType, Btns, nil , []);
gtk_message_dialog_set_markup(PGtkMessageDialog(Dialog), PGChar(DialogMessage));
set_message_text(DialogMessage);
g_signal_connect_data(Dialog, 'delete-event',
TGCallback(@BoxClosed),
@ -315,6 +316,26 @@ begin
Result:=pButtons[ndx];
end;
procedure TGtk3DialogFactory.set_message_text(const msg: string;const is_pango_markup:boolean=false);
var
ma:PGtkWidget;
mainList,ChildList:PgList;
begin
if is_pango_markup then
gtk_message_dialog_set_markup(PGtkMessageDialog(Dialog), PGChar(msg))
else
begin
ma:=PGtkMessageDialog(Dialog)^.get_message_area();
MainList := gtk_container_get_children(PGtkContainer(ma));
if Assigned(MainList) then
begin
PGtkLabel(MainList^.data)^.set_label(PGChar(msg));
g_list_free(MainList);
end;
end;
end;
procedure TGtk3DialogFactory.update_widget_list(const func:TBtnListFunction);
var
btn:PgtkButton;
@ -431,7 +452,7 @@ begin
Dialog := gtk_message_dialog_new(nil, GTK_DIALOG_MODAL, GtkDialogType, Btns, nil , []);
gtk_message_dialog_set_markup(PGtkMessageDialog(Dialog), PGChar(DialogMessage));
set_message_text(DialogMessage);
g_signal_connect_data(GPointer(Dialog), 'delete-event',
TGCallback(@BoxClosed),