diff --git a/wxPython/contrib/ogl/_oglbasic.i b/wxPython/contrib/ogl/_oglbasic.i index 334cc093c0..5cbdfa7b7b 100644 --- a/wxPython/contrib/ogl/_oglbasic.i +++ b/wxPython/contrib/ogl/_oglbasic.i @@ -42,7 +42,7 @@ public: int GetFormatMode(); wxString GetName(); wxString GetColour(); - wxColour *GetActualColourObject(); + wxColour GetActualColourObject(); wxList& GetFormattedText(); wxString GetPenColour(); int GetPenStyle(); diff --git a/wxPython/contrib/ogl/gtk/ogl_wrap.cpp b/wxPython/contrib/ogl/gtk/ogl_wrap.cpp index 1ffce41500..5457033f2c 100644 --- a/wxPython/contrib/ogl/gtk/ogl_wrap.cpp +++ b/wxPython/contrib/ogl/gtk/ogl_wrap.cpp @@ -1256,7 +1256,7 @@ static PyObject *_wrap_ShapeRegion_GetColour(PyObject *self, PyObject *args, PyO static PyObject *_wrap_ShapeRegion_GetActualColourObject(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxShapeRegion *arg1 = (wxShapeRegion *) 0 ; - wxColour *result; + wxColour result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL @@ -1266,12 +1266,16 @@ static PyObject *_wrap_ShapeRegion_GetActualColourObject(PyObject *self, PyObjec if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxColour *)(arg1)->GetActualColourObject(); + result = (arg1)->GetActualColourObject(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxColour, 0); + { + wxColour * resultptr; + resultptr = new wxColour((wxColour &) result); + resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxColour, 1); + } return resultobj; fail: return NULL; diff --git a/wxPython/src/_gdicmn.i b/wxPython/src/_gdicmn.i index efe789a039..f925aa8da3 100644 --- a/wxPython/src/_gdicmn.i +++ b/wxPython/src/_gdicmn.i @@ -301,11 +301,18 @@ public: bool, operator!=(const wxPoint& pt), "Test for inequality of wx.Point objects."); + + +// %nokwargs operator+; +// %nokwargs operator-; +// %nokwargs operator+=; +// %nokwargs operator-=; DocDeclStr( wxPoint, operator+(const wxPoint& pt), "Add pt's proprties to this and return the result."); + DocDeclStr( wxPoint, operator-(const wxPoint& pt), "Subtract pt's proprties from this and return the result"); @@ -319,6 +326,27 @@ public: wxPoint&, operator-=(const wxPoint& pt), "Subtract pt from this object."); + + +// DocDeclStr( +// wxPoint, operator+(const wxSize& sz), +// "Add sz to this Point and return the result."); + +// DocDeclStr( +// wxPoint, operator-(const wxSize& sz), +// "Subtract sz from this Point and return the result"); + + +// DocDeclStr( +// wxPoint&, operator+=(const wxSize& sz), +// "Add sz to this object."); + +// DocDeclStr( +// wxPoint&, operator-=(const wxSize& sz), +// "Subtract sz from this object."); + + + %extend { DocStr(Set, "Set both the x and y properties");