// the helper needs to know more about the type.
wxList* wxPy_wxListHelper(PyObject* pyList, char* className) {
- wxPyTState* state = wxPyBeginBlockThreads();
+ wxPyBeginBlockThreads();
if (!PyList_Check(pyList)) {
PyErr_SetString(PyExc_TypeError, "Expected a list object.");
- wxPyEndBlockThreads(state);
+ wxPyEndBlockThreads();
return NULL;
}
int count = PyList_Size(pyList);
wxList* list = new wxList;
if (! list) {
PyErr_SetString(PyExc_MemoryError, "Unable to allocate wxList object");
- wxPyEndBlockThreads(state);
+ wxPyEndBlockThreads();
return NULL;
}
for (int x=0; x<count; x++) {
char errmsg[1024];
sprintf(errmsg, "Type error, expected list of %s objects", className);
PyErr_SetString(PyExc_TypeError, errmsg);
- wxPyEndBlockThreads(state);
+ wxPyEndBlockThreads();
return NULL;
}
list->Append(wxo);
}
- wxPyEndBlockThreads(state);
+ wxPyEndBlockThreads();
return list;
}
//---------------------------------------------------------------------------
wxList* wxPy_wxRealPoint_ListHelper(PyObject* pyList) {
- wxPyTState* state = wxPyBeginBlockThreads();
+ wxPyBeginBlockThreads();
if (!PyList_Check(pyList)) {
PyErr_SetString(PyExc_TypeError, "Expected a list object.");
- wxPyEndBlockThreads(state);
+ wxPyEndBlockThreads();
return NULL;
}
int count = PyList_Size(pyList);
wxList* list = new wxList;
if (! list) {
PyErr_SetString(PyExc_MemoryError, "Unable to allocate wxList object");
- wxPyEndBlockThreads(state);
+ wxPyEndBlockThreads();
return NULL;
}
for (int x=0; x<count; x++) {
wxRealPoint* wxo = NULL;
if (SWIG_GetPtrObj(pyo, (void **)&wxo, "_wxRealPoint_p")) {
PyErr_SetString(PyExc_TypeError, "Type error, expected list of wxRealPoint objects or 2-tuples");
- wxPyEndBlockThreads(state);
+ wxPyEndBlockThreads();
return NULL;
}
list->Append((wxObject*) new wxRealPoint(*wxo));
}
}
- wxPyEndBlockThreads(state);
+ wxPyEndBlockThreads();
return list;
}
+//---------------------------------------------------------------------------
+
+PyObject* wxPyMake_wxShapeEvtHandler(wxShapeEvtHandler* source) {
+ PyObject* target = NULL;
+
+ if (source && wxIsKindOf(source, wxShapeEvtHandler)) {
+ // If it's derived from wxShapeEvtHandler then there may
+ // already be a pointer to a Python object that we can use
+ // in the OOR data.
+ wxShapeEvtHandler* seh = (wxShapeEvtHandler*)source;
+ wxPyClientData* data = (wxPyClientData*)seh->GetClientObject();
+ if (data) {
+ target = data->m_obj;
+ Py_INCREF(target);
+ }
+ }
+ if (! target) {
+ target = wxPyMake_wxObject2(source, FALSE);
+ if (target != Py_None)
+ ((wxShapeEvtHandler*)source)->SetClientObject(new wxPyClientData(target));
+ }
+ return target;
+}
+
+
//---------------------------------------------------------------------------