use wxModalEvtLoop, made more code exception safe

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23648 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp
index 948fd5bc80eaa96d84856b29a7fc6b40eb2ab5d9..a2505b168dec6210234fff4f94b9cc01f68b7ffc 100644 (file)
--- a/src/msw/dialog.cpp
+++ b/src/msw/dialog.cpp
@@ -41,6 +41,7 @@
 #include "wx/msw/private.h"
 #include "wx/log.h"
 #include "wx/evtloop.h"
 #include "wx/msw/private.h"
 #include "wx/log.h"
 #include "wx/evtloop.h"

+#include "wx/ptr_scpd.h"

 
 #if wxUSE_COMMON_DIALOGS && !defined(__WXMICROWIN__)
     #include <commdlg.h>
 
 #if wxUSE_COMMON_DIALOGS && !defined(__WXMICROWIN__)
     #include <commdlg.h>


@@ -135,38 +136,29 @@ END_EVENT_TABLE()
 // wxDialogModalData
 // ----------------------------------------------------------------------------
 
 // wxDialogModalData
 // ----------------------------------------------------------------------------
 

-// this is simply a container for wxEventLoop and wxWindowDisabler which allows
-// to have a single opaque pointer in wxDialog itself
+// this is simply a container for any data we need to implement modality which
+// allows us to avoid changing wxDialog each time the implementation changes

 class wxDialogModalData
 {
 public:
 class wxDialogModalData
 {
 public:

-    wxDialogModalData() { m_windowDisabler = NULL; }
+    wxDialogModalData(wxDialog *dialog) : m_evtLoop(dialog) { }

 
 

-    void RunLoop(wxDialog *dialog)
+    void RunLoop()

     {
     {

-        m_windowDisabler = new wxWindowDisabler(dialog);
-

         m_evtLoop.Run();
     }
 
     void ExitLoop()
     {
         m_evtLoop.Run();
     }
 
     void ExitLoop()
     {

-        delete m_windowDisabler;
-        m_windowDisabler = NULL;
-

         m_evtLoop.Exit();
     }
 
         m_evtLoop.Exit();
     }
 

-    ~wxDialogModalData()
-    {
-        wxASSERT_MSG( !m_windowDisabler, _T("forgot to call ExitLoop?") );
-    }
-

 private:
 private:

-    wxEventLoop m_evtLoop;
-    wxWindowDisabler *m_windowDisabler;
+    wxModalEventLoop m_evtLoop;

 };
 
 };
 

+wxDEFINE_TIED_SCOPED_PTR_TYPE(wxDialogModalData);
+

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -325,19 +317,12 @@ void wxDialog::DoShowModal()
             hwndOldFocus = GetHwndOf(parent);
     }
 
             hwndOldFocus = GetHwndOf(parent);
     }
 

-    // before entering the modal loop, reset the "is in OnIdle()" flag (see
-    // comment in app.cpp)
-    extern bool wxIsInOnIdleFlag;
-    bool wasInOnIdle = wxIsInOnIdleFlag;
-    wxIsInOnIdleFlag = FALSE;
-

     // enter the modal loop
     // enter the modal loop

-    m_modalData = new wxDialogModalData;
-    m_modalData->RunLoop(this);
-    delete m_modalData;
-    m_modalData = NULL;
-
-    wxIsInOnIdleFlag = wasInOnIdle;
+    {
+        wxDialogModalDataTiedPtr modalData(&m_modalData,
+                                           new wxDialogModalData(this));
+        modalData->RunLoop();
+    }

 
     // and restore focus
     // Note that this code MUST NOT access the dialog object's data
 
     // and restore focus
     // Note that this code MUST NOT access the dialog object's data