made IsMainLoopRunning() static and implemented it for wxAppConsole too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29655 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -209,7 +209,7 @@ to do it.
|
||||
|
||||
\membersection{wxApp::IsMainLoopRunning}\label{wxappismainlooprunning}
|
||||
|
||||
\constfunc{bool}{IsMainLoopRunning}{\void}
|
||||
\func{static bool}{IsMainLoopRunning}{\void}
|
||||
|
||||
Returns \true if the main event loop is currently running, i.e. if the
|
||||
application is inside \helpref{OnRun}{wxapponrun}.
|
||||
|
@@ -251,6 +251,10 @@ public:
|
||||
// make sure that idle events are sent again
|
||||
virtual void WakeUpIdle() { }
|
||||
|
||||
// this is just a convenience: by providing its implementation here we
|
||||
// avoid #ifdefs in the code using it
|
||||
static bool IsMainLoopRunning() { return false; }
|
||||
|
||||
|
||||
// debugging support
|
||||
// -----------------
|
||||
@@ -378,10 +382,11 @@ public:
|
||||
|
||||
// return true if we're running main loop, i.e. if the events can
|
||||
// (already) be dispatched
|
||||
bool IsMainLoopRunning() const
|
||||
static bool IsMainLoopRunning()
|
||||
{
|
||||
#if wxUSE_EVTLOOP_IN_APP
|
||||
return m_mainLoop != NULL;
|
||||
wxAppBase *app = wx_static_cast(wxAppBase *, GetInstance());
|
||||
return app && app->m_mainLoop != NULL;
|
||||
#else
|
||||
return false;
|
||||
#endif
|
||||
|
@@ -239,8 +239,7 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
|
||||
SaveState();
|
||||
|
||||
// we may use non blocking sockets only if we can dispatch events from them
|
||||
SetFlags( wxIsMainThread() && (wxTheApp && wxTheApp->IsMainLoopRunning())
|
||||
? wxSOCKET_NONE
|
||||
SetFlags( wxIsMainThread() && wxApp::IsMainLoopRunning() ? wxSOCKET_NONE
|
||||
: wxSOCKET_BLOCK );
|
||||
Notify(false);
|
||||
|
||||
|
Reference in New Issue
Block a user