X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b639c3c5ef53c4bdefd3b27aac1496787f024cb8..1475671a6655702355270d44757711bf63af9ed7:/utils/wxPython/src/helpers.cpp diff --git a/utils/wxPython/src/helpers.cpp b/utils/wxPython/src/helpers.cpp index 8ffbd7931a..df05338a93 100644 --- a/utils/wxPython/src/helpers.cpp +++ b/utils/wxPython/src/helpers.cpp @@ -10,22 +10,24 @@ // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// -#ifdef __WXMSW__ -#include -#undef FindWindow -#undef GetCharWidth -#undef LoadAccelerators + +#ifdef __WXGTK__ +#include #endif #undef DEBUG #include #include "helpers.h" - -#ifdef __WXGTK__ -#ifdef wxUSE_GDK_IMLIB -#include "gdk_imlib/gdk_imlib.h" -#endif +#ifdef __WXMSW__ +#include +#undef FindWindow +#undef GetCharWidth +#undef LoadAccelerators +#undef GetClassInfo +#undef GetClassName #endif +#include + //--------------------------------------------------------------------------- @@ -39,8 +41,6 @@ wxString wxPyEmptyStr(""); #ifdef __WXMSW__ // If building for win32... -extern HINSTANCE wxhInstance; - //---------------------------------------------------------------------- // This gets run when the DLL is loaded. We just need to save a handle. //---------------------------------------------------------------------- @@ -51,7 +51,7 @@ BOOL WINAPI DllMain( LPVOID lpvReserved // reserved ) { - wxhInstance = hinstDLL; + wxSetInstance(hinstDLL); return 1; } #endif @@ -63,6 +63,15 @@ BOOL WINAPI DllMain( wxPyApp *wxPythonApp = NULL; // Global instance of application object +wxPyApp::wxPyApp() { +// printf("**** ctor\n"); +} + +wxPyApp::~wxPyApp() { +// printf("**** dtor\n"); +} + + // This one isn't acutally called... See __wxStart() bool wxPyApp::OnInit(void) { return false; @@ -70,41 +79,36 @@ bool wxPyApp::OnInit(void) { int wxPyApp::MainLoop(void) { int retval = wxApp::MainLoop(); - AfterMainLoop(); +//# AfterMainLoop(); + wxPythonApp->OnExit(); //# return retval; } -void wxPyApp::AfterMainLoop(void) { - // more stuff from wxEntry... -#ifdef __WXMSW__ - if (wxPythonApp->GetTopWindow()) { - // Forcibly delete the window. - if (wxPythonApp->GetTopWindow()->IsKindOf(CLASSINFO(wxFrame)) || - wxPythonApp->GetTopWindow()->IsKindOf(CLASSINFO(wxDialog))) { +//# void wxPyApp::AfterMainLoop(void) { +// // more stuff from wxEntry... - wxPythonApp->GetTopWindow()->Close(TRUE); - wxPythonApp->DeletePendingObjects(); - } - else { - delete wxPythonApp->GetTopWindow(); - wxPythonApp->SetTopWindow(NULL); - } - } -#endif -#ifdef __WXGTK__ - wxPythonApp->DeletePendingObjects(); -#endif +// if (wxPythonApp->GetTopWindow()) { +// // Forcibly delete the window. +// if (wxPythonApp->GetTopWindow()->IsKindOf(CLASSINFO(wxFrame)) || +// wxPythonApp->GetTopWindow()->IsKindOf(CLASSINFO(wxDialog))) { - wxPythonApp->OnExit(); -#ifdef __WXMSW__ - wxApp::CleanUp(); -#endif -#ifdef __WXGTK__ - wxApp::CommonCleanUp(); -#endif - delete wxPythonApp; -} +// wxPythonApp->GetTopWindow()->Close(TRUE); +// wxPythonApp->DeletePendingObjects(); +// } +// else { +// delete wxPythonApp->GetTopWindow(); +// wxPythonApp->SetTopWindow(NULL); +// } +// } +// #ifdef __WXGTK__ +// wxPythonApp->DeletePendingObjects(); +// #endif + +// wxPythonApp->OnExit(); +// wxApp::CleanUp(); +// // delete wxPythonApp; +// } //--------------------------------------------------------------------- @@ -114,7 +118,7 @@ void wxPyApp::AfterMainLoop(void) { // 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 @@ -126,9 +130,8 @@ void __wxPreStart() #ifdef __WXMSW__ wxApp::Initialize(); #endif -#ifdef __WXGTK__ - wxClassInfo::InitializeClasses(); +#ifdef __WXGTK__ PyObject* sysargv = PySys_GetObject("argv"); int argc = PyList_Size(sysargv); char** argv = new char*[argc+1]; @@ -137,24 +140,29 @@ void __wxPreStart() argv[x] = PyString_AsString(PyList_GetItem(sysargv, x)); 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 wxUSE_GDK_IMLIB - gdk_imlib_init(); - gtk_widget_push_visual(gdk_imlib_get_visual()); - gtk_widget_push_colormap(gdk_imlib_get_colormap()); -#endif - - wxApp::CommonInit(); + wxApp::Initialize(); // may return FALSE. Should we check? #endif } - +#ifdef WXP_WITH_THREAD +PyThreadState* wxPyEventThreadState = NULL; +#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) { @@ -163,6 +171,9 @@ PyObject* __wxStart(PyObject* /* self */, PyObject* args) PyObject* result; long bResult; +#ifdef WXP_WITH_THREAD + wxPyEventThreadState = PyThreadState_Get(); +#endif if (!PyArg_ParseTuple(args, "O", &onInitFunc)) return NULL; @@ -175,16 +186,15 @@ PyObject* __wxStart(PyObject* /* self */, PyObject* args) // This is the next part of the wxEntry functionality... wxPythonApp->argc = 0; - wxPythonApp->argv = __nullArgv; + wxPythonApp->argv = NULL; wxPythonApp->OnInitGui(); // Call the Python App's OnInit function arglist = PyTuple_New(0); result = PyEval_CallObject(onInitFunc, arglist); - if (!result) { - PyErr_Print(); - exit(1); + if (!result) { // an exception was raised. + return NULL; } if (! PyInt_Check(result)) { @@ -193,14 +203,6 @@ PyObject* __wxStart(PyObject* /* self */, PyObject* args) } bResult = PyInt_AS_LONG(result); if (! bResult) { - wxPythonApp->DeletePendingObjects(); - wxPythonApp->OnExit(); -#ifdef __WXMSW__ - wxApp::CleanUp(); -#endif -#ifdef __WXGTK__ - wxApp::CommonCleanUp(); -#endif PyErr_SetString(PyExc_SystemExit, "OnInit returned false, exiting..."); return NULL; } @@ -253,10 +255,7 @@ PyObject* __wxSetDictionary(PyObject* /* self */, PyObject* args) //--------------------------------------------------------------------------- - -static -PyObject* wxPyConstructObject(void* ptr, char* className) -{ +PyObject* wxPyConstructObject(void* ptr, char* className) { char buff[64]; // should always be big enough... char swigptr[64]; @@ -277,6 +276,77 @@ PyObject* wxPyConstructObject(void* ptr, char* className) 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 +} + +//--------------------------------------------------------------------------- + + +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); +} + + + // This function is used for all events destined for Python event handlers. void wxPyCallback::EventThunker(wxEvent& event) { @@ -286,6 +356,8 @@ void wxPyCallback::EventThunker(wxEvent& event) { PyObject* arg; PyObject* tuple; + + bool doSave = wxPyRestoreThread(); arg = wxPyConstructObject((void*)&event, event.GetClassInfo()->GetClassName()); tuple = PyTuple_New(1); @@ -298,57 +370,94 @@ void wxPyCallback::EventThunker(wxEvent& event) { } else { PyErr_Print(); } + wxPySaveThread(doSave); } -//--------------------------------------------------------------------------- +//---------------------------------------------------------------------- + +wxPyCallbackHelper::wxPyCallbackHelper() { + m_self = NULL; + m_lastFound = NULL; +} -wxPyMenu::wxPyMenu(const wxString& title, PyObject* _func) - : wxMenu(title, (wxFunction)(func ? MenuCallback : NULL)), func(0) { - if (_func) { - func = _func; - Py_INCREF(func); - } +wxPyCallbackHelper::~wxPyCallbackHelper() { + bool doSave = wxPyRestoreThread(); + Py_XDECREF(m_self); + wxPySaveThread(doSave); +} + +wxPyCallbackHelper::wxPyCallbackHelper(const wxPyCallbackHelper& other) { + m_lastFound = NULL; + m_self = other.m_self; + if (m_self) + Py_INCREF(m_self); } -wxPyMenu::~wxPyMenu() { - if (func) - Py_DECREF(func); + +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 = wxPyConstructObject((void*)&evt, "wxCommandEvent"); - PyObject* menuobj = wxPyConstructObject((void*)&menu, "wxMenu"); - if (PyErr_Occurred()) { - // bail out if a problem +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; } - // Now call the callback... - PyObject* func = ((wxPyMenu*)&menu)->func; - PyObject* args = PyTuple_New(2); - PyTuple_SET_ITEM(args, 0, menuobj); - PyTuple_SET_ITEM(args, 1, evtobj); - PyObject* res = PyEval_CallObject(func, args); - Py_DECREF(args); - Py_XDECREF(res); /* In case res is a NULL pointer */ + return result; } + +//--------------------------------------------------------------------------- //--------------------------------------------------------------------------- + wxPyTimer::wxPyTimer(PyObject* callback) { func = callback; Py_INCREF(func); } wxPyTimer::~wxPyTimer() { + bool doSave = wxPyRestoreThread(); Py_DECREF(func); + wxPySaveThread(doSave); } void wxPyTimer::Notify() { + bool doSave = wxPyRestoreThread(); + PyObject* result; PyObject* args = Py_BuildValue("()"); @@ -360,14 +469,36 @@ void wxPyTimer::Notify() { } else { PyErr_Print(); } + 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) { @@ -476,22 +607,21 @@ wxPoint* wxPoint_LIST_helper(PyObject* source) { } for (int x=0; x