argv[argc] = NULL;
gtk_set_locale();
+#if wxUSE_WCHAR_T
if (!wxOKlibc()) wxConvCurrent = &wxConvLocal;
+#else
+ if (!wxOKlibc()) wxConvCurrent = (wxMBConv*) NULL;
+#endif
gtk_init( &argc, &argv );
wxSetDetectableAutoRepeat( TRUE );
delete [] argv;
#ifdef WXP_WITH_THREAD
PyThreadState* wxPyEventThreadState = NULL;
-bool wxPyInEvent = false;
#endif
static char* __nullArgv[1] = { 0 };
//---------------------------------------------------------------------------
-PyObject* wxPyConstructObject(void* ptr, char* className)
-{
+PyObject* wxPyConstructObject(void* ptr, char* className) {
char buff[64]; // should always be big enough...
char swigptr[64];
return obj;
}
+//---------------------------------------------------------------------------
+//static bool _wxPyInEvent = false;
+static unsigned int _wxPyNestCount = 0;
-wxPyCallback::wxPyCallback(PyObject* func) {
- m_func = func;
- Py_INCREF(m_func);
-}
-
-wxPyCallback::~wxPyCallback() {
+HELPEREXPORT bool wxPyRestoreThread() {
+// #ifdef WXP_WITH_THREAD
+// //if (wxPyEventThreadState != PyThreadState_Get()) {
+// if (! _wxPyInEvent) {
+// PyEval_RestoreThread(wxPyEventThreadState);
+// _wxPyInEvent = true;
+// return TRUE;
+// } else
+// #endif
+// return FALSE;
+
+ // 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 the above code as a guard condition since there are
+ // many possibilites for nested events and callbacks in wxPython.
+ //
+ // Unfortunately, it seems like somebody was lying (or I'm not
+ // understanding...) because each of the nested calls to this function
+ // MUST call PyEval_RestoreThread or Python pukes with a thread error (at
+ // least on Win32.)
+ //
+ // until I know better, this is how I am doing it instead:
#ifdef WXP_WITH_THREAD
- //if (! wxPyInEvent)
- PyEval_RestoreThread(wxPyEventThreadState);
+ PyEval_RestoreThread(wxPyEventThreadState);
+ _wxPyNestCount += 1;
+ if (_wxPyNestCount == 1)
+ return TRUE;
+ else
#endif
+ return FALSE;
+}
- Py_DECREF(m_func);
+HELPEREXPORT void wxPySaveThread(bool doSave) {
#ifdef WXP_WITH_THREAD
- //if (! wxPyInEvent)
+ if (doSave) {
PyEval_SaveThread();
+ //_wxPyInEvent = false;
+ }
+ _wxPyNestCount -= 1;
#endif
}
+//---------------------------------------------------------------------------
+
+
+IMPLEMENT_ABSTRACT_CLASS(wxPyCallback, wxObject);
+
+wxPyCallback::wxPyCallback(PyObject* func) {
+ m_func = func;
+ Py_INCREF(m_func);
+}
+
+wxPyCallback::wxPyCallback(const wxPyCallback& other) {
+ m_func = other.m_func;
+ Py_INCREF(m_func);
+}
+
+wxPyCallback::~wxPyCallback() {
+ bool doSave = wxPyRestoreThread();
+ Py_DECREF(m_func);
+ wxPySaveThread(doSave);
+}
+
PyObject* tuple;
-#ifdef WXP_WITH_THREAD
- PyEval_RestoreThread(wxPyEventThreadState);
- wxPyInEvent = true;
-#endif
+ bool doSave = wxPyRestoreThread();
arg = wxPyConstructObject((void*)&event, event.GetClassInfo()->GetClassName());
tuple = PyTuple_New(1);
} else {
PyErr_Print();
}
-#ifdef WXP_WITH_THREAD
- PyEval_SaveThread();
- wxPyInEvent = false;
-#endif
+ wxPySaveThread(doSave);
}
-//---------------------------------------------------------------------------
+//----------------------------------------------------------------------
-// wxPyMenu::wxPyMenu(const wxString& title, PyObject* _func)
-// : wxMenu(title, (wxFunction)(func ? MenuCallback : NULL)), func(0) {
+wxPyCallbackHelper::wxPyCallbackHelper() {
+ m_self = NULL;
+ m_lastFound = NULL;
+}
-// if (_func) {
-// func = _func;
-// Py_INCREF(func);
-// }
-// }
-// wxPyMenu::~wxPyMenu() {
-// #ifdef WXP_WITH_THREAD
-// //if (! wxPyInEvent)
-// PyEval_RestoreThread(wxPyEventThreadState);
-// #endif
+wxPyCallbackHelper::~wxPyCallbackHelper() {
+ bool doSave = wxPyRestoreThread();
+ Py_XDECREF(m_self);
+ wxPySaveThread(doSave);
+}
-// if (func)
-// Py_DECREF(func);
+wxPyCallbackHelper::wxPyCallbackHelper(const wxPyCallbackHelper& other) {
+ m_lastFound = NULL;
+ m_self = other.m_self;
+ if (m_self)
+ Py_INCREF(m_self);
+}
-// #ifdef WXP_WITH_THREAD
-// //if (! wxPyInEvent)
-// PyEval_SaveThread();
-// #endif
-// }
+void wxPyCallbackHelper::setSelf(PyObject* self, int incref) {
+ m_self = self;
+ if (incref)
+ Py_INCREF(m_self);
+}
-// void wxPyMenu::MenuCallback(wxMenu& menu, wxCommandEvent& evt) {
-// PyObject* evtobj;
-// PyObject* menuobj;
-// PyObject* func;
-// PyObject* args;
-// PyObject* res;
-// #ifdef WXP_WITH_THREAD
-// PyEval_RestoreThread(wxPyEventThreadState);
-// wxPyInEvent = true;
-// #endif
-// evtobj = wxPyConstructObject((void*)&evt, "wxCommandEvent");
-// menuobj = wxPyConstructObject((void*)&menu, "wxMenu");
-// if (PyErr_Occurred()) {
-// // bail out if a problem
-// PyErr_Print();
-// goto done;
-// }
-// // Now call the callback...
-// func = ((wxPyMenu*)&menu)->func;
-// args = PyTuple_New(2);
-// PyTuple_SET_ITEM(args, 0, menuobj);
-// PyTuple_SET_ITEM(args, 1, evtobj);
-// res = PyEval_CallObject(func, args);
-// Py_DECREF(args);
-// Py_XDECREF(res); /* In case res is a NULL pointer */
-// done:
-// #ifdef WXP_WITH_THREAD
-// PyEval_SaveThread();
-// wxPyInEvent = false;
-// #endif
-// return;
-// }
+bool wxPyCallbackHelper::findCallback(const wxString& name) {
+ m_lastFound = NULL;
+ if (m_self && PyObject_HasAttrString(m_self, (char*)name.c_str()))
+ m_lastFound = PyObject_GetAttrString(m_self, (char*)name.c_str());
+
+ return m_lastFound != NULL;
+}
+
+
+int wxPyCallbackHelper::callCallback(PyObject* argTuple) {
+ PyObject* result;
+ int retval = FALSE;
+ result = callCallbackObj(argTuple);
+ if (result) { // Assumes an integer return type...
+ retval = PyInt_AsLong(result);
+ Py_DECREF(result);
+ PyErr_Clear(); // forget about it if it's not...
+ }
+ return retval;
+}
+
+// Invoke the Python callable object, returning the raw PyObject return
+// value. Caller should DECREF the return value and also call PyEval_SaveThread.
+PyObject* wxPyCallbackHelper::callCallbackObj(PyObject* argTuple) {
+ PyObject* result;
+ result = PyEval_CallObject(m_lastFound, argTuple);
+ Py_DECREF(argTuple);
+ if (!result) {
+ PyErr_Print();
+ }
+ return result;
+}
+
+
+
+//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
+
wxPyTimer::wxPyTimer(PyObject* callback) {
func = callback;
Py_INCREF(func);
}
wxPyTimer::~wxPyTimer() {
-#ifdef WXP_WITH_THREAD
- //if (! wxPyInEvent)
- PyEval_RestoreThread(wxPyEventThreadState);
-#endif
-
+ bool doSave = wxPyRestoreThread();
Py_DECREF(func);
-
-#ifdef WXP_WITH_THREAD
- //if (! wxPyInEvent)
- PyEval_SaveThread();
-#endif
+ wxPySaveThread(doSave);
}
void wxPyTimer::Notify() {
-#ifdef WXP_WITH_THREAD
- PyEval_RestoreThread(wxPyEventThreadState);
- wxPyInEvent = true;
-#endif
+ bool doSave = wxPyRestoreThread();
+
PyObject* result;
PyObject* args = Py_BuildValue("()");
} else {
PyErr_Print();
}
-#ifdef WXP_WITH_THREAD
- PyEval_SaveThread();
- wxPyInEvent = false;
-#endif
+ wxPySaveThread(doSave);
}
-//----------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxPyEvent, wxCommandEvent)
-
-wxPyEvent::wxPyEvent(wxEventType commandType, PyObject* userData)
- : wxCommandEvent(commandType), m_userData(Py_None)
-{
- m_userData = userData;
- if (m_userData != Py_None) {
- Py_INCREF(m_userData);
- }
-}
+//---------------------------------------------------------------------------
+//---------------------------------------------------------------------------
+// Convert a wxList to a Python List
-wxPyEvent::~wxPyEvent() {
-#ifdef WXP_WITH_THREAD
- //if (! wxPyInEvent)
- PyEval_RestoreThread(wxPyEventThreadState);
-#endif
- if (m_userData != Py_None) {
- Py_DECREF(m_userData);
- m_userData = Py_None;
- }
-#ifdef WXP_WITH_THREAD
- //if (! wxPyInEvent)
- PyEval_SaveThread();
-#endif
-}
-
+PyObject* wxPy_ConvertList(wxListBase* list, char* className) {
+ PyObject* pyList;
+ PyObject* pyObj;
+ wxObject* wxObj;
+ wxNode* node = list->First();
-void wxPyEvent::SetUserData(PyObject* userData) {
- if (m_userData != Py_None) {
- Py_DECREF(m_userData);
- m_userData = Py_None;
- }
- m_userData = userData;
- if (m_userData != Py_None) {
- Py_INCREF(m_userData);
+ bool doSave = wxPyRestoreThread();
+ pyList = PyList_New(0);
+ while (node) {
+ wxObj = node->Data();
+ pyObj = wxPyConstructObject(wxObj, className);
+ PyList_Append(pyList, pyObj);
+ node = node->Next();
}
+ wxPySaveThread(doSave);
+ return pyList;
}
-
-PyObject* wxPyEvent::GetUserData() {
- return m_userData;
-}
-
-//----------------------------------------------------------------------
//----------------------------------------------------------------------
// Some helper functions for typemaps in my_typemaps.i, so they won't be
-// imcluded in every file...
+// included in every file...
byte* byte_LIST_helper(PyObject* source) {
}
for (int x=0; x<count; x++) {
PyObject* o = PyList_GetItem(source, x);
- if (PyString_Check(o)) {
- char* st = PyString_AsString(o);
- wxPoint* pt;
- if (SWIG_GetPtr(st,(void **) &pt,"_wxPoint_p")) {
- PyErr_SetString(PyExc_TypeError,"Expected _wxPoint_p.");
- return NULL;
- }
- temp[x] = *pt;
- }
- else if (PyTuple_Check(o)) {
+ if (PyTuple_Check(o)) {
PyObject* o1 = PyTuple_GetItem(o, 0);
PyObject* o2 = PyTuple_GetItem(o, 1);
temp[x].x = PyInt_AsLong(o1);
temp[x].y = PyInt_AsLong(o2);
}
+ else if (PyInstance_Check(o)) {
+ wxPoint* pt;
+ if (SWIG_GetPtrObj(o,(void **) &pt,"_wxPoint_p")) {
+ PyErr_SetString(PyExc_TypeError,"Expected _wxPoint_p.");
+ return NULL;
+ }
+ temp[x] = *pt;
+ }
else {
PyErr_SetString(PyExc_TypeError, "Expected a list of 2-tuples or wxPoints.");
return NULL;
}
for (int x=0; x<count; x++) {
PyObject* o = PyList_GetItem(source, x);
- if (PyString_Check(o)) {
- char* st = PyString_AsString(o);
+ if (PyInstance_Check(o)) {
wxBitmap* pt;
- if (SWIG_GetPtr(st,(void **) &pt,"_wxBitmap_p")) {
+ if (SWIG_GetPtrObj(o, (void **) &pt,"_wxBitmap_p")) {
PyErr_SetString(PyExc_TypeError,"Expected _wxBitmap_p.");
return NULL;
}
}
for (int x=0; x<count; x++) {
PyObject* o = PyList_GetItem(source, x);
- if (PyString_Check(o)) {
- char* st = PyString_AsString(o);
+ if (PyInstance_Check(o)) {
wxAcceleratorEntry* ae;
- if (SWIG_GetPtr(st,(void **) &ae,"_wxAcceleratorEntry_p")) {
+ if (SWIG_GetPtrObj(o, (void **) &ae,"_wxAcceleratorEntry_p")) {
PyErr_SetString(PyExc_TypeError,"Expected _wxAcceleratorEntry_p.");
return NULL;
}
-//----------------------------------------------------------------------
//----------------------------------------------------------------------
-wxPyCallbackHelper::wxPyCallbackHelper() {
- m_self = NULL;
- m_lastFound = NULL;
-}
+bool wxSize_helper(PyObject* source, wxSize** obj) {
+ // If source is an object instance then it may already be the right type
+ if (PyInstance_Check(source)) {
+ wxSize* ptr;
+ if (SWIG_GetPtrObj(source, (void **)&ptr, "_wxSize_p"))
+ goto error;
+ *obj = ptr;
+ return TRUE;
+ }
+ // otherwise a 2-tuple of integers is expected
+ else if (PySequence_Check(source) && PyObject_Length(source) == 2) {
+ PyObject* o1 = PySequence_GetItem(source, 0);
+ PyObject* o2 = PySequence_GetItem(source, 1);
+ **obj = wxSize(PyInt_AsLong(o1), PyInt_AsLong(o2));
+ return TRUE;
+ }
-wxPyCallbackHelper::~wxPyCallbackHelper() {
-#ifdef WXP_WITH_THREAD
- PyEval_RestoreThread(wxPyEventThreadState);
-#endif
+ error:
+ PyErr_SetString(PyExc_TypeError, "Expected a 2-tuple of integers or a wxSize object.");
+ return FALSE;
+}
- Py_XDECREF(m_self);
+bool wxPoint_helper(PyObject* source, wxPoint** obj) {
-#ifdef WXP_WITH_THREAD
- PyEval_SaveThread();
-#endif
-}
+ // If source is an object instance then it may already be the right type
+ if (PyInstance_Check(source)) {
+ wxPoint* ptr;
+ if (SWIG_GetPtrObj(source, (void **)&ptr, "_wxPoint_p"))
+ goto error;
+ *obj = ptr;
+ return TRUE;
+ }
+ // otherwise a 2-tuple of integers is expected
+ else if (PySequence_Check(source) && PyObject_Length(source) == 2) {
+ PyObject* o1 = PySequence_GetItem(source, 0);
+ PyObject* o2 = PySequence_GetItem(source, 1);
+ **obj = wxPoint(PyInt_AsLong(o1), PyInt_AsLong(o2));
+ return TRUE;
+ }
-void wxPyCallbackHelper::setSelf(PyObject* self) {
- m_self = self;
- Py_INCREF(m_self);
+ error:
+ PyErr_SetString(PyExc_TypeError, "Expected a 2-tuple of integers or a wxPoint object.");
+ return FALSE;
}
-bool wxPyCallbackHelper::findCallback(const wxString& name) {
- m_lastFound = NULL;
- if (m_self && PyObject_HasAttrString(m_self, (char*)name.c_str()))
- m_lastFound = PyObject_GetAttrString(m_self, (char*)name.c_str());
+bool wxRealPoint_helper(PyObject* source, wxRealPoint** obj) {
- return m_lastFound != NULL;
+ // If source is an object instance then it may already be the right type
+ if (PyInstance_Check(source)) {
+ wxRealPoint* ptr;
+ if (SWIG_GetPtrObj(source, (void **)&ptr, "_wxRealPoint_p"))
+ goto error;
+ *obj = ptr;
+ return TRUE;
+ }
+ // otherwise a 2-tuple of floats is expected
+ else if (PySequence_Check(source) && PyObject_Length(source) == 2) {
+ PyObject* o1 = PySequence_GetItem(source, 0);
+ PyObject* o2 = PySequence_GetItem(source, 1);
+ **obj = wxRealPoint(PyFloat_AsDouble(o1), PyFloat_AsDouble(o2));
+ return TRUE;
+ }
+
+ error:
+ PyErr_SetString(PyExc_TypeError, "Expected a 2-tuple of floats or a wxRealPoint object.");
+ return FALSE;
}
-int wxPyCallbackHelper::callCallback(PyObject* argTuple) {
- PyObject* result;
- int retval = FALSE;
- result = callCallbackObj(argTuple);
- if (result) { // Assumes an integer return type...
- retval = PyInt_AsLong(result);
- Py_DECREF(result);
- PyErr_Clear(); // forget about it if it's not...
- }
-#ifdef WXP_WITH_THREAD
- PyEval_SaveThread();
-#endif
- return retval;
-}
-// Invoke the Python callable object, returning the raw PyObject return
-// value. Caller should DECREF the return value and also call PyEval_SaveThread.
-PyObject* wxPyCallbackHelper::callCallbackObj(PyObject* argTuple) {
-#ifdef WXP_WITH_THREAD
- PyEval_RestoreThread(wxPyEventThreadState);
-#endif
- PyObject* result;
+bool wxRect_helper(PyObject* source, wxRect** obj) {
- result = PyEval_CallObject(m_lastFound, argTuple);
- Py_DECREF(argTuple);
- if (!result) {
- PyErr_Print();
+ // If source is an object instance then it may already be the right type
+ if (PyInstance_Check(source)) {
+ wxRect* ptr;
+ if (SWIG_GetPtrObj(source, (void **)&ptr, "_wxRect_p"))
+ goto error;
+ *obj = ptr;
+ return TRUE;
+ }
+ // otherwise a 4-tuple of integers is expected
+ else if (PySequence_Check(source) && PyObject_Length(source) == 4) {
+ PyObject* o1 = PySequence_GetItem(source, 0);
+ PyObject* o2 = PySequence_GetItem(source, 1);
+ PyObject* o3 = PySequence_GetItem(source, 2);
+ PyObject* o4 = PySequence_GetItem(source, 3);
+ **obj = wxRect(PyInt_AsLong(o1), PyInt_AsLong(o2),
+ PyInt_AsLong(o3), PyInt_AsLong(o4));
+ return TRUE;
}
- return result;
-}
+ error:
+ PyErr_SetString(PyExc_TypeError, "Expected a 4-tuple of integers or a wxRect object.");
+ return FALSE;
+}
projects / wxWidgets.git / blobdiff