From: Robin Dunn Date: Thu, 12 Oct 2006 08:37:14 +0000 (+0000) Subject: reSWIGged X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/f8eb59b90fb74063130b8ea42fa291e7982fdcad?hp=6a64d5510ceb4e3fee71e8e4f1b2ee362e720894 reSWIGged git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41972 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/wxPython/src/gtk/_core.py b/wxPython/src/gtk/_core.py index b8f021db3c..740d758b3b 100644 --- a/wxPython/src/gtk/_core.py +++ b/wxPython/src/gtk/_core.py @@ -3044,7 +3044,6 @@ class Image(Object): MaskBlue = property(GetMaskBlue,doc="See `GetMaskBlue`") MaskGreen = property(GetMaskGreen,doc="See `GetMaskGreen`") MaskRed = property(GetMaskRed,doc="See `GetMaskRed`") - Size = property(GetSize,doc="See `GetSize`") Width = property(GetWidth,doc="See `GetWidth`") _core_.Image_swigregister(Image) diff --git a/wxPython/src/gtk/_gdi.py b/wxPython/src/gtk/_gdi.py index 453f64fb35..4997fe158d 100644 --- a/wxPython/src/gtk/_gdi.py +++ b/wxPython/src/gtk/_gdi.py @@ -4456,8 +4456,8 @@ class BufferedDC(DC): `wx.BufferedPaintDC`. Please note that GTK+ 2.0 and OS X provide double buffering themselves - natively so using this class on those platforms will normally result - in an unneeded level of buffering. + natively. wxBufferedDC is aware of this however, and will bypass the buffering + unless an explicit buffer bitmap is given. """ thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') @@ -5008,9 +5008,9 @@ class GraphicsContext(object): """StrokeLines(self, List points)""" return _gdi_.GraphicsContext_StrokeLines(*args, **kwargs) - def StrokeDisconnectedLines(*args, **kwargs): - """StrokeDisconnectedLines(self, PyObject beginPoints, PyObject endPoints)""" - return _gdi_.GraphicsContext_StrokeDisconnectedLines(*args, **kwargs) + def StrokeLineSegements(*args, **kwargs): + """StrokeLineSegements(self, PyObject beginPoints, PyObject endPoints)""" + return _gdi_.GraphicsContext_StrokeLineSegements(*args, **kwargs) def DrawLines(*args, **kwargs): """DrawLines(self, size_t points, int fillStyle=WINDING_RULE)""" diff --git a/wxPython/src/gtk/_gdi_wrap.cpp b/wxPython/src/gtk/_gdi_wrap.cpp index aab2a2d9e4..638a268643 100644 --- a/wxPython/src/gtk/_gdi_wrap.cpp +++ b/wxPython/src/gtk/_gdi_wrap.cpp @@ -3673,7 +3673,7 @@ SWIGINTERN wxArrayDouble wxGraphicsContext_GetPartialTextExtents(wxGraphicsConte self->GetPartialTextExtents(text, widths); return widths; } -SWIGINTERN void wxGraphicsContext_StrokeDisconnectedLines(wxGraphicsContext *self,PyObject *beginPoints,PyObject *endPoints){ +SWIGINTERN void wxGraphicsContext_StrokeLineSegements(wxGraphicsContext *self,PyObject *beginPoints,PyObject *endPoints){ size_t c1, c2, count; wxPoint2D* beginP = wxPoint2D_LIST_helper(beginPoints, &c1); wxPoint2D* endP = wxPoint2D_LIST_helper(endPoints, &c2); @@ -26072,7 +26072,7 @@ fail: } -SWIGINTERN PyObject *_wrap_GraphicsContext_StrokeDisconnectedLines(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_GraphicsContext_StrokeLineSegements(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxGraphicsContext *arg1 = (wxGraphicsContext *) 0 ; PyObject *arg2 = (PyObject *) 0 ; @@ -26086,16 +26086,16 @@ SWIGINTERN PyObject *_wrap_GraphicsContext_StrokeDisconnectedLines(PyObject *SWI (char *) "self",(char *) "beginPoints",(char *) "endPoints", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GraphicsContext_StrokeDisconnectedLines",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GraphicsContext_StrokeLineSegements",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxGraphicsContext, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsContext_StrokeDisconnectedLines" "', expected argument " "1"" of type '" "wxGraphicsContext *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsContext_StrokeLineSegements" "', expected argument " "1"" of type '" "wxGraphicsContext *""'"); } arg1 = reinterpret_cast< wxGraphicsContext * >(argp1); arg2 = obj1; arg3 = obj2; { - wxGraphicsContext_StrokeDisconnectedLines(arg1,arg2,arg3); + wxGraphicsContext_StrokeLineSegements(arg1,arg2,arg3); if (PyErr_Occurred()) SWIG_fail; } resultobj = SWIG_Py_Void(); @@ -34796,7 +34796,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"GraphicsContext_DrawIcon", (PyCFunction) _wrap_GraphicsContext_DrawIcon, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GraphicsContext_StrokeLine", (PyCFunction) _wrap_GraphicsContext_StrokeLine, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GraphicsContext_StrokeLines", (PyCFunction) _wrap_GraphicsContext_StrokeLines, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"GraphicsContext_StrokeDisconnectedLines", (PyCFunction) _wrap_GraphicsContext_StrokeDisconnectedLines, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"GraphicsContext_StrokeLineSegements", (PyCFunction) _wrap_GraphicsContext_StrokeLineSegements, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GraphicsContext_DrawLines", (PyCFunction) _wrap_GraphicsContext_DrawLines, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GraphicsContext_DrawRectangle", (PyCFunction) _wrap_GraphicsContext_DrawRectangle, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GraphicsContext_DrawEllipse", (PyCFunction) _wrap_GraphicsContext_DrawEllipse, METH_VARARGS | METH_KEYWORDS, NULL}, diff --git a/wxPython/src/gtk/animate.py b/wxPython/src/gtk/animate.py index 3aaaab1319..a099b9bd89 100644 --- a/wxPython/src/gtk/animate.py +++ b/wxPython/src/gtk/animate.py @@ -123,10 +123,18 @@ class Animation(AnimationBase): """GetFramePosition(self, size_t frame) -> Point""" return _animate.Animation_GetFramePosition(*args, **kwargs) + def GetFrameSize(*args, **kwargs): + """GetFrameSize(self, size_t frame) -> Size""" + return _animate.Animation_GetFrameSize(*args, **kwargs) + def GetDisposalMethod(*args, **kwargs): """GetDisposalMethod(self, size_t frame) -> int""" return _animate.Animation_GetDisposalMethod(*args, **kwargs) + def GetTransparentColour(*args, **kwargs): + """GetTransparentColour(self, size_t frame) -> Colour""" + return _animate.Animation_GetTransparentColour(*args, **kwargs) + def GetBackgroundColour(*args, **kwargs): """GetBackgroundColour(self) -> Colour""" return _animate.Animation_GetBackgroundColour(*args, **kwargs) diff --git a/wxPython/src/gtk/animate_wrap.cpp b/wxPython/src/gtk/animate_wrap.cpp index fdb897ce59..1124398a97 100644 --- a/wxPython/src/gtk/animate_wrap.cpp +++ b/wxPython/src/gtk/animate_wrap.cpp @@ -2759,7 +2759,9 @@ SWIGINTERN wxAnimation *new_wxAnimation__SWIG_1(wxString const &name,wxAnimation return ani; } SWIGINTERN wxPoint wxAnimation_GetFramePosition(wxAnimation const *self,size_t frame){ return wxDefaultPosition; } +SWIGINTERN wxSize wxAnimation_GetFrameSize(wxAnimation const *self,size_t frame){ return wxDefaultSize; } SWIGINTERN wxAnimationDisposal wxAnimation_GetDisposalMethod(wxAnimation const *self,size_t frame){ return wxANIM_UNSPECIFIED; } +SWIGINTERN wxColour wxAnimation_GetTransparentColour(wxAnimation const *self,size_t frame){ return wxNullColour; } SWIGINTERN wxColour wxAnimation_GetBackgroundColour(wxAnimation const *self){ return wxNullColour; } // for backwards compatibility #ifndef wxAN_FIT_ANIMATION @@ -3283,6 +3285,45 @@ fail: } +SWIGINTERN PyObject *_wrap_Animation_GetFrameSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxAnimation *arg1 = (wxAnimation *) 0 ; + size_t arg2 ; + wxSize result; + void *argp1 = 0 ; + int res1 = 0 ; + size_t val2 ; + int ecode2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "frame", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Animation_GetFrameSize",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxAnimation, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Animation_GetFrameSize" "', expected argument " "1"" of type '" "wxAnimation const *""'"); + } + arg1 = reinterpret_cast< wxAnimation * >(argp1); + ecode2 = SWIG_AsVal_size_t(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Animation_GetFrameSize" "', expected argument " "2"" of type '" "size_t""'"); + } + arg2 = static_cast< size_t >(val2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = wxAnimation_GetFrameSize((wxAnimation const *)arg1,arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((new wxSize(static_cast< const wxSize& >(result))), SWIGTYPE_p_wxSize, SWIG_POINTER_OWN | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_Animation_GetDisposalMethod(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxAnimation *arg1 = (wxAnimation *) 0 ; @@ -3322,6 +3363,45 @@ fail: } +SWIGINTERN PyObject *_wrap_Animation_GetTransparentColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxAnimation *arg1 = (wxAnimation *) 0 ; + size_t arg2 ; + wxColour result; + void *argp1 = 0 ; + int res1 = 0 ; + size_t val2 ; + int ecode2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "frame", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Animation_GetTransparentColour",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxAnimation, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Animation_GetTransparentColour" "', expected argument " "1"" of type '" "wxAnimation const *""'"); + } + arg1 = reinterpret_cast< wxAnimation * >(argp1); + ecode2 = SWIG_AsVal_size_t(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Animation_GetTransparentColour" "', expected argument " "2"" of type '" "size_t""'"); + } + arg2 = static_cast< size_t >(val2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = wxAnimation_GetTransparentColour((wxAnimation const *)arg1,arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((new wxColour(static_cast< const wxColour& >(result))), SWIGTYPE_p_wxColour, SWIG_POINTER_OWN | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_Animation_GetBackgroundColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxAnimation *arg1 = (wxAnimation *) 0 ; @@ -4007,7 +4087,9 @@ static PyMethodDef SwigMethods[] = { { (char *)"new_Animation", _wrap_new_Animation, METH_VARARGS, NULL}, { (char *)"delete_Animation", (PyCFunction)_wrap_delete_Animation, METH_O, NULL}, { (char *)"Animation_GetFramePosition", (PyCFunction) _wrap_Animation_GetFramePosition, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Animation_GetFrameSize", (PyCFunction) _wrap_Animation_GetFrameSize, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Animation_GetDisposalMethod", (PyCFunction) _wrap_Animation_GetDisposalMethod, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Animation_GetTransparentColour", (PyCFunction) _wrap_Animation_GetTransparentColour, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Animation_GetBackgroundColour", (PyCFunction)_wrap_Animation_GetBackgroundColour, METH_O, NULL}, { (char *)"Animation_swigregister", Animation_swigregister, METH_VARARGS, NULL}, { (char *)"Animation_swiginit", Animation_swiginit, METH_VARARGS, NULL}, diff --git a/wxPython/src/mac/_core.py b/wxPython/src/mac/_core.py index b8f021db3c..740d758b3b 100644 --- a/wxPython/src/mac/_core.py +++ b/wxPython/src/mac/_core.py @@ -3044,7 +3044,6 @@ class Image(Object): MaskBlue = property(GetMaskBlue,doc="See `GetMaskBlue`") MaskGreen = property(GetMaskGreen,doc="See `GetMaskGreen`") MaskRed = property(GetMaskRed,doc="See `GetMaskRed`") - Size = property(GetSize,doc="See `GetSize`") Width = property(GetWidth,doc="See `GetWidth`") _core_.Image_swigregister(Image) diff --git a/wxPython/src/mac/_gdi.py b/wxPython/src/mac/_gdi.py index 5e9f246b2f..7aff85ea1d 100644 --- a/wxPython/src/mac/_gdi.py +++ b/wxPython/src/mac/_gdi.py @@ -4455,8 +4455,8 @@ class BufferedDC(DC): `wx.BufferedPaintDC`. Please note that GTK+ 2.0 and OS X provide double buffering themselves - natively so using this class on those platforms will normally result - in an unneeded level of buffering. + natively. wxBufferedDC is aware of this however, and will bypass the buffering + unless an explicit buffer bitmap is given. """ thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') @@ -5035,9 +5035,9 @@ class GraphicsContext(object): """StrokeLines(self, List points)""" return _gdi_.GraphicsContext_StrokeLines(*args, **kwargs) - def StrokeDisconnectedLines(*args, **kwargs): - """StrokeDisconnectedLines(self, PyObject beginPoints, PyObject endPoints)""" - return _gdi_.GraphicsContext_StrokeDisconnectedLines(*args, **kwargs) + def StrokeLineSegements(*args, **kwargs): + """StrokeLineSegements(self, PyObject beginPoints, PyObject endPoints)""" + return _gdi_.GraphicsContext_StrokeLineSegements(*args, **kwargs) def DrawLines(*args, **kwargs): """DrawLines(self, size_t points, int fillStyle=WINDING_RULE)""" diff --git a/wxPython/src/mac/_gdi_wrap.cpp b/wxPython/src/mac/_gdi_wrap.cpp index 5fc82ab1fb..f419ee7e8c 100644 --- a/wxPython/src/mac/_gdi_wrap.cpp +++ b/wxPython/src/mac/_gdi_wrap.cpp @@ -3677,7 +3677,7 @@ SWIGINTERN wxArrayDouble wxGraphicsContext_GetPartialTextExtents(wxGraphicsConte self->GetPartialTextExtents(text, widths); return widths; } -SWIGINTERN void wxGraphicsContext_StrokeDisconnectedLines(wxGraphicsContext *self,PyObject *beginPoints,PyObject *endPoints){ +SWIGINTERN void wxGraphicsContext_StrokeLineSegements(wxGraphicsContext *self,PyObject *beginPoints,PyObject *endPoints){ size_t c1, c2, count; wxPoint2D* beginP = wxPoint2D_LIST_helper(beginPoints, &c1); wxPoint2D* endP = wxPoint2D_LIST_helper(endPoints, &c2); @@ -26281,7 +26281,7 @@ fail: } -SWIGINTERN PyObject *_wrap_GraphicsContext_StrokeDisconnectedLines(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_GraphicsContext_StrokeLineSegements(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxGraphicsContext *arg1 = (wxGraphicsContext *) 0 ; PyObject *arg2 = (PyObject *) 0 ; @@ -26295,16 +26295,16 @@ SWIGINTERN PyObject *_wrap_GraphicsContext_StrokeDisconnectedLines(PyObject *SWI (char *) "self",(char *) "beginPoints",(char *) "endPoints", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GraphicsContext_StrokeDisconnectedLines",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GraphicsContext_StrokeLineSegements",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxGraphicsContext, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsContext_StrokeDisconnectedLines" "', expected argument " "1"" of type '" "wxGraphicsContext *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsContext_StrokeLineSegements" "', expected argument " "1"" of type '" "wxGraphicsContext *""'"); } arg1 = reinterpret_cast< wxGraphicsContext * >(argp1); arg2 = obj1; arg3 = obj2; { - wxGraphicsContext_StrokeDisconnectedLines(arg1,arg2,arg3); + wxGraphicsContext_StrokeLineSegements(arg1,arg2,arg3); if (PyErr_Occurred()) SWIG_fail; } resultobj = SWIG_Py_Void(); @@ -35012,7 +35012,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"GraphicsContext_DrawIcon", (PyCFunction) _wrap_GraphicsContext_DrawIcon, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GraphicsContext_StrokeLine", (PyCFunction) _wrap_GraphicsContext_StrokeLine, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GraphicsContext_StrokeLines", (PyCFunction) _wrap_GraphicsContext_StrokeLines, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"GraphicsContext_StrokeDisconnectedLines", (PyCFunction) _wrap_GraphicsContext_StrokeDisconnectedLines, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"GraphicsContext_StrokeLineSegements", (PyCFunction) _wrap_GraphicsContext_StrokeLineSegements, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GraphicsContext_DrawLines", (PyCFunction) _wrap_GraphicsContext_DrawLines, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GraphicsContext_DrawRectangle", (PyCFunction) _wrap_GraphicsContext_DrawRectangle, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GraphicsContext_DrawEllipse", (PyCFunction) _wrap_GraphicsContext_DrawEllipse, METH_VARARGS | METH_KEYWORDS, NULL}, diff --git a/wxPython/src/mac/animate.py b/wxPython/src/mac/animate.py index 3aaaab1319..a099b9bd89 100644 --- a/wxPython/src/mac/animate.py +++ b/wxPython/src/mac/animate.py @@ -123,10 +123,18 @@ class Animation(AnimationBase): """GetFramePosition(self, size_t frame) -> Point""" return _animate.Animation_GetFramePosition(*args, **kwargs) + def GetFrameSize(*args, **kwargs): + """GetFrameSize(self, size_t frame) -> Size""" + return _animate.Animation_GetFrameSize(*args, **kwargs) + def GetDisposalMethod(*args, **kwargs): """GetDisposalMethod(self, size_t frame) -> int""" return _animate.Animation_GetDisposalMethod(*args, **kwargs) + def GetTransparentColour(*args, **kwargs): + """GetTransparentColour(self, size_t frame) -> Colour""" + return _animate.Animation_GetTransparentColour(*args, **kwargs) + def GetBackgroundColour(*args, **kwargs): """GetBackgroundColour(self) -> Colour""" return _animate.Animation_GetBackgroundColour(*args, **kwargs) diff --git a/wxPython/src/mac/animate_wrap.cpp b/wxPython/src/mac/animate_wrap.cpp index f1dbd328ca..80f6c7f8f2 100644 --- a/wxPython/src/mac/animate_wrap.cpp +++ b/wxPython/src/mac/animate_wrap.cpp @@ -3276,6 +3276,45 @@ fail: } +SWIGINTERN PyObject *_wrap_Animation_GetFrameSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxAnimation *arg1 = (wxAnimation *) 0 ; + size_t arg2 ; + wxSize result; + void *argp1 = 0 ; + int res1 = 0 ; + size_t val2 ; + int ecode2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "frame", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Animation_GetFrameSize",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxAnimation, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Animation_GetFrameSize" "', expected argument " "1"" of type '" "wxAnimation const *""'"); + } + arg1 = reinterpret_cast< wxAnimation * >(argp1); + ecode2 = SWIG_AsVal_size_t(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Animation_GetFrameSize" "', expected argument " "2"" of type '" "size_t""'"); + } + arg2 = static_cast< size_t >(val2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = ((wxAnimation const *)arg1)->GetFrameSize(arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((new wxSize(static_cast< const wxSize& >(result))), SWIGTYPE_p_wxSize, SWIG_POINTER_OWN | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_Animation_GetDisposalMethod(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxAnimation *arg1 = (wxAnimation *) 0 ; @@ -3315,6 +3354,45 @@ fail: } +SWIGINTERN PyObject *_wrap_Animation_GetTransparentColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxAnimation *arg1 = (wxAnimation *) 0 ; + size_t arg2 ; + wxColour result; + void *argp1 = 0 ; + int res1 = 0 ; + size_t val2 ; + int ecode2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "frame", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Animation_GetTransparentColour",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxAnimation, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Animation_GetTransparentColour" "', expected argument " "1"" of type '" "wxAnimation const *""'"); + } + arg1 = reinterpret_cast< wxAnimation * >(argp1); + ecode2 = SWIG_AsVal_size_t(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Animation_GetTransparentColour" "', expected argument " "2"" of type '" "size_t""'"); + } + arg2 = static_cast< size_t >(val2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = ((wxAnimation const *)arg1)->GetTransparentColour(arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((new wxColour(static_cast< const wxColour& >(result))), SWIGTYPE_p_wxColour, SWIG_POINTER_OWN | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_Animation_GetBackgroundColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxAnimation *arg1 = (wxAnimation *) 0 ; @@ -4000,7 +4078,9 @@ static PyMethodDef SwigMethods[] = { { (char *)"new_Animation", _wrap_new_Animation, METH_VARARGS, NULL}, { (char *)"delete_Animation", (PyCFunction)_wrap_delete_Animation, METH_O, NULL}, { (char *)"Animation_GetFramePosition", (PyCFunction) _wrap_Animation_GetFramePosition, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Animation_GetFrameSize", (PyCFunction) _wrap_Animation_GetFrameSize, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Animation_GetDisposalMethod", (PyCFunction) _wrap_Animation_GetDisposalMethod, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Animation_GetTransparentColour", (PyCFunction) _wrap_Animation_GetTransparentColour, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Animation_GetBackgroundColour", (PyCFunction)_wrap_Animation_GetBackgroundColour, METH_O, NULL}, { (char *)"Animation_swigregister", Animation_swigregister, METH_VARARGS, NULL}, { (char *)"Animation_swiginit", Animation_swiginit, METH_VARARGS, NULL}, diff --git a/wxPython/src/msw/_core.py b/wxPython/src/msw/_core.py index 0c899fb2ec..7bf5545486 100644 --- a/wxPython/src/msw/_core.py +++ b/wxPython/src/msw/_core.py @@ -3044,7 +3044,6 @@ class Image(Object): MaskBlue = property(GetMaskBlue,doc="See `GetMaskBlue`") MaskGreen = property(GetMaskGreen,doc="See `GetMaskGreen`") MaskRed = property(GetMaskRed,doc="See `GetMaskRed`") - Size = property(GetSize,doc="See `GetSize`") Width = property(GetWidth,doc="See `GetWidth`") _core_.Image_swigregister(Image) diff --git a/wxPython/src/msw/_gdi.py b/wxPython/src/msw/_gdi.py index 21407a9ad2..8033d8e8fe 100644 --- a/wxPython/src/msw/_gdi.py +++ b/wxPython/src/msw/_gdi.py @@ -4549,8 +4549,8 @@ class BufferedDC(DC): `wx.BufferedPaintDC`. Please note that GTK+ 2.0 and OS X provide double buffering themselves - natively so using this class on those platforms will normally result - in an unneeded level of buffering. + natively. wxBufferedDC is aware of this however, and will bypass the buffering + unless an explicit buffer bitmap is given. """ thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') @@ -5133,9 +5133,9 @@ class GraphicsContext(object): """StrokeLines(self, List points)""" return _gdi_.GraphicsContext_StrokeLines(*args, **kwargs) - def StrokeDisconnectedLines(*args, **kwargs): - """StrokeDisconnectedLines(self, PyObject beginPoints, PyObject endPoints)""" - return _gdi_.GraphicsContext_StrokeDisconnectedLines(*args, **kwargs) + def StrokeLineSegements(*args, **kwargs): + """StrokeLineSegements(self, PyObject beginPoints, PyObject endPoints)""" + return _gdi_.GraphicsContext_StrokeLineSegements(*args, **kwargs) def DrawLines(*args, **kwargs): """DrawLines(self, size_t points, int fillStyle=WINDING_RULE)""" diff --git a/wxPython/src/msw/_gdi_wrap.cpp b/wxPython/src/msw/_gdi_wrap.cpp index 211f1ebdbb..d08dac2508 100644 --- a/wxPython/src/msw/_gdi_wrap.cpp +++ b/wxPython/src/msw/_gdi_wrap.cpp @@ -3655,7 +3655,7 @@ SWIGINTERN wxArrayDouble wxGraphicsContext_GetPartialTextExtents(wxGraphicsConte self->GetPartialTextExtents(text, widths); return widths; } -SWIGINTERN void wxGraphicsContext_StrokeDisconnectedLines(wxGraphicsContext *self,PyObject *beginPoints,PyObject *endPoints){ +SWIGINTERN void wxGraphicsContext_StrokeLineSegements(wxGraphicsContext *self,PyObject *beginPoints,PyObject *endPoints){ size_t c1, c2, count; wxPoint2D* beginP = wxPoint2D_LIST_helper(beginPoints, &c1); wxPoint2D* endP = wxPoint2D_LIST_helper(endPoints, &c2); @@ -27021,7 +27021,7 @@ fail: } -SWIGINTERN PyObject *_wrap_GraphicsContext_StrokeDisconnectedLines(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_GraphicsContext_StrokeLineSegements(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxGraphicsContext *arg1 = (wxGraphicsContext *) 0 ; PyObject *arg2 = (PyObject *) 0 ; @@ -27035,16 +27035,16 @@ SWIGINTERN PyObject *_wrap_GraphicsContext_StrokeDisconnectedLines(PyObject *SWI (char *) "self",(char *) "beginPoints",(char *) "endPoints", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GraphicsContext_StrokeDisconnectedLines",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GraphicsContext_StrokeLineSegements",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxGraphicsContext, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsContext_StrokeDisconnectedLines" "', expected argument " "1"" of type '" "wxGraphicsContext *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsContext_StrokeLineSegements" "', expected argument " "1"" of type '" "wxGraphicsContext *""'"); } arg1 = reinterpret_cast< wxGraphicsContext * >(argp1); arg2 = obj1; arg3 = obj2; { - wxGraphicsContext_StrokeDisconnectedLines(arg1,arg2,arg3); + wxGraphicsContext_StrokeLineSegements(arg1,arg2,arg3); if (PyErr_Occurred()) SWIG_fail; } resultobj = SWIG_Py_Void(); @@ -35774,7 +35774,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"GraphicsContext_DrawIcon", (PyCFunction) _wrap_GraphicsContext_DrawIcon, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GraphicsContext_StrokeLine", (PyCFunction) _wrap_GraphicsContext_StrokeLine, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GraphicsContext_StrokeLines", (PyCFunction) _wrap_GraphicsContext_StrokeLines, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"GraphicsContext_StrokeDisconnectedLines", (PyCFunction) _wrap_GraphicsContext_StrokeDisconnectedLines, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"GraphicsContext_StrokeLineSegements", (PyCFunction) _wrap_GraphicsContext_StrokeLineSegements, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GraphicsContext_DrawLines", (PyCFunction) _wrap_GraphicsContext_DrawLines, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GraphicsContext_DrawRectangle", (PyCFunction) _wrap_GraphicsContext_DrawRectangle, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GraphicsContext_DrawEllipse", (PyCFunction) _wrap_GraphicsContext_DrawEllipse, METH_VARARGS | METH_KEYWORDS, NULL}, diff --git a/wxPython/src/msw/animate.py b/wxPython/src/msw/animate.py index 3aaaab1319..a099b9bd89 100644 --- a/wxPython/src/msw/animate.py +++ b/wxPython/src/msw/animate.py @@ -123,10 +123,18 @@ class Animation(AnimationBase): """GetFramePosition(self, size_t frame) -> Point""" return _animate.Animation_GetFramePosition(*args, **kwargs) + def GetFrameSize(*args, **kwargs): + """GetFrameSize(self, size_t frame) -> Size""" + return _animate.Animation_GetFrameSize(*args, **kwargs) + def GetDisposalMethod(*args, **kwargs): """GetDisposalMethod(self, size_t frame) -> int""" return _animate.Animation_GetDisposalMethod(*args, **kwargs) + def GetTransparentColour(*args, **kwargs): + """GetTransparentColour(self, size_t frame) -> Colour""" + return _animate.Animation_GetTransparentColour(*args, **kwargs) + def GetBackgroundColour(*args, **kwargs): """GetBackgroundColour(self) -> Colour""" return _animate.Animation_GetBackgroundColour(*args, **kwargs) diff --git a/wxPython/src/msw/animate_wrap.cpp b/wxPython/src/msw/animate_wrap.cpp index f1dbd328ca..80f6c7f8f2 100644 --- a/wxPython/src/msw/animate_wrap.cpp +++ b/wxPython/src/msw/animate_wrap.cpp @@ -3276,6 +3276,45 @@ fail: } +SWIGINTERN PyObject *_wrap_Animation_GetFrameSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxAnimation *arg1 = (wxAnimation *) 0 ; + size_t arg2 ; + wxSize result; + void *argp1 = 0 ; + int res1 = 0 ; + size_t val2 ; + int ecode2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "frame", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Animation_GetFrameSize",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxAnimation, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Animation_GetFrameSize" "', expected argument " "1"" of type '" "wxAnimation const *""'"); + } + arg1 = reinterpret_cast< wxAnimation * >(argp1); + ecode2 = SWIG_AsVal_size_t(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Animation_GetFrameSize" "', expected argument " "2"" of type '" "size_t""'"); + } + arg2 = static_cast< size_t >(val2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = ((wxAnimation const *)arg1)->GetFrameSize(arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((new wxSize(static_cast< const wxSize& >(result))), SWIGTYPE_p_wxSize, SWIG_POINTER_OWN | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_Animation_GetDisposalMethod(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxAnimation *arg1 = (wxAnimation *) 0 ; @@ -3315,6 +3354,45 @@ fail: } +SWIGINTERN PyObject *_wrap_Animation_GetTransparentColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxAnimation *arg1 = (wxAnimation *) 0 ; + size_t arg2 ; + wxColour result; + void *argp1 = 0 ; + int res1 = 0 ; + size_t val2 ; + int ecode2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "frame", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Animation_GetTransparentColour",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxAnimation, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Animation_GetTransparentColour" "', expected argument " "1"" of type '" "wxAnimation const *""'"); + } + arg1 = reinterpret_cast< wxAnimation * >(argp1); + ecode2 = SWIG_AsVal_size_t(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Animation_GetTransparentColour" "', expected argument " "2"" of type '" "size_t""'"); + } + arg2 = static_cast< size_t >(val2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = ((wxAnimation const *)arg1)->GetTransparentColour(arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((new wxColour(static_cast< const wxColour& >(result))), SWIGTYPE_p_wxColour, SWIG_POINTER_OWN | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_Animation_GetBackgroundColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxAnimation *arg1 = (wxAnimation *) 0 ; @@ -4000,7 +4078,9 @@ static PyMethodDef SwigMethods[] = { { (char *)"new_Animation", _wrap_new_Animation, METH_VARARGS, NULL}, { (char *)"delete_Animation", (PyCFunction)_wrap_delete_Animation, METH_O, NULL}, { (char *)"Animation_GetFramePosition", (PyCFunction) _wrap_Animation_GetFramePosition, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Animation_GetFrameSize", (PyCFunction) _wrap_Animation_GetFrameSize, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Animation_GetDisposalMethod", (PyCFunction) _wrap_Animation_GetDisposalMethod, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Animation_GetTransparentColour", (PyCFunction) _wrap_Animation_GetTransparentColour, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Animation_GetBackgroundColour", (PyCFunction)_wrap_Animation_GetBackgroundColour, METH_O, NULL}, { (char *)"Animation_swigregister", Animation_swigregister, METH_VARARGS, NULL}, { (char *)"Animation_swiginit", Animation_swiginit, METH_VARARGS, NULL},