projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
don't show size grip when maximized
[wxWidgets.git]
/
src
/
os2
/
dialog.cpp
diff --git
a/src/os2/dialog.cpp
b/src/os2/dialog.cpp
index edc04a0d243b4f1b784df71baa9cd0e4683af43e..eb635379c9397889fc060f65593ee8d60ef6634a 100644
(file)
--- a/
src/os2/dialog.cpp
+++ b/
src/os2/dialog.cpp
@@
-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 they stay disabled Windows will activate another window (one
//
// If we had disabled other app windows, reenable them back now because
// 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);
Show(FALSE);
{
SetReturnCode(nRetCode);
Show(FALSE);
+ ::WinDismissDlg((HWND)GetHwnd(), nRetCode);
} // end of wxDialog::EndModal
// ----------------------------------------------------------------------------
} // end of wxDialog::EndModal
// ----------------------------------------------------------------------------