X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/89424d9b35a32b6c450380d22dbb34268947644c..8cbc59fe84f046685b873cf58f6c56debe59de1c:/src/msw/dialog.cpp diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp index 6dc0d62e04..1f9459d57d 100644 --- a/src/msw/dialog.cpp +++ b/src/msw/dialog.cpp @@ -40,7 +40,7 @@ #include "wx/msw/private.h" #include "wx/evtloop.h" -#include "wx/ptr_scpd.h" +#include "wx/scopedptr.h" #if defined(__SMARTPHONE__) && defined(__WXWINCE__) #include "wx/msw/wince/resources.h" @@ -192,8 +192,6 @@ bool wxDialog::Create(wxWindow *parent, wxDialog::~wxDialog() { - m_isBeingDeleted = true; - // this will also reenable all the other windows for a modal dialog Show(false); @@ -284,7 +282,7 @@ int wxDialog::ShowModal() // EndModal may have been called from InitDialog handler (called from // inside Show()) and hidden the dialog back again - if ( !IsShown() ) + if ( IsShown() ) { // enter and run the modal loop wxDialogModalDataTiedPtr modalData(&m_modalData,