applied patch 923858 (fixes crash in zlib streams)

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

diff --git a/src/mac/carbon/dialog.cpp b/src/mac/carbon/dialog.cpp
index ad9de2c9698be90dd3e843e6fc20ca64a5e46a81..16f3a0fb7f93660aac7a4edda1edea332350352b 100644 (file)
--- a/src/mac/carbon/dialog.cpp
+++ b/src/mac/carbon/dialog.cpp
@@ -57,16 +57,15 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
            long style,
            const wxString& name)
 {
-    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
-    
-    
+    SetExtraStyle(GetExtraStyle() | wxTOPLEVEL_EX_DIALOG);
+
+    // All dialogs should really have this style
+    style |= wxTAB_TRAVERSAL;
+
     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 ) ;
+
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
 
     return TRUE;
 }
@@ -76,7 +75,7 @@ void wxDialog::SetModal(bool flag)
     if ( flag )
     {
         m_windowStyle |= wxDIALOG_MODAL;
-        
+
         wxModelessWindows.DeleteObject(this);
 #if TARGET_CARBON
         SetWindowModality( (WindowRef) MacGetWindowRef() , kWindowModalityAppModal , NULL ) ;
@@ -85,7 +84,7 @@ void wxDialog::SetModal(bool flag)
     else
     {
         m_windowStyle &= ~wxDIALOG_MODAL;
-        
+
         wxModelessWindows.Append(this);
     }
 }
@@ -99,7 +98,7 @@ wxDialog::~wxDialog()
 // 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 || 
+    if (( event.m_keyCode == WXK_ESCAPE ||
         ( event.m_keyCode == '.' && event.MetaDown() ) )
         && FindWindow(wxID_CANCEL) )
     {
@@ -108,7 +107,7 @@ void wxDialog::OnCharHook(wxKeyEvent& event)
         wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
         cancelEvent.SetEventObject( this );
         GetEventHandler()->ProcessEvent(cancelEvent);
-        
+
         return;
     }
     // We didn't process this event.
@@ -167,18 +166,6 @@ 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()) ;
 #else
@@ -191,20 +178,13 @@ void wxDialog::DoShowModal()
         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
-
-
-    // and restore focus
-    if ( winFocus )
-    {
-        winFocus->SetFocus();
-    }
 }