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 cc581e9bf44fdae933614ae1f1bcd88cc919f172..966b6001baab09493d96f813cb563ae159c3e573 100644 (file)
--- a/src/mac/carbon/dialog.cpp
+++ b/src/mac/carbon/dialog.cpp
@@ -1,142 +1,115 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dialog.cpp
+// Name:        src/mac/carbon/dialog.cpp

 // Purpose:     wxDialog class
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Purpose:     wxDialog class
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:       wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "dialog.h"
-#endif
+#include "wx/wxprec.h"

 
 #include "wx/dialog.h"
 
 #include "wx/dialog.h"

-#include "wx/utils.h"
-#include "wx/frame.h"
-#include "wx/app.h"
-#include "wx/settings.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/utils.h"
+    #include "wx/frame.h"
+    #include "wx/settings.h"
+#endif // WX_PRECOMP

 
 #include "wx/mac/uma.h"
 
 
 #include "wx/mac/uma.h"
 

+

 // Lists to keep track of windows, so we can disable/enable them
 // for modal dialogs
 wxList wxModalDialogs;
 // Lists to keep track of windows, so we can disable/enable them
 // for modal dialogs
 wxList wxModalDialogs;

-//wxList wxModelessWindows;  // Frames and modeless dialogs
-extern wxList wxPendingDelete;

 
 

-#if !USE_SHARED_LIBRARY

 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_CHAR_HOOK(wxDialog::OnCharHook)
-
-  EVT_SYS_COLOUR_CHANGED(wxDialog::OnSysColourChanged)
-
-  EVT_CLOSE(wxDialog::OnCloseWindow)
-END_EVENT_TABLE()
-
-#endif
-

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

-bool wxDialog::Create(wxWindow *parent, wxWindowID id,
-           const wxString& title,
-           const wxPoint& pos,
-           const wxSize& size,
-           long style,
-           const wxString& name)
+bool wxDialog::Create( wxWindow *parent,
+    wxWindowID id,
+    const wxString& title,
+    const wxPoint& pos,
+    const wxSize& size,
+    long style,
+    const wxString& name )

 {
 {

-    SetExtraStyle(GetExtraStyle() | wxTOPLEVEL_EX_DIALOG);
+    SetExtraStyle( GetExtraStyle() | wxTOPLEVEL_EX_DIALOG );

 
 

-    // All dialogs should really have this style
+    // All dialogs should really have this style...

     style |= wxTAB_TRAVERSAL;
 
     style |= wxTAB_TRAVERSAL;
 

-    if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style & ~(wxYES|wxOK|wxNO|wxCANCEL) , name) )
-        return FALSE;
+    // ...but not these styles
+    style &= ~(wxYES | wxOK | wxNO); // | wxCANCEL

 
 

-    return TRUE;
+    if ( !wxTopLevelWindow::Create( parent, id, title, pos, size, style, name ) )
+        return false;
+
+    return true;

 }
 
 }
 

-void wxDialog::SetModal(bool flag)
+void wxDialog::SetModal( bool flag )

 {
     if ( flag )
     {
         m_isModalStyle = true;
 
 {
     if ( flag )
     {
         m_isModalStyle = true;
 

-        wxModelessWindows.DeleteObject(this);
-#if TARGET_CARBON
-        SetWindowModality( (WindowRef) MacGetWindowRef() , kWindowModalityAppModal , NULL ) ;
-#endif
+        wxModelessWindows.DeleteObject( this );
+
+        SetWindowModality( (WindowRef)MacGetWindowRef(), kWindowModalityAppModal, NULL ) ;

     }
     else
     {
         m_isModalStyle = false;
 
     }
     else
     {
         m_isModalStyle = false;
 

-        wxModelessWindows.Append(this);
+        wxModelessWindows.Append( this );

     }
 }
 
 wxDialog::~wxDialog()
 {
     }
 }
 
 wxDialog::~wxDialog()
 {

-    m_isBeingDeleted = TRUE;
-    Show(FALSE);
+    m_isBeingDeleted = true;
+    Show(false);

 }
 
 }
 

-// By default, pressing escape cancels the dialog , on mac command-stop does the same thing
-void wxDialog::OnCharHook(wxKeyEvent& event)
+// On mac command-stop does the same thing as Esc, let the base class know
+// about it
+bool wxDialog::IsEscapeKey(const wxKeyEvent& event)

 {
 {

-    if (( event.m_keyCode == WXK_ESCAPE ||
-        ( event.m_keyCode == '.' && event.MetaDown() ) )
-        && FindWindow(wxID_CANCEL) )
-    {
-        // Behaviour changed in 2.0: we'll send a Cancel message
-        // to the dialog instead of Close.
-        wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
-        cancelEvent.SetEventObject( this );
-        GetEventHandler()->ProcessEvent(cancelEvent);
+    if ( event.GetKeyCode() == '.' && event.GetModifiers() == wxMOD_CMD )
+        return true;

 
 

-        return;
-    }
-    // We didn't process this event.
-    event.Skip();
+    return wxDialogBase::IsEscapeKey(event);

 }
 
 bool wxDialog::IsModal() const
 }
 
 bool wxDialog::IsModal() const

