From bf2e21452d63f8af785340f55dda0cc513bf34f4 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Tue, 4 Mar 2003 05:50:52 +0000 Subject: [PATCH] SWIGged updates for wxMac git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@19470 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/contrib/glcanvas/mac/glcanvas.py | 5 +- wxPython/contrib/stc/mac/stc_.py | 5 +- wxPython/src/mac/clip_dnd.py | 20 +- wxPython/src/mac/cmndlgs.py | 15 +- wxPython/src/mac/controls.py | 5 +- wxPython/src/mac/controls2.py | 10 +- wxPython/src/mac/events.py | 15 +- wxPython/src/mac/fonts.py | 25 +- wxPython/src/mac/gdi.cpp | 393 ++++++++++++---------- wxPython/src/mac/gdi.py | 167 ++++++++- wxPython/src/mac/grid.cpp | 91 +++++ wxPython/src/mac/grid.py | 19 +- wxPython/src/mac/help.py | 5 +- wxPython/src/mac/html.py | 10 +- wxPython/src/mac/htmlhelp.py | 10 +- wxPython/src/mac/image.py | 5 +- wxPython/src/mac/misc.py | 35 +- wxPython/src/mac/misc2.py | 75 ++++- wxPython/src/mac/printfw.py | 20 +- wxPython/src/mac/utils.py | 30 +- wxPython/src/mac/windows2.cpp | 24 +- wxPython/src/mac/windows3.py | 5 +- wxPython/src/mac/wx.py | 11 +- 23 files changed, 732 insertions(+), 268 deletions(-) diff --git a/wxPython/contrib/glcanvas/mac/glcanvas.py b/wxPython/contrib/glcanvas/mac/glcanvas.py index 19259a217d..163eccb7cc 100644 --- a/wxPython/contrib/glcanvas/mac/glcanvas.py +++ b/wxPython/contrib/glcanvas/mac/glcanvas.py @@ -49,7 +49,10 @@ class wxGLContextPtr(wxObjectPtr): self.thisown = 0 def __del__(self, delfunc=glcanvasc.delete_wxGLContext): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def SetCurrent(self, *_args, **_kwargs): val = apply(glcanvasc.wxGLContext_SetCurrent,(self,) + _args, _kwargs) return val diff --git a/wxPython/contrib/stc/mac/stc_.py b/wxPython/contrib/stc/mac/stc_.py index 5b87064291..a3a4fef4a9 100644 --- a/wxPython/contrib/stc/mac/stc_.py +++ b/wxPython/contrib/stc/mac/stc_.py @@ -1048,7 +1048,10 @@ class wxStyledTextEventPtr(wxCommandEventPtr): self.thisown = 0 def __del__(self, delfunc=stc_c.delete_wxStyledTextEvent): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def SetPosition(self, *_args, **_kwargs): val = apply(stc_c.wxStyledTextEvent_SetPosition,(self,) + _args, _kwargs) return val diff --git a/wxPython/src/mac/clip_dnd.py b/wxPython/src/mac/clip_dnd.py index a7209f2a6f..bb31645abc 100644 --- a/wxPython/src/mac/clip_dnd.py +++ b/wxPython/src/mac/clip_dnd.py @@ -13,7 +13,10 @@ class wxDataFormatPtr : self.thisown = 0 def __del__(self, delfunc=clip_dndc.delete_wxDataFormat): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def SetType(self, *_args, **_kwargs): val = apply(clip_dndc.wxDataFormat_SetType,(self,) + _args, _kwargs) return val @@ -45,7 +48,10 @@ class wxDataObjectPtr : self.thisown = 0 def __del__(self, delfunc=clip_dndc.delete_wxDataObject): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def GetPreferredFormat(self, *_args, **_kwargs): val = apply(clip_dndc.wxDataObject_GetPreferredFormat,(self,) + _args, _kwargs) if val: val = wxDataFormatPtr(val) ; val.thisown = 1 @@ -352,7 +358,10 @@ class wxDropSourcePtr : return val def __del__(self, delfunc=clip_dndc.delete_wxDropSource): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def SetData(self, *_args, **_kwargs): val = apply(clip_dndc.wxDropSource_SetData,(self,) + _args, _kwargs) return val @@ -402,7 +411,10 @@ class wxPyDropTargetPtr(wxDropTargetPtr): return val def __del__(self, delfunc=clip_dndc.delete_wxPyDropTarget): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def GetDataObject(self, *_args, **_kwargs): val = apply(clip_dndc.wxPyDropTarget_GetDataObject,(self,) + _args, _kwargs) if val: val = wxDataObjectPtr(val) diff --git a/wxPython/src/mac/cmndlgs.py b/wxPython/src/mac/cmndlgs.py index e27245cf3b..9555d3bc82 100644 --- a/wxPython/src/mac/cmndlgs.py +++ b/wxPython/src/mac/cmndlgs.py @@ -43,7 +43,10 @@ class wxColourDataPtr(wxObjectPtr): self.thisown = 0 def __del__(self, delfunc=cmndlgsc.delete_wxColourData): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def GetChooseFull(self, *_args, **_kwargs): val = apply(cmndlgsc.wxColourData_GetChooseFull,(self,) + _args, _kwargs) return val @@ -273,7 +276,10 @@ class wxFontDataPtr(wxObjectPtr): self.thisown = 0 def __del__(self, delfunc=cmndlgsc.delete_wxFontData): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def EnableEffects(self, *_args, **_kwargs): val = apply(cmndlgsc.wxFontData_EnableEffects,(self,) + _args, _kwargs) return val @@ -429,7 +435,10 @@ class wxFindReplaceDataPtr(wxObjectPtr): self.thisown = 0 def __del__(self, delfunc=cmndlgsc.delete_wxFindReplaceData): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def GetFindString(self, *_args, **_kwargs): val = apply(cmndlgsc.wxFindReplaceData_GetFindString,(self,) + _args, _kwargs) return val diff --git a/wxPython/src/mac/controls.py b/wxPython/src/mac/controls.py index b47251984f..0ddbe6c365 100644 --- a/wxPython/src/mac/controls.py +++ b/wxPython/src/mac/controls.py @@ -565,7 +565,10 @@ class wxTextAttrPtr : self.thisown = 0 def __del__(self, delfunc=controlsc.delete_wxTextAttr): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def SetTextColour(self, *_args, **_kwargs): val = apply(controlsc.wxTextAttr_SetTextColour,(self,) + _args, _kwargs) return val diff --git a/wxPython/src/mac/controls2.py b/wxPython/src/mac/controls2.py index abe6cb4fee..32817cdbb3 100644 --- a/wxPython/src/mac/controls2.py +++ b/wxPython/src/mac/controls2.py @@ -188,7 +188,10 @@ class wxListItemPtr(wxObjectPtr): self.thisown = 0 def __del__(self, delfunc=controls2c.delete_wxListItem): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def Clear(self, *_args, **_kwargs): val = apply(controls2c.wxListItem_Clear,(self,) + _args, _kwargs) return val @@ -813,7 +816,10 @@ class wxTreeItemIdPtr : self.thisown = 0 def __del__(self, delfunc=controls2c.delete_wxTreeItemId): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def IsOk(self, *_args, **_kwargs): val = apply(controls2c.wxTreeItemId_IsOk,(self,) + _args, _kwargs) return val diff --git a/wxPython/src/mac/events.py b/wxPython/src/mac/events.py index dab6d0735c..9ec900d64f 100644 --- a/wxPython/src/mac/events.py +++ b/wxPython/src/mac/events.py @@ -12,7 +12,10 @@ class wxEventPtr(wxObjectPtr): self.thisown = 0 def __del__(self, delfunc=eventsc.delete_wxEvent): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def GetEventObject(self, *_args, **_kwargs): val = apply(eventsc.wxEvent_GetEventObject,(self,) + _args, _kwargs) return val @@ -1097,7 +1100,10 @@ class wxPyEventPtr(wxEventPtr): self.thisown = 0 def __del__(self, delfunc=eventsc.delete_wxPyEvent): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def SetSelf(self, *_args, **_kwargs): val = apply(eventsc.wxPyEvent_SetSelf,(self,) + _args, _kwargs) return val @@ -1121,7 +1127,10 @@ class wxPyCommandEventPtr(wxCommandEventPtr): self.thisown = 0 def __del__(self, delfunc=eventsc.delete_wxPyCommandEvent): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def SetSelf(self, *_args, **_kwargs): val = apply(eventsc.wxPyCommandEvent_SetSelf,(self,) + _args, _kwargs) return val diff --git a/wxPython/src/mac/fonts.py b/wxPython/src/mac/fonts.py index 975ea7fd4b..4f2f474f91 100644 --- a/wxPython/src/mac/fonts.py +++ b/wxPython/src/mac/fonts.py @@ -82,7 +82,10 @@ class wxFontMapperPtr : self.thisown = 0 def __del__(self, delfunc=fontsc.delete_wxFontMapper): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def GetAltForEncoding(self, *_args, **_kwargs): val = apply(fontsc.wxFontMapper_GetAltForEncoding,(self,) + _args, _kwargs) return val @@ -124,7 +127,10 @@ class wxFontPtr(wxObjectPtr): return val def __del__(self, delfunc=fontsc.delete_wxFont): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def Ok(self, *_args, **_kwargs): val = apply(fontsc.wxFont_Ok,(self,) + _args, _kwargs) return val @@ -251,7 +257,10 @@ class wxFontEnumeratorPtr : self.thisown = 0 def __del__(self, delfunc=fontsc.delete_wxFontEnumerator): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def _setCallbackInfo(self, *_args, **_kwargs): val = apply(fontsc.wxFontEnumerator__setCallbackInfo,(self,) + _args, _kwargs) return val @@ -316,7 +325,10 @@ class wxLocalePtr : self.thisown = 0 def __del__(self, delfunc=fontsc.delete_wxLocale): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def Init1(self, *_args, **_kwargs): val = apply(fontsc.wxLocale_Init1,(self,) + _args, _kwargs) return val @@ -374,7 +386,10 @@ class wxEncodingConverterPtr(wxObjectPtr): self.thisown = 0 def __del__(self, delfunc=fontsc.delete_wxEncodingConverter): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def Init(self, *_args, **_kwargs): val = apply(fontsc.wxEncodingConverter_Init,(self,) + _args, _kwargs) return val diff --git a/wxPython/src/mac/gdi.cpp b/wxPython/src/mac/gdi.cpp index 50253809c9..735314ca9d 100644 --- a/wxPython/src/mac/gdi.cpp +++ b/wxPython/src/mac/gdi.cpp @@ -7766,91 +7766,8 @@ static PyObject *_wrap_wxDC_GetBoundingBox(PyObject *self, PyObject *args, PyObj return _resultobj; } -static PyObject * wxDC__DrawPointList(wxDC *self,PyObject * pyPoints,PyObject * pyPens) { - wxPyBeginBlockThreads(); - - bool isFastSeq = PyList_Check(pyPoints) || PyTuple_Check(pyPoints); - bool isFastPens = PyList_Check(pyPens) || PyTuple_Check(pyPens); - int numObjs = 0; - int numPens = 0; - wxPen* pen; - PyObject* obj; - int x1, y1; - int i = 0; - PyObject* retval; - - if (!PySequence_Check(pyPoints)) { - goto err0; - } - if (!PySequence_Check(pyPens)) { - goto err1; - } - numObjs = PySequence_Length(pyPoints); - numPens = PySequence_Length(pyPens); - - for (i = 0; i < numObjs; i++) { - // Use a new pen? - if (i < numPens) { - if (isFastPens) { - obj = PySequence_Fast_GET_ITEM(pyPens, i); - } - else { - obj = PySequence_GetItem(pyPens, i); - } - if (SWIG_GetPtrObj(obj, (void **) &pen, "_wxPen_p")) { - if (!isFastPens) - Py_DECREF(obj); - goto err1; - } - - self->SetPen(*pen); - if (!isFastPens) - Py_DECREF(obj); - } - - // Get the point coordinants - if (isFastSeq) { - obj = PySequence_Fast_GET_ITEM(pyPoints, i); - } - else { - obj = PySequence_GetItem(pyPoints, i); - } - if (! wxPy2int_seq_helper(obj, &x1, &y1)) { - if (!isFastPens) - Py_DECREF(obj); - goto err0; - } - if (PyErr_Occurred()) { - retval = NULL; - if (!isFastPens) - Py_DECREF(obj); - goto exit; - } - - - // Now draw the point - self->DrawPoint(x1, y1); - - if (!isFastSeq) - Py_DECREF(obj); - } - - Py_INCREF(Py_None); - retval = Py_None; - goto exit; - - err1: - PyErr_SetString(PyExc_TypeError, "Expected a sequence of wxPens"); - retval = NULL; - goto exit; - err0: - PyErr_SetString(PyExc_TypeError, "Expected a sequence of (x,y) sequences."); - retval = NULL; - goto exit; - - exit: - wxPyEndBlockThreads(); - return retval; +static PyObject * wxDC__DrawPointList(wxDC *self,PyObject * pyCoords,PyObject * pyPens,PyObject * pyBrushes) { + return wxPyDrawXXXList(*self, wxPyDrawXXXPoint, pyCoords, pyPens, pyBrushes); } static PyObject *_wrap_wxDC__DrawPointList(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -7858,13 +7775,15 @@ static PyObject *_wrap_wxDC__DrawPointList(PyObject *self, PyObject *args, PyObj wxDC * _arg0; PyObject * _arg1; PyObject * _arg2; + PyObject * _arg3; PyObject * _argo0 = 0; PyObject * _obj1 = 0; PyObject * _obj2 = 0; - char *_kwnames[] = { "self","pyPoints","pyPens", NULL }; + PyObject * _obj3 = 0; + char *_kwnames[] = { "self","pyCoords","pyPens","pyBrushes", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxDC__DrawPointList",_kwnames,&_argo0,&_obj1,&_obj2)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOOO:wxDC__DrawPointList",_kwnames,&_argo0,&_obj1,&_obj2,&_obj3)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -7879,9 +7798,12 @@ static PyObject *_wrap_wxDC__DrawPointList(PyObject *self, PyObject *args, PyObj { _arg2 = _obj2; } +{ + _arg3 = _obj3; +} { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (PyObject *)wxDC__DrawPointList(_arg0,_arg1,_arg2); + _result = (PyObject *)wxDC__DrawPointList(_arg0,_arg1,_arg2,_arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -7891,91 +7813,8 @@ static PyObject *_wrap_wxDC__DrawPointList(PyObject *self, PyObject *args, PyObj return _resultobj; } -static PyObject * wxDC__DrawLineList(wxDC *self,PyObject * pyLines,PyObject * pyPens) { - wxPyBeginBlockThreads(); - - bool isFastSeq = PyList_Check(pyLines) || PyTuple_Check(pyLines); - bool isFastPens = PyList_Check(pyPens) || PyTuple_Check(pyPens); - int numObjs = 0; - int numPens = 0; - wxPen* pen; - PyObject* obj; - int x1, y1, x2, y2; - int i = 0; - PyObject* retval; - - if (!PySequence_Check(pyLines)) { - goto err0; - } - if (!PySequence_Check(pyPens)) { - goto err1; - } - numObjs = PySequence_Length(pyLines); - numPens = PySequence_Length(pyPens); - - for (i = 0; i < numObjs; i++) { - // Use a new pen? - if (i < numPens) { - if (isFastPens) { - obj = PySequence_Fast_GET_ITEM(pyPens, i); - } - else { - obj = PySequence_GetItem(pyPens, i); - } - if (SWIG_GetPtrObj(obj, (void **) &pen, "_wxPen_p")) { - if (!isFastPens) - Py_DECREF(obj); - goto err1; - } - - self->SetPen(*pen); - if (!isFastPens) - Py_DECREF(obj); - } - - // Get the line coordinants - if (isFastSeq) { - obj = PySequence_Fast_GET_ITEM(pyLines, i); - } - else { - obj = PySequence_GetItem(pyLines, i); - } - if (! wxPy4int_seq_helper(obj, &x1, &y1, &x2, &y2)) { - if (!isFastPens) - Py_DECREF(obj); - goto err0; - } - if (PyErr_Occurred()) { - retval = NULL; - if (!isFastPens) - Py_DECREF(obj); - goto exit; - } - - // Now draw the line - self->DrawLine(x1, y1, x2, y2); - - if (!isFastSeq) - Py_DECREF(obj); - } - - Py_INCREF(Py_None); - retval = Py_None; - goto exit; - - err1: - PyErr_SetString(PyExc_TypeError, "Expected a sequence of wxPens"); - retval = NULL; - goto exit; - - err0: - PyErr_SetString(PyExc_TypeError, "Expected a sequence of (x1,y1, x2,y2) sequences."); - retval = NULL; - goto exit; - - exit: - wxPyEndBlockThreads(); - return retval; +static PyObject * wxDC__DrawLineList(wxDC *self,PyObject * pyCoords,PyObject * pyPens,PyObject * pyBrushes) { + return wxPyDrawXXXList(*self, wxPyDrawXXXLine, pyCoords, pyPens, pyBrushes); } static PyObject *_wrap_wxDC__DrawLineList(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -7983,13 +7822,15 @@ static PyObject *_wrap_wxDC__DrawLineList(PyObject *self, PyObject *args, PyObje wxDC * _arg0; PyObject * _arg1; PyObject * _arg2; + PyObject * _arg3; PyObject * _argo0 = 0; PyObject * _obj1 = 0; PyObject * _obj2 = 0; - char *_kwnames[] = { "self","pyLines","pyPens", NULL }; + PyObject * _obj3 = 0; + char *_kwnames[] = { "self","pyCoords","pyPens","pyBrushes", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxDC__DrawLineList",_kwnames,&_argo0,&_obj1,&_obj2)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOOO:wxDC__DrawLineList",_kwnames,&_argo0,&_obj1,&_obj2,&_obj3)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -8004,9 +7845,205 @@ static PyObject *_wrap_wxDC__DrawLineList(PyObject *self, PyObject *args, PyObje { _arg2 = _obj2; } +{ + _arg3 = _obj3; +} { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (PyObject *)wxDC__DrawLineList(_arg0,_arg1,_arg2); + _result = (PyObject *)wxDC__DrawLineList(_arg0,_arg1,_arg2,_arg3); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +}{ + _resultobj = _result; +} + return _resultobj; +} + +static PyObject * wxDC__DrawRectangleList(wxDC *self,PyObject * pyCoords,PyObject * pyPens,PyObject * pyBrushes) { + return wxPyDrawXXXList(*self, wxPyDrawXXXRectangle, pyCoords, pyPens, pyBrushes); + } +static PyObject *_wrap_wxDC__DrawRectangleList(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + PyObject * _result; + wxDC * _arg0; + PyObject * _arg1; + PyObject * _arg2; + PyObject * _arg3; + PyObject * _argo0 = 0; + PyObject * _obj1 = 0; + PyObject * _obj2 = 0; + PyObject * _obj3 = 0; + char *_kwnames[] = { "self","pyCoords","pyPens","pyBrushes", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOOO:wxDC__DrawRectangleList",_kwnames,&_argo0,&_obj1,&_obj2,&_obj3)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC__DrawRectangleList. Expected _wxDC_p."); + return NULL; + } + } +{ + _arg1 = _obj1; +} +{ + _arg2 = _obj2; +} +{ + _arg3 = _obj3; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (PyObject *)wxDC__DrawRectangleList(_arg0,_arg1,_arg2,_arg3); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +}{ + _resultobj = _result; +} + return _resultobj; +} + +static PyObject * wxDC__DrawEllipseList(wxDC *self,PyObject * pyCoords,PyObject * pyPens,PyObject * pyBrushes) { + return wxPyDrawXXXList(*self, wxPyDrawXXXEllipse, pyCoords, pyPens, pyBrushes); + } +static PyObject *_wrap_wxDC__DrawEllipseList(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + PyObject * _result; + wxDC * _arg0; + PyObject * _arg1; + PyObject * _arg2; + PyObject * _arg3; + PyObject * _argo0 = 0; + PyObject * _obj1 = 0; + PyObject * _obj2 = 0; + PyObject * _obj3 = 0; + char *_kwnames[] = { "self","pyCoords","pyPens","pyBrushes", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOOO:wxDC__DrawEllipseList",_kwnames,&_argo0,&_obj1,&_obj2,&_obj3)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC__DrawEllipseList. Expected _wxDC_p."); + return NULL; + } + } +{ + _arg1 = _obj1; +} +{ + _arg2 = _obj2; +} +{ + _arg3 = _obj3; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (PyObject *)wxDC__DrawEllipseList(_arg0,_arg1,_arg2,_arg3); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +}{ + _resultobj = _result; +} + return _resultobj; +} + +static PyObject * wxDC__DrawPolygonList(wxDC *self,PyObject * pyCoords,PyObject * pyPens,PyObject * pyBrushes) { + return wxPyDrawXXXList(*self, wxPyDrawXXXPolygon, pyCoords, pyPens, pyBrushes); + } +static PyObject *_wrap_wxDC__DrawPolygonList(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + PyObject * _result; + wxDC * _arg0; + PyObject * _arg1; + PyObject * _arg2; + PyObject * _arg3; + PyObject * _argo0 = 0; + PyObject * _obj1 = 0; + PyObject * _obj2 = 0; + PyObject * _obj3 = 0; + char *_kwnames[] = { "self","pyCoords","pyPens","pyBrushes", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOOO:wxDC__DrawPolygonList",_kwnames,&_argo0,&_obj1,&_obj2,&_obj3)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC__DrawPolygonList. Expected _wxDC_p."); + return NULL; + } + } +{ + _arg1 = _obj1; +} +{ + _arg2 = _obj2; +} +{ + _arg3 = _obj3; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (PyObject *)wxDC__DrawPolygonList(_arg0,_arg1,_arg2,_arg3); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +}{ + _resultobj = _result; +} + return _resultobj; +} + +static PyObject * wxDC__DrawTextList(wxDC *self,PyObject * textList,PyObject * pyPoints,PyObject * foregroundList,PyObject * backgroundList) { + return wxPyDrawTextList(*self, textList, pyPoints, foregroundList, backgroundList); + } +static PyObject *_wrap_wxDC__DrawTextList(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + PyObject * _result; + wxDC * _arg0; + PyObject * _arg1; + PyObject * _arg2; + PyObject * _arg3; + PyObject * _arg4; + PyObject * _argo0 = 0; + PyObject * _obj1 = 0; + PyObject * _obj2 = 0; + PyObject * _obj3 = 0; + PyObject * _obj4 = 0; + char *_kwnames[] = { "self","textList","pyPoints","foregroundList","backgroundList", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOOOO:wxDC__DrawTextList",_kwnames,&_argo0,&_obj1,&_obj2,&_obj3,&_obj4)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC__DrawTextList. Expected _wxDC_p."); + return NULL; + } + } +{ + _arg1 = _obj1; +} +{ + _arg2 = _obj2; +} +{ + _arg3 = _obj3; +} +{ + _arg4 = _obj4; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (PyObject *)wxDC__DrawTextList(_arg0,_arg1,_arg2,_arg3,_arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -10366,6 +10403,10 @@ static PyMethodDef gdicMethods[] = { { "new_wxBufferedDC", (PyCFunction) _wrap_new_wxBufferedDC, METH_VARARGS | METH_KEYWORDS }, { "wxMemoryDC_SelectObject", (PyCFunction) _wrap_wxMemoryDC_SelectObject, METH_VARARGS | METH_KEYWORDS }, { "new_wxMemoryDC", (PyCFunction) _wrap_new_wxMemoryDC, METH_VARARGS | METH_KEYWORDS }, + { "wxDC__DrawTextList", (PyCFunction) _wrap_wxDC__DrawTextList, METH_VARARGS | METH_KEYWORDS }, + { "wxDC__DrawPolygonList", (PyCFunction) _wrap_wxDC__DrawPolygonList, METH_VARARGS | METH_KEYWORDS }, + { "wxDC__DrawEllipseList", (PyCFunction) _wrap_wxDC__DrawEllipseList, METH_VARARGS | METH_KEYWORDS }, + { "wxDC__DrawRectangleList", (PyCFunction) _wrap_wxDC__DrawRectangleList, METH_VARARGS | METH_KEYWORDS }, { "wxDC__DrawLineList", (PyCFunction) _wrap_wxDC__DrawLineList, METH_VARARGS | METH_KEYWORDS }, { "wxDC__DrawPointList", (PyCFunction) _wrap_wxDC__DrawPointList, METH_VARARGS | METH_KEYWORDS }, { "wxDC_GetBoundingBox", (PyCFunction) _wrap_wxDC_GetBoundingBox, METH_VARARGS | METH_KEYWORDS }, diff --git a/wxPython/src/mac/gdi.py b/wxPython/src/mac/gdi.py index e2d4f641b5..86e339e0c7 100644 --- a/wxPython/src/mac/gdi.py +++ b/wxPython/src/mac/gdi.py @@ -11,7 +11,10 @@ class wxGDIObjectPtr(wxObjectPtr): self.thisown = 0 def __del__(self, delfunc=gdic.delete_wxGDIObject): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def GetVisible(self, *_args, **_kwargs): val = apply(gdic.wxGDIObject_GetVisible,(self,) + _args, _kwargs) return val @@ -37,7 +40,10 @@ class wxBitmapPtr(wxGDIObjectPtr): self.thisown = 0 def __del__(self, delfunc=gdic.delete_wxBitmap): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def GetPalette(self, *_args, **_kwargs): val = apply(gdic.wxBitmap_GetPalette,(self,) + _args, _kwargs) if val: val = wxPalettePtr(val) @@ -121,7 +127,10 @@ class wxIconPtr(wxGDIObjectPtr): self.thisown = 0 def __del__(self, delfunc=gdic.delete_wxIcon): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def Ok(self, *_args, **_kwargs): val = apply(gdic.wxIcon_Ok,(self,) + _args, _kwargs) return val @@ -162,7 +171,10 @@ class wxIconBundlePtr : self.thisown = 0 def __del__(self, delfunc=gdic.delete_wxIconBundle): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def AddIcon(self, *_args, **_kwargs): val = apply(gdic.wxIconBundle_AddIcon,(self,) + _args, _kwargs) return val @@ -199,7 +211,10 @@ class wxCursorPtr(wxGDIObjectPtr): self.thisown = 0 def __del__(self, delfunc=gdic.delete_wxCursor): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def Ok(self, *_args, **_kwargs): val = apply(gdic.wxCursor_Ok,(self,) + _args, _kwargs) return val @@ -218,7 +233,10 @@ class wxColourPtr(wxObjectPtr): self.thisown = 0 def __del__(self, delfunc=gdic.delete_wxColour): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def Red(self, *_args, **_kwargs): val = apply(gdic.wxColour_Red,(self,) + _args, _kwargs) return val @@ -290,7 +308,10 @@ class wxPenPtr(wxGDIObjectPtr): self.thisown = 0 def __del__(self, delfunc=gdic.delete_wxPen): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def GetCap(self, *_args, **_kwargs): val = apply(gdic.wxPen_GetCap,(self,) + _args, _kwargs) return val @@ -347,7 +368,10 @@ class wxPyPenPtr(wxPenPtr): self.thisown = 0 def __del__(self, delfunc=gdic.delete_wxPyPen): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def SetDashes(self, *_args, **_kwargs): val = apply(gdic.wxPyPen_SetDashes,(self,) + _args, _kwargs) return val @@ -393,7 +417,10 @@ class wxBrushPtr(wxGDIObjectPtr): self.thisown = 0 def __del__(self, delfunc=gdic.delete_wxBrush): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def GetColour(self, *_args, **_kwargs): val = apply(gdic.wxBrush_GetColour,(self,) + _args, _kwargs) if val: val = wxColourPtr(val) ; val.thisown = 1 @@ -459,7 +486,10 @@ class wxDCPtr(wxObjectPtr): self.thisown = 0 def __del__(self, delfunc=gdic.delete_wxDC): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def BeginDrawing(self, *_args, **_kwargs): val = apply(gdic.wxDC_BeginDrawing,(self,) + _args, _kwargs) return val @@ -750,26 +780,115 @@ class wxDCPtr(wxObjectPtr): def _DrawLineList(self, *_args, **_kwargs): val = apply(gdic.wxDC__DrawLineList,(self,) + _args, _kwargs) return val + def _DrawRectangleList(self, *_args, **_kwargs): + val = apply(gdic.wxDC__DrawRectangleList,(self,) + _args, _kwargs) + return val + def _DrawEllipseList(self, *_args, **_kwargs): + val = apply(gdic.wxDC__DrawEllipseList,(self,) + _args, _kwargs) + return val + def _DrawPolygonList(self, *_args, **_kwargs): + val = apply(gdic.wxDC__DrawPolygonList,(self,) + _args, _kwargs) + return val + def _DrawTextList(self, *_args, **_kwargs): + val = apply(gdic.wxDC__DrawTextList,(self,) + _args, _kwargs) + return val def __repr__(self): return "" % (self.this,) def DrawPointList(self, points, pens=None): if pens is None: pens = [] - elif wx.wxPy_isinstance(pens, (wxPen, wxPenPtr)): + elif isinstance(pens, wxPenPtr): pens = [pens] elif len(pens) != len(points): raise ValueError('points and pens must have same length') - return self._DrawPointList(points, pens) + return self._DrawPointList(points, pens, []) + def DrawLineList(self, lines, pens=None): if pens is None: pens = [] - elif wx.wxPy_isinstance(pens, (wxPen, wxPenPtr)): + elif isinstance(pens, wxPenPtr): pens = [pens] elif len(pens) != len(lines): raise ValueError('lines and pens must have same length') - return self._DrawLineList(lines, pens) + return self._DrawLineList(lines, pens, []) + + + def DrawRectangleList(self, rectangles, pens=None, brushes=None): + if pens is None: + pens = [] + elif isinstance(pens, wxPenPtr): + pens = [pens] + elif len(pens) != len(rectangles): + raise ValueError('rectangles and pens must have same length') + if brushes is None: + brushes = [] + elif isinstance(brushes, wxBrushPtr): + brushes = [brushes] + elif len(brushes) != len(rectangles): + raise ValueError('rectangles and brushes must have same length') + return self._DrawRectangleList(rectangles, pens, brushes) + + + def DrawEllipseList(self, ellipses, pens=None, brushes=None): + if pens is None: + pens = [] + elif isinstance(pens, wxPenPtr): + pens = [pens] + elif len(pens) != len(ellipses): + raise ValueError('ellipses and pens must have same length') + if brushes is None: + brushes = [] + elif isinstance(brushes, wxBrushPtr): + brushes = [brushes] + elif len(brushes) != len(ellipses): + raise ValueError('ellipses and brushes must have same length') + return self._DrawEllipseList(ellipses, pens, brushes) + + + def DrawPolygonList(self, polygons, pens=None, brushes=None): + ## Note: This does not currently support fill style or offset + ## you can always use the non-List version if need be. + ## I really would like to support fill-style, however, + ## but wxODDEVEN_RULE does not appear to be defined at the Python level + ## [It's in wx.py... --Robin] + if pens is None: + pens = [] + elif isinstance(pens, wxPenPtr): + pens = [pens] + elif len(pens) != len(polygons): + raise ValueError('polygons and pens must have same length') + if brushes is None: + brushes = [] + elif isinstance(brushes, wxBrushPtr): + brushes = [brushes] + elif len(brushes) != len(polygons): + raise ValueError('polygons and brushes must have same length') + return self._DrawPolygonList(polygons, pens, brushes) + + + def DrawTextList(self, textList, coords, foregrounds = None, backgrounds = None, fonts = None): + ## NOTE: this does not currently support changing the font + ## Make sure you set Background mode to wxSolid (DC.SetBackgroundMode) + ## If you want backgounds to do anything. + if type(textList) == type(''): + textList = [textList] + elif len(textList) != len(coords): + raise ValueError('textlist and coords must have same length') + if foregrounds is None: + foregrounds = [] + elif isinstance(foregrounds, wxColourPtr): + foregrounds = [foregrounds] + elif len(foregrounds) != len(coords): + raise ValueError('foregrounds and coords must have same length') + if backgrounds is None: + backgrounds = [] + elif isinstance(backgrounds, wxColourPtr): + backgrounds = [backgrounds] + elif len(backgrounds) != len(coords): + raise ValueError('backgrounds and coords must have same length') + return self._DrawTextList(textList, coords, foregrounds, backgrounds) class wxDC(wxDCPtr): def __init__(self,this): @@ -904,7 +1023,10 @@ class wxPalettePtr(wxGDIObjectPtr): self.thisown = 0 def __del__(self, delfunc=gdic.delete_wxPalette): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def GetPixel(self, *_args, **_kwargs): val = apply(gdic.wxPalette_GetPixel,(self,) + _args, _kwargs) return val @@ -930,7 +1052,10 @@ class wxImageListPtr(wxObjectPtr): self.thisown = 0 def __del__(self, delfunc=gdic.delete_wxImageList): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def Add(self, *_args, **_kwargs): val = apply(gdic.wxImageList_Add,(self,) + _args, _kwargs) return val @@ -974,7 +1099,10 @@ class wxRegionPtr(wxGDIObjectPtr): self.thisown = 0 def __del__(self, delfunc=gdic.delete_wxRegion): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def Clear(self, *_args, **_kwargs): val = apply(gdic.wxRegion_Clear,(self,) + _args, _kwargs) return val @@ -1049,7 +1177,10 @@ class wxRegionIteratorPtr(wxObjectPtr): self.thisown = 0 def __del__(self, delfunc=gdic.delete_wxRegionIterator): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def GetX(self, *_args, **_kwargs): val = apply(gdic.wxRegionIterator_GetX,(self,) + _args, _kwargs) return val diff --git a/wxPython/src/mac/grid.cpp b/wxPython/src/mac/grid.cpp index dd3ec6c95c..85d3a6ecf5 100644 --- a/wxPython/src/mac/grid.cpp +++ b/wxPython/src/mac/grid.cpp @@ -12728,6 +12728,94 @@ static PyObject *_wrap_wxGrid_GetSelectedCols(PyObject *self, PyObject *args, Py return _resultobj; } +#define wxGrid_DeselectRow(_swigobj,_swigarg0) (_swigobj->DeselectRow(_swigarg0)) +static PyObject *_wrap_wxGrid_DeselectRow(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxGrid * _arg0; + int _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","row", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxGrid_DeselectRow",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_DeselectRow. Expected _wxGrid_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxGrid_DeselectRow(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxGrid_DeselectCol(_swigobj,_swigarg0) (_swigobj->DeselectCol(_swigarg0)) +static PyObject *_wrap_wxGrid_DeselectCol(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxGrid * _arg0; + int _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","col", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxGrid_DeselectCol",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_DeselectCol. Expected _wxGrid_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxGrid_DeselectCol(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxGrid_DeselectCell(_swigobj,_swigarg0,_swigarg1) (_swigobj->DeselectCell(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxGrid_DeselectCell(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxGrid * _arg0; + int _arg1; + int _arg2; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","row","col", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxGrid_DeselectCell",_kwnames,&_argo0,&_arg1,&_arg2)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_DeselectCell. Expected _wxGrid_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxGrid_DeselectCell(_arg0,_arg1,_arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + #define wxGrid_BlockToDeviceRect(_swigobj,_swigarg0,_swigarg1) (_swigobj->BlockToDeviceRect(_swigarg0,_swigarg1)) static PyObject *_wrap_wxGrid_BlockToDeviceRect(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -14525,6 +14613,9 @@ static PyMethodDef gridcMethods[] = { { "wxGrid_GetSelectionForeground", (PyCFunction) _wrap_wxGrid_GetSelectionForeground, METH_VARARGS | METH_KEYWORDS }, { "wxGrid_GetSelectionBackground", (PyCFunction) _wrap_wxGrid_GetSelectionBackground, METH_VARARGS | METH_KEYWORDS }, { "wxGrid_BlockToDeviceRect", (PyCFunction) _wrap_wxGrid_BlockToDeviceRect, METH_VARARGS | METH_KEYWORDS }, + { "wxGrid_DeselectCell", (PyCFunction) _wrap_wxGrid_DeselectCell, METH_VARARGS | METH_KEYWORDS }, + { "wxGrid_DeselectCol", (PyCFunction) _wrap_wxGrid_DeselectCol, METH_VARARGS | METH_KEYWORDS }, + { "wxGrid_DeselectRow", (PyCFunction) _wrap_wxGrid_DeselectRow, METH_VARARGS | METH_KEYWORDS }, { "wxGrid_GetSelectedCols", (PyCFunction) _wrap_wxGrid_GetSelectedCols, METH_VARARGS | METH_KEYWORDS }, { "wxGrid_GetSelectedRows", (PyCFunction) _wrap_wxGrid_GetSelectedRows, METH_VARARGS | METH_KEYWORDS }, { "wxGrid_GetSelectionBlockBottomRight", (PyCFunction) _wrap_wxGrid_GetSelectionBlockBottomRight, METH_VARARGS | METH_KEYWORDS }, diff --git a/wxPython/src/mac/grid.py b/wxPython/src/mac/grid.py index cadcd8383e..760f902e4b 100644 --- a/wxPython/src/mac/grid.py +++ b/wxPython/src/mac/grid.py @@ -873,7 +873,10 @@ class wxGridTableMessagePtr : self.thisown = 0 def __del__(self, delfunc=gridc.delete_wxGridTableMessage): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def SetTableObject(self, *_args, **_kwargs): val = apply(gridc.wxGridTableMessage_SetTableObject,(self,) + _args, _kwargs) return val @@ -914,7 +917,10 @@ class wxGridCellCoordsPtr : self.thisown = 0 def __del__(self, delfunc=gridc.delete_wxGridCellCoords): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def GetRow(self, *_args, **_kwargs): val = apply(gridc.wxGridCellCoords_GetRow,(self,) + _args, _kwargs) return val @@ -1462,6 +1468,15 @@ class wxGridPtr(wxScrolledWindowPtr): def GetSelectedCols(self, *_args, **_kwargs): val = apply(gridc.wxGrid_GetSelectedCols,(self,) + _args, _kwargs) return val + def DeselectRow(self, *_args, **_kwargs): + val = apply(gridc.wxGrid_DeselectRow,(self,) + _args, _kwargs) + return val + def DeselectCol(self, *_args, **_kwargs): + val = apply(gridc.wxGrid_DeselectCol,(self,) + _args, _kwargs) + return val + def DeselectCell(self, *_args, **_kwargs): + val = apply(gridc.wxGrid_DeselectCell,(self,) + _args, _kwargs) + return val def BlockToDeviceRect(self, *_args, **_kwargs): val = apply(gridc.wxGrid_BlockToDeviceRect,(self,) + _args, _kwargs) if val: val = wxRectPtr(val) ; val.thisown = 1 diff --git a/wxPython/src/mac/help.py b/wxPython/src/mac/help.py index ece2a71df4..ac1612ba19 100644 --- a/wxPython/src/mac/help.py +++ b/wxPython/src/mac/help.py @@ -67,7 +67,10 @@ class wxContextHelpPtr(wxObjectPtr): self.thisown = 0 def __del__(self, delfunc=helpc.delete_wxContextHelp): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def BeginContextHelp(self, *_args, **_kwargs): val = apply(helpc.wxContextHelp_BeginContextHelp,(self,) + _args, _kwargs) return val diff --git a/wxPython/src/mac/html.py b/wxPython/src/mac/html.py index fe4ef7fecc..8766b132a2 100644 --- a/wxPython/src/mac/html.py +++ b/wxPython/src/mac/html.py @@ -651,7 +651,10 @@ class wxHtmlDCRendererPtr(wxObjectPtr): self.thisown = 0 def __del__(self, delfunc=htmlc.delete_wxHtmlDCRenderer): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def SetDC(self, *_args, **_kwargs): val = apply(htmlc.wxHtmlDCRenderer_SetDC,(self,) + _args, _kwargs) return val @@ -712,7 +715,10 @@ class wxHtmlEasyPrintingPtr(wxObjectPtr): self.thisown = 0 def __del__(self, delfunc=htmlc.delete_wxHtmlEasyPrinting): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def PreviewFile(self, *_args, **_kwargs): val = apply(htmlc.wxHtmlEasyPrinting_PreviewFile,(self,) + _args, _kwargs) return val diff --git a/wxPython/src/mac/htmlhelp.py b/wxPython/src/mac/htmlhelp.py index 4c88c542b5..33fdd1e5df 100644 --- a/wxPython/src/mac/htmlhelp.py +++ b/wxPython/src/mac/htmlhelp.py @@ -156,7 +156,10 @@ class wxHtmlHelpDataPtr : self.thisown = 0 def __del__(self, delfunc=htmlhelpc.delete_wxHtmlHelpData): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def SetTempDir(self, *_args, **_kwargs): val = apply(htmlhelpc.wxHtmlHelpData_SetTempDir,(self,) + _args, _kwargs) return val @@ -248,7 +251,10 @@ class wxHtmlHelpControllerPtr(wxEvtHandlerPtr): self.thisown = 0 def __del__(self, delfunc=htmlhelpc.delete_wxHtmlHelpController): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def SetTitleFormat(self, *_args, **_kwargs): val = apply(htmlhelpc.wxHtmlHelpController_SetTitleFormat,(self,) + _args, _kwargs) return val diff --git a/wxPython/src/mac/image.py b/wxPython/src/mac/image.py index 719c840bc0..d19383f178 100644 --- a/wxPython/src/mac/image.py +++ b/wxPython/src/mac/image.py @@ -194,7 +194,10 @@ class wxImagePtr(wxObjectPtr): self.thisown = 0 def __del__(self, delfunc=imagec.delete_wxImage): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def Create(self, *_args, **_kwargs): val = apply(imagec.wxImage_Create,(self,) + _args, _kwargs) return val diff --git a/wxPython/src/mac/misc.py b/wxPython/src/mac/misc.py index 129914af14..3b453f7cb6 100644 --- a/wxPython/src/mac/misc.py +++ b/wxPython/src/mac/misc.py @@ -25,7 +25,10 @@ class wxSizePtr : self.thisown = 0 def __del__(self, delfunc=miscc.delete_wxSize): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def Set(self, *_args, **_kwargs): val = apply(miscc.wxSize_Set,(self,) + _args, _kwargs) return val @@ -110,7 +113,10 @@ class wxRealPointPtr : self.thisown = 0 def __del__(self, delfunc=miscc.delete_wxRealPoint): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def Set(self, *_args, **_kwargs): val = apply(miscc.wxRealPoint_Set,(self,) + _args, _kwargs) return val @@ -175,7 +181,10 @@ class wxPointPtr : self.thisown = 0 def __del__(self, delfunc=miscc.delete_wxPoint): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def Set(self, *_args, **_kwargs): val = apply(miscc.wxPoint_Set,(self,) + _args, _kwargs) return val @@ -240,7 +249,10 @@ class wxRectPtr : self.thisown = 0 def __del__(self, delfunc=miscc.delete_wxRect): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def GetX(self, *_args, **_kwargs): val = apply(miscc.wxRect_GetX,(self,) + _args, _kwargs) return val @@ -665,7 +677,10 @@ class wxAcceleratorEntryPtr : self.thisown = 0 def __del__(self, delfunc=miscc.delete_wxAcceleratorEntry): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def Set(self, *_args, **_kwargs): val = apply(miscc.wxAcceleratorEntry_Set,(self,) + _args, _kwargs) return val @@ -694,7 +709,10 @@ class wxAcceleratorTablePtr(wxObjectPtr): self.thisown = 0 def __del__(self, delfunc=miscc.delete_wxAcceleratorTable): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def __repr__(self): return "" % (self.this,) class wxAcceleratorTable(wxAcceleratorTablePtr): @@ -711,7 +729,10 @@ class wxBusyInfoPtr(wxObjectPtr): self.thisown = 0 def __del__(self, delfunc=miscc.delete_wxBusyInfo): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def __repr__(self): return "" % (self.this,) class wxBusyInfo(wxBusyInfoPtr): diff --git a/wxPython/src/mac/misc2.py b/wxPython/src/mac/misc2.py index 597f77d9df..0780c1886a 100644 --- a/wxPython/src/mac/misc2.py +++ b/wxPython/src/mac/misc2.py @@ -100,7 +100,10 @@ class wxCaretPtr : self.thisown = 0 def __del__(self, delfunc=misc2c.delete_wxCaret): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def IsOk(self, *_args, **_kwargs): val = apply(misc2c.wxCaret_IsOk,(self,) + _args, _kwargs) return val @@ -158,7 +161,10 @@ class wxBusyCursorPtr : self.thisown = 0 def __del__(self, delfunc=misc2c.delete_wxBusyCursor): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def __repr__(self): return "" % (self.this,) class wxBusyCursor(wxBusyCursorPtr): @@ -175,7 +181,10 @@ class wxWindowDisablerPtr : self.thisown = 0 def __del__(self, delfunc=misc2c.delete_wxWindowDisabler): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def __repr__(self): return "" % (self.this,) class wxWindowDisabler(wxWindowDisablerPtr): @@ -192,7 +201,10 @@ class wxMutexGuiLockerPtr : self.thisown = 0 def __del__(self, delfunc=misc2c.delete_wxMutexGuiLocker): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def __repr__(self): return "" % (self.this,) class wxMutexGuiLocker(wxMutexGuiLockerPtr): @@ -209,7 +221,10 @@ class wxTipProviderPtr : self.thisown = 0 def __del__(self, delfunc=misc2c.delete_wxTipProvider): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def GetTip(self, *_args, **_kwargs): val = apply(misc2c.wxTipProvider_GetTip,(self,) + _args, _kwargs) return val @@ -252,7 +267,10 @@ class wxDragImagePtr(wxObjectPtr): self.thisown = 0 def __del__(self, delfunc=misc2c.delete_wxDragImage): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def SetBackingBitmap(self, *_args, **_kwargs): val = apply(misc2c.wxDragImage_SetBackingBitmap,(self,) + _args, _kwargs) return val @@ -318,7 +336,10 @@ class wxPyTimerPtr(wxObjectPtr): self.thisown = 0 def __del__(self, delfunc=misc2c.delete_wxPyTimer): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def GetInterval(self, *_args, **_kwargs): val = apply(misc2c.wxPyTimer_GetInterval,(self,) + _args, _kwargs) return val @@ -353,7 +374,10 @@ class wxStopWatchPtr : self.thisown = 0 def __del__(self, delfunc=misc2c.delete_wxStopWatch): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def Start(self, *_args, **_kwargs): val = apply(misc2c.wxStopWatch_Start,(self,) + _args, _kwargs) return val @@ -507,7 +531,10 @@ class wxLogNullPtr : self.thisown = 0 def __del__(self, delfunc=misc2c.delete_wxLogNull): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def __repr__(self): return "" % (self.this,) class wxLogNull(wxLogNullPtr): @@ -634,7 +661,10 @@ class wxJoystickPtr(wxObjectPtr): self.thisown = 0 def __del__(self, delfunc=misc2c.delete_wxJoystick): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def GetPosition(self, *_args, **_kwargs): val = apply(misc2c.wxJoystick_GetPosition,(self,) + _args, _kwargs) if val: val = wxPointPtr(val) ; val.thisown = 1 @@ -778,7 +808,10 @@ class wxWavePtr(wxObjectPtr): self.thisown = 0 def __del__(self, delfunc=misc2c.delete_wxWave): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def IsOk(self, *_args, **_kwargs): val = apply(misc2c.wxWave_IsOk,(self,) + _args, _kwargs) return val @@ -898,7 +931,10 @@ class wxFileTypePtr : return val def __del__(self, delfunc=misc2c.delete_wxFileType): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def __repr__(self): return "" % (self.this,) class wxFileType(wxFileTypePtr): @@ -948,7 +984,10 @@ class wxMimeTypesManagerPtr : return val def __del__(self, delfunc=misc2c.delete_wxMimeTypesManager): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def __repr__(self): return "" % (self.this,) class wxMimeTypesManager(wxMimeTypesManagerPtr): @@ -983,7 +1022,10 @@ class wxFileHistoryPtr(wxObjectPtr): self.thisown = 0 def __del__(self, delfunc=misc2c.delete_wxFileHistory): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def AddFileToHistory(self, *_args, **_kwargs): val = apply(misc2c.wxFileHistory_AddFileToHistory,(self,) + _args, _kwargs) return val @@ -1094,7 +1136,10 @@ class wxSingleInstanceCheckerPtr : self.thisown = 0 def __del__(self, delfunc=misc2c.delete_wxSingleInstanceChecker): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def Create(self, *_args, **_kwargs): val = apply(misc2c.wxSingleInstanceChecker_Create,(self,) + _args, _kwargs) return val diff --git a/wxPython/src/mac/printfw.py b/wxPython/src/mac/printfw.py index 2081aa5849..b9bbff1719 100644 --- a/wxPython/src/mac/printfw.py +++ b/wxPython/src/mac/printfw.py @@ -27,7 +27,10 @@ class wxPrintDataPtr(wxObjectPtr): self.thisown = 0 def __del__(self, delfunc=printfwc.delete_wxPrintData): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def GetNoCopies(self, *_args, **_kwargs): val = apply(printfwc.wxPrintData_GetNoCopies,(self,) + _args, _kwargs) return val @@ -189,7 +192,10 @@ class wxPageSetupDialogDataPtr(wxObjectPtr): self.thisown = 0 def __del__(self, delfunc=printfwc.delete_wxPageSetupDialogData): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def EnableHelp(self, *_args, **_kwargs): val = apply(printfwc.wxPageSetupDialogData_EnableHelp,(self,) + _args, _kwargs) return val @@ -321,7 +327,10 @@ class wxPrintDialogDataPtr(wxObjectPtr): self.thisown = 0 def __del__(self, delfunc=printfwc.delete_wxPrintDialogData): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def EnableHelp(self, *_args, **_kwargs): val = apply(printfwc.wxPrintDialogData_EnableHelp,(self,) + _args, _kwargs) return val @@ -493,7 +502,10 @@ class wxPrinterPtr(wxObjectPtr): self.thisown = 0 def __del__(self, delfunc=printfwc.delete_wxPrinter): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def CreateAbortWindow(self, *_args, **_kwargs): val = apply(printfwc.wxPrinter_CreateAbortWindow,(self,) + _args, _kwargs) return val diff --git a/wxPython/src/mac/utils.py b/wxPython/src/mac/utils.py index 2d0bb90d84..98fb73308a 100644 --- a/wxPython/src/mac/utils.py +++ b/wxPython/src/mac/utils.py @@ -12,7 +12,10 @@ class wxConfigBasePtr : self.thisown = 0 def __del__(self, delfunc=utilsc.delete_wxConfigBase): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def DeleteAll(self, *_args, **_kwargs): val = apply(utilsc.wxConfigBase_DeleteAll,(self,) + _args, _kwargs) return val @@ -139,7 +142,10 @@ class wxConfigPtr(wxConfigBasePtr): self.thisown = 0 def __del__(self, delfunc=utilsc.delete_wxConfig): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def __repr__(self): return "" % (self.this,) class wxConfig(wxConfigPtr): @@ -156,7 +162,10 @@ class wxFileConfigPtr(wxConfigBasePtr): self.thisown = 0 def __del__(self, delfunc=utilsc.delete_wxFileConfig): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def __repr__(self): return "" % (self.this,) class wxFileConfig(wxFileConfigPtr): @@ -264,7 +273,10 @@ class wxDateTimePtr : self.thisown = 0 def __del__(self, delfunc=utilsc.delete_wxDateTime): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def SetToCurrent(self, *_args, **_kwargs): val = apply(utilsc.wxDateTime_SetToCurrent,(self,) + _args, _kwargs) if val: val = wxDateTimePtr(val) @@ -605,7 +617,10 @@ class wxTimeSpanPtr : self.thisown = 0 def __del__(self, delfunc=utilsc.delete_wxTimeSpan): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def Add(self, *_args, **_kwargs): val = apply(utilsc.wxTimeSpan_Add,(self,) + _args, _kwargs) if val: val = wxTimeSpanPtr(val) @@ -704,7 +719,10 @@ class wxDateSpanPtr : self.thisown = 0 def __del__(self, delfunc=utilsc.delete_wxDateSpan): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def SetYears(self, *_args, **_kwargs): val = apply(utilsc.wxDateSpan_SetYears,(self,) + _args, _kwargs) if val: val = wxDateSpanPtr(val) diff --git a/wxPython/src/mac/windows2.cpp b/wxPython/src/mac/windows2.cpp index 714993fd55..0e97d3909c 100644 --- a/wxPython/src/mac/windows2.cpp +++ b/wxPython/src/mac/windows2.cpp @@ -345,7 +345,7 @@ static PyObject *_wrap_new_wxNotebookEvent(PyObject *self, PyObject *args, PyObj int _arg1 = (int ) 0; int _arg2 = (int ) -1; int _arg3 = (int ) -1; - char *_kwnames[] = { "commandType","id","nSel","nOldSel", NULL }; + char *_kwnames[] = { "commandType","id","sel","oldSel", NULL }; char _ptemp[128]; self = self; @@ -710,7 +710,7 @@ static PyObject *_wrap_wxNotebook_SetSelection(PyObject *self, PyObject *args, P wxNotebook * _arg0; int _arg1; PyObject * _argo0 = 0; - char *_kwnames[] = { "self","nPage", NULL }; + char *_kwnames[] = { "self","page", NULL }; self = self; if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxNotebook_SetSelection",_kwnames,&_argo0,&_arg1)) @@ -739,7 +739,7 @@ static PyObject *_wrap_wxNotebook_AdvanceSelection(PyObject *self, PyObject *arg bool _arg1 = (bool ) TRUE; PyObject * _argo0 = 0; int tempbool1 = (int) TRUE; - char *_kwnames[] = { "self","bForward", NULL }; + char *_kwnames[] = { "self","forward", NULL }; self = self; if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxNotebook_AdvanceSelection",_kwnames,&_argo0,&tempbool1)) @@ -800,7 +800,7 @@ static PyObject *_wrap_wxNotebook_SetPageText(PyObject *self, PyObject *args, Py wxString * _arg2; PyObject * _argo0 = 0; PyObject * _obj2 = 0; - char *_kwnames[] = { "self","nPage","strText", NULL }; + char *_kwnames[] = { "self","page","text", NULL }; self = self; if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO:wxNotebook_SetPageText",_kwnames,&_argo0,&_arg1,&_obj2)) @@ -838,7 +838,7 @@ static PyObject *_wrap_wxNotebook_GetPageText(PyObject *self, PyObject *args, Py wxNotebook * _arg0; int _arg1; PyObject * _argo0 = 0; - char *_kwnames[] = { "self","nPage", NULL }; + char *_kwnames[] = { "self","page", NULL }; self = self; if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxNotebook_GetPageText",_kwnames,&_argo0,&_arg1)) @@ -978,7 +978,7 @@ static PyObject *_wrap_wxNotebook_GetPageImage(PyObject *self, PyObject *args, P wxNotebook * _arg0; int _arg1; PyObject * _argo0 = 0; - char *_kwnames[] = { "self","nPage", NULL }; + char *_kwnames[] = { "self","page", NULL }; self = self; if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxNotebook_GetPageImage",_kwnames,&_argo0,&_arg1)) @@ -1008,7 +1008,7 @@ static PyObject *_wrap_wxNotebook_SetPageImage(PyObject *self, PyObject *args, P int _arg1; int _arg2; PyObject * _argo0 = 0; - char *_kwnames[] = { "self","nPage","nImage", NULL }; + char *_kwnames[] = { "self","page","image", NULL }; self = self; if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxNotebook_SetPageImage",_kwnames,&_argo0,&_arg1,&_arg2)) @@ -1137,7 +1137,7 @@ static PyObject *_wrap_wxNotebook_DeletePage(PyObject *self, PyObject *args, PyO wxNotebook * _arg0; int _arg1; PyObject * _argo0 = 0; - char *_kwnames[] = { "self","nPage", NULL }; + char *_kwnames[] = { "self","page", NULL }; self = self; if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxNotebook_DeletePage",_kwnames,&_argo0,&_arg1)) @@ -1166,7 +1166,7 @@ static PyObject *_wrap_wxNotebook_RemovePage(PyObject *self, PyObject *args, PyO wxNotebook * _arg0; int _arg1; PyObject * _argo0 = 0; - char *_kwnames[] = { "self","nPage", NULL }; + char *_kwnames[] = { "self","page", NULL }; self = self; if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxNotebook_RemovePage",_kwnames,&_argo0,&_arg1)) @@ -1228,7 +1228,7 @@ static PyObject *_wrap_wxNotebook_AddPage(PyObject *self, PyObject *args, PyObje PyObject * _argo0 = 0; PyObject * _argo1 = 0; PyObject * _obj2 = 0; - char *_kwnames[] = { "self","pPage","strText","bSelect","imageId", NULL }; + char *_kwnames[] = { "self","page","text","select","imageId", NULL }; self = self; if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO|ii:wxNotebook_AddPage",_kwnames,&_argo0,&_argo1,&_obj2,&_arg3,&_arg4)) @@ -1280,7 +1280,7 @@ static PyObject *_wrap_wxNotebook_InsertPage(PyObject *self, PyObject *args, PyO PyObject * _argo2 = 0; PyObject * _obj3 = 0; int tempbool4 = (int) FALSE; - char *_kwnames[] = { "self","nPage","pPage","strText","bSelect","imageId", NULL }; + char *_kwnames[] = { "self","page","page","text","select","imageId", NULL }; self = self; if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiOO|ii:wxNotebook_InsertPage",_kwnames,&_argo0,&_arg1,&_argo2,&_obj3,&tempbool4,&_arg5)) @@ -1326,7 +1326,7 @@ static PyObject *_wrap_wxNotebook_GetPage(PyObject *self, PyObject *args, PyObje wxNotebook * _arg0; int _arg1; PyObject * _argo0 = 0; - char *_kwnames[] = { "self","nPage", NULL }; + char *_kwnames[] = { "self","page", NULL }; self = self; if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxNotebook_GetPage",_kwnames,&_argo0,&_arg1)) diff --git a/wxPython/src/mac/windows3.py b/wxPython/src/mac/windows3.py index 41bf7d09ca..838e90b6da 100644 --- a/wxPython/src/mac/windows3.py +++ b/wxPython/src/mac/windows3.py @@ -248,7 +248,10 @@ class wxLayoutAlgorithmPtr(wxObjectPtr): self.thisown = 0 def __del__(self, delfunc=windows3c.delete_wxLayoutAlgorithm): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def LayoutMDIFrame(self, *_args, **_kwargs): val = apply(windows3c.wxLayoutAlgorithm_LayoutMDIFrame,(self,) + _args, _kwargs) return val diff --git a/wxPython/src/mac/wx.py b/wxPython/src/mac/wx.py index ffffd13e67..10f63fe78f 100644 --- a/wxPython/src/mac/wx.py +++ b/wxPython/src/mac/wx.py @@ -48,7 +48,10 @@ class wxPyAppPtr(wxEvtHandlerPtr): self.thisown = 0 def __del__(self, delfunc=wxc.delete_wxPyApp): if self.thisown == 1: - delfunc(self) + try: + delfunc(self) + except: + pass def _setCallbackInfo(self, *_args, **_kwargs): val = apply(wxc.wxPyApp__setCallbackInfo,(self,) + _args, _kwargs) return val @@ -1592,6 +1595,12 @@ if wxPlatform == "__WXGTK__": except: pass +if wxPlatform == "__WXMSW__": + import os + localedir = os.path.join(os.path.split(__file__)[0], "locale") + wxLocale_AddCatalogLookupPathPrefix(localedir) + del os + #---------------------------------------------------------------------- # wxWindows version numbers. wxPython version is in __version__.