Move wxEventLoopManual::m_shouldExit to wxEventLoopBase.

No real changes, just make this flag available to the other event loop
implementations as they will need it soon.

See #10258.

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

diff --git a/include/wx/evtloop.h b/include/wx/evtloop.h
index ee6759d5b3234a5d6f5eef4d11906b1559e746d7..24ea711ece39e20af4719d81b7bde9d2e5dcb6c4 100644 (file)
--- a/include/wx/evtloop.h
+++ b/include/wx/evtloop.h
@@ -177,6 +177,9 @@ protected:
     // the pointer to currently active loop
     static wxEventLoopBase *ms_activeLoop;
 
+    // should we exit the loop?
+    bool m_shouldExit;
+
     // YieldFor() helpers:
     bool m_isInsideYield;
     long m_eventsToProcessInsideYield;
@@ -212,9 +215,6 @@ protected:
     // the loop exit code
     int m_exitcode;
 
-    // should we exit the loop?
-    bool m_shouldExit;
-
 private:
     // process all already pending events and dispatch a new one (blocking
     // until it appears in the event queue if necessary)

diff --git a/include/wx/osx/core/evtloop.h b/include/wx/osx/core/evtloop.h
index a59a785a0e08a6a3a4d4fcc0d883d3b0e09a79c9..85f2a6c9911fa012a2859d9c921311d386256811 100644 (file)
--- a/include/wx/osx/core/evtloop.h
+++ b/include/wx/osx/core/evtloop.h
@@ -80,9 +80,6 @@ protected:
     virtual void OSXDoRun();
     virtual void OSXDoStop();
 
-    // should we exit the loop?
-    bool m_shouldExit;
-
     // the loop exit code
     int m_exitcode;
 

diff --git a/src/common/evtloopcmn.cpp b/src/common/evtloopcmn.cpp
index 99f2d78f3dda3ebdda6111a3d7a6e689104ad81f..a9f7bfccf4914c230de4ff5184f662cbff351b97 100644 (file)
--- a/src/common/evtloopcmn.cpp
+++ b/src/common/evtloopcmn.cpp
@@ -30,6 +30,8 @@ wxEventLoopBase *wxEventLoopBase::ms_activeLoop = NULL;
 
 wxEventLoopBase::wxEventLoopBase()
 {
+    m_shouldExit = false;
+
     m_isInsideYield = false;
     m_eventsToProcessInsideYield = wxEVT_CATEGORY_ALL;
 }
@@ -91,7 +93,6 @@ bool wxEventLoopBase::Yield(bool onlyIfNeeded)
 wxEventLoopManual::wxEventLoopManual()
 {
     m_exitcode = 0;
-    m_shouldExit = false;
 }
 
 bool wxEventLoopManual::ProcessEvents()