explicitly call OnExit() in the ports which don't use wxEventLoopManual

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

diff --git a/src/cocoa/evtloop.mm b/src/cocoa/evtloop.mm
index add5528e947aca0685ca803a963e545ebb6f742f..7a6e393670661134afdcf45477d5e11cd96c2357 100644 (file)
--- a/src/cocoa/evtloop.mm
+++ b/src/cocoa/evtloop.mm
@@ -64,6 +64,8 @@ int wxEventLoop::Run()
 
     [[NSApplication sharedApplication] run];
 
 
     [[NSApplication sharedApplication] run];
 

+    OnExit();
+

     int exitcode = m_impl->GetExitCode();
     delete m_impl;
     m_impl = NULL;
     int exitcode = m_impl->GetExitCode();
     delete m_impl;
     m_impl = NULL;

diff --git a/src/gtk/evtloop.cpp b/src/gtk/evtloop.cpp
index fbdd81bd2d9f308df2694adc338d257141e53439..11406deb0b8ed6a1bd53c9d057b2bc861bc11803 100644 (file)
--- a/src/gtk/evtloop.cpp
+++ b/src/gtk/evtloop.cpp
@@ -75,6 +75,8 @@ int wxEventLoop::Run()
 
     gtk_main();
 
 
     gtk_main();
 

+    OnExit();
+

     int exitcode = m_impl->GetExitCode();
     delete m_impl;
     m_impl = NULL;
     int exitcode = m_impl->GetExitCode();
     delete m_impl;
     m_impl = NULL;

diff --git a/src/gtk1/evtloop.cpp b/src/gtk1/evtloop.cpp
index b610e01a75c5098cd2905453ca03e6b8c009b464..8f5dfb1341fe25941fe656df62722f881095874e 100644 (file)
--- a/src/gtk1/evtloop.cpp
+++ b/src/gtk1/evtloop.cpp
@@ -75,6 +75,8 @@ int wxEventLoop::Run()
 
     gtk_main();
 
 
     gtk_main();
 

+    OnExit();
+

     int exitcode = m_impl->GetExitCode();
     delete m_impl;
     m_impl = NULL;
     int exitcode = m_impl->GetExitCode();
     delete m_impl;
     m_impl = NULL;

diff --git a/src/mgl/evtloop.cpp b/src/mgl/evtloop.cpp
index 076009f6d45c49a58c773e8734076f33a56bb40c..8135bf6a5d68296e578c7a865f924756aa976351 100644 (file)
--- a/src/mgl/evtloop.cpp
+++ b/src/mgl/evtloop.cpp
@@ -137,6 +137,8 @@ int wxEventLoop::Run()
         }
     }
 
         }
     }
 

+    OnExit();
+

     int exitcode = m_impl->GetExitCode();
     delete m_impl;
     m_impl = NULL;
     int exitcode = m_impl->GetExitCode();
     delete m_impl;
     m_impl = NULL;

diff --git a/src/motif/evtloop.cpp b/src/motif/evtloop.cpp
index 79a49240f10b2502128aaa8d912c4945898f0137..84999bb11eb8f636f9f1974a4c40cf0cf4bce07c 100644 (file)
--- a/src/motif/evtloop.cpp
+++ b/src/motif/evtloop.cpp
@@ -122,6 +122,8 @@ int wxEventLoop::Run()
             break;
     }
 
             break;
     }
 

+    OnExit();
+

     int exitcode = m_impl->GetExitCode();
     delete m_impl;
     m_impl = NULL;
     int exitcode = m_impl->GetExitCode();
     delete m_impl;
     m_impl = NULL;

diff --git a/src/os2/evtloop.cpp b/src/os2/evtloop.cpp
index 08f615fe5051efeba6db1f35a74497cafd093871..e558aaefebd8ceee386c0af7425fbe125283e074 100644 (file)
--- a/src/os2/evtloop.cpp
+++ b/src/os2/evtloop.cpp
@@ -277,6 +277,8 @@ int wxEventLoop::Run()
             wxMilliSleep(10);
     }
 
             wxMilliSleep(10);
     }
 

+    OnExit();
+

     return m_impl->GetExitCode();
 }
 
     return m_impl->GetExitCode();
 }
 

diff --git a/src/x11/evtloop.cpp b/src/x11/evtloop.cpp
index b62ce72440522179e793cc076ff5a9b3fa3d1ebf..ce563c84999d013e35bbfbe20605052566ac1998 100644 (file)
--- a/src/x11/evtloop.cpp
+++ b/src/x11/evtloop.cpp
@@ -372,10 +372,6 @@ int wxEventLoop::Run()
     m_impl->m_keepGoing = true;
     while ( m_impl->m_keepGoing )
     {
     m_impl->m_keepGoing = true;
     while ( m_impl->m_keepGoing )
     {

-#if 0 // wxUSE_THREADS
-        wxMutexGuiLeaveOrEnter();
-#endif // wxUSE_THREADS
-

         // generate and process idle events for as long as we don't have
         // anything else to do
         while ( ! Pending() )
         // generate and process idle events for as long as we don't have
         // anything else to do
         while ( ! Pending() )


@@ -385,13 +381,6 @@ int wxEventLoop::Run()
 #endif
             if (!m_impl->SendIdleEvent())
             {
 #endif
             if (!m_impl->SendIdleEvent())
             {

-#if 0 // wxUSE_THREADS
-                // leave the main loop to give other threads a chance to
-                // perform their GUI work
-                wxMutexGuiLeave();
-                wxUsleep(20);
-                wxMutexGuiEnter();
-#endif

                 // Break out of while loop
                 break;
             }
                 // Break out of while loop
                 break;
             }


@@ -405,6 +394,8 @@ int wxEventLoop::Run()
         }
     }
 
         }
     }
 

+    OnExit();
+

     int exitcode = m_impl->GetExitCode();
     delete m_impl;
     m_impl = NULL;
     int exitcode = m_impl->GetExitCode();
     delete m_impl;
     m_impl = NULL;