allow specifying the mask colour in wxImage::ConvertAlphaToMask() (closes #10143)

[wxWidgets.git] / src / msw / dialog.cpp

diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp
index 6dc0d62e047c6bd24beb417b6641629c89648b9e..55bd004088e09c714de08b0ffa72fc15d5b4b32f 100644 (file)
--- a/src/msw/dialog.cpp
+++ b/src/msw/dialog.cpp
@@ -192,8 +192,6 @@ bool wxDialog::Create(wxWindow *parent,
 
 wxDialog::~wxDialog()
 {
 
 wxDialog::~wxDialog()
 {

-    m_isBeingDeleted = true;
-

     // this will also reenable all the other windows for a modal dialog
     Show(false);
 
     // 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
 
     // 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,
     {
         // enter and run the modal loop
         wxDialogModalDataTiedPtr modalData(&m_modalData,