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

LCL-GTK3: Prevent crash when Open/SaveDialog is closed. Remove 'destroy' signal handler. Still no memory leaks.

Browse Source
This commit is contained in:
Juha 2021-11-06 02:46:48 +02:00
parent 776e1e91ad
commit 0d20c53cd4
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lcl/interfaces/gtk3/gtk3wsdialogs.pp
View File

@ -961,8 +961,8 @@ end;
Params: widget: PGtkWidget; data: gPointer Params: widget: PGtkWidget; data: gPointer
Result: GBoolean Result: GBoolean
This function is called, when a commondialog is destroyed This function is called when a commondialog is destroyed (caused a crash, removed)
-------------------------------------------------------------------------------} -------------------------------------------------------------------------------
function gtkDialogDestroyCB(widget: PGtkWidget; data: gPointer): GBoolean; cdecl; function gtkDialogDestroyCB(widget: PGtkWidget; data: gPointer): GBoolean; cdecl;
begin begin
Result := True; Result := True;
@ -970,7 +970,7 @@ begin
TCommonDialog(data).UserChoice := mrCancel; TCommonDialog(data).UserChoice := mrCancel;
TCommonDialog(data).Close; TCommonDialog(data).Close;
end; end;
}
{------------------------------------------------------------------------------- {-------------------------------------------------------------------------------
function GTKDialogKeyUpDownCB function GTKDialogKeyUpDownCB
Params: Widget: PGtkWidget; Event : pgdkeventkey; Data: gPointer Params: Widget: PGtkWidget; Event : pgdkeventkey; Data: gPointer
@ -1482,8 +1482,8 @@ end;
class procedure TGtk3WSCommonDialog.SetCallbacks(const AGtkWidget: PGtkWidget; class procedure TGtk3WSCommonDialog.SetCallbacks(const AGtkWidget: PGtkWidget;
const AWidgetInfo: TGtk3Dialog); const AWidgetInfo: TGtk3Dialog);
begin begin
g_signal_connect_data(AGtkWidget, //g_signal_connect_data(AGtkWidget,
'destroy', TGCallback(@gtkDialogDestroyCB), AWidgetInfo, nil, 0); // 'destroy', TGCallback(@gtkDialogDestroyCB), AWidgetInfo, nil, 0);
g_signal_connect_data(AGtkWidget, g_signal_connect_data(AGtkWidget,
'delete-event', TGCallback(@gtkDialogCloseQueryCB), AWidgetInfo, nil, 0); 'delete-event', TGCallback(@gtkDialogCloseQueryCB), AWidgetInfo, nil, 0);
g_signal_connect_data(AGtkWidget, g_signal_connect_data(AGtkWidget,