X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dd9a3de816bb5e048a2b99837a508542a91235f0..4cd9591aab117574f7d0af749d0d1f774b9d7945:/utils/wxPython/src/helpers.cpp diff --git a/utils/wxPython/src/helpers.cpp b/utils/wxPython/src/helpers.cpp index ae7a8321ae..2f5eabfb67 100644 --- a/utils/wxPython/src/helpers.cpp +++ b/utils/wxPython/src/helpers.cpp @@ -10,12 +10,6 @@ // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// -#ifdef __WXMSW__ -#include -#undef FindWindow -#undef GetCharWidth -#undef LoadAccelerators -#endif #ifdef __WXGTK__ #include "gtk/gtk.h" @@ -24,8 +18,17 @@ #undef DEBUG #include #include "helpers.h" +#ifdef __WXMSW__ +#include +#undef FindWindow +#undef GetCharWidth +#undef LoadAccelerators +#undef GetClassInfo +#undef GetClassName +#endif #include + //--------------------------------------------------------------------------- //wxHashTable* wxPyWindows = NULL; @@ -38,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. //---------------------------------------------------------------------- @@ -50,7 +51,7 @@ BOOL WINAPI DllMain( LPVOID lpvReserved // reserved ) { - wxhInstance = hinstDLL; + wxSetInstance(hinstDLL); return 1; } #endif @@ -62,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; @@ -73,6 +83,7 @@ int wxPyApp::MainLoop(void) { return retval; } + void wxPyApp::AfterMainLoop(void) { // more stuff from wxEntry... @@ -138,7 +149,9 @@ void __wxPreStart() } - +#ifdef WXP_WITH_THREAD +static PyThreadState *event_tstate = NULL; +#endif static char* __nullArgv[1] = { 0 }; // Start the user application, user App's OnInit method is a parameter here @@ -149,6 +162,9 @@ PyObject* __wxStart(PyObject* /* self */, PyObject* args) PyObject* result; long bResult; +#ifdef WXP_WITH_THREAD + event_tstate = PyThreadState_Get(); +#endif if (!PyArg_ParseTuple(args, "O", &onInitFunc)) return NULL; @@ -161,13 +177,18 @@ 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); + + // 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); @@ -259,6 +280,27 @@ PyObject* wxPyConstructObject(void* ptr, char* className) } + +wxPyCallback::wxPyCallback(PyObject* func) { + m_func = func; + Py_INCREF(m_func); +} + +wxPyCallback::~wxPyCallback() { +#ifdef WXP_WITH_THREAD + PyEval_RestoreThread(event_tstate); +#endif + + Py_DECREF(m_func); + +#ifdef WXP_WITH_THREAD + PyEval_SaveThread(); +#endif +} + + + + // This function is used for all events destined for Python event handlers. void wxPyCallback::EventThunker(wxEvent& event) { wxPyCallback* cb = (wxPyCallback*)event.m_callbackUserData; @@ -267,6 +309,10 @@ void wxPyCallback::EventThunker(wxEvent& event) { PyObject* arg; PyObject* tuple; + +#ifdef WXP_WITH_THREAD + PyEval_RestoreThread(event_tstate); +#endif arg = wxPyConstructObject((void*)&event, event.GetClassInfo()->GetClassName()); tuple = PyTuple_New(1); @@ -279,6 +325,9 @@ void wxPyCallback::EventThunker(wxEvent& event) { } else { PyErr_Print(); } +#ifdef WXP_WITH_THREAD + PyEval_SaveThread(); +#endif } @@ -300,6 +349,9 @@ wxPyMenu::~wxPyMenu() { void wxPyMenu::MenuCallback(wxMenu& menu, wxCommandEvent& evt) { +#ifdef WXP_WITH_THREAD + PyEval_RestoreThread(event_tstate); +#endif PyObject* evtobj = wxPyConstructObject((void*)&evt, "wxCommandEvent"); PyObject* menuobj = wxPyConstructObject((void*)&menu, "wxMenu"); if (PyErr_Occurred()) { @@ -315,6 +367,9 @@ void wxPyMenu::MenuCallback(wxMenu& menu, wxCommandEvent& evt) { PyObject* res = PyEval_CallObject(func, args); Py_DECREF(args); Py_XDECREF(res); /* In case res is a NULL pointer */ +#ifdef WXP_WITH_THREAD + PyEval_SaveThread(); +#endif } @@ -330,6 +385,9 @@ wxPyTimer::~wxPyTimer() { } void wxPyTimer::Notify() { +#ifdef WXP_WITH_THREAD + PyEval_RestoreThread(event_tstate); +#endif PyObject* result; PyObject* args = Py_BuildValue("()"); @@ -341,9 +399,49 @@ void wxPyTimer::Notify() { } else { PyErr_Print(); } +#ifdef WXP_WITH_THREAD + PyEval_SaveThread(); +#endif +} + + +//---------------------------------------------------------------------- + +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); + } +} + + +wxPyEvent::~wxPyEvent() { + if (m_userData != Py_None) { + Py_DECREF(m_userData); + m_userData = Py_None; + } } +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); + } +} + + +PyObject* wxPyEvent::GetUserData() { + return m_userData; +} //---------------------------------------------------------------------- //---------------------------------------------------------------------- @@ -583,7 +681,31 @@ wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source) { ///////////////////////////////////////////////////////////////////////////// // // $Log$ +// Revision 1.20 1999/04/30 03:29:18 RD +// wxPython 2.0b9, first phase (win32) +// Added gobs of stuff, see wxPython/README.txt for details +// +// Revision 1.19.4.1 1999/03/27 23:29:14 RD +// +// wxPython 2.0b8 +// Python thread support +// various minor additions +// various minor fixes +// +// Revision 1.19 1999/02/20 09:02:59 RD +// Added wxWindow_FromHWND(hWnd) for wxMSW to construct a wxWindow from a +// window handle. If you can get the window handle into the python code, +// it should just work... More news on this later. +// +// Added wxImageList, wxToolTip. +// +// Re-enabled wxConfig.DeleteAll() since it is reportedly fixed for the +// wxRegConfig class. +// +// As usual, some bug fixes, tweaks, etc. +// // Revision 1.18 1999/01/30 08:17:27 RD +// // Added wxSashWindow, wxSashEvent, wxLayoutAlgorithm, etc. // // Various cleanup, tweaks, minor additions, etc. to maintain