X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1893b029458c15069855bde50889d2a1a82a44e9..ca5e5bad86564bf71c095b755291f6997844b10a:/wxPython/src/helpers.cpp diff --git a/wxPython/src/helpers.cpp b/wxPython/src/helpers.cpp index c8cf22a045..0943cabc00 100644 --- a/wxPython/src/helpers.cpp +++ b/wxPython/src/helpers.cpp @@ -441,30 +441,14 @@ PyObject* wxPyConstructObject(void* ptr, //--------------------------------------------------------------------------- -// TODO: This should really be wxThread::GetCurrentId(), and I will do so -// after I make a quick 2.3.2.1 release. + #ifdef WXP_WITH_THREAD -#ifdef __WXGTK__ // does wxGTK always use pthreads? -#include -#include -#endif inline unsigned long wxPyGetCurrentThreadId() { -#ifdef __WXMSW__ - return (unsigned long)::GetCurrentThreadId(); -#endif -#ifdef __WXGTK__ // does wxGTK always use pthreads? - return (unsigned long)pthread_self(); -#endif -#ifdef __WXMAC__ - ThreadID current ; - MacGetCurrentThread( ¤t ) ; - return (unsigned long)current; -#endif + return wxThread::GetCurrentId(); } - static PyThreadState* wxPyGetThreadState() { unsigned long ctid = wxPyGetCurrentThreadId();