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

carbon: disable the main menu then showing modals, fixes #15913

Browse Source 
git-svn-id: trunk@23870 -
This commit is contained in:
dmitry 2010-03-07 23:12:56 +00:00
parent 5024444dc5
commit 96172c3bcd
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lcl/interfaces/carbon/carbonprivatewindow.inc
View File

@ -1683,9 +1683,9 @@ procedure TCarbonWindow.CloseModal;
begin
if not Assigned(fWindowRef) then Exit; // not possible to show modal if not Window mode
if ((LCLObject as TCustomForm).Menu <> nil) and ((LCLObject as TCustomForm).Menu.HandleAllocated) and
(CarbonWidgetSet.MainMenu <> (LCLObject as TCustomForm).Menu.Handle) then
CarbonWidgetSet.SetMainMenuEnabled(True);
//if ((LCLObject as TCustomForm).Menu <> nil) and ((LCLObject as TCustomForm).Menu.HandleAllocated) and
// (CarbonWidgetSet.MainMenu <> (LCLObject as TCustomForm).Menu.Handle) then
CarbonWidgetSet.SetMainMenuEnabled(True);
OSError(
SetWindowModality(fWindowRef, kWindowModalityNone, nil),
@ -1706,9 +1706,14 @@ begin
Self, 'ShowModal', SSetModality);
SelectWindow(fWindowRef);
if ((LCLObject as TCustomForm).Menu <> nil) and ((LCLObject as TCustomForm).Menu.HandleAllocated) and
(CarbonWidgetSet.MainMenu <> (LCLObject as TCustomForm).Menu.Handle) then
CarbonWidgetSet.SetMainMenuEnabled(False);
{if ((LCLObject as TCustomForm).Menu <> nil) and ((LCLObject as TCustomForm).Menu.HandleAllocated) and
(CarbonWidgetSet.MainMenu <> (LCLObject as TCustomForm).Menu.Handle) then begin}
// Always disable the main menu, so the modal window cannot be called again
// if it's previously called by the menu shortcut
// see bug #15913
CarbonWidgetSet.SetMainMenuEnabled(False);
//end;
end;
{------------------------------------------------------------------------------