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

the msw implementation even shows an ok button if it is not specified, we do the same

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19511 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2003-03-06 16:32:14 +00:00
parent 8950f7cc7e
commit c4a49e11f7
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/mac/carbon/msgdlg.cpp
View File

@@ -120,7 +120,8 @@ int wxMessageDialog::ShowModal()
param.cancelButton = 0; param.cancelButton = 0;
} }
} }
else if (m_dialogStyle & wxOK) // the msw implementation even shows an ok button if it is not specified, we'll do the same
else
{ {
if (m_dialogStyle & wxCANCEL) if (m_dialogStyle & wxCANCEL)
{ {
@@ -142,10 +143,12 @@ int wxMessageDialog::ShowModal()
param.cancelButton = 0; param.cancelButton = 0;
} }
} }
/*
else else
{ {
skipDialog = true ; skipDialog = true ;
} }
*/
param.position = kWindowDefaultPosition; param.position = kWindowDefaultPosition;
if ( !skipDialog ) if ( !skipDialog )

5
src/mac/msgdlg.cpp
View File

@@ -120,7 +120,8 @@ int wxMessageDialog::ShowModal()
param.cancelButton = 0; param.cancelButton = 0;
} }
} }
else if (m_dialogStyle & wxOK) // the msw implementation even shows an ok button if it is not specified, we'll do the same
else
{ {
if (m_dialogStyle & wxCANCEL) if (m_dialogStyle & wxCANCEL)
{ {
@@ -142,10 +143,12 @@ int wxMessageDialog::ShowModal()
param.cancelButton = 0; param.cancelButton = 0;
} }
} }
/*
else else
{ {
skipDialog = true ; skipDialog = true ;
} }
*/
param.position = kWindowDefaultPosition; param.position = kWindowDefaultPosition;
if ( !skipDialog ) if ( !skipDialog )