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

return correct dialog return code for exec

Browse Source
This commit is contained in:
Sean D'Epagnier
2016-08-26 17:39:18 -04:00
committed by Vadim Zeitlin
parent 52a7a1c5e6
commit 7e7530f010
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/qt/dialog.cpp
View File

@@ -68,8 +68,11 @@ bool wxDialog::Create( wxWindow *parent, wxWindowID id,
int wxDialog::ShowModal()
{
wxCHECK_MSG( GetHandle() != NULL, -1, "Invalid dialog" );
return GetDialogHandle()->exec() ? wxID_OK : wxID_CANCEL;
bool ret = GetDialogHandle()->exec();
if(GetReturnCode() == 0)
return ret ? wxID_OK : wxID_CANCEL;
return GetReturnCode();
}
void wxDialog::EndModal(int retCode)
@@ -77,7 +80,7 @@ void wxDialog::EndModal(int retCode)
wxCHECK_RET( GetDialogHandle() != NULL, "Invalid dialog" );
SetReturnCode(retCode);
GetDialogHandle()->done( retCode );
GetDialogHandle()->done( QDialog::Accepted );
}
bool wxDialog::IsModal() const