if ( !wxTopLevelWindow::Create( parent, id, title, pos, size, style, name ) )
return false;
-#if TARGET_API_MAC_OSX
- HIViewRef growBoxRef = 0 ;
- OSStatus err = HIViewFindByID( HIViewGetRoot( (WindowRef)m_macWindow ), kHIViewWindowGrowBoxID, &growBoxRef );
- if ( err == noErr && growBoxRef != 0 )
- HIGrowBoxViewSetTransparent( growBoxRef, true ) ;
-#endif
-
return true;
}
wxModelessWindows.DeleteObject( this );
-#if TARGET_CARBON
SetWindowModality( (WindowRef)MacGetWindowRef(), kWindowModalityAppModal, NULL ) ;
-#endif
}
else
{
wxDialog::~wxDialog()
{
m_isBeingDeleted = true;
+
+ // if the dialog is modal, this will end its event loop
Show(false);
}
// nothing to do
return false;
+ if (show && CanDoLayoutAdaptation())
+ DoLayoutAdaptation();
+
if ( show )
// usually will result in TransferDataToWindow() being called
InitDialog();
+ HiliteMenu(0);
+
if ( m_isModalStyle )
{
if ( show )
return true;
}
-#if !TARGET_CARBON
-extern bool s_macIsInModalLoop ;
-#endif
-
void wxDialog::DoShowModal()
{
- wxCHECK_RET( !IsModalShowing(), wxT("DoShowModal() called twice") );
+ wxCHECK_RET( !IsModal(), wxT("DoShowModal() called twice") );
wxModalDialogs.Append(this);
SetFocus() ;
-#if TARGET_CARBON
- BeginAppModalStateForWindow( (WindowRef) MacGetWindowRef()) ;
-#else
- // TODO : test whether parent gets disabled
- bool formerModal = s_macIsInModalLoop ;
- s_macIsInModalLoop = true ;
-#endif
+ WindowRef windowRef = (WindowRef) MacGetWindowRef();
+ WindowGroupRef windowGroup;
+ WindowGroupRef formerParentGroup;
+ bool resetGroupParent = false;
- while ( IsModalShowing() )
+ if ( GetParent() == NULL )
+ {
+ windowGroup = GetWindowGroup(windowRef) ;
+ formerParentGroup = GetWindowGroupParent( windowGroup );
+ SetWindowGroupParent( windowGroup, GetWindowGroupOfClass( kMovableModalWindowClass ) );
+ resetGroupParent = true;
+ }
+ BeginAppModalStateForWindow(windowRef) ;
+
+ while ( IsModal() )
{
wxTheApp->MacDoOneEvent() ;
// calls process idle itself
}
-#if TARGET_CARBON
- EndAppModalStateForWindow( (WindowRef) MacGetWindowRef() ) ;
-#else
- // TODO probably reenable the parent window if any
- s_macIsInModalLoop = formerModal ;
-#endif
+ EndAppModalStateForWindow(windowRef) ;
+ if ( resetGroupParent )
+ {
+ SetWindowGroupParent( windowGroup , formerParentGroup );
+ }
}