X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/26eac43ed138355a6c8e091d03696a715b6df559..ad3fca675f77c2903cafd096bbda8baa2e7689ff:/wxPython/src/helpers.cpp diff --git a/wxPython/src/helpers.cpp b/wxPython/src/helpers.cpp index 5416f937a5..edb5a91791 100644 --- a/wxPython/src/helpers.cpp +++ b/wxPython/src/helpers.cpp @@ -23,9 +23,18 @@ #endif #ifdef __WXGTK__ +#include +#include #include #include #include +#define GetXWindow(wxwin) GDK_WINDOW_XWINDOW((wxwin)->m_widget->window) +#include +#endif + +#ifdef __WXX11__ +#include "wx/x11/privx.h" +#define GetXWindow(wxwin) ((Window)(wxwin)->GetHandle()) #endif #ifdef __WXMAC__ @@ -53,10 +62,9 @@ bool wxPyDoingCleanup = False; struct wxPyThreadState { unsigned long tid; PyThreadState* tstate; - int blocked; wxPyThreadState(unsigned long _tid=0, PyThreadState* _tstate=NULL) - : tid(_tid), tstate(_tstate), blocked(1) {} + : tid(_tid), tstate(_tstate) {} }; #include @@ -71,6 +79,7 @@ wxMutex* wxPyTMutex = NULL; static PyObject* wxPython_dict = NULL; static PyObject* wxPyAssertionError = NULL; +static PyObject* wxPyNoAppError = NULL; PyObject* wxPyPtrTypeMap = NULL; @@ -137,20 +146,20 @@ int wxPyApp::MainLoop() { bool wxPyApp::OnInitGui() { bool rval=True; wxApp::OnInitGui(); // in this case always call the base class version - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); if (wxPyCBH_findCallback(m_myInst, "OnInitGui")) rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); return rval; } int wxPyApp::OnExit() { int rval=0; - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); if (wxPyCBH_findCallback(m_myInst, "OnExit")) rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); wxApp::OnExit(); // in this case always call the base class version return rval; } @@ -178,7 +187,7 @@ void wxPyApp::OnAssert(const wxChar *file, // If the OnAssert is overloaded in the Python class then call it... bool found; - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); if ((found = wxPyCBH_findCallback(m_myInst, "OnAssert"))) { PyObject* fso = wx2PyString(file); PyObject* cso = wx2PyString(file); @@ -193,7 +202,7 @@ void wxPyApp::OnAssert(const wxChar *file, Py_DECREF(cso); Py_DECREF(mso); } - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); // ...otherwise do our own thing with it if (! found) { @@ -212,11 +221,11 @@ void wxPyApp::OnAssert(const wxChar *file, } // set the exception - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); PyObject* s = wx2PyString(buf); PyErr_SetObject(wxPyAssertionError, s); Py_DECREF(s); - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); // Now when control returns to whatever API wrapper was called from // Python it should detect that an exception is set and will return @@ -247,40 +256,40 @@ void wxPyApp::OnAssert(const wxChar *file, // For catching Apple Events void wxPyApp::MacOpenFile(const wxString &fileName) { - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); if (wxPyCBH_findCallback(m_myInst, "MacOpenFile")) { PyObject* s = wx2PyString(fileName); wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", s)); Py_DECREF(s); } - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); } void wxPyApp::MacPrintFile(const wxString &fileName) { - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); if (wxPyCBH_findCallback(m_myInst, "MacPrintFile")) { PyObject* s = wx2PyString(fileName); wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", s)); Py_DECREF(s); } - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); } void wxPyApp::MacNewFile() { - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); if (wxPyCBH_findCallback(m_myInst, "MacNewFile")) wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); } void wxPyApp::MacReopenApp() { - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); if (wxPyCBH_findCallback(m_myInst, "MacReopenApp")) wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); } @@ -377,7 +386,7 @@ void wxPyApp::_BootstrapApp() // Get any command-line args passed to this program from the sys module int argc = 0; char** argv = NULL; - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); PyObject* sysargv = PySys_GetObject("argv"); if (sysargv != NULL) { argc = PyList_Size(sysargv); @@ -389,17 +398,30 @@ void wxPyApp::_BootstrapApp() } argv[argc] = NULL; } - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); + // Initialize wxWidgets result = wxEntryStart(argc, argv); delete [] argv; - wxPyBeginBlockThreads(); + blocked = wxPyBeginBlockThreads(); if (! result) { - PyErr_SetString(PyExc_SystemError, "wxEntryStart failed!"); + PyErr_SetString(PyExc_SystemError, + "wxEntryStart failed, unable to initialize wxWidgets!" +#ifdef __WXGTK__ + " (Is DISPLAY set properly?)" +#endif + ); goto error; } + // On wxGTK the locale will be changed to match the system settings, but + // Python needs to have LC_NUMERIC set to "C" in order for the floating + // point conversions and such to work right. +#ifdef __WXGTK__ + setlocale(LC_NUMERIC, "C"); +#endif + // The stock objects were all NULL when they were loaded into // SWIG generated proxies, so re-init those now... wxPy_ReinitStockObjects(3); @@ -430,7 +452,6 @@ void wxPyApp::_BootstrapApp() result = True; } - if (! result) { PyErr_SetString(PyExc_SystemExit, "OnInit returned False, exiting..."); } @@ -439,7 +460,7 @@ void wxPyApp::_BootstrapApp() Py_XDECREF(retval); Py_XDECREF(pyint); - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); }; //--------------------------------------------------------------------- @@ -491,8 +512,8 @@ inline const char* dropwx(const char* name) { //---------------------------------------------------------------------- -// This function is called when the wxc module is imported to do some initial -// setup. (Before there is a wxApp object.) The rest happens in +// This function is called when the wx._core_ module is imported to do some +// initial setup. (Before there is a wxApp object.) The rest happens in // wxPyApp::_BootstrapApp void __wxPyPreStart(PyObject* moduleDict) { @@ -516,6 +537,8 @@ void __wxPyPreStart(PyObject* moduleDict) // Init the stock objects to a non-NULL value so SWIG doesn't create them as None wxPy_ReinitStockObjects(1); + + wxInitAllImageHandlers(); } @@ -536,7 +559,7 @@ void __wxPyCleanup() { } -// Save a reference to the dictionary of the wx.core module, and inject +// Save a reference to the dictionary of the wx._core module, and inject // a few more things into it. PyObject* __wxPySetDictionary(PyObject* /* self */, PyObject* args) { @@ -545,7 +568,8 @@ PyObject* __wxPySetDictionary(PyObject* /* self */, PyObject* args) return NULL; if (!PyDict_Check(wxPython_dict)) { - PyErr_SetString(PyExc_TypeError, "_wxPySetDictionary must have dictionary object!"); + PyErr_SetString(PyExc_TypeError, + "_wxPySetDictionary must have dictionary object!"); return NULL; } @@ -554,25 +578,36 @@ PyObject* __wxPySetDictionary(PyObject* /* self */, PyObject* args) PyDict_SetItemString(wxPython_dict, "__wxPyPtrTypeMap", wxPyPtrTypeMap); // Create an exception object to use for wxASSERTions - wxPyAssertionError = PyErr_NewException("wx.core.PyAssertionError", + wxPyAssertionError = PyErr_NewException("wx._core.PyAssertionError", PyExc_AssertionError, NULL); PyDict_SetItemString(wxPython_dict, "PyAssertionError", wxPyAssertionError); + // Create an exception object to use when the app object hasn't been created yet + wxPyNoAppError = PyErr_NewException("wx._core.PyNoAppError", + PyExc_RuntimeError, NULL); + PyDict_SetItemString(wxPython_dict, "PyNoAppError", wxPyNoAppError); + + #ifdef __WXMOTIF__ #define wxPlatform "__WXMOTIF__" +#define wxPlatName "wxMotif" #endif #ifdef __WXX11__ #define wxPlatform "__WXX11__" +#define wxPlatName "wxX11" #endif #ifdef __WXGTK__ #define wxPlatform "__WXGTK__" +#define wxPlatName "wxGTK" #endif -#if defined(__WIN32__) || defined(__WXMSW__) +#ifdef __WXMSW__ #define wxPlatform "__WXMSW__" +#define wxPlatName "wxMSW" #endif #ifdef __WXMAC__ #define wxPlatform "__WXMAC__" +#define wxPlatName "wxMac" #endif #ifdef __WXDEBUG__ @@ -581,10 +616,46 @@ PyObject* __wxPySetDictionary(PyObject* /* self */, PyObject* args) int wxdebug = 0; #endif + // These should be deprecated in favor of the PlatformInfo tuple built below... PyDict_SetItemString(wxPython_dict, "Platform", PyString_FromString(wxPlatform)); PyDict_SetItemString(wxPython_dict, "USE_UNICODE", PyInt_FromLong(wxUSE_UNICODE)); PyDict_SetItemString(wxPython_dict, "__WXDEBUG__", PyInt_FromLong(wxdebug)); + + PyObject* PlatInfo = PyList_New(0); + PyObject* obj; + +#define _AddInfoString(st) \ + obj = PyString_FromString(st); \ + PyList_Append(PlatInfo, obj); \ + Py_DECREF(obj) + + _AddInfoString(wxPlatform); + _AddInfoString(wxPlatName); +#if wxUSE_UNICODE + _AddInfoString("unicode"); +#else + _AddInfoString("ascii"); +#endif +#ifdef __WXGTK__ +#ifdef __WXGTK20__ + _AddInfoString("gtk2"); +#else + _AddInfoString("gtk1"); +#endif +#endif +#ifdef __WXDEBUG__ + _AddInfoString("wx-assertions-on"); +#else + _AddInfoString("wx-assertions-off"); +#endif + +#undef _AddInfoString + + PyObject* PlatInfoTuple = PyList_AsTuple(PlatInfo); + Py_DECREF(PlatInfo); + PyDict_SetItemString(wxPython_dict, "PlatformInfo", PlatInfoTuple); + RETURN_NONE(); } @@ -607,20 +678,20 @@ bool wxPySwigInstance_Check(PyObject* obj) { //--------------------------------------------------------------------------- -// The stock objects are no longer created when the wxc module is imported, -// but only after the app object has been created. The +// The stock objects are no longer created when the wx._core_ module is +// imported, but only after the app object has been created. The // wxPy_ReinitStockObjects function will be called 3 times to pass the stock // objects though various stages of evolution: // // pass 1: Set all the pointers to a non-NULL value so the Python proxy -// object will be created (otherwise it will just use None.) +// object will be created (otherwise SWIG will just use None.) // // pass 2: After the module has been imported and the python proxys have // been created, then set the __class__ to be _wxPyUnbornObject so // it will catch any access to the object and will raise an exception. // -// pass 3: Finally, from OnInit patch things up so the stock objects can -// be used. +// pass 3: Finally, from BootstrapApp patch things up so the stock objects +// can be used. PyObject* __wxPyFixStockObjects(PyObject* /* self */, PyObject* args) @@ -677,6 +748,17 @@ static void rsoPass3(const char* name, const char* classname, void* ptr) void wxPy_ReinitStockObjects(int pass) { + // If there is already an App object then wxPython is probably embedded in + // a wx C++ application, so there is no need to do all this. + static bool embedded = false; + if ((pass == 1 || pass == 2) && wxTheApp) { + embedded = true; + return; + } + if (pass == 3 && embedded) + return; + + #define REINITOBJ(name, classname) \ if (pass == 1) { name = (classname*)0xC0C0C0C0; } \ else if (pass == 2) { rsoPass2(#name); } \ @@ -687,7 +769,7 @@ void wxPy_ReinitStockObjects(int pass) if (pass == 1) { } \ else if (pass == 2) { rsoPass2(#name); } \ else if (pass == 3) { rsoPass3(#name, #classname, (void*)&name); } - + REINITOBJ(wxNORMAL_FONT, wxFont); REINITOBJ(wxSMALL_FONT, wxFont); @@ -754,22 +836,38 @@ void wxPy_ReinitStockObjects(int pass) //--------------------------------------------------------------------------- +// Check for existence of a wxApp, setting an exception if there isn't one. +// This doesn't need to aquire the GIL because it should only be called from +// an %exception before the lock is released. + +bool wxPyCheckForApp() { + if (wxTheApp != NULL) + return true; + else { + PyErr_SetString(wxPyNoAppError, "The wx.App object must be created first!"); + return false; + } +} + +//--------------------------------------------------------------------------- + + void wxPyClientData_dtor(wxPyClientData* self) { if (! wxPyDoingCleanup) { // Don't do it during cleanup as Python // may have already garbage collected the object... - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); Py_DECREF(self->m_obj); self->m_obj = NULL; - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); } } void wxPyUserData_dtor(wxPyUserData* self) { if (! wxPyDoingCleanup) { - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); Py_DECREF(self->m_obj); self->m_obj = NULL; - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); } } @@ -786,7 +884,7 @@ void wxPyOORClientData_dtor(wxPyOORClientData* self) { static PyObject* deadObjectClass = NULL; - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); if (deadObjectClass == NULL) { deadObjectClass = PyDict_GetItemString(wxPython_dict, "_wxPyDeadObject"); // TODO: Can not wxASSERT here because inside a wxPyBeginBlock Threads, @@ -831,7 +929,7 @@ void wxPyOORClientData_dtor(wxPyOORClientData* self) { } // m_obj is DECREF'd in the base class dtor... - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); } @@ -1002,7 +1100,6 @@ PyThreadState* wxPyBeginAllowThreads() { #ifdef WXP_WITH_THREAD PyThreadState* saved = PyEval_SaveThread(); // Py_BEGIN_ALLOW_THREADS; wxPySaveThreadState(saved); - wxPyGetThreadState()->blocked -= 1; return saved; #else return NULL; @@ -1011,7 +1108,6 @@ PyThreadState* wxPyBeginAllowThreads() { void wxPyEndAllowThreads(PyThreadState* saved) { #ifdef WXP_WITH_THREAD - wxPyGetThreadState()->blocked += 1; PyEval_RestoreThread(saved); // Py_END_ALLOW_THREADS; #endif } @@ -1021,21 +1117,33 @@ void wxPyEndAllowThreads(PyThreadState* saved) { // Calls from wxWindows back to Python code, or even any PyObject // manipulations, PyDECREF's and etc. are wrapped in calls to these functions: -void wxPyBeginBlockThreads() { +bool wxPyBeginBlockThreads() { #ifdef WXP_WITH_THREAD + // This works in for 2.3, maybe a good alternative to find the needed tstate? + // PyThreadState *check = PyGILState_GetThisThreadState(); + + PyThreadState *current = _PyThreadState_Current; + + // Only block if there wasn't already a tstate, or if the current one is + // not the one we are wanting to change to. This should prevent deadlock + // if there are nested calls to wxPyBeginBlockThreads + bool blocked = false; wxPyThreadState* tstate = wxPyGetThreadState(); - if (tstate->blocked++ == 0) { // if nested calls then do nothing + if (current != tstate->tstate) { PyEval_RestoreThread(tstate->tstate); + blocked = true; } + return blocked; #endif } -void wxPyEndBlockThreads() { +void wxPyEndBlockThreads(bool blocked) { #ifdef WXP_WITH_THREAD - wxPyThreadState* tstate = wxPyGetThreadState(); - tstate->blocked -= 1; - if ( tstate->blocked == 0) { // if nested calls then do nothing + // Only unblock if we blocked in the last call to wxPyBeginBlockThreads. + // The value of blocked passed in needs to be the same as that returned + // from wxPyBeginBlockThreads at the same nesting level. + if ( blocked ) { PyEval_SaveThread(); } #endif @@ -1075,9 +1183,9 @@ PyObject* wxPyInputStream::read(int size) { // check if we have a real wxInputStream to work with if (!m_wxis) { - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); PyErr_SetString(PyExc_IOError, "no valid C-wxInputStream"); - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); return NULL; } @@ -1094,7 +1202,7 @@ PyObject* wxPyInputStream::read(int size) { } // error check - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); wxStreamError err = m_wxis->GetLastError(); if (err != wxSTREAM_NO_ERROR && err != wxSTREAM_EOF) { PyErr_SetString(PyExc_IOError,"IOError in wxInputStream"); @@ -1103,7 +1211,7 @@ PyObject* wxPyInputStream::read(int size) { // We use only strings for the streams, not unicode obj = PyString_FromStringAndSize(buf, buf.GetDataLen()); } - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); return obj; } @@ -1116,9 +1224,9 @@ PyObject* wxPyInputStream::readline(int size) { // check if we have a real wxInputStream to work with if (!m_wxis) { - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); PyErr_SetString(PyExc_IOError,"no valid C-wxInputStream"); - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); return NULL; } @@ -1129,7 +1237,7 @@ PyObject* wxPyInputStream::readline(int size) { } // errorcheck - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); wxStreamError err = m_wxis->GetLastError(); if (err != wxSTREAM_NO_ERROR && err != wxSTREAM_EOF) { PyErr_SetString(PyExc_IOError,"IOError in wxInputStream"); @@ -1138,7 +1246,7 @@ PyObject* wxPyInputStream::readline(int size) { // We use only strings for the streams, not unicode obj = PyString_FromStringAndSize((char*)buf.GetData(), buf.GetDataLen()); } - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); return obj; } @@ -1148,19 +1256,21 @@ PyObject* wxPyInputStream::readlines(int sizehint) { // check if we have a real wxInputStream to work with if (!m_wxis) { - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); PyErr_SetString(PyExc_IOError,"no valid C-wxInputStream"); - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); return NULL; } // init list - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); pylist = PyList_New(0); + wxPyEndBlockThreads(blocked); + if (!pylist) { - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); PyErr_NoMemory(); - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); return NULL; } @@ -1169,24 +1279,24 @@ PyObject* wxPyInputStream::readlines(int sizehint) { for (i=0; (m_wxis->CanRead()) && ((sizehint < 0) || (i < sizehint));) { PyObject* s = this->readline(); if (s == NULL) { - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); Py_DECREF(pylist); - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); return NULL; } - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); PyList_Append(pylist, s); i += PyString_Size(s); - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); } // error check wxStreamError err = m_wxis->GetLastError(); if (err != wxSTREAM_NO_ERROR && err != wxSTREAM_EOF) { - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); Py_DECREF(pylist); PyErr_SetString(PyExc_IOError,"IOError in wxInputStream"); - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); return NULL; } @@ -1214,16 +1324,18 @@ wxPyCBInputStream::wxPyCBInputStream(PyObject *r, PyObject *s, PyObject *t, bool wxPyCBInputStream::~wxPyCBInputStream() { - if (m_block) wxPyBeginBlockThreads(); + bool blocked; + if (m_block) blocked = wxPyBeginBlockThreads(); Py_XDECREF(m_read); Py_XDECREF(m_seek); Py_XDECREF(m_tell); - if (m_block) wxPyEndBlockThreads(); + if (m_block) wxPyEndBlockThreads(blocked); } wxPyCBInputStream* wxPyCBInputStream::create(PyObject *py, bool block) { - if (block) wxPyBeginBlockThreads(); + bool blocked; + if (block) blocked = wxPyBeginBlockThreads(); PyObject* read = getMethod(py, "read"); PyObject* seek = getMethod(py, "seek"); @@ -1234,11 +1346,11 @@ wxPyCBInputStream* wxPyCBInputStream::create(PyObject *py, bool block) { Py_XDECREF(read); Py_XDECREF(seek); Py_XDECREF(tell); - if (block) wxPyEndBlockThreads(); + if (block) wxPyEndBlockThreads(blocked); return NULL; } - if (block) wxPyEndBlockThreads(); + if (block) wxPyEndBlockThreads(blocked); return new wxPyCBInputStream(read, seek, tell, block); } @@ -1276,7 +1388,7 @@ size_t wxPyCBInputStream::OnSysRead(void *buffer, size_t bufsize) { if (bufsize == 0) return 0; - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); PyObject* arglist = Py_BuildValue("(i)", bufsize); PyObject* result = PyEval_CallObject(m_read, arglist); Py_DECREF(arglist); @@ -1294,7 +1406,7 @@ size_t wxPyCBInputStream::OnSysRead(void *buffer, size_t bufsize) { } else m_lasterror = wxSTREAM_READ_ERROR; - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); return o; } @@ -1304,7 +1416,7 @@ size_t wxPyCBInputStream::OnSysWrite(const void *buffer, size_t bufsize) { } off_t wxPyCBInputStream::OnSysSeek(off_t off, wxSeekMode mode) { - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); #ifdef _LARGE_FILES // off_t is a 64-bit value... PyObject* arglist = Py_BuildValue("(Li)", off, mode); @@ -1314,13 +1426,13 @@ off_t wxPyCBInputStream::OnSysSeek(off_t off, wxSeekMode mode) { PyObject* result = PyEval_CallObject(m_seek, arglist); Py_DECREF(arglist); Py_XDECREF(result); - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); return OnSysTell(); } off_t wxPyCBInputStream::OnSysTell() const { - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); PyObject* arglist = Py_BuildValue("()"); PyObject* result = PyEval_CallObject(m_tell, arglist); Py_DECREF(arglist); @@ -1334,7 +1446,7 @@ off_t wxPyCBInputStream::OnSysTell() const { o = PyInt_AsLong(result); Py_DECREF(result); }; - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); return o; } @@ -1353,12 +1465,14 @@ wxPyCallback::wxPyCallback(const wxPyCallback& other) { } wxPyCallback::~wxPyCallback() { - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); Py_DECREF(m_func); - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); } +#define wxPy_PRECALLINIT "_preCallInit" +#define wxPy_POSTCALLCLEANUP "_postCallCleanup" // This function is used for all events destined for Python event handlers. void wxPyCallback::EventThunker(wxEvent& event) { @@ -1369,7 +1483,7 @@ void wxPyCallback::EventThunker(wxEvent& event) { PyObject* tuple; bool checkSkip = False; - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); wxString className = event.GetClassInfo()->GetClassName(); // If the event is one of these types then pass the original @@ -1389,6 +1503,25 @@ void wxPyCallback::EventThunker(wxEvent& event) { if (!arg) { PyErr_Print(); } else { + // "intern" the pre/post method names to speed up the HasAttr + static PyObject* s_preName = NULL; + static PyObject* s_postName = NULL; + if (s_preName == NULL) { + s_preName = PyString_FromString(wxPy_PRECALLINIT); + s_postName = PyString_FromString(wxPy_POSTCALLCLEANUP); + } + + // Check if the event object needs some preinitialization + if (PyObject_HasAttr(arg, s_preName)) { + result = PyObject_CallMethodObjArgs(arg, s_preName, arg, NULL); + if ( result ) { + Py_DECREF(result); // result is ignored, but we still need to decref it + PyErr_Clear(); // Just in case... + } else { + PyErr_Print(); + } + } + // Call the event handler, passing the event object tuple = PyTuple_New(1); PyTuple_SET_ITEM(tuple, 0, arg); // steals ref to arg @@ -1400,6 +1533,17 @@ void wxPyCallback::EventThunker(wxEvent& event) { PyErr_Print(); } + // Check if the event object needs some post cleanup + if (PyObject_HasAttr(arg, s_postName)) { + result = PyObject_CallMethodObjArgs(arg, s_postName, arg, NULL); + if ( result ) { + Py_DECREF(result); // result is ignored, but we still need to decref it + PyErr_Clear(); // Just in case... + } else { + PyErr_Print(); + } + } + if ( checkSkip ) { // if the event object was one of our special types and // it had been cloned, then we need to extract the Skipped @@ -1414,7 +1558,7 @@ void wxPyCallback::EventThunker(wxEvent& event) { } Py_DECREF(tuple); } - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); } @@ -1599,10 +1743,10 @@ PyObject* wxPyCBH_callCallbackObj(const wxPyCallbackHelper& cbh, PyObject* argTu void wxPyCBH_delete(wxPyCallbackHelper* cbh) { if (cbh->m_incRef) { - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); Py_XDECREF(cbh->m_self); Py_XDECREF(cbh->m_class); - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); } } @@ -1620,14 +1764,14 @@ wxPyEvtSelfRef::wxPyEvtSelfRef() { } wxPyEvtSelfRef::~wxPyEvtSelfRef() { - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); if (m_cloned) Py_DECREF(m_self); - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); } void wxPyEvtSelfRef::SetSelf(PyObject* self, bool clone) { - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); if (m_cloned) Py_DECREF(m_self); m_self = self; @@ -1635,7 +1779,7 @@ void wxPyEvtSelfRef::SetSelf(PyObject* self, bool clone) { Py_INCREF(m_self); m_cloned = True; } - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); } PyObject* wxPyEvtSelfRef::GetSelf() const { @@ -1694,7 +1838,7 @@ PyObject* wxPy_ConvertList(wxListBase* listbase) { wxObject* wxObj; wxNode* node = list->GetFirst(); - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); pyList = PyList_New(0); while (node) { wxObj = node->GetData(); @@ -1702,7 +1846,7 @@ PyObject* wxPy_ConvertList(wxListBase* listbase) { PyList_Append(pyList, pyObj); node = node->GetNext(); } - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); return pyList; } @@ -1714,22 +1858,13 @@ long wxPyGetWinHandle(wxWindow* win) { return (long)win->GetHandle(); #endif - // Find and return the actual X-Window. -#ifdef __WXGTK__ - if (win->m_wxwindow) { -#ifdef __WXGTK20__ - return (long) GDK_WINDOW_XWINDOW(GTK_PIZZA(win->m_wxwindow)->bin_window); -#else - GdkWindowPrivate* bwin = (GdkWindowPrivate*)GTK_PIZZA(win->m_wxwindow)->bin_window; - if (bwin) { - return (long)bwin->xwindow; - } -#endif - } +#if defined(__WXGTK__) || defined(__WXX11) + return (long)GetXWindow(win); #endif - + #ifdef __WXMAC__ - return (long)MAC_WXHWND(win->MacGetRootWindow()); + //return (long)MAC_WXHWND(win->MacGetTopLevelWindowRef()); + return (long)win->GetHandle(); #endif return 0; @@ -1739,34 +1874,28 @@ long wxPyGetWinHandle(wxWindow* win) { // Some helper functions for typemaps in my_typemaps.i, so they won't be // included in every file over and over again... -#if PYTHON_API_VERSION >= 1009 - static char* wxStringErrorMsg = "String or Unicode type required"; -#else - static char* wxStringErrorMsg = "String type required"; -#endif - - wxString* wxString_in_helper(PyObject* source) { - wxString* target; -#if PYTHON_API_VERSION >= 1009 // Have Python unicode API + wxString* target = NULL; + if (!PyString_Check(source) && !PyUnicode_Check(source)) { - PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + PyErr_SetString(PyExc_TypeError, "String or Unicode type required"); return NULL; } #if wxUSE_UNICODE - if (PyUnicode_Check(source)) { - target = new wxString(); - size_t len = PyUnicode_GET_SIZE(source); - if (len) { - PyUnicode_AsWideChar((PyUnicodeObject*)source, target->GetWriteBuf(len), len); - target->UngetWriteBuf(); - } - } else { - // It is a string, get pointers to it and transform to unicode - char* tmpPtr; int tmpSize; - PyString_AsStringAndSize(source, &tmpPtr, &tmpSize); - target = new wxString(tmpPtr, *wxConvCurrent, tmpSize); + PyObject* uni = source; + if (PyString_Check(source)) { + uni = PyUnicode_FromObject(source); + if (PyErr_Occurred()) return NULL; + } + target = new wxString(); + size_t len = PyUnicode_GET_SIZE(uni); + if (len) { + PyUnicode_AsWideChar((PyUnicodeObject*)uni, target->GetWriteBuf(len), len); + target->UngetWriteBuf(); } + + if (PyString_Check(source)) + Py_DECREF(uni); #else char* tmpPtr; int tmpSize; if (PyString_AsStringAndSize(source, &tmpPtr, &tmpSize) == -1) { @@ -1775,14 +1904,7 @@ wxString* wxString_in_helper(PyObject* source) { } target = new wxString(tmpPtr, tmpSize); #endif // wxUSE_UNICODE - -#else // No Python unicode API (1.5.2) - if (!PyString_Check(source)) { - PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); - return NULL; - } - target = new wxString(PyString_AS_STRING(source), PyString_GET_SIZE(source)); -#endif + return target; } @@ -1791,45 +1913,37 @@ wxString* wxString_in_helper(PyObject* source) { wxString Py2wxString(PyObject* source) { wxString target; - bool doDecRef = False; - -#if PYTHON_API_VERSION >= 1009 // Have Python unicode API - if (!PyString_Check(source) && !PyUnicode_Check(source)) { - // Convert to String if not one already... (TODO: Unicode too?) - source = PyObject_Str(source); - doDecRef = True; - } #if wxUSE_UNICODE - if (PyUnicode_Check(source)) { - size_t len = PyUnicode_GET_SIZE(source); - if (len) { - PyUnicode_AsWideChar((PyUnicodeObject*)source, target.GetWriteBuf(len), len); - target.UngetWriteBuf(); - } - } else { - // It is a string, get pointers to it and transform to unicode - char* tmpPtr; int tmpSize; - PyString_AsStringAndSize(source, &tmpPtr, &tmpSize); - target = wxString(tmpPtr, *wxConvCurrent, tmpSize); - } + // Convert to a unicode object, if not already, then to a wxString + PyObject* uni = source; + if (!PyUnicode_Check(source)) { + uni = PyUnicode_FromObject(source); + if (PyErr_Occurred()) return wxEmptyString; // TODO: should we PyErr_Clear? + } + size_t len = PyUnicode_GET_SIZE(uni); + if (len) { + PyUnicode_AsWideChar((PyUnicodeObject*)uni, target.GetWriteBuf(len), len); + target.UngetWriteBuf(); + } + + if (!PyUnicode_Check(source)) + Py_DECREF(uni); #else + // Convert to a string object if it isn't already, then to wxString + PyObject* str = source; + if (!PyString_Check(source)) { + str = PyObject_Str(source); + if (PyErr_Occurred()) return wxEmptyString; // TODO: should we PyErr_Clear? + } char* tmpPtr; int tmpSize; - PyString_AsStringAndSize(source, &tmpPtr, &tmpSize); + PyString_AsStringAndSize(str, &tmpPtr, &tmpSize); target = wxString(tmpPtr, tmpSize); + + if (!PyString_Check(source)) + Py_DECREF(str); #endif // wxUSE_UNICODE -#else // No Python unicode API (1.5.2) - if (!PyString_Check(source)) { - // Convert to String if not one already... - source = PyObject_Str(source); - doDecRef = True; - } - target = wxString(PyString_AS_STRING(source), PyString_GET_SIZE(source)); -#endif - - if (doDecRef) - Py_DECREF(source); return target; }