X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/450c7f34c0a49a5b0c762157ab74f9073e87737a..42f8298f6f42d5d63bb3caf65682b7d9d9f8b702:/wxPython/src/helpers.cpp diff --git a/wxPython/src/helpers.cpp b/wxPython/src/helpers.cpp index 69e70b5106..512b685baa 100644 --- a/wxPython/src/helpers.cpp +++ b/wxPython/src/helpers.cpp @@ -28,7 +28,9 @@ #include #include #include -#define GetXWindow(wxwin) GDK_WINDOW_XWINDOW((wxwin)->m_widget->window) +#define GetXWindow(wxwin) (wxwin)->m_wxwindow ? \ + GDK_WINDOW_XWINDOW(GTK_PIZZA((wxwin)->m_wxwindow)->bin_window) : \ + GDK_WINDOW_XWINDOW((wxwin)->m_widget->window) #include #endif @@ -47,15 +49,15 @@ //---------------------------------------------------------------------- -#if PYTHON_API_VERSION <= 1007 && wxUSE_UNICODE +#if PYTHON_API_VERSION < 1009 && wxUSE_UNICODE #error Python must support Unicode to use wxWindows Unicode #endif //---------------------------------------------------------------------- wxPyApp* wxPythonApp = NULL; // Global instance of application object -bool wxPyDoCleanup = False; -bool wxPyDoingCleanup = False; +bool wxPyDoCleanup = false; +bool wxPyDoingCleanup = false; #ifdef WXP_WITH_THREAD @@ -76,6 +78,8 @@ wxPyThreadStateArray* wxPyTStates = NULL; wxMutex* wxPyTMutex = NULL; #endif +#define DEFAULTENCODING_SIZE 64 +static char wxPyDefaultEncoding[DEFAULTENCODING_SIZE] = "ascii"; static PyObject* wxPython_dict = NULL; static PyObject* wxPyAssertionError = NULL; @@ -99,7 +103,7 @@ BOOL WINAPI DllMain( // the inatance has already been set. if (! wxGetInstance()) wxSetInstance(hinstDLL); - return True; + return true; } #endif @@ -112,7 +116,7 @@ IMPLEMENT_ABSTRACT_CLASS(wxPyApp, wxApp); wxPyApp::wxPyApp() { m_assertMode = wxPYAPP_ASSERT_EXCEPTION; - m_startupComplete = False; + m_startupComplete = false; } @@ -122,7 +126,7 @@ wxPyApp::~wxPyApp() { // This one isn't acutally called... We fake it with _BootstrapApp bool wxPyApp::OnInit() { - return False; + return false; } @@ -144,7 +148,7 @@ int wxPyApp::MainLoop() { bool wxPyApp::OnInitGui() { - bool rval=True; + bool rval=true; wxApp::OnInitGui(); // in this case always call the base class version bool blocked = wxPyBeginBlockThreads(); if (wxPyCBH_findCallback(m_myInst, "OnInitGui")) @@ -378,58 +382,67 @@ void wxPyApp::SetMacHelpMenuTitleName(const wxString& val) { // that should be present in the derived (Python) class. void wxPyApp::_BootstrapApp() { - bool result; + static bool haveInitialized = false; + bool result, blocked; PyObject* retval = NULL; PyObject* pyint = NULL; - - // Get any command-line args passed to this program from the sys module - int argc = 0; - char** argv = NULL; - bool blocked = wxPyBeginBlockThreads(); - PyObject* sysargv = PySys_GetObject("argv"); - if (sysargv != NULL) { - argc = PyList_Size(sysargv); - argv = new char*[argc+1]; - int x; - for(x=0; xSetStartupComplete(True); + wxPythonApp->SetStartupComplete(true); // Call the Python wxApp's OnInit function + blocked = wxPyBeginBlockThreads(); if (wxPyCBH_findCallback(m_myInst, "OnInit")) { PyObject* method = m_myInst.GetLastFound(); @@ -449,11 +462,11 @@ void wxPyApp::_BootstrapApp() } else { // Is it okay if there is no OnInit? Probably so... - result = True; + result = true; } if (! result) { - PyErr_SetString(PyExc_SystemExit, "OnInit returned False, exiting..."); + PyErr_SetString(PyExc_SystemExit, "OnInit returned false, exiting..."); } error: @@ -547,9 +560,9 @@ void __wxPyPreStart(PyObject* moduleDict) void __wxPyCleanup() { - wxPyDoingCleanup = True; + wxPyDoingCleanup = true; if (wxPyDoCleanup) { - wxPyDoCleanup = False; + wxPyDoCleanup = false; wxEntryCleanup(); } #ifdef WXP_WITH_THREAD @@ -624,7 +637,7 @@ PyObject* __wxPySetDictionary(PyObject* /* self */, PyObject* args) PyDict_SetItemString(wxPython_dict, "USE_UNICODE", PyInt_FromLong(wxUSE_UNICODE)); PyDict_SetItemString(wxPython_dict, "__WXDEBUG__", PyInt_FromLong(wxdebug)); - + // Make a tuple of strings that gives more info about the platform. PyObject* PlatInfo = PyList_New(0); PyObject* obj; @@ -638,7 +651,7 @@ PyObject* __wxPySetDictionary(PyObject* /* self */, PyObject* args) #if wxUSE_UNICODE _AddInfoString("unicode"); #else - _AddInfoString("ascii"); + _AddInfoString("ansi"); #endif #ifdef __WXGTK__ #ifdef __WXGTK20__ @@ -853,10 +866,8 @@ bool wxPyCheckForApp() { //--------------------------------------------------------------------------- - -void wxPyClientData_dtor(wxPyClientData* self) { - if (! wxPyDoingCleanup) { // Don't do it during cleanup as Python - // may have already garbage collected the object... +void wxPyUserData_dtor(wxPyUserData* self) { + if (! wxPyDoingCleanup) { bool blocked = wxPyBeginBlockThreads(); Py_DECREF(self->m_obj); self->m_obj = NULL; @@ -864,16 +875,21 @@ void wxPyClientData_dtor(wxPyClientData* self) { } } -void wxPyUserData_dtor(wxPyUserData* self) { - if (! wxPyDoingCleanup) { - bool blocked = wxPyBeginBlockThreads(); - Py_DECREF(self->m_obj); + +void wxPyClientData_dtor(wxPyClientData* self) { + if (! wxPyDoingCleanup) { // Don't do it during cleanup as Python + // may have already garbage collected the object... + if (self->m_incRef) { + bool blocked = wxPyBeginBlockThreads(); + Py_DECREF(self->m_obj); + wxPyEndBlockThreads(blocked); + } self->m_obj = NULL; - wxPyEndBlockThreads(blocked); } } + // This is called when an OOR controled object is being destroyed. Although // the C++ object is going away there is no way to force the Python object // (and all references to it) to die too. This causes problems (crashes) in @@ -896,8 +912,9 @@ void wxPyOORClientData_dtor(wxPyOORClientData* self) { } - // Only if there is more than one reference to the object - if ( !wxPyDoingCleanup && self->m_obj->ob_refcnt > 1 ) { + // Only if there is more than one reference to the object and we are + // holding the OOR reference: + if ( !wxPyDoingCleanup && self->m_obj->ob_refcnt > 1 && self->m_incRef) { // bool isInstance = wxPyInstance_Check(self->m_obj); // TODO same here //wxASSERT_MSG(isInstance, wxT("m_obj not an instance!?!?!")); @@ -958,14 +975,14 @@ void wxPyPtrTypeMap_Add(const char* commonName, const char* ptrName) { PyObject* wxPyMake_wxObject(wxObject* source, bool setThisOwn, bool checkEvtHandler) { PyObject* target = NULL; - bool isEvtHandler = False; + bool isEvtHandler = false; if (source) { // If it's derived from wxEvtHandler then there may // already be a pointer to a Python object that we can use // in the OOR data. if (checkEvtHandler && wxIsKindOf(source, wxEvtHandler)) { - isEvtHandler = True; + isEvtHandler = true; wxEvtHandler* eh = (wxEvtHandler*)source; wxPyOORClientData* data = (wxPyOORClientData*)eh->GetClientObject(); if (data) { @@ -1021,7 +1038,7 @@ PyObject* wxPyMake_wxSizer(wxSizer* source, bool setThisOwn) { } } if (! target) { - target = wxPyMake_wxObject(source, setThisOwn, False); + target = wxPyMake_wxObject(source, setThisOwn, false); if (target != Py_None) ((wxSizer*)source)->SetClientObject(new wxPyOORClientData(target)); } @@ -1077,11 +1094,12 @@ void wxPySaveThreadState(PyThreadState* tstate) { if (info.tstate != tstate) wxLogMessage("*** tstate mismatch!???"); #endif - // info.tstate = tstate; *** DO NOT update existing ones??? + info.tstate = tstate; // allow for transient tstates // Normally it will never change, but apparently COM callbacks // (i.e. ActiveX controls) will (incorrectly IMHO) use a transient // tstate which will then be garbage the next time we try to use // it... + wxPyTMutex->Unlock(); return; } @@ -1168,11 +1186,12 @@ bool wxPyInputStream::eof() { if (m_wxis) return m_wxis->Eof(); else - return True; + return true; } wxPyInputStream::~wxPyInputStream() { - /* do nothing */ + if (m_wxis) + delete m_wxis; } @@ -1373,16 +1392,16 @@ PyObject* wxPyCBInputStream::getMethod(PyObject* py, char* name) { } -size_t wxPyCBInputStream::GetSize() const { +wxFileOffset wxPyCBInputStream::GetLength() const { wxPyCBInputStream* self = (wxPyCBInputStream*)this; // cast off const if (m_seek && m_tell) { - off_t temp = self->OnSysTell(); - off_t ret = self->OnSysSeek(0, wxFromEnd); + wxFileOffset temp = self->OnSysTell(); + wxFileOffset ret = self->OnSysSeek(0, wxFromEnd); self->OnSysSeek(temp, wxFromStart); return ret; } else - return 0; + return wxInvalidOffset; } @@ -1417,14 +1436,20 @@ size_t wxPyCBInputStream::OnSysWrite(const void *buffer, size_t bufsize) { return 0; } -off_t wxPyCBInputStream::OnSysSeek(off_t off, wxSeekMode mode) { + +wxFileOffset wxPyCBInputStream::OnSysSeek(wxFileOffset off, wxSeekMode mode) { bool blocked = wxPyBeginBlockThreads(); -#ifdef _LARGE_FILES - // off_t is a 64-bit value... - PyObject* arglist = Py_BuildValue("(Li)", off, mode); -#else - PyObject* arglist = Py_BuildValue("(ii)", off, mode); -#endif + PyObject* arglist = PyTuple_New(2); + + if (sizeof(wxFileOffset) > sizeof(long)) + // wxFileOffset is a 64-bit value... + PyTuple_SET_ITEM(arglist, 0, PyLong_FromLongLong(off)); + else + PyTuple_SET_ITEM(arglist, 0, PyInt_FromLong(off)); + + PyTuple_SET_ITEM(arglist, 1, PyInt_FromLong(mode)); + + PyObject* result = PyEval_CallObject(m_seek, arglist); Py_DECREF(arglist); Py_XDECREF(result); @@ -1433,18 +1458,16 @@ off_t wxPyCBInputStream::OnSysSeek(off_t off, wxSeekMode mode) { } -off_t wxPyCBInputStream::OnSysTell() const { +wxFileOffset wxPyCBInputStream::OnSysTell() const { bool blocked = wxPyBeginBlockThreads(); PyObject* arglist = Py_BuildValue("()"); PyObject* result = PyEval_CallObject(m_tell, arglist); Py_DECREF(arglist); - off_t o = 0; + wxFileOffset o = 0; if (result != NULL) { -#ifdef _LARGE_FILES if (PyLong_Check(result)) o = PyLong_AsLongLong(result); else -#endif o = PyInt_AsLong(result); Py_DECREF(result); }; @@ -1454,7 +1477,7 @@ off_t wxPyCBInputStream::OnSysTell() const { //---------------------------------------------------------------------- -IMPLEMENT_ABSTRACT_CLASS(wxPyCallback, wxObject); +IMPLEMENT_ABSTRACT_CLASS(wxPyCallback, wxEvtHandler); wxPyCallback::wxPyCallback(PyObject* func) { m_func = func; @@ -1483,7 +1506,7 @@ void wxPyCallback::EventThunker(wxEvent& event) { PyObject* result; PyObject* arg; PyObject* tuple; - bool checkSkip = False; + bool checkSkip = false; bool blocked = wxPyBeginBlockThreads(); wxString className = event.GetClassInfo()->GetClassName(); @@ -1695,7 +1718,7 @@ bool wxPyCallbackHelper::findCallback(const char* name) const { int wxPyCallbackHelper::callCallback(PyObject* argTuple) const { PyObject* result; - int retval = False; + int retval = false; result = callCallbackObj(argTuple); if (result) { // Assumes an integer return type... @@ -1762,7 +1785,7 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh) { wxPyEvtSelfRef::wxPyEvtSelfRef() { //m_self = Py_None; // **** We don't do normal ref counting to prevent //Py_INCREF(m_self); // circular loops... - m_cloned = False; + m_cloned = false; } wxPyEvtSelfRef::~wxPyEvtSelfRef() { @@ -1779,7 +1802,7 @@ void wxPyEvtSelfRef::SetSelf(PyObject* self, bool clone) { m_self = self; if (clone) { Py_INCREF(m_self); - m_cloned = True; + m_cloned = true; } wxPyEndBlockThreads(blocked); } @@ -1802,7 +1825,7 @@ wxPyEvent::wxPyEvent(int winid, wxEventType commandType) wxPyEvent::wxPyEvent(const wxPyEvent& evt) : wxEvent(evt) { - SetSelf(evt.m_self, True); + SetSelf(evt.m_self, true); } @@ -1818,7 +1841,7 @@ wxPyCommandEvent::wxPyCommandEvent(wxEventType commandType, int id) wxPyCommandEvent::wxPyCommandEvent(const wxPyCommandEvent& evt) : wxCommandEvent(evt) { - SetSelf(evt.m_self, True); + SetSelf(evt.m_self, true); } @@ -1886,25 +1909,35 @@ wxString* wxString_in_helper(PyObject* source) { #if wxUSE_UNICODE PyObject* uni = source; if (PyString_Check(source)) { - uni = PyUnicode_FromObject(source); + uni = PyUnicode_FromEncodedObject(source, wxPyDefaultEncoding, "strict"); 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(); + target->UngetWriteBuf(len); } if (PyString_Check(source)) Py_DECREF(uni); #else - char* tmpPtr; int tmpSize; - if (PyString_AsStringAndSize(source, &tmpPtr, &tmpSize) == -1) { - PyErr_SetString(PyExc_TypeError, "Unable to convert string"); - return NULL; + // Convert to a string object if it isn't already, then to wxString + PyObject* str = source; + if (PyUnicode_Check(source)) { + str = PyUnicode_AsEncodedString(source, wxPyDefaultEncoding, "strict"); + if (PyErr_Occurred()) return NULL; + } + else if (!PyString_Check(source)) { + str = PyObject_Str(source); + if (PyErr_Occurred()) return NULL; } + char* tmpPtr; int tmpSize; + PyString_AsStringAndSize(str, &tmpPtr, &tmpSize); target = new wxString(tmpPtr, tmpSize); + + if (!PyString_Check(source)) + Py_DECREF(str); #endif // wxUSE_UNICODE return target; @@ -1920,7 +1953,7 @@ wxString Py2wxString(PyObject* source) // Convert to a unicode object, if not already, then to a wxString PyObject* uni = source; if (!PyUnicode_Check(source)) { - uni = PyUnicode_FromObject(source); + uni = PyUnicode_FromEncodedObject(source, wxPyDefaultEncoding, "strict"); if (PyErr_Occurred()) return wxEmptyString; // TODO: should we PyErr_Clear? } size_t len = PyUnicode_GET_SIZE(uni); @@ -1934,7 +1967,11 @@ wxString Py2wxString(PyObject* source) #else // Convert to a string object if it isn't already, then to wxString PyObject* str = source; - if (!PyString_Check(source)) { + if (PyUnicode_Check(source)) { + str = PyUnicode_AsEncodedString(source, wxPyDefaultEncoding, "strict"); + if (PyErr_Occurred()) return wxEmptyString; // TODO: should we PyErr_Clear? + } + else if (!PyString_Check(source)) { str = PyObject_Str(source); if (PyErr_Occurred()) return wxEmptyString; // TODO: should we PyErr_Clear? } @@ -1963,6 +2000,17 @@ PyObject* wx2PyString(const wxString& src) } + +void wxSetDefaultPyEncoding(const char* encoding) +{ + strncpy(wxPyDefaultEncoding, encoding, DEFAULTENCODING_SIZE); +} + +const char* wxGetDefaultPyEncoding() +{ + return wxPyDefaultEncoding; +} + //---------------------------------------------------------------------- @@ -2063,24 +2111,24 @@ static inline bool wxPointFromObjects(PyObject* o1, PyObject* o2, wxPoint* point if (PyInt_Check(o1) && PyInt_Check(o2)) { point->x = PyInt_AS_LONG(o1); point->y = PyInt_AS_LONG(o2); - return True; + return true; } if (PyFloat_Check(o1) && PyFloat_Check(o2)) { point->x = (int)PyFloat_AS_DOUBLE(o1); point->y = (int)PyFloat_AS_DOUBLE(o2); - return True; + return true; } if (wxPySwigInstance_Check(o1) || wxPySwigInstance_Check(o2)) { // TODO: Why??? // Disallow instances because they can cause havok - return False; + return false; } if (PyNumber_Check(o1) && PyNumber_Check(o2)) { // I believe this excludes instances, so this should be safe without INCREFFing o1 and o2 point->x = PyInt_AsLong(o1); point->y = PyInt_AsLong(o2); - return True; + return true; } - return False; + return false; } @@ -2306,7 +2354,7 @@ bool wxPy2int_seq_helper(PyObject* source, int* i1, int* i2) { PyObject *o1, *o2; if (!PySequence_Check(source) || PySequence_Length(source) != 2) - return False; + return false; if (isFast) { o1 = PySequence_Fast_GET_ITEM(source, 0); @@ -2324,7 +2372,7 @@ bool wxPy2int_seq_helper(PyObject* source, int* i1, int* i2) { Py_DECREF(o1); Py_DECREF(o2); } - return True; + return true; } @@ -2333,7 +2381,7 @@ bool wxPy4int_seq_helper(PyObject* source, int* i1, int* i2, int* i3, int* i4) { PyObject *o1, *o2, *o3, *o4; if (!PySequence_Check(source) || PySequence_Length(source) != 4) - return False; + return false; if (isFast) { o1 = PySequence_Fast_GET_ITEM(source, 0); @@ -2359,7 +2407,7 @@ bool wxPy4int_seq_helper(PyObject* source, int* i1, int* i2, int* i3, int* i4) { Py_DECREF(o3); Py_DECREF(o4); } - return True; + return true; } @@ -2371,20 +2419,20 @@ bool wxPySimple_typecheck(PyObject* source, const wxChar* classname, int seqLen) if (wxPySwigInstance_Check(source) && wxPyConvertSwigPtr(source, (void **)&ptr, classname)) - return True; + return true; PyErr_Clear(); if (PySequence_Check(source) && PySequence_Length(source) == seqLen) - return True; + return true; - return False; + return false; } bool wxSize_helper(PyObject* source, wxSize** obj) { if (source == Py_None) { **obj = wxSize(-1,-1); - return True; + return true; } return wxPyTwoIntItem_helper(source, obj, wxT("wxSize")); } @@ -2394,7 +2442,7 @@ bool wxPoint_helper(PyObject* source, wxPoint** obj) { if (source == Py_None) { **obj = wxPoint(-1,-1); - return True; + return true; } return wxPyTwoIntItem_helper(source, obj, wxT("wxPoint")); } @@ -2405,7 +2453,7 @@ bool wxRealPoint_helper(PyObject* source, wxRealPoint** obj) { if (source == Py_None) { **obj = wxRealPoint(-1,-1); - return True; + return true; } // If source is an object instance then it may already be the right type @@ -2414,7 +2462,7 @@ bool wxRealPoint_helper(PyObject* source, wxRealPoint** obj) { if (! wxPyConvertSwigPtr(source, (void **)&ptr, wxT("wxRealPoint"))) goto error; *obj = ptr; - return True; + return true; } // otherwise a 2-tuple of floats is expected else if (PySequence_Check(source) && PyObject_Length(source) == 2) { @@ -2428,12 +2476,12 @@ bool wxRealPoint_helper(PyObject* source, wxRealPoint** obj) { **obj = wxRealPoint(PyFloat_AsDouble(o1), PyFloat_AsDouble(o2)); Py_DECREF(o1); Py_DECREF(o2); - return True; + return true; } error: PyErr_SetString(PyExc_TypeError, "Expected a 2-tuple of floats or a wxRealPoint object."); - return False; + return false; } @@ -2442,7 +2490,7 @@ bool wxRect_helper(PyObject* source, wxRect** obj) { if (source == Py_None) { **obj = wxRect(-1,-1,-1,-1); - return True; + return true; } // If source is an object instance then it may already be the right type @@ -2451,7 +2499,7 @@ bool wxRect_helper(PyObject* source, wxRect** obj) { if (! wxPyConvertSwigPtr(source, (void **)&ptr, wxT("wxRect"))) goto error; *obj = ptr; - return True; + return true; } // otherwise a 4-tuple of integers is expected else if (PySequence_Check(source) && PyObject_Length(source) == 4) { @@ -2473,12 +2521,12 @@ bool wxRect_helper(PyObject* source, wxRect** obj) { Py_DECREF(o2); Py_DECREF(o3); Py_DECREF(o4); - return True; + return true; } error: PyErr_SetString(PyExc_TypeError, "Expected a 4-tuple of integers or a wxRect object."); - return False; + return false; } @@ -2487,7 +2535,7 @@ bool wxColour_helper(PyObject* source, wxColour** obj) { if (source == Py_None) { **obj = wxNullColour; - return True; + return true; } // If source is an object instance then it may already be the right type @@ -2496,7 +2544,7 @@ bool wxColour_helper(PyObject* source, wxColour** obj) { if (! wxPyConvertSwigPtr(source, (void **)&ptr, wxT("wxColour"))) goto error; *obj = ptr; - return True; + return true; } // otherwise check for a string else if (PyString_Check(source) || PyUnicode_Check(source)) { @@ -2509,11 +2557,11 @@ bool wxColour_helper(PyObject* source, wxColour** obj) { spec.Mid(5,2).ToLong(&blue, 16); **obj = wxColour(red, green, blue); - return True; + return true; } else { // it's a colour name **obj = wxColour(spec); - return True; + return true; } } // last chance: 3-tuple of integers is expected @@ -2531,25 +2579,25 @@ bool wxColour_helper(PyObject* source, wxColour** obj) { Py_DECREF(o1); Py_DECREF(o2); Py_DECREF(o3); - return True; + return true; } error: PyErr_SetString(PyExc_TypeError, "Expected a wxColour object or a string containing a colour name or '#RRGGBB'."); - return False; + return false; } bool wxColour_typecheck(PyObject* source) { if (wxPySimple_typecheck(source, wxT("wxColour"), 3)) - return True; + return true; if (PyString_Check(source) || PyUnicode_Check(source)) - return True; + return true; - return False; + return false; } @@ -2558,7 +2606,7 @@ bool wxPoint2D_helper(PyObject* source, wxPoint2D** obj) { if (source == Py_None) { **obj = wxPoint2D(-1,-1); - return True; + return true; } // If source is an object instance then it may already be the right type @@ -2567,7 +2615,7 @@ bool wxPoint2D_helper(PyObject* source, wxPoint2D** obj) { if (! wxPyConvertSwigPtr(source, (void **)&ptr, wxT("wxPoint2D"))) goto error; *obj = ptr; - return True; + return true; } // otherwise a length-2 sequence of floats is expected if (PySequence_Check(source) && PySequence_Length(source) == 2) { @@ -2582,11 +2630,11 @@ bool wxPoint2D_helper(PyObject* source, wxPoint2D** obj) { **obj = wxPoint2D(PyFloat_AsDouble(o1), PyFloat_AsDouble(o2)); Py_DECREF(o1); Py_DECREF(o2); - return True; + return true; } error: PyErr_SetString(PyExc_TypeError, "Expected a 2-tuple of floats or a wxPoint2D object."); - return False; + return false; }