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

wxMSW: return correct value from wxMessageDialog::GetReturnCode().

Browse Source 
wxMessageDialog's native code didn't call SetReturnCode() as it should.
As a result, it didn't work with ShowWindowModal().

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74776 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2013-09-06 17:09:23 +00:00
parent c5d4360fc9
commit d9b22d8fff
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/msw/msgdlg.cpp
View File

@@ -586,7 +586,9 @@ int wxMessageDialog::ShowMessageBox()
// do show the dialog // do show the dialog
int msAns = MessageBox(hWnd, message.t_str(), m_caption.t_str(), msStyle); int msAns = MessageBox(hWnd, message.t_str(), m_caption.t_str(), msStyle);
return MSWTranslateReturnCode(msAns); int ret = MSWTranslateReturnCode(msAns);
SetReturnCode(ret);
return ret;
} }
int wxMessageDialog::ShowModal() int wxMessageDialog::ShowModal()
@@ -621,7 +623,9 @@ int wxMessageDialog::ShowModal()
msAns = IDOK; msAns = IDOK;
} }
return MSWTranslateReturnCode( msAns ); int ret = MSWTranslateReturnCode(msAns);
SetReturnCode(ret);
return ret;
} }
#endif // wxHAS_MSW_TASKDIALOG #endif // wxHAS_MSW_TASKDIALOG