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

If the threads module hasn't been initialized yet then we can assume

Browse Source 
the IsMain == true.  This allows wxASSERTs that happen before the
wxApp is created (as can easily happen in wxPython unfortunatly) to
behave normally instead of just calling wxTrap.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27344 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-05-18 19:59:18 +00:00
parent 42cfa1842f
commit 5b65f1364d
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mac/carbon/thread.cpp
View File

@@ -1197,7 +1197,7 @@ wxThread *wxThread::This()
bool wxThread::IsMain() bool wxThread::IsMain()
{ {
return GetCurrentId() == gs_idMainThread; return GetCurrentId() == gs_idMainThread || gs_idMainThread == kNoThreadID;
} }
#ifdef Yield #ifdef Yield

2
src/msw/thread.cpp
View File

@@ -863,7 +863,7 @@ wxThread *wxThread::This()
bool wxThread::IsMain() bool wxThread::IsMain()
{ {
return ::GetCurrentThreadId() == gs_idMainThread; return ::GetCurrentThreadId() == gs_idMainThread || gs_idMainThread == 0;
} }
void wxThread::Yield() void wxThread::Yield()

4
src/unix/threadpsx.cpp
View File

@@ -113,7 +113,7 @@ WX_DEFINE_ARRAY(wxThread *, wxArrayThread);
static wxArrayThread gs_allThreads; static wxArrayThread gs_allThreads;
// the id of the main thread // the id of the main thread
static pthread_t gs_tidMain; static pthread_t gs_tidMain = (pthread_t)-1;
// the key for the pointer to the associated wxThread object // the key for the pointer to the associated wxThread object
static pthread_key_t gs_keySelf; static pthread_key_t gs_keySelf;
@@ -957,7 +957,7 @@ wxThread *wxThread::This()
bool wxThread::IsMain() bool wxThread::IsMain()
{ {
return (bool)pthread_equal(pthread_self(), gs_tidMain); return (bool)pthread_equal(pthread_self(), gs_tidMain) || gs_tidMain == (pthread_t)-1;
} }
void wxThread::Yield() void wxThread::Yield()