Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removing interference between two layering fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@49109 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2007-10-09 15:29:50 +00:00
parent 1149bfedc9
commit 0f876f047a
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/mac/carbon/dialog.cpp
View File

@@ -145,16 +145,16 @@ void wxDialog::DoShowModal()
SetFocus() ; SetFocus() ;
#if TARGET_CARBON
WindowRef windowRef = (WindowRef) MacGetWindowRef(); WindowRef windowRef = (WindowRef) MacGetWindowRef();
WindowGroupRef formerGroup = GetWindowGroup(windowRef) ; WindowGroupRef windowGroup;
SetWindowGroup( windowRef, GetWindowGroupOfClass( kMovableModalWindowClass )); WindowGroupRef formerParentGroup;
if ( GetParent() == NULL )
{
windowGroup = GetWindowGroup(windowRef) ;
formerParentGroup = GetWindowGroupParent( windowGroup );
SetWindowGroupParent( windowGroup, GetWindowGroupOfClass( kMovableModalWindowClass ) );
}
BeginAppModalStateForWindow(windowRef) ; BeginAppModalStateForWindow(windowRef) ;
#else
// TODO : test whether parent gets disabled
bool formerModal = s_macIsInModalLoop ;
s_macIsInModalLoop = true ;
#endif
while ( IsModalShowing() ) while ( IsModalShowing() )
{ {
@@ -162,13 +162,11 @@ void wxDialog::DoShowModal()
// calls process idle itself // calls process idle itself
} }
#if TARGET_CARBON
EndAppModalStateForWindow(windowRef) ; EndAppModalStateForWindow(windowRef) ;
SetWindowGroup( windowRef, formerGroup ); if ( GetParent() == NULL )
#else {
// TODO probably reenable the parent window if any SetWindowGroupParent( windowGroup , formerParentGroup );
s_macIsInModalLoop = formerModal ; }
#endif
} }