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

GTK3: Fixed crash on Win64 after recent changes on GTK3 hints.

Browse Source 
Seems that on Win64, `FHintControl` is not always a valid `TWinControl`
class instance.
This commit is contained in:
Abou Al Montacir 2023-06-25 20:29:18 +02:00
parent ed0b79bf27
commit 58645a39f4
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lcl/forms.pp
View File

@ -991,6 +991,7 @@ type
FAutoHide: Boolean; FAutoHide: Boolean;
FAutoHideTimer: TCustomTimer; FAutoHideTimer: TCustomTimer;
FHideInterval: Integer; FHideInterval: Integer;
FHintCtrl: TControl;
procedure AdjustBoundsForMonitor(KeepWidth: Boolean = True; procedure AdjustBoundsForMonitor(KeepWidth: Boolean = True;
KeepHeight: Boolean = True); KeepHeight: Boolean = True);
function GetDrawTextFlags: Cardinal; function GetDrawTextFlags: Cardinal;
@ -1040,6 +1041,7 @@ type
property HintRect: TRect read FHintRect write FHintRect; property HintRect: TRect read FHintRect write FHintRect;
property HintRectAdjust: TRect read FHintRect write SetHintRectAdjust; property HintRectAdjust: TRect read FHintRect write SetHintRectAdjust;
property HintData: Pointer read FHintData write FHintData; property HintData: Pointer read FHintData write FHintData;
property HintControl: TControl read FHintCtrl write FHintCtrl; experimental;
property AutoHide: Boolean read FAutoHide write SetAutoHide; property AutoHide: Boolean read FAutoHide write SetAutoHide;
property BiDiMode; property BiDiMode;
property HideInterval: Integer read FHideInterval write SetHideInterval; property HideInterval: Integer read FHideInterval write SetHideInterval;

2
lcl/include/application.inc
View File

@ -850,7 +850,7 @@ begin
Visible := False; Visible := False;
Caption := ''; Caption := '';
AutoHide := False; AutoHide := False;
HintData := Pointer((FHintControl as TWinControl).Handle); HintControl := FHintControl;
end; end;
end; end;

4
lcl/interfaces/gtk3/gtk3widgets.pas
View File

@ -7903,8 +7903,8 @@ var
begin begin
inherited; inherited;
with LCLObject as THintWindow do begin with LCLObject as THintWindow do begin
if Assigned(HintData) then begin if HintControl is TWinControl then with HintControl as TWinControl do begin
ParentWidget := TGtk3Widget(HintData); ParentWidget := TGtk3Widget(Handle);
FWidget^.realize; FWidget^.realize;
GetWindow^.set_transient_for(ParentWidget.GetWindow); GetWindow^.set_transient_for(ParentWidget.GetWindow);
end; end;