X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/eeacbb8c4ff812199e509b36329d1bb237f770a1..736fac3a51ed6e9c4ac906a731b9d35a349303e6:/src/mac/carbon/dialog.cpp

diff --git a/src/mac/carbon/dialog.cpp b/src/mac/carbon/dialog.cpp
index f29ed3e59e..af14cbc258 100644
--- a/src/mac/carbon/dialog.cpp
+++ b/src/mac/carbon/dialog.cpp
@@ -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,17 +56,14 @@ 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) )
+    if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style & ~(wxYES|wxOK|wxNO|wxCANCEL) , name) )
         return FALSE;
 
-    MacCreateRealWindow( title , pos , size , MacRemoveBordersFromStyle(style) & ~(wxYES|wxOK|wxNO|wxCANCEL) , name ) ;
-
-    m_macWindowBackgroundTheme = kThemeBrushDialogBackgroundActive ;
-    SetThemeWindowBackground( (WindowRef) m_macWindow , m_macWindowBackgroundTheme , false ) ;
-
     return TRUE;
 }
 
@@ -75,7 +71,7 @@ void wxDialog::SetModal(bool flag)
 {
     if ( flag )
     {
-        m_windowStyle |= wxDIALOG_MODAL;
+        m_isModalStyle = true;
 
         wxModelessWindows.DeleteObject(this);
 #if TARGET_CARBON
@@ -84,7 +80,7 @@ void wxDialog::SetModal(bool flag)
     }
     else
     {
-        m_windowStyle &= ~wxDIALOG_MODAL;
+        m_isModalStyle = false;
 
         wxModelessWindows.Append(this);
     }
@@ -117,7 +113,7 @@ void wxDialog::OnCharHook(wxKeyEvent& event)
 
 bool wxDialog::IsModal() const
 {
-    return (GetWindowStyleFlag() & wxDIALOG_MODAL) != 0;
+    return m_isModalStyle;
 }
 
 
@@ -168,7 +164,7 @@ void wxDialog::DoShowModal()
     wxModalDialogs.Append(this);
 
 #if TARGET_CARBON
-    BeginAppModalStateForWindow(  (WindowRef) MacGetWindowRef()) ;
+//    BeginAppModalStateForWindow(  (WindowRef) MacGetWindowRef()) ;
 #else
     // TODO : test whether parent gets disabled
     bool formerModal = s_macIsInModalLoop ;
@@ -181,7 +177,7 @@ void wxDialog::DoShowModal()
     }
 
 #if TARGET_CARBON
-    EndAppModalStateForWindow( (WindowRef) MacGetWindowRef() ) ;
+//    EndAppModalStateForWindow( (WindowRef) MacGetWindowRef() ) ;
 #else
     // TODO probably reenable the parent window if any
     s_macIsInModalLoop = formerModal ;