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

Merge the changes from 3.0 branch.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75178 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2013-11-12 18:06:37 +00:00
parent e4d0bc4bb1
commit 9b31387508
100 changed files with 7289 additions and 1390 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/msw/msgdlg.cpp
View File

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