* In _GSocket_Get_Mac_Socket(), do not call CFSocketSetSocketFlags to turn

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

diff --git a/src/mac/carbon/dialog.cpp b/src/mac/carbon/dialog.cpp
index 506e3399adb3cfdef236cc571b420b32fb5f90e7..ad9de2c9698be90dd3e843e6fc20ca64a5e46a81 100644 (file)
--- a/src/mac/carbon/dialog.cpp
+++ b/src/mac/carbon/dialog.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:    wxWindows licence
+// Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -46,7 +46,7 @@ END_EVENT_TABLE()
 
 wxDialog::wxDialog()
 {
-       m_isShown = FALSE;
+      m_isShown = FALSE;
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
 }
 
@@ -57,60 +57,62 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
            long style,
            const wxString& name)
 {
-
-  SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
-  
-
-  if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
+    
+    
+    if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
         return FALSE;
+    
+    MacCreateRealWindow( title , pos , size , MacRemoveBordersFromStyle(style) & ~(wxYES|wxOK|wxNO|wxCANCEL) , name ) ;
+    
+    m_macWindowBackgroundTheme = kThemeBrushDialogBackgroundActive ;
+    SetThemeWindowBackground( (WindowRef) m_macWindow , m_macWindowBackgroundTheme , false ) ;
 
-       MacCreateRealWindow( title , pos , size , MacRemoveBordersFromStyle(style)  , name ) ;
-
-       m_macWindowBackgroundTheme = kThemeBrushDialogBackgroundActive ;
-       SetThemeWindowBackground( (WindowRef) m_macWindow , m_macWindowBackgroundTheme , false ) ;
-  return TRUE;
+    return TRUE;
 }
 
 void wxDialog::SetModal(bool flag)
 {
-  if ( flag )
+    if ( flag )
     {
         m_windowStyle |= wxDIALOG_MODAL;
-
+        
         wxModelessWindows.DeleteObject(this);
+#if TARGET_CARBON
+        SetWindowModality( (WindowRef) MacGetWindowRef() , kWindowModalityAppModal , NULL ) ;
+#endif
     }
     else
     {
         m_windowStyle &= ~wxDIALOG_MODAL;
-
+        
         wxModelessWindows.Append(this);
     }
 }
 
 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)
 {
-  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);
-
-               return;
-  }
-  // We didn't process this event.
-  event.Skip();
+    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);
+        
+        return;
+    }
+    // We didn't process this event.
+    event.Skip();
 }
 
 bool wxDialog::IsModal() const
@@ -165,7 +167,7 @@ void wxDialog::DoShowModal()
 
     wxModalDialogs.Append(this);
 
-       wxWindow *parent = GetParent();
+      wxWindow *parent = GetParent();
 
     // remember where the focus was
     wxWindow *winFocus = FindFocus();
@@ -178,23 +180,23 @@ void wxDialog::DoShowModal()
         winFocus = wxTheApp->GetTopWindow();
     }
 #if TARGET_CARBON
-       BeginAppModalStateForWindow(  (WindowRef) MacGetWindowRef()) ;
+    BeginAppModalStateForWindow(  (WindowRef) MacGetWindowRef()) ;
 #else
-       // TODO : test whether parent gets disabled
-       bool formerModal = s_macIsInModalLoop ;
-       s_macIsInModalLoop = true ;
+    // TODO : test whether parent gets disabled
+    bool formerModal = s_macIsInModalLoop ;
+    s_macIsInModalLoop = true ;
 #endif
-       while ( IsModalShowing() )
-       {
-               wxTheApp->MacDoOneEvent() ;
-               // calls process idle itself
-       }
-       
+    while ( IsModalShowing() )
+    {
+        wxTheApp->MacDoOneEvent() ;
+        // calls process idle itself
+    }
+    
 #if TARGET_CARBON
-       EndAppModalStateForWindow( (WindowRef) MacGetWindowRef() ) ;
+    EndAppModalStateForWindow( (WindowRef) MacGetWindowRef() ) ;
 #else
     // TODO probably reenable the parent window if any
-       s_macIsInModalLoop = formerModal ;
+    s_macIsInModalLoop = formerModal ;
 #endif
 
 
@@ -209,13 +211,13 @@ void wxDialog::DoShowModal()
 // Replacement for Show(TRUE) for modal dialogs - returns return code
 int wxDialog::ShowModal()
 {
-       if ( !IsModal() )
-       {
-           SetModal(TRUE);
-       }
+    if ( !IsModal() )
+    {
+        SetModal(TRUE);
+    }
 
-       Show(TRUE);
-       return GetReturnCode();
+    Show(TRUE);
+    return GetReturnCode();
 }
 
 // NB: this function (surprizingly) may be called for both modal and modeless