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

Merged revision(s) 53027 #dcbe735606 from trunk:

Browse Source 
Carbon: fixed hang with save dialog. issue #29911
........

git-svn-id: branches/fixes_1_6@53784 -
This commit is contained in:
maxim 2016-12-27 22:26:33 +00:00
parent 4f2fce423d
commit b77cf2fae1
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lcl/interfaces/carbon/carbonwinapi.inc
View File

@ -1811,8 +1811,11 @@ begin
DebugLn('TCarbonWidgetSet.GetParent Widget: ' + DbgS(TCarbonControl(Handle).Widget));
{$ENDIF}
Result := HWnd(GetCarbonWidget(HIViewGetSuperview(TCarbonControl(Handle).Widget)));
if Result = 0 then // no parent control => then parent is a window?
if Result = 0 then begin // no parent control => then parent is a window?
Result := HWnd(GetCarbonWidget(HIViewGetWindow(TCarbonControl(Handle).Widget)));
if Result = Handle then
Result := 0; // Sanity check - otherwise FindLCLWindow can be stuck in a loop
end;
end;
// Carbon windows has no parent