debug handling. More broken Apple 'goodness'

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

diff --git a/src/mac/carbon/dialog.cpp b/src/mac/carbon/dialog.cpp
index f29ed3e59eab4d46b446f9f16aa155c56b24c0e4..9ec4ef5220b13e90232794cb99f3004a20de2642 100644 (file)
--- a/src/mac/carbon/dialog.cpp
+++ b/src/mac/carbon/dialog.cpp
@@ -44,10 +44,9 @@ END_EVENT_TABLE()
 
 #endif
 
 
 #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,
 }
 
 bool wxDialog::Create(wxWindow *parent, wxWindowID id,


@@ -57,17 +56,14 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
            long style,
            const wxString& name)
 {
            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;
 
         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;
 }
 
     return TRUE;
 }
 


@@ -75,7 +71,7 @@ void wxDialog::SetModal(bool flag)
 {
     if ( flag )
     {
 {
     if ( flag )
     {

-        m_windowStyle |= wxDIALOG_MODAL;
+        m_isModalStyle = true;

 
         wxModelessWindows.DeleteObject(this);
 #if TARGET_CARBON
 
         wxModelessWindows.DeleteObject(this);
 #if TARGET_CARBON


@@ -84,7 +80,7 @@ void wxDialog::SetModal(bool flag)
     }
     else
     {
     }
     else
     {

-        m_windowStyle &= ~wxDIALOG_MODAL;
+        m_isModalStyle = false;

 
         wxModelessWindows.Append(this);
     }
 
         wxModelessWindows.Append(this);
     }


@@ -117,7 +113,7 @@ void wxDialog::OnCharHook(wxKeyEvent& event)
 
 bool wxDialog::IsModal() const
 {
 
 bool wxDialog::IsModal() const
 {

-    return (GetWindowStyleFlag() & wxDIALOG_MODAL) != 0;
+    return m_isModalStyle;

 }
 
 
 }