Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed flags for wxOK etc that interfere with miniframe style

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26530 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2004-04-01 05:58:11 +00:00
parent c6f9fb0548
commit 0f89f2f558
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/mac/carbon/dialog.cpp
View File

@@ -62,7 +62,7 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
// All dialogs should really have this style // All dialogs should really have this style
style |= wxTAB_TRAVERSAL; 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;
SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)); SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
@@ -167,7 +167,7 @@ void wxDialog::DoShowModal()
wxModalDialogs.Append(this); wxModalDialogs.Append(this);
#if TARGET_CARBON #if TARGET_CARBON
BeginAppModalStateForWindow( (WindowRef) MacGetWindowRef()) ; // BeginAppModalStateForWindow( (WindowRef) MacGetWindowRef()) ;
#else #else
// TODO : test whether parent gets disabled // TODO : test whether parent gets disabled
bool formerModal = s_macIsInModalLoop ; bool formerModal = s_macIsInModalLoop ;
@@ -180,7 +180,7 @@ void wxDialog::DoShowModal()
} }
#if TARGET_CARBON #if TARGET_CARBON
EndAppModalStateForWindow( (WindowRef) MacGetWindowRef() ) ; // EndAppModalStateForWindow( (WindowRef) MacGetWindowRef() ) ;
#else #else
// TODO probably reenable the parent window if any // TODO probably reenable the parent window if any
s_macIsInModalLoop = formerModal ; s_macIsInModalLoop = formerModal ;