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

made IsMainLoopRunning() static and implemented it for wxAppConsole too

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29655 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-10-04 20:21:44 +00:00
parent 30bbdf96e5
commit 9b0db4529f
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/latex/wx/app.tex
View File

@@ -209,7 +209,7 @@ to do it.
\membersection{wxApp::IsMainLoopRunning}\label{wxappismainlooprunning} \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 Returns \true if the main event loop is currently running, i.e. if the
application is inside \helpref{OnRun}{wxapponrun}. application is inside \helpref{OnRun}{wxapponrun}.

9
include/wx/app.h
View File

@@ -251,6 +251,10 @@ public:
// make sure that idle events are sent again // make sure that idle events are sent again
virtual void WakeUpIdle() { } 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 // debugging support
// ----------------- // -----------------
@@ -378,10 +382,11 @@ public:
// return true if we're running main loop, i.e. if the events can // return true if we're running main loop, i.e. if the events can
// (already) be dispatched // (already) be dispatched
bool IsMainLoopRunning() const static bool IsMainLoopRunning()
{ {
#if wxUSE_EVTLOOP_IN_APP #if wxUSE_EVTLOOP_IN_APP
return m_mainLoop != NULL; wxAppBase *app = wx_static_cast(wxAppBase *, GetInstance());
return app && app->m_mainLoop != NULL;
#else #else
return false; return false;
#endif #endif

5
src/common/http.cpp
View File

@@ -239,9 +239,8 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
SaveState(); SaveState();
// we may use non blocking sockets only if we can dispatch events from them // we may use non blocking sockets only if we can dispatch events from them
SetFlags( wxIsMainThread() && (wxTheApp && wxTheApp->IsMainLoopRunning()) SetFlags( wxIsMainThread() && wxApp::IsMainLoopRunning() ? wxSOCKET_NONE
? wxSOCKET_NONE : wxSOCKET_BLOCK );
: wxSOCKET_BLOCK );
Notify(false); Notify(false);
wxString buf; wxString buf;