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

* The handle of a TCustomForm contains in most cases a TCocoaWindowContent and not directly a NSWindow. This fixes an access violation

Browse Source 
git-svn-id: trunk@43791 -
This commit is contained in:
joost 2014-01-25 10:50:10 +00:00
parent 4ba9ae2cdc
commit a491cb1360
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lcl/interfaces/cocoa/cocoawsforms.pp
View File

@ -382,8 +382,13 @@ begin
cnt.callback := TCocoaWindow(win).callback;
win.setContentView(cnt);
if AParams.WndParent <> 0 then
NSWindow(AParams.WndParent).addChildWindow_ordered(win, NSWindowAbove);
if (AParams.WndParent <> 0) then
begin
if (NSObject(AParams.WndParent).isKindOfClass(TCocoaWindowContent)) and (not TCocoaWindowContent(AParams.WndParent).isembedded) then
TCocoaWindowContent(AParams.WndParent).window.addChildWindow_ordered(win, NSWindowAbove)
else
NSWindow(AParams.WndParent).addChildWindow_ordered(win, NSWindowAbove);
end;
end
else
begin