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

added wxCANCEL_DEFAULT style to wxMessageDialog (only implemented for MSW for now); also tightened up the style checks in wxMessageDialog::SetMessageDialogStyle()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55561 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-09-11 23:37:35 +00:00
parent c9b6cebdab
commit f45d6ade08
4 changed files with 46 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/msw/msgdlg.cpp
View File

@@ -446,9 +446,9 @@ int wxMessageDialog::ShowModal()
HWND hWnd = m_parent ? GetHwndOf(m_parent) : NULL;
// translate wx style in MSW
unsigned int msStyle = MB_OK;
unsigned int msStyle;
const long wxStyle = GetMessageDialogStyle();
if (wxStyle & wxYES_NO)
if ( wxStyle & wxYES_NO )
{
#if !(defined(__SMARTPHONE__) && defined(__WXWINCE__))
if (wxStyle & wxCANCEL)
@@ -457,17 +457,26 @@ int wxMessageDialog::ShowModal()
#endif // !(__SMARTPHONE__ && __WXWINCE__)
msStyle = MB_YESNO;
if (wxStyle & wxNO_DEFAULT)
if ( wxStyle & wxNO_DEFAULT )
msStyle |= MB_DEFBUTTON2;
else if ( wxStyle & wxCANCEL_DEFAULT )
msStyle |= MB_DEFBUTTON3;
}
else // without Yes/No we're going to have an OK button
{
if ( wxStyle & wxCANCEL )
{
msStyle = MB_OKCANCEL;
if ( wxStyle & wxCANCEL_DEFAULT )
msStyle |= MB_DEFBUTTON2;
}
else // just "OK"
{
msStyle = MB_OK;
}
}
if (wxStyle & wxOK)
{
if (wxStyle & wxCANCEL)
msStyle = MB_OKCANCEL;
else
msStyle = MB_OK;
}
if (wxStyle & wxICON_EXCLAMATION)
msStyle |= MB_ICONEXCLAMATION;
else if (wxStyle & wxICON_HAND)