removed flags for wxOK etc that interfere with miniframe style

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

diff --git a/src/mac/carbon/dialog.cpp b/src/mac/carbon/dialog.cpp
index 16f3a0fb7f93660aac7a4edda1edea332350352b..95606e6db09f63989d5016c1c58efb54f83d1604 100644 (file)
--- a/src/mac/carbon/dialog.cpp
+++ b/src/mac/carbon/dialog.cpp
@@ -62,7 +62,7 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
     // All dialogs should really have this style
     style |= wxTAB_TRAVERSAL;
 
     // 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;
 
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
         return FALSE;
 
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));


@@ -167,7 +167,7 @@ void wxDialog::DoShowModal()
     wxModalDialogs.Append(this);
 
 #if TARGET_CARBON
     wxModalDialogs.Append(this);
 
 #if TARGET_CARBON

-    BeginAppModalStateForWindow(  (WindowRef) MacGetWindowRef()) ;
+//    BeginAppModalStateForWindow(  (WindowRef) MacGetWindowRef()) ;

 #else
     // TODO : test whether parent gets disabled
     bool formerModal = s_macIsInModalLoop ;
 #else
     // TODO : test whether parent gets disabled
     bool formerModal = s_macIsInModalLoop ;


@@ -180,7 +180,7 @@ void wxDialog::DoShowModal()
     }
 
 #if TARGET_CARBON
     }
 
 #if TARGET_CARBON

-    EndAppModalStateForWindow( (WindowRef) MacGetWindowRef() ) ;
+//    EndAppModalStateForWindow( (WindowRef) MacGetWindowRef() ) ;

 #else
     // TODO probably reenable the parent window if any
     s_macIsInModalLoop = formerModal ;
 #else
     // TODO probably reenable the parent window if any
     s_macIsInModalLoop = formerModal ;