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

gtk2: fixed av with modal forms. issues #26752,#27577

Browse Source 
git-svn-id: trunk@48136 -
This commit is contained in:
zeljko 2015-03-04 16:40:34 +00:00
parent 002d3acb17
commit 7efeb2a3cc
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lcl/interfaces/gtk2/gtk2callback.inc
View File

@ -1103,6 +1103,7 @@ var
Mess : TLMessage; Mess : TLMessage;
Info: PWidgetInfo; Info: PWidgetInfo;
AStart,AEnd: gint; AStart,AEnd: gint;
AForm: TCustomForm;
{$IFDEF VerboseFocus} {$IFDEF VerboseFocus}
LCLObject: TObject; LCLObject: TObject;
CurFocusWidget: PGtkWidget; CurFocusWidget: PGtkWidget;
@ -1138,8 +1139,23 @@ begin
// do not show selection when widget is unfocused // do not show selection when widget is unfocused
// issues #18164,#21897,#23182 // issues #18164,#21897,#23182
if GtkWidgetIsA(Widget, gtk_type_entry) then if GtkWidgetIsA(Widget, gtk_type_entry) and Assigned(Data) then
begin begin
if (csDestroying in TComponent(Data).ComponentState) or
(csDestroyingHandle in TControl(Data).ControlState) then
begin
// DebugLn('NOTICE: Control is destroying itself, do not add new idle timer for ',dbgsName(TControl(Data)));
exit;
end;
AForm := GetParentForm(TControl(Data));
if Assigned(AForm) and ((csDestroying in AForm.ComponentState) or
(csDestroyingHandle in AForm.ControlState) or
((fsModal in AForm.FormState) and (AForm.ModalResult <> mrNone)) ) then
begin
// DebugLn('NOTICE: Parent form is destroying, do not add new idle timer for ',dbgsName(TControl(Data)));
exit;
end;
g_idle_add(@GtkEntryDelayClearCursorPos, Widget); g_idle_add(@GtkEntryDelayClearCursorPos, Widget);
//save now CursorPos and SelStart in WidgetInfo //save now CursorPos and SelStart in WidgetInfo
if (Widget <> nil) then if (Widget <> nil) then