AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Modal dialogs now correctly use wxEventLoop.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24021 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis 2003-09-30 20:13:51 +00:00
parent bd76e17e0f
commit ee22d7f339
1 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/os2/dialog.cpp
View File

@ -33,8 +33,6 @@
#define wxDIALOG_DEFAULT_WIDTH 500
#define wxDIALOG_DEFAULT_HEIGHT 500
wxWindowList wxModalDialogs;
IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
BEGIN_EVENT_TABLE(wxDialog, wxDialogBase)
@ -86,6 +84,7 @@ void wxDialog::Init()
m_pOldFocus = (wxWindow *)NULL;
m_isShown = FALSE;
m_pWindowDisabler = (wxWindowDisabler *)NULL;
m_modalData = NULL;
SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
} // end of wxDialog::Init
@ -206,7 +205,7 @@ bool wxDialog::IsModal() const
bool wxDialog::IsModalShowing() const
{
return wxModalDialogs.Find((wxDialog *)this) != NULL; // const_cast
return m_modalData != NULL; // const_cast
} // end of wxDialog::IsModalShowing
void wxDialog::DoShowModal()
@ -218,7 +217,6 @@ void wxDialog::DoShowModal()
wxCHECK_RET( !IsModalShowing(), _T("DoShowModal() called twice") );
wxCHECK_RET( IsModal(), _T("can't DoShowModal() modeless dialog") );
wxModalDialogs.Append(this);
if (pOldFocus)
hWndOldFocus = (HWND)pOldFocus->GetHWND();
@ -237,12 +235,6 @@ void wxDialog::DoShowModal()
//
wxASSERT_MSG(!m_pWindowDisabler, _T("disabling windows twice?"));
//
// Disables other app windows and window proc message processing
// until WinDismissDlg called
//
::WinProcessDlg((HWND)GetHwnd());
//
// Before entering the modal loop, reset the "is in OnIdle()" flag (see
// comment in app.cpp)
@ -293,6 +285,8 @@ bool wxDialog::Show(
delete m_pWindowDisabler;
m_pWindowDisabler = NULL;
}
if ( m_modalData )
m_modalData->ExitLoop();
}
//
@ -308,6 +302,14 @@ bool wxDialog::Show(
if (bShow)
{
// dialogs don't get WM_SIZE message after creation unlike most (all?)
// other windows and so could start their life non laid out correctly
// if we didn't call Layout() from here
//
// NB: normally we should call it just the first time but doing it
// every time is simpler than keeping a flag
// Layout();
//
// Usually will result in TransferDataToWindow() being called
//
@ -338,14 +340,6 @@ bool wxDialog::Show(
}
DoShowModal();
}
else // end of modal dialog
{
//
// This will cause IsModalShowing() return FALSE and our local
// message loop will terminate
//
wxModalDialogs.DeleteObject(this);
}
}
return TRUE;
} // end of wxDialog::Show
@ -369,7 +363,6 @@ void wxDialog::EndModal(
{
SetReturnCode(nRetCode);
Show(FALSE);
::WinDismissDlg((HWND)GetHwnd(), nRetCode);
} // end of wxDialog::EndModal
// ----------------------------------------------------------------------------