Reverted fragment

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

diff --git a/src/mac/dialog.cpp b/src/mac/dialog.cpp
index 7b7bfc024b7899c5636d789022edcb6947d7ef24..ad9de2c9698be90dd3e843e6fc20ca64a5e46a81 100644 (file)
--- a/src/mac/dialog.cpp
+++ b/src/mac/dialog.cpp
@@ -63,7 +63,7 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
     if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
         return FALSE;
     
     if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
         return FALSE;
     

-    MacCreateRealWindow( title , pos , size , MacRemoveBordersFromStyle(style)  , name ) ;
+    MacCreateRealWindow( title , pos , size , MacRemoveBordersFromStyle(style) & ~(wxYES|wxOK|wxNO|wxCANCEL) , name ) ;

     
     m_macWindowBackgroundTheme = kThemeBrushDialogBackgroundActive ;
     SetThemeWindowBackground( (WindowRef) m_macWindow , m_macWindowBackgroundTheme , false ) ;
     
     m_macWindowBackgroundTheme = kThemeBrushDialogBackgroundActive ;
     SetThemeWindowBackground( (WindowRef) m_macWindow , m_macWindowBackgroundTheme , false ) ;


@@ -78,6 +78,9 @@ void wxDialog::SetModal(bool flag)
         m_windowStyle |= wxDIALOG_MODAL;
         
         wxModelessWindows.DeleteObject(this);
         m_windowStyle |= wxDIALOG_MODAL;
         
         wxModelessWindows.DeleteObject(this);

+#if TARGET_CARBON
+        SetWindowModality( (WindowRef) MacGetWindowRef() , kWindowModalityAppModal , NULL ) ;
+#endif

     }
     else
     {
     }
     else
     {


@@ -89,7 +92,7 @@ void wxDialog::SetModal(bool flag)
 
 wxDialog::~wxDialog()
 {
 
 wxDialog::~wxDialog()
 {

-    m_isBeingDeleted = TRUE ;
+    m_isBeingDeleted = TRUE;

     Show(FALSE);
 }
 
     Show(FALSE);
 }