#ifdef WXP_WITH_THREAD
-PyThreadState* wxPyEventThreadState = NULL;
+//PyThreadState* wxPyEventThreadState = NULL;
+PyInterpreterState* wxPyInterpreter = NULL;
#endif
#ifdef WXP_WITH_THREAD
PyEval_InitThreads();
- wxPyEventThreadState = PyThreadState_New(PyThreadState_Get()->interp);
+// wxPyEventThreadState = PyThreadState_Get(); // PyThreadState_New(PyThreadState_Get()->interp);
+ wxPyInterpreter = PyThreadState_Get()->interp;
#endif
// Bail out if there is already windows created. This means that the
wxString msg("wxPython class not found for ");
msg += source->GetClassInfo()->GetClassName();
PyErr_SetString(PyExc_NameError, msg.c_str());
- return NULL;
+ target = NULL;
}
} else { // source was NULL so return None.
Py_INCREF(Py_None); target = Py_None;
//---------------------------------------------------------------------------
-static PyThreadState* myPyThreadState_Get() {
- PyThreadState* current;
- current = PyThreadState_Swap(NULL);
- PyThreadState_Swap(current);
- return current;
-}
-
-
-bool wxPyRestoreThread() {
- // NOTE: The Python API docs state that if a thread already has the
- // interpreter lock and calls PyEval_RestoreThread again a deadlock
- // occurs, so I put in this code as a guard condition since there are
- // many possibilites for nested events and callbacks in wxPython. If
- // The current thread is our thread, then we can assume that we
- // already have the lock. (I hope!)
- //
+// static PyThreadState* myPyThreadState_Get() {
+// PyThreadState* current;
+// current = PyThreadState_Swap(NULL);
+// PyThreadState_Swap(current);
+// return current;
+// }
+
+
+// bool wxPyRestoreThread() {
+// // NOTE: The Python API docs state that if a thread already has the
+// // interpreter lock and calls PyEval_RestoreThread again a deadlock
+// // occurs, so I put in this code as a guard condition since there are
+// // many possibilites for nested events and callbacks in wxPython. If
+// // The current thread is our thread, then we can assume that we
+// // already have the lock. (I hope!)
+// //
+// #ifdef WXP_WITH_THREAD
+// if (wxPyEventThreadState != myPyThreadState_Get()) {
+// PyEval_AcquireThread(wxPyEventThreadState);
+// return TRUE;
+// }
+// else
+// #endif
+// return FALSE;
+// }
+
+
+// void wxPySaveThread(bool doSave) {
+// #ifdef WXP_WITH_THREAD
+// if (doSave) {
+// PyEval_ReleaseThread(wxPyEventThreadState);
+// }
+// #endif
+// }
+
+
+
+wxPyTState* wxPyBeginBlockThreads() {
+ wxPyTState* state = NULL;
#ifdef WXP_WITH_THREAD
- if (wxPyEventThreadState != myPyThreadState_Get()) {
- PyEval_AcquireThread(wxPyEventThreadState);
- return TRUE;
+ if (1) { // Can I check if I've already got the lock?
+ state = new wxPyTState;
+ PyEval_AcquireLock();
+ state->newState = PyThreadState_New(wxPyInterpreter);
+ state->prevState = PyThreadState_Swap(state->newState);
}
- else
#endif
- return FALSE;
+ return state;
}
-void wxPySaveThread(bool doSave) {
+void wxPyEndBlockThreads(wxPyTState* state) {
#ifdef WXP_WITH_THREAD
- if (doSave) {
- PyEval_ReleaseThread(wxPyEventThreadState);
+ if (state) {
+ PyThreadState_Swap(state->prevState);
+ PyThreadState_Clear(state->newState);
+ PyEval_ReleaseLock();
+ PyThreadState_Delete(state->newState);
+ delete state;
}
#endif
}
-//---------------------------------------------------------------------------
+//---------------------------------------------------------------------------
IMPLEMENT_ABSTRACT_CLASS(wxPyCallback, wxObject);
}
wxPyCallback::~wxPyCallback() {
- bool doSave = wxPyRestoreThread();
+ wxPyTState* state = wxPyBeginBlockThreads();
Py_DECREF(m_func);
- wxPySaveThread(doSave);
+ wxPyEndBlockThreads(state);
}
PyObject* tuple;
- bool doSave = wxPyRestoreThread();
+ wxPyTState* state = wxPyBeginBlockThreads();
wxString className = event.GetClassInfo()->GetClassName();
if (className == "wxPyEvent")
Py_DECREF(tuple);
if (result) {
Py_DECREF(result);
- PyErr_Clear();
+ PyErr_Clear(); // Just in case...
} else {
PyErr_Print();
}
- wxPySaveThread(doSave);
+ wxPyEndBlockThreads(state);
}
void wxPyCBH_delete(wxPyCallbackHelper* cbh) {
- bool doSave = wxPyRestoreThread();
if (cbh->m_incRef) {
+ wxPyTState* state = wxPyBeginBlockThreads();
Py_XDECREF(cbh->m_self);
Py_XDECREF(cbh->m_class);
+ wxPyEndBlockThreads(state);
}
- wxPySaveThread(doSave);
}
//---------------------------------------------------------------------------
}
wxPyEvtSelfRef::~wxPyEvtSelfRef() {
- bool doSave = wxPyRestoreThread();
+ wxPyTState* state = wxPyBeginBlockThreads();
if (m_cloned)
Py_DECREF(m_self);
- wxPySaveThread(doSave);
+ wxPyEndBlockThreads(state);
}
void wxPyEvtSelfRef::SetSelf(PyObject* self, bool clone) {
- bool doSave = wxPyRestoreThread();
+ wxPyTState* state = wxPyBeginBlockThreads();
if (m_cloned)
Py_DECREF(m_self);
m_self = self;
Py_INCREF(m_self);
m_cloned = TRUE;
}
- wxPySaveThread(doSave);
+ wxPyEndBlockThreads(state);
}
PyObject* wxPyEvtSelfRef::GetSelf() const {
}
wxPyTimer::~wxPyTimer() {
- bool doSave = wxPyRestoreThread();
+ wxPyTState* state = wxPyBeginBlockThreads();
Py_DECREF(func);
- wxPySaveThread(doSave);
+ wxPyEndBlockThreads(state);
}
void wxPyTimer::Notify() {
wxTimer::Notify();
}
else {
- bool doSave = wxPyRestoreThread();
+ wxPyTState* state = wxPyBeginBlockThreads();
PyObject* result;
PyObject* args = Py_BuildValue("()");
PyErr_Print();
}
- wxPySaveThread(doSave);
+ wxPyEndBlockThreads(state);
}
}
wxObject* wxObj;
wxNode* node = list->First();
- bool doSave = wxPyRestoreThread();
+ wxPyTState* state = wxPyBeginBlockThreads();
pyList = PyList_New(0);
while (node) {
wxObj = node->Data();
PyList_Append(pyList, pyObj);
node = node->Next();
}
- wxPySaveThread(doSave);
+ wxPyEndBlockThreads(state);
return pyList;
}
}
for (int x=0; x<count; x++) {
PyObject* o = PyList_GetItem(source, x);
+#if PYTHON_API_VERSION >= 1009
+ if (! PyString_Check(o) && ! PyUnicode_Check(o)) {
+ PyErr_SetString(PyExc_TypeError, "Expected a list of string or unicode objects.");
+ return NULL;
+ }
+
+ char* buff;
+ int length;
+ if (PyString_AsStringAndSize(o, &buff, &length) == -1)
+ return NULL;
+ temp[x] = wxString(buff, length);
+#else
if (! PyString_Check(o)) {
PyErr_SetString(PyExc_TypeError, "Expected a list of strings.");
return NULL;
}
temp[x] = PyString_AsString(o);
+#endif
}
return temp;
}
PyObject* o1 = PyTuple_GetItem(o, 0);
PyObject* o2 = PyTuple_GetItem(o, 1);
PyObject* o3 = PyTuple_GetItem(o, 2);
-
- temp[x].m_flags = PyInt_AsLong(o1);
- temp[x].m_keyCode = PyInt_AsLong(o2);
- temp[x].m_command = PyInt_AsLong(o3);
+ temp[x].Set(PyInt_AsLong(o1), PyInt_AsLong(o2), PyInt_AsLong(o3));
}
else {
PyErr_SetString(PyExc_TypeError, "Expected a list of 3-tuples or wxAcceleratorEntry objects.");
projects / wxWidgets.git / blobdiff