From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Fri, 9 May 2003 07:12:53 +0000 (+0000)
Subject: masking out wxOK and friends from dialog style in order to avoid clashes with minifra... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/4506b24a05ead0374f9965b433c1038f5596340c?ds=sidebyside

masking out wxOK and friends from dialog style in order to avoid clashes with miniframe windows flags


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20558 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/mac/carbon/dialog.cpp b/src/mac/carbon/dialog.cpp
index cab8d1906c..ad9de2c969 100644
--- a/src/mac/carbon/dialog.cpp
+++ b/src/mac/carbon/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;
     
-    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 ) ;
@@ -92,7 +92,7 @@ void wxDialog::SetModal(bool flag)
 
 wxDialog::~wxDialog()
 {
-    m_isBeingDeleted = TRUE ;
+    m_isBeingDeleted = TRUE;
     Show(FALSE);
 }
 
diff --git a/src/mac/dialog.cpp b/src/mac/dialog.cpp
index cab8d1906c..ad9de2c969 100644
--- 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;
     
-    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 ) ;
@@ -92,7 +92,7 @@ void wxDialog::SetModal(bool flag)
 
 wxDialog::~wxDialog()
 {
-    m_isBeingDeleted = TRUE ;
+    m_isBeingDeleted = TRUE;
     Show(FALSE);
 }