-{
-    return m_isModalStyle;
-}
-
-
-bool wxDialog::IsModalShowing() const

 {
     return wxModalDialogs.Find((wxDialog *)this) != NULL; // const_cast
 {
     return wxModalDialogs.Find((wxDialog *)this) != NULL; // const_cast

+    //    return m_isModalStyle;

 }
 
 }
 

+

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

-    {

         // nothing to do
         // nothing to do

-        return FALSE;
-    }
+        return false;

 
     if ( show )
 
     if ( show )

-    {

         // usually will result in TransferDataToWindow() being called
         InitDialog();
         // usually will result in TransferDataToWindow() being called
         InitDialog();

-    }

 
 

-    if ( IsModal() )
+    HiliteMenu(0);
+
+    if ( m_isModalStyle )

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


@@ -144,58 +117,59 @@ bool wxDialog::Show(bool show)
         }
         else // end of modal dialog
         {
         }
         else // end of modal dialog
         {

-            // this will cause IsModalShowing() return FALSE and our local
+            // this will cause IsModalShowing() return false and our local

             // message loop will terminate
             wxModalDialogs.DeleteObject(this);
         }
     }
 
             // message loop will terminate
             wxModalDialogs.DeleteObject(this);
         }
     }
 

-    return TRUE;
+    return true;

 }
 
 }
 

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

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

-    wxCHECK_RET( !IsModalShowing(), _T("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
-    while ( IsModalShowing() )
+
+    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 ( 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 );
+    }

 }
 
 
 }
 
 

-// Replacement for Show(TRUE) for modal dialogs - returns return code
+// Replacement for Show(true) for modal dialogs - returns return code

 int wxDialog::ShowModal()
 {
 int wxDialog::ShowModal()
 {

-    if ( !IsModal() )
-    {
-        SetModal(TRUE);
-    }
+    if ( !m_isModalStyle )
+        SetModal(true);
+
+    Show(true);

 
 

-    Show(TRUE);

     return GetReturnCode();
 }
 
     return GetReturnCode();
 }
 


@@ -203,64 +177,8 @@ int wxDialog::ShowModal()
 //     dialogs and should work for both of them
 void wxDialog::EndModal(int retCode)
 {
 //     dialogs and should work for both of them
 void wxDialog::EndModal(int retCode)
 {

-  SetReturnCode(retCode);
-  Show(FALSE);
-}
-
-// Standard buttons
-void wxDialog::OnOK(wxCommandEvent& WXUNUSED(event))
-{
-  if ( Validate() && TransferDataFromWindow() )
-  {
-      EndModal(wxID_OK);
-  }
-}
-
-void wxDialog::OnApply(wxCommandEvent& WXUNUSED(event))
-{
-  if (Validate())
-    TransferDataFromWindow();
-  // TODO probably need to disable the Apply button until things change again
-}
-
-void wxDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
-{
-    EndModal(wxID_CANCEL);
-}
-
-void wxDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
-{
-    // We'll send a Cancel message by default,
-    // which may close the dialog.
-    // Check for looping if the Cancel event handler calls Close().
-
-    // Note that if a cancel button and handler aren't present in the dialog,
-    // nothing will happen when you close the dialog via the window manager, or
-    // via Close().
-    // We wouldn't want to destroy the dialog by default, since the dialog may have been
-    // created on the stack.
-    // However, this does mean that calling dialog->Close() won't delete the dialog
-    // unless the handler for wxID_CANCEL does so. So use Destroy() if you want to be
-    // sure to destroy the dialog.
-    // The default OnCancel (above) simply ends a modal dialog, and hides a modeless dialog.
-
-    static wxList closing;
-
-    if ( closing.Member(this) )
-        return;
-
-    closing.Append(this);
-
-    wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
-    cancelEvent.SetEventObject( this );
-    GetEventHandler()->ProcessEvent(cancelEvent); // This may close the dialog
-
-    closing.DeleteObject(this);
-}
-
-void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))
-{
-  SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
-  Refresh();
+    SetReturnCode(retCode);
+    Show(false);
+    SetModal(false);

 }
 
 }