added adjustOrigin parameter to bounds calculation

[wxWidgets.git] / wxPython / src / helpers.cpp

diff --git a/wxPython/src/helpers.cpp b/wxPython/src/helpers.cpp
index 81c954bc70251b3b1feea017ad363c53f2e40f14..6bcefc228de4a06fab805e4c19daeb45897f7b64 100644 (file)
--- a/wxPython/src/helpers.cpp
+++ b/wxPython/src/helpers.cpp
@@ -1059,15 +1059,14 @@ bool wxPyBeginBlockThreads() {
     // This works in for 2.3, maybe a good alternative to find the needed tstate?
     // PyThreadState *check = PyGILState_GetThisThreadState();  
 
     // This works in for 2.3, maybe a good alternative to find the needed tstate?
     // PyThreadState *check = PyGILState_GetThisThreadState();  
 

-    // get the currect tstate by swapping in NULL and then putting it back.
-    PyThreadState *current = PyThreadState_Swap(NULL);
-    PyThreadState_Swap(current);
+    PyThreadState *current = _PyThreadState_Current;

 
 

-    // Only block if there wasn't alrady a tstate.  This cen happen with
-    // nested calls to wxPyBeginBlockThreads
+    // Only block if there wasn't already a tstate, or if the current one is
+    // not the one we are wanting to change to.  This should prevent deadlock
+    // if there are nested calls to wxPyBeginBlockThreads

     bool blocked = false;
     bool blocked = false;

-    if (current == NULL) {
-        wxPyThreadState* tstate = wxPyGetThreadState();
+    wxPyThreadState* tstate = wxPyGetThreadState();
+    if (current != tstate->tstate) {

         PyEval_RestoreThread(tstate->tstate);
         blocked = true;
     }
         PyEval_RestoreThread(tstate->tstate);
         blocked = true;
     }