diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-08-27 07:09:23 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-08-27 07:09:23 +0000 |
| commit | 7c2bf1b6a012ad3407374fb73135e50605cf4f2e (patch) | |
| tree | d79ed5aea0649997298fd581e66afd7ab7e7cf11 /vcl/aqua | |
| parent | ea6d634bd2ec91de4a602cd6e64ebcd20b9cb164 (diff) | |
INTEGRATION: CWS vcl30stop5_DEV300 (1.66.16.2.4); FILE MERGED
2008/08/13 14:33:22 pl 1.66.16.2.4.1: #i92674# work around cocoa mapping invisible parents implicitly
Diffstat (limited to 'vcl/aqua')
| -rw-r--r-- | vcl/aqua/source/window/salframe.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/aqua/source/window/salframe.cxx b/vcl/aqua/source/window/salframe.cxx index b7f924ecbd2e..0be5fc6bb36b 100644 --- a/vcl/aqua/source/window/salframe.cxx +++ b/vcl/aqua/source/window/salframe.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: salframe.cxx,v $ - * $Revision: 1.68 $ + * $Revision: 1.69 $ * * This file is part of OpenOffice.org. * @@ -406,7 +406,7 @@ void AquaSalFrame::Show(BOOL bVisible, BOOL bNoActivate) else [mpWindow makeKeyAndOrderFront: NSApp]; - if( mpParent ) + if( mpParent && mpParent->mbShown ) [mpParent->mpWindow addChildWindow: mpWindow ordered: NSWindowAbove]; if( mbPresentation ) @@ -427,7 +427,7 @@ void AquaSalFrame::Show(BOOL bVisible, BOOL bNoActivate) [mpParent->mpWindow makeKeyAndOrderFront: NSApp]; [SalFrameView unsetMouseFrame: this]; - if( mpParent ) + if( mpParent && [mpWindow parentWindow] == mpParent->mpWindow ) [mpParent->mpWindow removeChildWindow: mpWindow]; [mpWindow orderOut: NSApp]; |