remove m_endModalCalled flag, it seems to be unnecessary

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

diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h
index c53c8b7426243b7aab3e8029607a21142b908a63..98b19aec79767a4cfcce98120ff54fff3c1590fb 100644 (file)
--- a/include/wx/msw/dialog.h
+++ b/include/wx/msw/dialog.h
@@ -120,8 +120,6 @@ private:
     // gripper if we have one
     void OnWindowCreate(wxWindowCreateEvent& event);
 
     // gripper if we have one
     void OnWindowCreate(wxWindowCreateEvent& event);
 

-    bool        m_endModalCalled; // allow for closing within InitDialog
-

 #if wxUSE_TOOLBAR && defined(__POCKETPC__)
     wxToolBar*  m_dialogToolBar;
 #endif
 #if wxUSE_TOOLBAR && defined(__POCKETPC__)
     wxToolBar*  m_dialogToolBar;
 #endif

diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp
index 7b4ad2baaa387e59cacc7acbbd5fe7ad17e9188f..6dc0d62e047c6bd24beb417b6641629c89648b9e 100644 (file)
--- a/src/msw/dialog.cpp
+++ b/src/msw/dialog.cpp
@@ -147,7 +147,6 @@ void wxDialog::Init()
 {
     m_isShown = false;
     m_modalData = NULL;
 {
     m_isShown = false;
     m_modalData = NULL;

-    m_endModalCalled = false;

 #if wxUSE_TOOLBAR && defined(__POCKETPC__)
     m_dialogToolBar = NULL;
 #endif
 #if wxUSE_TOOLBAR && defined(__POCKETPC__)
     m_dialogToolBar = NULL;
 #endif


@@ -281,14 +280,11 @@ int wxDialog::ShowModal()
 {
     wxASSERT_MSG( !IsModal(), _T("ShowModal() can't be called twice") );
 
 {
     wxASSERT_MSG( !IsModal(), _T("ShowModal() can't be called twice") );
 

-    m_endModalCalled = false;
-

     Show();
 
     // EndModal may have been called from InitDialog handler (called from
     Show();
 
     // EndModal may have been called from InitDialog handler (called from

-    // inside Show()), which would cause an infinite loop if we didn't take it
-    // into account
-    if ( !m_endModalCalled )
+    // inside Show()) and hidden the dialog back again
+    if ( !IsShown() )

     {
         // enter and run the modal loop
         wxDialogModalDataTiedPtr modalData(&m_modalData,
     {
         // enter and run the modal loop
         wxDialogModalDataTiedPtr modalData(&m_modalData,


@@ -303,7 +299,6 @@ void wxDialog::EndModal(int retCode)
 {
     wxASSERT_MSG( IsModal(), _T("EndModal() called for non modal dialog") );
 
 {
     wxASSERT_MSG( IsModal(), _T("EndModal() called for non modal dialog") );
 

-    m_endModalCalled = true;

     SetReturnCode(retCode);
 
     Hide();
     SetReturnCode(retCode);
 
     Hide();