Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move wxEventLoopManual::m_shouldExit to wxEventLoopBase.

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2013-07-03 00:24:58 +00:00
parent 8d40c05f41
commit a1fe5f9048
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/evtloop.h
View File

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

3
include/wx/osx/core/evtloop.h
View File

@@ -80,9 +80,6 @@ protected:
virtual void OSXDoRun(); virtual void OSXDoRun();
virtual void OSXDoStop(); virtual void OSXDoStop();
// should we exit the loop?
bool m_shouldExit;
// the loop exit code // the loop exit code
int m_exitcode; int m_exitcode;

3
src/common/evtloopcmn.cpp
View File

@@ -30,6 +30,8 @@ wxEventLoopBase *wxEventLoopBase::ms_activeLoop = NULL;
wxEventLoopBase::wxEventLoopBase() wxEventLoopBase::wxEventLoopBase()
{ {
m_shouldExit = false;
m_isInsideYield = false; m_isInsideYield = false;
m_eventsToProcessInsideYield = wxEVT_CATEGORY_ALL; m_eventsToProcessInsideYield = wxEVT_CATEGORY_ALL;
} }
@@ -91,7 +93,6 @@ bool wxEventLoopBase::Yield(bool onlyIfNeeded)
wxEventLoopManual::wxEventLoopManual() wxEventLoopManual::wxEventLoopManual()
{ {
m_exitcode = 0; m_exitcode = 0;
m_shouldExit = false;
} }
bool wxEventLoopManual::ProcessEvents() bool wxEventLoopManual::ProcessEvents()