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

don't use wxDIALOG_MODAL any more

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26771 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-04-14 07:02:36 +00:00
parent 2b61982245
commit 570384d865
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/msw/dialog.cpp
View File

@@ -77,9 +77,6 @@ wxBEGIN_FLAGS( wxDialogStyle )
wxFLAGS_MEMBER(wxCLIP_CHILDREN) wxFLAGS_MEMBER(wxCLIP_CHILDREN)
// dialog styles // dialog styles
wxFLAGS_MEMBER(wxDIALOG_MODAL)
wxFLAGS_MEMBER(wxDIALOG_MODELESS)
wxFLAGS_MEMBER(wxNO_3D)
wxFLAGS_MEMBER(wxWS_EX_VALIDATE_RECURSIVELY) wxFLAGS_MEMBER(wxWS_EX_VALIDATE_RECURSIVELY)
wxFLAGS_MEMBER(wxSTAY_ON_TOP) wxFLAGS_MEMBER(wxSTAY_ON_TOP)
wxFLAGS_MEMBER(wxCAPTION) wxFLAGS_MEMBER(wxCAPTION)
@@ -192,14 +189,10 @@ void wxDialog::SetModal(bool flag)
{ {
if ( flag ) if ( flag )
{ {
m_windowStyle |= wxDIALOG_MODAL;
wxModelessWindows.DeleteObject(this); wxModelessWindows.DeleteObject(this);
} }
else else
{ {
m_windowStyle &= ~wxDIALOG_MODAL;
wxModelessWindows.Append(this); wxModelessWindows.Append(this);
} }
} }
@@ -218,7 +211,7 @@ wxDialog::~wxDialog()
bool wxDialog::IsModal() const bool wxDialog::IsModal() const
{ {
return (GetWindowStyleFlag() & wxDIALOG_MODAL) != 0; return !wxModelessWindows.Member(this);
} }
bool wxDialog::IsModalShowing() const bool wxDialog::IsModalShowing() const