#ifdef __WXGTK__
-#include "gtk/gtk.h"
+#include <gtk/gtk.h>
#endif
#undef DEBUG
int wxPyApp::MainLoop(void) {
int retval = wxApp::MainLoop();
- AfterMainLoop();
+//# AfterMainLoop();
+ wxPythonApp->OnExit(); //#
return retval;
}
-void wxPyApp::AfterMainLoop(void) {
- // more stuff from wxEntry...
+//# void wxPyApp::AfterMainLoop(void) {
+// // more stuff from wxEntry...
- if (wxPythonApp->GetTopWindow()) {
- // Forcibly delete the window.
- if (wxPythonApp->GetTopWindow()->IsKindOf(CLASSINFO(wxFrame)) ||
- wxPythonApp->GetTopWindow()->IsKindOf(CLASSINFO(wxDialog))) {
+// if (wxPythonApp->GetTopWindow()) {
+// // Forcibly delete the window.
+// if (wxPythonApp->GetTopWindow()->IsKindOf(CLASSINFO(wxFrame)) ||
+// wxPythonApp->GetTopWindow()->IsKindOf(CLASSINFO(wxDialog))) {
- wxPythonApp->GetTopWindow()->Close(TRUE);
- wxPythonApp->DeletePendingObjects();
- }
- else {
- delete wxPythonApp->GetTopWindow();
- wxPythonApp->SetTopWindow(NULL);
- }
- }
-#ifdef __WXGTK__
- wxPythonApp->DeletePendingObjects();
-#endif
+// wxPythonApp->GetTopWindow()->Close(TRUE);
+// wxPythonApp->DeletePendingObjects();
+// }
+// else {
+// delete wxPythonApp->GetTopWindow();
+// wxPythonApp->SetTopWindow(NULL);
+// }
+// }
+// #ifdef __WXGTK__
+// wxPythonApp->DeletePendingObjects();
+// #endif
- wxPythonApp->OnExit();
- wxApp::CleanUp();
-// delete wxPythonApp;
-}
+// wxPythonApp->OnExit();
+// wxApp::CleanUp();
+// // delete wxPythonApp;
+// }
//---------------------------------------------------------------------
// This is where we pick up the first part of the wxEntry functionality...
// The rest is in __wxStart and AfterMainLoop. This function is called when
-// wxpc is imported. (Before there is a wxApp object.)
+// wxcmodule is imported. (Before there is a wxApp object.)
void __wxPreStart()
{
// Bail out if there is already windows created. This means that the
argv[argc] = NULL;
gtk_set_locale();
+ if (!wxOKlibc()) wxConvCurrent = &wxConvLocal;
gtk_init( &argc, &argv );
+ wxSetDetectableAutoRepeat( TRUE );
delete [] argv;
wxApp::Initialize(); // may return FALSE. Should we check?
#ifdef WXP_WITH_THREAD
PyThreadState* wxPyEventThreadState = NULL;
-bool wxPyInEvent = false;
#endif
static char* __nullArgv[1] = { 0 };
+
+
// Start the user application, user App's OnInit method is a parameter here
PyObject* __wxStart(PyObject* /* self */, PyObject* args)
{
// Call the Python App's OnInit function
arglist = PyTuple_New(0);
-
- // Py_END_ALLOW_THREADS; **** __wxStart was called from Python,
- // should already have the lock
result = PyEval_CallObject(onInitFunc, arglist);
- // Py_BEGIN_ALLOW_THREADS;
-
- if (!result) {
- PyErr_Print();
- exit(1);
+ if (!result) { // an exception was raised.
+ return NULL;
}
if (! PyInt_Check(result)) {
}
bResult = PyInt_AS_LONG(result);
if (! bResult) {
- wxPythonApp->DeletePendingObjects();
- wxPythonApp->OnExit();
- wxApp::CleanUp();
PyErr_SetString(PyExc_SystemExit, "OnInit returned false, exiting...");
return NULL;
}
//---------------------------------------------------------------------------
-
-static
-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;
+
+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
+ PyEval_RestoreThread(wxPyEventThreadState);
+ _wxPyNestCount += 1;
+ if (_wxPyNestCount == 1)
+ return TRUE;
+ else
+#endif
+ return FALSE;
+}
+
+
+HELPEREXPORT void wxPySaveThread(bool doSave) {
+#ifdef WXP_WITH_THREAD
+ if (doSave) {
+ PyEval_SaveThread();
+ //_wxPyInEvent = false;
+ }
+ _wxPyNestCount -= 1;
+#endif
+}
+
+//---------------------------------------------------------------------------
wxPyCallback::wxPyCallback(PyObject* func) {
}
wxPyCallback::~wxPyCallback() {
-#ifdef WXP_WITH_THREAD
- //if (! wxPyInEvent)
- PyEval_RestoreThread(wxPyEventThreadState);
-#endif
-
+ bool doSave = wxPyRestoreThread();
Py_DECREF(m_func);
-
-#ifdef WXP_WITH_THREAD
- //if (! wxPyInEvent)
- PyEval_SaveThread();
-#endif
+ 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);
- }
+
+wxPyCallbackHelper::~wxPyCallbackHelper() {
+ bool doSave = wxPyRestoreThread();
+ Py_XDECREF(m_self);
+ wxPySaveThread(doSave);
}
-wxPyMenu::~wxPyMenu() {
-#ifdef WXP_WITH_THREAD
- //if (! wxPyInEvent)
- PyEval_RestoreThread(wxPyEventThreadState);
-#endif
+void wxPyCallbackHelper::setSelf(PyObject* self) {
+ m_self = self;
+ Py_INCREF(m_self);
+}
- if (func)
- Py_DECREF(func);
-#ifdef WXP_WITH_THREAD
- //if (! wxPyInEvent)
- PyEval_SaveThread();
-#endif
+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;
}
-void wxPyMenu::MenuCallback(wxMenu& menu, wxCommandEvent& evt) {
- PyObject* evtobj;
- PyObject* menuobj;
- PyObject* func;
- PyObject* args;
- PyObject* res;
+int wxPyCallbackHelper::callCallback(PyObject* argTuple) {
+ PyObject* result;
+ int retval = FALSE;
-#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
+ 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();
- 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 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);
}
wxPyEvent::~wxPyEvent() {
-#ifdef WXP_WITH_THREAD
- //if (! wxPyInEvent)
- PyEval_RestoreThread(wxPyEventThreadState);
-#endif
+ bool doSave = wxPyRestoreThread();
if (m_userData != Py_None) {
Py_DECREF(m_userData);
m_userData = Py_None;
}
-#ifdef WXP_WITH_THREAD
- //if (! wxPyInEvent)
- PyEval_SaveThread();
-#endif
+ wxPySaveThread(doSave);
}
}
//----------------------------------------------------------------------
+//---------------------------------------------------------------------------
+// Convert a wxList to a Python List
+
+PyObject* wxPy_ConvertList(wxListBase* list, char* className) {
+ PyObject* pyList;
+ PyObject* pyObj;
+ wxObject* wxObj;
+ wxNode* node = list->First();
+
+ 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;
+}
+
//----------------------------------------------------------------------
// 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) {
+HELPEREXPORT byte* byte_LIST_helper(PyObject* source) {
if (!PyList_Check(source)) {
PyErr_SetString(PyExc_TypeError, "Expected a list object.");
return NULL;
}
-int* int_LIST_helper(PyObject* source) {
+HELPEREXPORT int* int_LIST_helper(PyObject* source) {
if (!PyList_Check(source)) {
PyErr_SetString(PyExc_TypeError, "Expected a list object.");
return NULL;
}
-long* long_LIST_helper(PyObject* source) {
+HELPEREXPORT long* long_LIST_helper(PyObject* source) {
if (!PyList_Check(source)) {
PyErr_SetString(PyExc_TypeError, "Expected a list object.");
return NULL;
}
-char** string_LIST_helper(PyObject* source) {
+HELPEREXPORT char** string_LIST_helper(PyObject* source) {
if (!PyList_Check(source)) {
PyErr_SetString(PyExc_TypeError, "Expected a list object.");
return NULL;
-wxPoint* wxPoint_LIST_helper(PyObject* source) {
+HELPEREXPORT wxPoint* wxPoint_LIST_helper(PyObject* source) {
if (!PyList_Check(source)) {
PyErr_SetString(PyExc_TypeError, "Expected a list object.");
return NULL;
}
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;
}
-wxBitmap** wxBitmap_LIST_helper(PyObject* source) {
+HELPEREXPORT wxBitmap** wxBitmap_LIST_helper(PyObject* source) {
if (!PyList_Check(source)) {
PyErr_SetString(PyExc_TypeError, "Expected a list object.");
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;
}
-wxString* wxString_LIST_helper(PyObject* source) {
+HELPEREXPORT wxString* wxString_LIST_helper(PyObject* source) {
if (!PyList_Check(source)) {
PyErr_SetString(PyExc_TypeError, "Expected a list object.");
return NULL;
}
-wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source) {
+HELPEREXPORT wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source) {
if (!PyList_Check(source)) {
PyErr_SetString(PyExc_TypeError, "Expected a list object.");
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;
-}
-
-
-wxPyCallbackHelper::~wxPyCallbackHelper() {
-#ifdef WXP_WITH_THREAD
- PyEval_RestoreThread(wxPyEventThreadState);
-#endif
-
- Py_XDECREF(m_self);
-
-#ifdef WXP_WITH_THREAD
- PyEval_SaveThread();
-#endif
-}
-
-void wxPyCallbackHelper::setSelf(PyObject* self) {
- m_self = self;
- Py_INCREF(m_self);
-}
-
-
-
-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...
- }
-#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;
-
- result = PyEval_CallObject(m_lastFound, argTuple);
- Py_DECREF(argTuple);
- if (!result) {
- PyErr_Print();
- }
- return result;
-}
-
-
-
//----------------------------------------------------------------------
//----------------------------------------------------------------------
projects / wxWidgets.git / blobdiff