X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4268f79856cbe66b8ad31b86ee183879cede98e3..ca5e5bad86564bf71c095b755291f6997844b10a:/wxPython/src/helpers.cpp

diff --git a/wxPython/src/helpers.cpp b/wxPython/src/helpers.cpp
index b7c8510f85..0943cabc00 100644
--- a/wxPython/src/helpers.cpp
+++ b/wxPython/src/helpers.cpp
@@ -31,8 +31,11 @@
 
 //----------------------------------------------------------------------
 
-
+#ifdef __WXGTK__
+int  WXDLLEXPORT wxEntryStart( int& argc, char** argv );
+#else
 int  WXDLLEXPORT wxEntryStart( int argc, char** argv );
+#endif
 int  WXDLLEXPORT wxEntryInitGui();
 void WXDLLEXPORT wxEntryCleanup();
 
@@ -123,7 +126,7 @@ void __wxPreStart()
 {
 
 #ifdef __WXMSW__
-    wxCrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF);
+//    wxCrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF);
 #endif
 
 #ifdef WXP_WITH_THREAD
@@ -438,28 +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 <unistd.h>
-#include <pthread.h>
-#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__
-#error Fix this!
-#endif
+    return wxThread::GetCurrentId();
 }
 
 
-
 static
 PyThreadState* wxPyGetThreadState() {
     unsigned long ctid = wxPyGetCurrentThreadId();