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

Dialog updates

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13725 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2002-01-21 18:45:09 +00:00
parent bf9adb3a20
commit f3e4a2a414
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/os2/dialog.cpp
View File

@@ -200,7 +200,11 @@ void wxDialog::DoShowModal()
// //
wxASSERT_MSG(!m_pWindowDisabler, _T("disabling windows twice?")); wxASSERT_MSG(!m_pWindowDisabler, _T("disabling windows twice?"));
m_pWindowDisabler = new wxWindowDisabler(this); //
// Disables other app windows and window proc message processing
// until WinDismissDlg called
//
::WinProcessDlg((HWND)GetHwnd());
// //
// Enter the modal loop // Enter the modal loop
@@ -243,7 +247,8 @@ bool wxDialog::Show(
// //
// If we had disabled other app windows, reenable them back now because // If we had disabled other app windows, reenable them back now because
// if they stay disabled Windows will activate another window (one // if they stay disabled Windows will activate another window (one
// which is enabled, anyhow) and we will lose activation // which is enabled, anyhow) and we will lose activation. We really don't
// do this in OS/2 since PM does this for us.
// //
if (m_pWindowDisabler) if (m_pWindowDisabler)
{ {
@@ -326,6 +331,7 @@ void wxDialog::EndModal(
{ {
SetReturnCode(nRetCode); SetReturnCode(nRetCode);
Show(FALSE); Show(FALSE);
::WinDismissDlg((HWND)GetHwnd(), nRetCode);
} // end of wxDialog::EndModal } // end of wxDialog::EndModal
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

11
src/os2/window.cpp
View File

@@ -2466,11 +2466,14 @@ MRESULT wxWindowOS2::OS2WindowProc(
if (IsKindOf(CLASSINFO(wxDialog))) if (IsKindOf(CLASSINFO(wxDialog)))
{ {
PSWP pSwp = (PSWP)PVOIDFROMMP(wParam); PSWP pSwp = (PSWP)PVOIDFROMMP(wParam);
PSWP pSwp2 = pSwp++;
bProcessed = HandleSize( pSwp->cx if (!(pSwp->cx == pSwp2->cx &&
,pSwp->cy pSwp->cy == pSwp2->cy))
,(WXUINT)lParam bProcessed = HandleSize( pSwp->cx
); ,pSwp->cy
,(WXUINT)lParam
);
} }
break; break;