check that the version of __sync_sub_and_fetch that returns a value is supported...

[wxWidgets.git] / src / mac / carbon / dialog.cpp

diff --git a/src/mac/carbon/dialog.cpp b/src/mac/carbon/dialog.cpp
index f0b0ca6eee2eae1b2e2803c19d545b6d98fa2bf8..966b6001baab09493d96f813cb563ae159c3e573 100644 (file)
--- a/src/mac/carbon/dialog.cpp
+++ b/src/mac/carbon/dialog.cpp
@@ -29,17 +29,6 @@ wxList wxModalDialogs;
 
 IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
 

-BEGIN_EVENT_TABLE(wxDialog, wxDialogBase)
-  EVT_BUTTON(wxID_OK, wxDialog::OnOK)
-  EVT_BUTTON(wxID_APPLY, wxDialog::OnApply)
-  EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel)
-
-  EVT_SYS_COLOUR_CHANGED(wxDialog::OnSysColourChanged)
-
-  EVT_CLOSE(wxDialog::OnCloseWindow)
-END_EVENT_TABLE()
-
-

 void wxDialog::Init()
 {
     m_isModalStyle = false;
 void wxDialog::Init()
 {
     m_isModalStyle = false;


@@ -64,13 +53,6 @@ bool wxDialog::Create( wxWindow *parent,
     if ( !wxTopLevelWindow::Create( parent, id, title, pos, size, style, name ) )
         return false;
 
     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;
 }
 
     return true;
 }
 


@@ -82,9 +64,7 @@ void wxDialog::SetModal( bool flag )
 
         wxModelessWindows.DeleteObject( this );
 
 
         wxModelessWindows.DeleteObject( this );
 

-#if TARGET_CARBON

         SetWindowModality( (WindowRef)MacGetWindowRef(), kWindowModalityAppModal, NULL ) ;
         SetWindowModality( (WindowRef)MacGetWindowRef(), kWindowModalityAppModal, NULL ) ;

-#endif

     }
     else
     {
     }
     else
     {


@@ -117,11 +97,6 @@ bool wxDialog::IsModal() const
 }
 
 
 }
 
 

-bool wxDialog::IsModalShowing() const
-{
-    return wxModalDialogs.Find((wxDialog *)this) != NULL; // const_cast
-}
-

 bool wxDialog::Show(bool show)
 {
     if ( !wxDialogBase::Show(show) )
 bool wxDialog::Show(bool show)
 {
     if ( !wxDialogBase::Show(show) )


@@ -132,6 +107,8 @@ bool wxDialog::Show(bool show)
         // usually will result in TransferDataToWindow() being called
         InitDialog();
 
         // usually will result in TransferDataToWindow() being called
         InitDialog();
 

+    HiliteMenu(0);
+

     if ( m_isModalStyle )
     {
         if ( show )
     if ( m_isModalStyle )
     {
         if ( show )


@@ -149,38 +126,39 @@ bool wxDialog::Show(bool show)
     return true;
 }
 
     return true;
 }
 

-#if !TARGET_CARBON
-extern bool s_macIsInModalLoop ;
-#endif
-

 void wxDialog::DoShowModal()
 {
 void wxDialog::DoShowModal()
 {

-    wxCHECK_RET( !IsModalShowing(), wxT("DoShowModal() called twice") );
+    wxCHECK_RET( !IsModal(), wxT("DoShowModal() called twice") );

 
     wxModalDialogs.Append(this);
 
     SetFocus() ;
 
 
     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;
+
+    if ( GetParent() == NULL )
+    {
+        windowGroup = GetWindowGroup(windowRef) ;
+        formerParentGroup = GetWindowGroupParent( windowGroup );
+        SetWindowGroupParent( windowGroup, GetWindowGroupOfClass( kMovableModalWindowClass ) );
+        resetGroupParent = true;
+    }
+    BeginAppModalStateForWindow(windowRef) ;

 
 

-    while ( IsModalShowing() )
+    while ( IsModal() )

     {
         wxTheApp->MacDoOneEvent() ;
         // calls process idle itself
     }
 
     {
         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 );
+    }

 }
 
 
 }