X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8bda0ec6a3b0a7852eb0056f20a0dba7b07ea593..5fdb6350921035ace3d9619bd2d36f776d0653ef:/src/os2/dialog.cpp diff --git a/src/os2/dialog.cpp b/src/os2/dialog.cpp index 5115230049..a8f0d6f9d1 100644 --- a/src/os2/dialog.cpp +++ b/src/os2/dialog.cpp @@ -224,7 +224,7 @@ bool wxDialog::Show( bool bShow ) // int wxDialog::ShowModal() { - wxASSERT_MSG( !IsModal(), _T("wxDialog::ShowModal() reentered?") ); + wxASSERT_MSG( !IsModal(), wxT("wxDialog::ShowModal() reentered?") ); m_endModalCalled = false; @@ -236,11 +236,7 @@ int wxDialog::ShowModal() if ( !m_endModalCalled ) { // modal dialog needs a parent window, so try to find one - wxWindow *parent = GetParent(); - if ( !parent ) - { - parent = FindSuitableParent(); - } + wxWindow * const parent = GetParentForModalDialog(); // remember where the focus was wxWindow *oldFocus = m_pOldFocus; @@ -292,7 +288,7 @@ void wxDialog::EndModal( int nRetCode ) { - wxASSERT_MSG( IsModal(), _T("EndModal() called for non modal dialog") ); + wxASSERT_MSG( IsModal(), wxT("EndModal() called for non modal dialog") ); m_endModalCalled = true; SetReturnCode(nRetCode);