X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2726cac5959dc1cf86be0f483d08f8ec9b68b4d8..db7a550bd7a74758d73885e7344845f8fc7ec934:/src/mac/carbon/dialog.cpp

diff --git a/src/mac/carbon/dialog.cpp b/src/mac/carbon/dialog.cpp
index 1ef72057f8..9ec4ef5220 100644
--- a/src/mac/carbon/dialog.cpp
+++ b/src/mac/carbon/dialog.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        dialog.cpp
 // Purpose:     wxDialog class
-// Author:      AUTHOR
+// Author:      Stefan Csomor
 // Modified by:
-// Created:     ??/??/98
+// Created:     1998-01-01
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:   	wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -44,10 +44,9 @@ END_EVENT_TABLE()
 
 #endif
 
-wxDialog::wxDialog()
+void wxDialog::Init()
 {
-  	m_isShown = FALSE;
-    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
+    m_isModalStyle = false;
 }
 
 bool wxDialog::Create(wxWindow *parent, wxWindowID id,
@@ -57,31 +56,31 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
            long style,
            const wxString& name)
 {
+    SetExtraStyle(GetExtraStyle() | wxTOPLEVEL_EX_DIALOG);
 
-  SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
-  
+    // All dialogs should really have this style
+    style |= wxTAB_TRAVERSAL;
 
-  if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
+    if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style & ~(wxYES|wxOK|wxNO|wxCANCEL) , name) )
         return 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;
+        m_isModalStyle = true;
 
         wxModelessWindows.DeleteObject(this);
+#if TARGET_CARBON
+        SetWindowModality( (WindowRef) MacGetWindowRef() , kWindowModalityAppModal , NULL ) ;
+#endif
     }
     else
     {
-        m_windowStyle &= ~wxDIALOG_MODAL;
+        m_isModalStyle = false;
 
         wxModelessWindows.Append(this);
     }
@@ -89,33 +88,32 @@ void wxDialog::SetModal(bool flag)
 
 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);
+    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();
+        return;
+    }
+    // We didn't process this event.
+    event.Skip();
 }
 
 bool wxDialog::IsModal() const
 {
-    return (GetWindowStyleFlag() & wxDIALOG_MODAL) != 0;
+    return m_isModalStyle;
 }
 
 
@@ -165,53 +163,38 @@ void wxDialog::DoShowModal()
 
     wxModalDialogs.Append(this);
 
-  	wxWindow *parent = GetParent();
-
-    // remember where the focus was
-    wxWindow *winFocus = FindFocus();
-    if ( !winFocus )
-    {
-        winFocus = parent;
-    }
-    if ( !winFocus )
-    {
-        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
-
-
-    // and restore focus
-    if ( winFocus )
-    {
-        winFocus->SetFocus();
-    }
 }
 
 
 // Replacement for Show(TRUE) for modal dialogs - returns return code
 int wxDialog::ShowModal()
 {
-  m_windowStyle |= wxDIALOG_MODAL;
-  Show(TRUE);
-  return GetReturnCode();
+    if ( !IsModal() )
+    {
+        SetModal(TRUE);
+    }
+
+    Show(TRUE);
+    return GetReturnCode();
 }
 
 // NB: this function (surprizingly) may be called for both modal and modeless