From 0f89f2f5585d9c8cd7027b9b230c662e54df60f0 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Thu, 1 Apr 2004 05:58:11 +0000 Subject: [PATCH] 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 --- src/mac/carbon/dialog.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mac/carbon/dialog.cpp b/src/mac/carbon/dialog.cpp index 16f3a0fb7f..95606e6db0 100644 --- 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; - 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)); @@ -167,7 +167,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 ; @@ -180,7 +180,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 ;