From e2950dbb1f759c12b300f1ea98815bdf9f76204c Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 3 Mar 2005 20:13:45 +0000 Subject: [PATCH] reSWIGged git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32591 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/contrib/activex/activex_wrap.cpp | 15 +---- wxPython/src/__gdi_rename.i | 2 + wxPython/src/gtk/_core.py | 2 +- wxPython/src/gtk/_core_wrap.cpp | 60 +++++++------------- wxPython/src/gtk/_gdi.py | 10 +++- wxPython/src/gtk/_gdi_wrap.cpp | 68 ++++++++++++++++++----- wxPython/src/gtk/xrc_wrap.cpp | 16 ++---- wxPython/src/mac/_core.py | 2 +- wxPython/src/mac/_core_wrap.cpp | 60 +++++++------------- wxPython/src/mac/_gdi.py | 10 +++- wxPython/src/mac/_gdi_wrap.cpp | 68 ++++++++++++++++++----- wxPython/src/mac/xrc_wrap.cpp | 16 ++---- wxPython/src/msw/_core.py | 2 +- wxPython/src/msw/_core_wrap.cpp | 60 +++++++------------- wxPython/src/msw/_gdi.py | 10 +++- wxPython/src/msw/_gdi_wrap.cpp | 68 ++++++++++++++++++----- wxPython/src/msw/xrc_wrap.cpp | 16 ++---- wxPython/wxPython/_gdi.py | 2 + 18 files changed, 273 insertions(+), 214 deletions(-) diff --git a/wxPython/contrib/activex/activex_wrap.cpp b/wxPython/contrib/activex/activex_wrap.cpp index ea7855d805..86819b61df 100644 --- a/wxPython/contrib/activex/activex_wrap.cpp +++ b/wxPython/contrib/activex/activex_wrap.cpp @@ -4368,7 +4368,6 @@ static PyObject *_wrap_IEHtmlWindowBase_LoadStream(PyObject *, PyObject *args, P wxInputStream *arg2 = (wxInputStream *) 0 ; bool result; wxPyInputStream *temp2 ; - bool created2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -4380,16 +4379,14 @@ static PyObject *_wrap_IEHtmlWindowBase_LoadStream(PyObject *, PyObject *args, P if (SWIG_arg_fail(1)) SWIG_fail; { if (wxPyConvertSwigPtr(obj1, (void **)&temp2, wxT("wxPyInputStream"))) { - arg2 = temp2->m_wxis; - created2 = false; + arg2 = wxPyCBInputStream_copy((wxPyCBInputStream*)temp2->m_wxis); } else { PyErr_Clear(); // clear the failure of the wxPyConvert above arg2 = wxPyCBInputStream_create(obj1, false); if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError, "Expected wxInputStream or Python file-like object."); + PyErr_SetString(PyExc_TypeError, "Expected wx.InputStream or Python file-like object."); SWIG_fail; } - created2 = true; } } { @@ -4402,16 +4399,8 @@ static PyObject *_wrap_IEHtmlWindowBase_LoadStream(PyObject *, PyObject *args, P { resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); } - { - if (created2) - delete arg2; - } return resultobj; fail: - { - if (created2) - delete arg2; - } return NULL; } diff --git a/wxPython/src/__gdi_rename.i b/wxPython/src/__gdi_rename.i index 55e1970d68..f94804e820 100644 --- a/wxPython/src/__gdi_rename.i +++ b/wxPython/src/__gdi_rename.i @@ -403,6 +403,8 @@ %rename(EncodingConverter) wxEncodingConverter; %rename(DC) wxDC; %rename(MemoryDC) wxMemoryDC; +%rename(BUFFER_VIRTUAL_AREA) wxBUFFER_VIRTUAL_AREA; +%rename(BUFFER_CLIENT_AREA) wxBUFFER_CLIENT_AREA; %rename(BufferedDC) wxBufferedDC; %rename(BufferedPaintDC) wxBufferedPaintDC; %rename(ScreenDC) wxScreenDC; diff --git a/wxPython/src/gtk/_core.py b/wxPython/src/gtk/_core.py index d64f158bbb..ae80536361 100644 --- a/wxPython/src/gtk/_core.py +++ b/wxPython/src/gtk/_core.py @@ -1691,7 +1691,7 @@ class FSFile(Object): self.this = newobj.this self.thisown = 1 del newobj.thisown - self.thisown = 0 # It will normally be deleted by the user of the wxFileSystem + self.thisown = 0 # It will normally be deleted by the user of the wx.FileSystem def __del__(self, destroy=_core_.delete_FSFile): """__del__(self)""" diff --git a/wxPython/src/gtk/_core_wrap.cpp b/wxPython/src/gtk/_core_wrap.cpp index ad0e5f9846..3c612594fe 100644 --- a/wxPython/src/gtk/_core_wrap.cpp +++ b/wxPython/src/gtk/_core_wrap.cpp @@ -1649,7 +1649,8 @@ static wxPyCoreAPI API = { wxPyOORClientData_dtor, wxPyCBInputStream_create, - + wxPyCBInputStream_copy, + wxPyInstance_Check, wxPySwigInstance_Check, @@ -7913,7 +7914,6 @@ static PyObject *_wrap_new_FSFile(PyObject *, PyObject *args, PyObject *kwargs) wxDateTime arg5 ; wxFSFile *result; wxPyInputStream *temp1 ; - bool created1 ; bool temp2 = false ; bool temp3 = false ; bool temp4 = false ; @@ -7929,16 +7929,14 @@ static PyObject *_wrap_new_FSFile(PyObject *, PyObject *args, PyObject *kwargs) if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:new_FSFile",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; { if (wxPyConvertSwigPtr(obj0, (void **)&temp1, wxT("wxPyInputStream"))) { - arg1 = temp1->m_wxis; - created1 = false; + arg1 = wxPyCBInputStream_copy((wxPyCBInputStream*)temp1->m_wxis); } else { PyErr_Clear(); // clear the failure of the wxPyConvert above - arg1 = wxPyCBInputStream_create(obj0, false); + arg1 = wxPyCBInputStream_create(obj0, true); if (arg1 == NULL) { - PyErr_SetString(PyExc_TypeError, "Expected wxInputStream or Python file-like object."); + PyErr_SetString(PyExc_TypeError, "Expected wx.InputStream or Python file-like object."); SWIG_fail; } - created1 = true; } } { @@ -7976,10 +7974,6 @@ static PyObject *_wrap_new_FSFile(PyObject *, PyObject *args, PyObject *kwargs) { resultobj = wxPyMake_wxObject(result, 1); } - { - if (created1) - delete arg1; - } { if (temp2) delete arg2; @@ -7994,10 +7988,6 @@ static PyObject *_wrap_new_FSFile(PyObject *, PyObject *args, PyObject *kwargs) } return resultobj; fail: - { - if (created1) - delete arg1; - } { if (temp2) delete arg2; @@ -10485,7 +10475,7 @@ static PyObject *_wrap_new_ImageFromStream(PyObject *, PyObject *args, PyObject PyErr_Clear(); // clear the failure of the wxPyConvert above arg1 = wxPyCBInputStream_create(obj0, false); if (arg1 == NULL) { - PyErr_SetString(PyExc_TypeError, "Expected wxInputStream or Python file-like object."); + PyErr_SetString(PyExc_TypeError, "Expected wx.InputStream or Python file-like object."); SWIG_fail; } created1 = true; @@ -10512,14 +10502,12 @@ static PyObject *_wrap_new_ImageFromStream(PyObject *, PyObject *args, PyObject } resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxImage, 1); { - if (created1) - delete arg1; + if (created1) delete arg1; } return resultobj; fail: { - if (created1) - delete arg1; + if (created1) delete arg1; } return NULL; } @@ -10550,7 +10538,7 @@ static PyObject *_wrap_new_ImageFromStreamMime(PyObject *, PyObject *args, PyObj PyErr_Clear(); // clear the failure of the wxPyConvert above arg1 = wxPyCBInputStream_create(obj0, false); if (arg1 == NULL) { - PyErr_SetString(PyExc_TypeError, "Expected wxInputStream or Python file-like object."); + PyErr_SetString(PyExc_TypeError, "Expected wx.InputStream or Python file-like object."); SWIG_fail; } created1 = true; @@ -10576,8 +10564,7 @@ static PyObject *_wrap_new_ImageFromStreamMime(PyObject *, PyObject *args, PyObj } resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxImage, 1); { - if (created1) - delete arg1; + if (created1) delete arg1; } { if (temp2) @@ -10586,8 +10573,7 @@ static PyObject *_wrap_new_ImageFromStreamMime(PyObject *, PyObject *args, PyObj return resultobj; fail: { - if (created1) - delete arg1; + if (created1) delete arg1; } { if (temp2) @@ -11808,7 +11794,7 @@ static PyObject *_wrap_Image_CanReadStream(PyObject *, PyObject *args, PyObject PyErr_Clear(); // clear the failure of the wxPyConvert above arg1 = wxPyCBInputStream_create(obj0, false); if (arg1 == NULL) { - PyErr_SetString(PyExc_TypeError, "Expected wxInputStream or Python file-like object."); + PyErr_SetString(PyExc_TypeError, "Expected wx.InputStream or Python file-like object."); SWIG_fail; } created1 = true; @@ -11825,14 +11811,12 @@ static PyObject *_wrap_Image_CanReadStream(PyObject *, PyObject *args, PyObject resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); } { - if (created1) - delete arg1; + if (created1) delete arg1; } return resultobj; fail: { - if (created1) - delete arg1; + if (created1) delete arg1; } return NULL; } @@ -11866,7 +11850,7 @@ static PyObject *_wrap_Image_LoadStream(PyObject *, PyObject *args, PyObject *kw PyErr_Clear(); // clear the failure of the wxPyConvert above arg2 = wxPyCBInputStream_create(obj1, false); if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError, "Expected wxInputStream or Python file-like object."); + PyErr_SetString(PyExc_TypeError, "Expected wx.InputStream or Python file-like object."); SWIG_fail; } created2 = true; @@ -11895,14 +11879,12 @@ static PyObject *_wrap_Image_LoadStream(PyObject *, PyObject *args, PyObject *kw resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); } { - if (created2) - delete arg2; + if (created2) delete arg2; } return resultobj; fail: { - if (created2) - delete arg2; + if (created2) delete arg2; } return NULL; } @@ -11937,7 +11919,7 @@ static PyObject *_wrap_Image_LoadMimeStream(PyObject *, PyObject *args, PyObject PyErr_Clear(); // clear the failure of the wxPyConvert above arg2 = wxPyCBInputStream_create(obj1, false); if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError, "Expected wxInputStream or Python file-like object."); + PyErr_SetString(PyExc_TypeError, "Expected wx.InputStream or Python file-like object."); SWIG_fail; } created2 = true; @@ -11965,8 +11947,7 @@ static PyObject *_wrap_Image_LoadMimeStream(PyObject *, PyObject *args, PyObject resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); } { - if (created2) - delete arg2; + if (created2) delete arg2; } { if (temp3) @@ -11975,8 +11956,7 @@ static PyObject *_wrap_Image_LoadMimeStream(PyObject *, PyObject *args, PyObject return resultobj; fail: { - if (created2) - delete arg2; + if (created2) delete arg2; } { if (temp3) diff --git a/wxPython/src/gtk/_gdi.py b/wxPython/src/gtk/_gdi.py index 89748cd19d..ceee5accd3 100644 --- a/wxPython/src/gtk/_gdi.py +++ b/wxPython/src/gtk/_gdi.py @@ -3949,6 +3949,8 @@ def MemoryDCFromDC(*args, **kwargs): #--------------------------------------------------------------------------- +BUFFER_VIRTUAL_AREA = _gdi_.BUFFER_VIRTUAL_AREA +BUFFER_CLIENT_AREA = _gdi_.BUFFER_CLIENT_AREA class BufferedDC(MemoryDC): """ This simple class provides a simple way to avoid flicker: when drawing @@ -3966,8 +3968,8 @@ class BufferedDC(MemoryDC): return "<%s.%s; proxy of C++ wxBufferedDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args): """ - __init__(self, DC dc, Bitmap buffer) -> BufferedDC - __init__(self, DC dc, Size area) -> BufferedDC + __init__(self, DC dc, Bitmap buffer, int style=BUFFER_CLIENT_AREA) -> BufferedDC + __init__(self, DC dc, Size area, int style=BUFFER_CLIENT_AREA) -> BufferedDC Constructs a buffered DC. """ @@ -4026,12 +4028,14 @@ class BufferedPaintDC(BufferedDC): + + """ def __repr__(self): return "<%s.%s; proxy of C++ wxBufferedPaintDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): """ - __init__(self, Window window, Bitmap buffer=NullBitmap) -> BufferedPaintDC + __init__(self, Window window, Bitmap buffer=NullBitmap, int style=BUFFER_CLIENT_AREA) -> BufferedPaintDC Create a buffered paint DC. As with `wx.BufferedDC`, you may either provide the bitmap to be used for buffering or let this object create diff --git a/wxPython/src/gtk/_gdi_wrap.cpp b/wxPython/src/gtk/_gdi_wrap.cpp index 0726c79864..bed2164d1e 100644 --- a/wxPython/src/gtk/_gdi_wrap.cpp +++ b/wxPython/src/gtk/_gdi_wrap.cpp @@ -17222,11 +17222,13 @@ static PyObject *_wrap_new_BufferedDC__SWIG_0(PyObject *, PyObject *args) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; wxBitmap *arg2 = 0 ; + int arg3 = (int) wxBUFFER_CLIENT_AREA ; wxBufferedDC *result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:new_BufferedDC",&obj0,&obj1)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"OO|O:new_BufferedDC",&obj0,&obj1,&obj2)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -17237,10 +17239,16 @@ static PyObject *_wrap_new_BufferedDC__SWIG_0(PyObject *, PyObject *args) { } if (SWIG_arg_fail(2)) SWIG_fail; } + if (obj2) { + { + arg3 = (int)(SWIG_As_int(obj2)); + if (SWIG_arg_fail(3)) SWIG_fail; + } + } { if (!wxPyCheckForApp()) SWIG_fail; PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxBufferedDC *)new wxBufferedDC(arg1,(wxBitmap const &)*arg2); + result = (wxBufferedDC *)new wxBufferedDC(arg1,(wxBitmap const &)*arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -17256,22 +17264,30 @@ static PyObject *_wrap_new_BufferedDC__SWIG_1(PyObject *, PyObject *args) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; wxSize *arg2 = 0 ; + int arg3 = (int) wxBUFFER_CLIENT_AREA ; wxBufferedDC *result; wxSize temp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:new_BufferedDC",&obj0,&obj1)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"OO|O:new_BufferedDC",&obj0,&obj1,&obj2)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { arg2 = &temp2; if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; } + if (obj2) { + { + arg3 = (int)(SWIG_As_int(obj2)); + if (SWIG_arg_fail(3)) SWIG_fail; + } + } { if (!wxPyCheckForApp()) SWIG_fail; PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxBufferedDC *)new wxBufferedDC(arg1,(wxSize const &)*arg2); + result = (wxBufferedDC *)new wxBufferedDC(arg1,(wxSize const &)*arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -17285,14 +17301,14 @@ static PyObject *_wrap_new_BufferedDC__SWIG_1(PyObject *, PyObject *args) { static PyObject *_wrap_new_BufferedDC(PyObject *self, PyObject *args) { int argc; - PyObject *argv[3]; + PyObject *argv[4]; int ii; argc = PyObject_Length(args); - for (ii = 0; (ii < argc) && (ii < 2); ii++) { + for (ii = 0; (ii < argc) && (ii < 3); ii++) { argv[ii] = PyTuple_GetItem(args,ii); } - if (argc == 2) { + if ((argc >= 2) && (argc <= 3)) { int _v; { void *ptr; @@ -17314,11 +17330,17 @@ static PyObject *_wrap_new_BufferedDC(PyObject *self, PyObject *args) { } } if (_v) { - return _wrap_new_BufferedDC__SWIG_0(self,args); + if (argc <= 2) { + return _wrap_new_BufferedDC__SWIG_0(self,args); + } + _v = SWIG_Check_int(argv[2]); + if (_v) { + return _wrap_new_BufferedDC__SWIG_0(self,args); + } } } } - if (argc == 2) { + if ((argc >= 2) && (argc <= 3)) { int _v; { void *ptr; @@ -17334,7 +17356,13 @@ static PyObject *_wrap_new_BufferedDC(PyObject *self, PyObject *args) { _v = wxPySimple_typecheck(argv[1], wxT("wxSize"), 2); } if (_v) { - return _wrap_new_BufferedDC__SWIG_1(self,args); + if (argc <= 2) { + return _wrap_new_BufferedDC__SWIG_1(self,args); + } + _v = SWIG_Check_int(argv[2]); + if (_v) { + return _wrap_new_BufferedDC__SWIG_1(self,args); + } } } } @@ -17406,14 +17434,16 @@ static PyObject *_wrap_new_BufferedPaintDC(PyObject *, PyObject *args, PyObject wxWindow *arg1 = (wxWindow *) 0 ; wxBitmap const &arg2_defvalue = wxNullBitmap ; wxBitmap *arg2 = (wxBitmap *) &arg2_defvalue ; + int arg3 = (int) wxBUFFER_CLIENT_AREA ; wxBufferedPaintDC *result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { - (char *) "window",(char *) "buffer", NULL + (char *) "window",(char *) "buffer",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_BufferedPaintDC",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:new_BufferedPaintDC",kwnames,&obj0,&obj1,&obj2)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; if (obj1) { @@ -17426,10 +17456,16 @@ static PyObject *_wrap_new_BufferedPaintDC(PyObject *, PyObject *args, PyObject if (SWIG_arg_fail(2)) SWIG_fail; } } + if (obj2) { + { + arg3 = (int)(SWIG_As_int(obj2)); + if (SWIG_arg_fail(3)) SWIG_fail; + } + } { if (!wxPyCheckForApp()) SWIG_fail; PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxBufferedPaintDC *)new wxBufferedPaintDC(arg1,(wxBitmap const &)*arg2); + result = (wxBufferedPaintDC *)new wxBufferedPaintDC(arg1,(wxBitmap const &)*arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -22959,6 +22995,12 @@ SWIGEXPORT(void) SWIG_init(void) { { PyDict_SetItemString(d,"PLATFORM_MAC", SWIG_From_int((int)(wxPLATFORM_MAC))); } + { + PyDict_SetItemString(d,"BUFFER_VIRTUAL_AREA", SWIG_From_int((int)(wxBUFFER_VIRTUAL_AREA))); + } + { + PyDict_SetItemString(d,"BUFFER_CLIENT_AREA", SWIG_From_int((int)(wxBUFFER_CLIENT_AREA))); + } { PyDict_SetItemString(d,"IMAGELIST_DRAW_NORMAL", SWIG_From_int((int)(wxIMAGELIST_DRAW_NORMAL))); } diff --git a/wxPython/src/gtk/xrc_wrap.cpp b/wxPython/src/gtk/xrc_wrap.cpp index 7cc5dc9365..ef8ca47db0 100644 --- a/wxPython/src/gtk/xrc_wrap.cpp +++ b/wxPython/src/gtk/xrc_wrap.cpp @@ -4527,7 +4527,7 @@ static PyObject *_wrap_new_XmlDocumentFromStream(PyObject *, PyObject *args, PyO PyErr_Clear(); // clear the failure of the wxPyConvert above arg1 = wxPyCBInputStream_create(obj0, false); if (arg1 == NULL) { - PyErr_SetString(PyExc_TypeError, "Expected wxInputStream or Python file-like object."); + PyErr_SetString(PyExc_TypeError, "Expected wx.InputStream or Python file-like object."); SWIG_fail; } created1 = true; @@ -4549,8 +4549,7 @@ static PyObject *_wrap_new_XmlDocumentFromStream(PyObject *, PyObject *args, PyO } resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxXmlDocument, 1); { - if (created1) - delete arg1; + if (created1) delete arg1; } { if (temp2) @@ -4559,8 +4558,7 @@ static PyObject *_wrap_new_XmlDocumentFromStream(PyObject *, PyObject *args, PyO return resultobj; fail: { - if (created1) - delete arg1; + if (created1) delete arg1; } { if (temp2) @@ -4708,7 +4706,7 @@ static PyObject *_wrap_XmlDocument_LoadFromStream(PyObject *, PyObject *args, Py PyErr_Clear(); // clear the failure of the wxPyConvert above arg2 = wxPyCBInputStream_create(obj1, false); if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError, "Expected wxInputStream or Python file-like object."); + PyErr_SetString(PyExc_TypeError, "Expected wx.InputStream or Python file-like object."); SWIG_fail; } created2 = true; @@ -4732,8 +4730,7 @@ static PyObject *_wrap_XmlDocument_LoadFromStream(PyObject *, PyObject *args, Py resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); } { - if (created2) - delete arg2; + if (created2) delete arg2; } { if (temp3) @@ -4742,8 +4739,7 @@ static PyObject *_wrap_XmlDocument_LoadFromStream(PyObject *, PyObject *args, Py return resultobj; fail: { - if (created2) - delete arg2; + if (created2) delete arg2; } { if (temp3) diff --git a/wxPython/src/mac/_core.py b/wxPython/src/mac/_core.py index d64f158bbb..ae80536361 100644 --- a/wxPython/src/mac/_core.py +++ b/wxPython/src/mac/_core.py @@ -1691,7 +1691,7 @@ class FSFile(Object): self.this = newobj.this self.thisown = 1 del newobj.thisown - self.thisown = 0 # It will normally be deleted by the user of the wxFileSystem + self.thisown = 0 # It will normally be deleted by the user of the wx.FileSystem def __del__(self, destroy=_core_.delete_FSFile): """__del__(self)""" diff --git a/wxPython/src/mac/_core_wrap.cpp b/wxPython/src/mac/_core_wrap.cpp index ad0e5f9846..3c612594fe 100644 --- a/wxPython/src/mac/_core_wrap.cpp +++ b/wxPython/src/mac/_core_wrap.cpp @@ -1649,7 +1649,8 @@ static wxPyCoreAPI API = { wxPyOORClientData_dtor, wxPyCBInputStream_create, - + wxPyCBInputStream_copy, + wxPyInstance_Check, wxPySwigInstance_Check, @@ -7913,7 +7914,6 @@ static PyObject *_wrap_new_FSFile(PyObject *, PyObject *args, PyObject *kwargs) wxDateTime arg5 ; wxFSFile *result; wxPyInputStream *temp1 ; - bool created1 ; bool temp2 = false ; bool temp3 = false ; bool temp4 = false ; @@ -7929,16 +7929,14 @@ static PyObject *_wrap_new_FSFile(PyObject *, PyObject *args, PyObject *kwargs) if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:new_FSFile",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; { if (wxPyConvertSwigPtr(obj0, (void **)&temp1, wxT("wxPyInputStream"))) { - arg1 = temp1->m_wxis; - created1 = false; + arg1 = wxPyCBInputStream_copy((wxPyCBInputStream*)temp1->m_wxis); } else { PyErr_Clear(); // clear the failure of the wxPyConvert above - arg1 = wxPyCBInputStream_create(obj0, false); + arg1 = wxPyCBInputStream_create(obj0, true); if (arg1 == NULL) { - PyErr_SetString(PyExc_TypeError, "Expected wxInputStream or Python file-like object."); + PyErr_SetString(PyExc_TypeError, "Expected wx.InputStream or Python file-like object."); SWIG_fail; } - created1 = true; } } { @@ -7976,10 +7974,6 @@ static PyObject *_wrap_new_FSFile(PyObject *, PyObject *args, PyObject *kwargs) { resultobj = wxPyMake_wxObject(result, 1); } - { - if (created1) - delete arg1; - } { if (temp2) delete arg2; @@ -7994,10 +7988,6 @@ static PyObject *_wrap_new_FSFile(PyObject *, PyObject *args, PyObject *kwargs) } return resultobj; fail: - { - if (created1) - delete arg1; - } { if (temp2) delete arg2; @@ -10485,7 +10475,7 @@ static PyObject *_wrap_new_ImageFromStream(PyObject *, PyObject *args, PyObject PyErr_Clear(); // clear the failure of the wxPyConvert above arg1 = wxPyCBInputStream_create(obj0, false); if (arg1 == NULL) { - PyErr_SetString(PyExc_TypeError, "Expected wxInputStream or Python file-like object."); + PyErr_SetString(PyExc_TypeError, "Expected wx.InputStream or Python file-like object."); SWIG_fail; } created1 = true; @@ -10512,14 +10502,12 @@ static PyObject *_wrap_new_ImageFromStream(PyObject *, PyObject *args, PyObject } resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxImage, 1); { - if (created1) - delete arg1; + if (created1) delete arg1; } return resultobj; fail: { - if (created1) - delete arg1; + if (created1) delete arg1; } return NULL; } @@ -10550,7 +10538,7 @@ static PyObject *_wrap_new_ImageFromStreamMime(PyObject *, PyObject *args, PyObj PyErr_Clear(); // clear the failure of the wxPyConvert above arg1 = wxPyCBInputStream_create(obj0, false); if (arg1 == NULL) { - PyErr_SetString(PyExc_TypeError, "Expected wxInputStream or Python file-like object."); + PyErr_SetString(PyExc_TypeError, "Expected wx.InputStream or Python file-like object."); SWIG_fail; } created1 = true; @@ -10576,8 +10564,7 @@ static PyObject *_wrap_new_ImageFromStreamMime(PyObject *, PyObject *args, PyObj } resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxImage, 1); { - if (created1) - delete arg1; + if (created1) delete arg1; } { if (temp2) @@ -10586,8 +10573,7 @@ static PyObject *_wrap_new_ImageFromStreamMime(PyObject *, PyObject *args, PyObj return resultobj; fail: { - if (created1) - delete arg1; + if (created1) delete arg1; } { if (temp2) @@ -11808,7 +11794,7 @@ static PyObject *_wrap_Image_CanReadStream(PyObject *, PyObject *args, PyObject PyErr_Clear(); // clear the failure of the wxPyConvert above arg1 = wxPyCBInputStream_create(obj0, false); if (arg1 == NULL) { - PyErr_SetString(PyExc_TypeError, "Expected wxInputStream or Python file-like object."); + PyErr_SetString(PyExc_TypeError, "Expected wx.InputStream or Python file-like object."); SWIG_fail; } created1 = true; @@ -11825,14 +11811,12 @@ static PyObject *_wrap_Image_CanReadStream(PyObject *, PyObject *args, PyObject resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); } { - if (created1) - delete arg1; + if (created1) delete arg1; } return resultobj; fail: { - if (created1) - delete arg1; + if (created1) delete arg1; } return NULL; } @@ -11866,7 +11850,7 @@ static PyObject *_wrap_Image_LoadStream(PyObject *, PyObject *args, PyObject *kw PyErr_Clear(); // clear the failure of the wxPyConvert above arg2 = wxPyCBInputStream_create(obj1, false); if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError, "Expected wxInputStream or Python file-like object."); + PyErr_SetString(PyExc_TypeError, "Expected wx.InputStream or Python file-like object."); SWIG_fail; } created2 = true; @@ -11895,14 +11879,12 @@ static PyObject *_wrap_Image_LoadStream(PyObject *, PyObject *args, PyObject *kw resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); } { - if (created2) - delete arg2; + if (created2) delete arg2; } return resultobj; fail: { - if (created2) - delete arg2; + if (created2) delete arg2; } return NULL; } @@ -11937,7 +11919,7 @@ static PyObject *_wrap_Image_LoadMimeStream(PyObject *, PyObject *args, PyObject PyErr_Clear(); // clear the failure of the wxPyConvert above arg2 = wxPyCBInputStream_create(obj1, false); if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError, "Expected wxInputStream or Python file-like object."); + PyErr_SetString(PyExc_TypeError, "Expected wx.InputStream or Python file-like object."); SWIG_fail; } created2 = true; @@ -11965,8 +11947,7 @@ static PyObject *_wrap_Image_LoadMimeStream(PyObject *, PyObject *args, PyObject resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); } { - if (created2) - delete arg2; + if (created2) delete arg2; } { if (temp3) @@ -11975,8 +11956,7 @@ static PyObject *_wrap_Image_LoadMimeStream(PyObject *, PyObject *args, PyObject return resultobj; fail: { - if (created2) - delete arg2; + if (created2) delete arg2; } { if (temp3) diff --git a/wxPython/src/mac/_gdi.py b/wxPython/src/mac/_gdi.py index 4854085c70..7884985fec 100644 --- a/wxPython/src/mac/_gdi.py +++ b/wxPython/src/mac/_gdi.py @@ -3949,6 +3949,8 @@ def MemoryDCFromDC(*args, **kwargs): #--------------------------------------------------------------------------- +BUFFER_VIRTUAL_AREA = _gdi_.BUFFER_VIRTUAL_AREA +BUFFER_CLIENT_AREA = _gdi_.BUFFER_CLIENT_AREA class BufferedDC(MemoryDC): """ This simple class provides a simple way to avoid flicker: when drawing @@ -3966,8 +3968,8 @@ class BufferedDC(MemoryDC): return "<%s.%s; proxy of C++ wxBufferedDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args): """ - __init__(self, DC dc, Bitmap buffer) -> BufferedDC - __init__(self, DC dc, Size area) -> BufferedDC + __init__(self, DC dc, Bitmap buffer, int style=BUFFER_CLIENT_AREA) -> BufferedDC + __init__(self, DC dc, Size area, int style=BUFFER_CLIENT_AREA) -> BufferedDC Constructs a buffered DC. """ @@ -4026,12 +4028,14 @@ class BufferedPaintDC(BufferedDC): + + """ def __repr__(self): return "<%s.%s; proxy of C++ wxBufferedPaintDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): """ - __init__(self, Window window, Bitmap buffer=NullBitmap) -> BufferedPaintDC + __init__(self, Window window, Bitmap buffer=NullBitmap, int style=BUFFER_CLIENT_AREA) -> BufferedPaintDC Create a buffered paint DC. As with `wx.BufferedDC`, you may either provide the bitmap to be used for buffering or let this object create diff --git a/wxPython/src/mac/_gdi_wrap.cpp b/wxPython/src/mac/_gdi_wrap.cpp index 936305ecfc..b3927dbdce 100644 --- a/wxPython/src/mac/_gdi_wrap.cpp +++ b/wxPython/src/mac/_gdi_wrap.cpp @@ -17232,11 +17232,13 @@ static PyObject *_wrap_new_BufferedDC__SWIG_0(PyObject *, PyObject *args) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; wxBitmap *arg2 = 0 ; + int arg3 = (int) wxBUFFER_CLIENT_AREA ; wxBufferedDC *result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:new_BufferedDC",&obj0,&obj1)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"OO|O:new_BufferedDC",&obj0,&obj1,&obj2)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -17247,10 +17249,16 @@ static PyObject *_wrap_new_BufferedDC__SWIG_0(PyObject *, PyObject *args) { } if (SWIG_arg_fail(2)) SWIG_fail; } + if (obj2) { + { + arg3 = (int)(SWIG_As_int(obj2)); + if (SWIG_arg_fail(3)) SWIG_fail; + } + } { if (!wxPyCheckForApp()) SWIG_fail; PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxBufferedDC *)new wxBufferedDC(arg1,(wxBitmap const &)*arg2); + result = (wxBufferedDC *)new wxBufferedDC(arg1,(wxBitmap const &)*arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -17266,22 +17274,30 @@ static PyObject *_wrap_new_BufferedDC__SWIG_1(PyObject *, PyObject *args) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; wxSize *arg2 = 0 ; + int arg3 = (int) wxBUFFER_CLIENT_AREA ; wxBufferedDC *result; wxSize temp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:new_BufferedDC",&obj0,&obj1)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"OO|O:new_BufferedDC",&obj0,&obj1,&obj2)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { arg2 = &temp2; if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; } + if (obj2) { + { + arg3 = (int)(SWIG_As_int(obj2)); + if (SWIG_arg_fail(3)) SWIG_fail; + } + } { if (!wxPyCheckForApp()) SWIG_fail; PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxBufferedDC *)new wxBufferedDC(arg1,(wxSize const &)*arg2); + result = (wxBufferedDC *)new wxBufferedDC(arg1,(wxSize const &)*arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -17295,14 +17311,14 @@ static PyObject *_wrap_new_BufferedDC__SWIG_1(PyObject *, PyObject *args) { static PyObject *_wrap_new_BufferedDC(PyObject *self, PyObject *args) { int argc; - PyObject *argv[3]; + PyObject *argv[4]; int ii; argc = PyObject_Length(args); - for (ii = 0; (ii < argc) && (ii < 2); ii++) { + for (ii = 0; (ii < argc) && (ii < 3); ii++) { argv[ii] = PyTuple_GetItem(args,ii); } - if (argc == 2) { + if ((argc >= 2) && (argc <= 3)) { int _v; { void *ptr; @@ -17324,11 +17340,17 @@ static PyObject *_wrap_new_BufferedDC(PyObject *self, PyObject *args) { } } if (_v) { - return _wrap_new_BufferedDC__SWIG_0(self,args); + if (argc <= 2) { + return _wrap_new_BufferedDC__SWIG_0(self,args); + } + _v = SWIG_Check_int(argv[2]); + if (_v) { + return _wrap_new_BufferedDC__SWIG_0(self,args); + } } } } - if (argc == 2) { + if ((argc >= 2) && (argc <= 3)) { int _v; { void *ptr; @@ -17344,7 +17366,13 @@ static PyObject *_wrap_new_BufferedDC(PyObject *self, PyObject *args) { _v = wxPySimple_typecheck(argv[1], wxT("wxSize"), 2); } if (_v) { - return _wrap_new_BufferedDC__SWIG_1(self,args); + if (argc <= 2) { + return _wrap_new_BufferedDC__SWIG_1(self,args); + } + _v = SWIG_Check_int(argv[2]); + if (_v) { + return _wrap_new_BufferedDC__SWIG_1(self,args); + } } } } @@ -17416,14 +17444,16 @@ static PyObject *_wrap_new_BufferedPaintDC(PyObject *, PyObject *args, PyObject wxWindow *arg1 = (wxWindow *) 0 ; wxBitmap const &arg2_defvalue = wxNullBitmap ; wxBitmap *arg2 = (wxBitmap *) &arg2_defvalue ; + int arg3 = (int) wxBUFFER_CLIENT_AREA ; wxBufferedPaintDC *result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { - (char *) "window",(char *) "buffer", NULL + (char *) "window",(char *) "buffer",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_BufferedPaintDC",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:new_BufferedPaintDC",kwnames,&obj0,&obj1,&obj2)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; if (obj1) { @@ -17436,10 +17466,16 @@ static PyObject *_wrap_new_BufferedPaintDC(PyObject *, PyObject *args, PyObject if (SWIG_arg_fail(2)) SWIG_fail; } } + if (obj2) { + { + arg3 = (int)(SWIG_As_int(obj2)); + if (SWIG_arg_fail(3)) SWIG_fail; + } + } { if (!wxPyCheckForApp()) SWIG_fail; PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxBufferedPaintDC *)new wxBufferedPaintDC(arg1,(wxBitmap const &)*arg2); + result = (wxBufferedPaintDC *)new wxBufferedPaintDC(arg1,(wxBitmap const &)*arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -23185,6 +23221,12 @@ SWIGEXPORT(void) SWIG_init(void) { { PyDict_SetItemString(d,"PLATFORM_MAC", SWIG_From_int((int)(wxPLATFORM_MAC))); } + { + PyDict_SetItemString(d,"BUFFER_VIRTUAL_AREA", SWIG_From_int((int)(wxBUFFER_VIRTUAL_AREA))); + } + { + PyDict_SetItemString(d,"BUFFER_CLIENT_AREA", SWIG_From_int((int)(wxBUFFER_CLIENT_AREA))); + } { PyDict_SetItemString(d,"IMAGELIST_DRAW_NORMAL", SWIG_From_int((int)(wxIMAGELIST_DRAW_NORMAL))); } diff --git a/wxPython/src/mac/xrc_wrap.cpp b/wxPython/src/mac/xrc_wrap.cpp index 7cc5dc9365..ef8ca47db0 100644 --- a/wxPython/src/mac/xrc_wrap.cpp +++ b/wxPython/src/mac/xrc_wrap.cpp @@ -4527,7 +4527,7 @@ static PyObject *_wrap_new_XmlDocumentFromStream(PyObject *, PyObject *args, PyO PyErr_Clear(); // clear the failure of the wxPyConvert above arg1 = wxPyCBInputStream_create(obj0, false); if (arg1 == NULL) { - PyErr_SetString(PyExc_TypeError, "Expected wxInputStream or Python file-like object."); + PyErr_SetString(PyExc_TypeError, "Expected wx.InputStream or Python file-like object."); SWIG_fail; } created1 = true; @@ -4549,8 +4549,7 @@ static PyObject *_wrap_new_XmlDocumentFromStream(PyObject *, PyObject *args, PyO } resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxXmlDocument, 1); { - if (created1) - delete arg1; + if (created1) delete arg1; } { if (temp2) @@ -4559,8 +4558,7 @@ static PyObject *_wrap_new_XmlDocumentFromStream(PyObject *, PyObject *args, PyO return resultobj; fail: { - if (created1) - delete arg1; + if (created1) delete arg1; } { if (temp2) @@ -4708,7 +4706,7 @@ static PyObject *_wrap_XmlDocument_LoadFromStream(PyObject *, PyObject *args, Py PyErr_Clear(); // clear the failure of the wxPyConvert above arg2 = wxPyCBInputStream_create(obj1, false); if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError, "Expected wxInputStream or Python file-like object."); + PyErr_SetString(PyExc_TypeError, "Expected wx.InputStream or Python file-like object."); SWIG_fail; } created2 = true; @@ -4732,8 +4730,7 @@ static PyObject *_wrap_XmlDocument_LoadFromStream(PyObject *, PyObject *args, Py resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); } { - if (created2) - delete arg2; + if (created2) delete arg2; } { if (temp3) @@ -4742,8 +4739,7 @@ static PyObject *_wrap_XmlDocument_LoadFromStream(PyObject *, PyObject *args, Py return resultobj; fail: { - if (created2) - delete arg2; + if (created2) delete arg2; } { if (temp3) diff --git a/wxPython/src/msw/_core.py b/wxPython/src/msw/_core.py index 1ecc6fd7ac..3187531399 100644 --- a/wxPython/src/msw/_core.py +++ b/wxPython/src/msw/_core.py @@ -1691,7 +1691,7 @@ class FSFile(Object): self.this = newobj.this self.thisown = 1 del newobj.thisown - self.thisown = 0 # It will normally be deleted by the user of the wxFileSystem + self.thisown = 0 # It will normally be deleted by the user of the wx.FileSystem def __del__(self, destroy=_core_.delete_FSFile): """__del__(self)""" diff --git a/wxPython/src/msw/_core_wrap.cpp b/wxPython/src/msw/_core_wrap.cpp index d312b16ddf..183b313542 100644 --- a/wxPython/src/msw/_core_wrap.cpp +++ b/wxPython/src/msw/_core_wrap.cpp @@ -1649,7 +1649,8 @@ static wxPyCoreAPI API = { wxPyOORClientData_dtor, wxPyCBInputStream_create, - + wxPyCBInputStream_copy, + wxPyInstance_Check, wxPySwigInstance_Check, @@ -7897,7 +7898,6 @@ static PyObject *_wrap_new_FSFile(PyObject *, PyObject *args, PyObject *kwargs) wxDateTime arg5 ; wxFSFile *result; wxPyInputStream *temp1 ; - bool created1 ; bool temp2 = false ; bool temp3 = false ; bool temp4 = false ; @@ -7913,16 +7913,14 @@ static PyObject *_wrap_new_FSFile(PyObject *, PyObject *args, PyObject *kwargs) if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:new_FSFile",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; { if (wxPyConvertSwigPtr(obj0, (void **)&temp1, wxT("wxPyInputStream"))) { - arg1 = temp1->m_wxis; - created1 = false; + arg1 = wxPyCBInputStream_copy((wxPyCBInputStream*)temp1->m_wxis); } else { PyErr_Clear(); // clear the failure of the wxPyConvert above - arg1 = wxPyCBInputStream_create(obj0, false); + arg1 = wxPyCBInputStream_create(obj0, true); if (arg1 == NULL) { - PyErr_SetString(PyExc_TypeError, "Expected wxInputStream or Python file-like object."); + PyErr_SetString(PyExc_TypeError, "Expected wx.InputStream or Python file-like object."); SWIG_fail; } - created1 = true; } } { @@ -7960,10 +7958,6 @@ static PyObject *_wrap_new_FSFile(PyObject *, PyObject *args, PyObject *kwargs) { resultobj = wxPyMake_wxObject(result, 1); } - { - if (created1) - delete arg1; - } { if (temp2) delete arg2; @@ -7978,10 +7972,6 @@ static PyObject *_wrap_new_FSFile(PyObject *, PyObject *args, PyObject *kwargs) } return resultobj; fail: - { - if (created1) - delete arg1; - } { if (temp2) delete arg2; @@ -10469,7 +10459,7 @@ static PyObject *_wrap_new_ImageFromStream(PyObject *, PyObject *args, PyObject PyErr_Clear(); // clear the failure of the wxPyConvert above arg1 = wxPyCBInputStream_create(obj0, false); if (arg1 == NULL) { - PyErr_SetString(PyExc_TypeError, "Expected wxInputStream or Python file-like object."); + PyErr_SetString(PyExc_TypeError, "Expected wx.InputStream or Python file-like object."); SWIG_fail; } created1 = true; @@ -10496,14 +10486,12 @@ static PyObject *_wrap_new_ImageFromStream(PyObject *, PyObject *args, PyObject } resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxImage, 1); { - if (created1) - delete arg1; + if (created1) delete arg1; } return resultobj; fail: { - if (created1) - delete arg1; + if (created1) delete arg1; } return NULL; } @@ -10534,7 +10522,7 @@ static PyObject *_wrap_new_ImageFromStreamMime(PyObject *, PyObject *args, PyObj PyErr_Clear(); // clear the failure of the wxPyConvert above arg1 = wxPyCBInputStream_create(obj0, false); if (arg1 == NULL) { - PyErr_SetString(PyExc_TypeError, "Expected wxInputStream or Python file-like object."); + PyErr_SetString(PyExc_TypeError, "Expected wx.InputStream or Python file-like object."); SWIG_fail; } created1 = true; @@ -10560,8 +10548,7 @@ static PyObject *_wrap_new_ImageFromStreamMime(PyObject *, PyObject *args, PyObj } resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxImage, 1); { - if (created1) - delete arg1; + if (created1) delete arg1; } { if (temp2) @@ -10570,8 +10557,7 @@ static PyObject *_wrap_new_ImageFromStreamMime(PyObject *, PyObject *args, PyObj return resultobj; fail: { - if (created1) - delete arg1; + if (created1) delete arg1; } { if (temp2) @@ -11792,7 +11778,7 @@ static PyObject *_wrap_Image_CanReadStream(PyObject *, PyObject *args, PyObject PyErr_Clear(); // clear the failure of the wxPyConvert above arg1 = wxPyCBInputStream_create(obj0, false); if (arg1 == NULL) { - PyErr_SetString(PyExc_TypeError, "Expected wxInputStream or Python file-like object."); + PyErr_SetString(PyExc_TypeError, "Expected wx.InputStream or Python file-like object."); SWIG_fail; } created1 = true; @@ -11809,14 +11795,12 @@ static PyObject *_wrap_Image_CanReadStream(PyObject *, PyObject *args, PyObject resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); } { - if (created1) - delete arg1; + if (created1) delete arg1; } return resultobj; fail: { - if (created1) - delete arg1; + if (created1) delete arg1; } return NULL; } @@ -11850,7 +11834,7 @@ static PyObject *_wrap_Image_LoadStream(PyObject *, PyObject *args, PyObject *kw PyErr_Clear(); // clear the failure of the wxPyConvert above arg2 = wxPyCBInputStream_create(obj1, false); if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError, "Expected wxInputStream or Python file-like object."); + PyErr_SetString(PyExc_TypeError, "Expected wx.InputStream or Python file-like object."); SWIG_fail; } created2 = true; @@ -11879,14 +11863,12 @@ static PyObject *_wrap_Image_LoadStream(PyObject *, PyObject *args, PyObject *kw resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); } { - if (created2) - delete arg2; + if (created2) delete arg2; } return resultobj; fail: { - if (created2) - delete arg2; + if (created2) delete arg2; } return NULL; } @@ -11921,7 +11903,7 @@ static PyObject *_wrap_Image_LoadMimeStream(PyObject *, PyObject *args, PyObject PyErr_Clear(); // clear the failure of the wxPyConvert above arg2 = wxPyCBInputStream_create(obj1, false); if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError, "Expected wxInputStream or Python file-like object."); + PyErr_SetString(PyExc_TypeError, "Expected wx.InputStream or Python file-like object."); SWIG_fail; } created2 = true; @@ -11949,8 +11931,7 @@ static PyObject *_wrap_Image_LoadMimeStream(PyObject *, PyObject *args, PyObject resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); } { - if (created2) - delete arg2; + if (created2) delete arg2; } { if (temp3) @@ -11959,8 +11940,7 @@ static PyObject *_wrap_Image_LoadMimeStream(PyObject *, PyObject *args, PyObject return resultobj; fail: { - if (created2) - delete arg2; + if (created2) delete arg2; } { if (temp3) diff --git a/wxPython/src/msw/_gdi.py b/wxPython/src/msw/_gdi.py index 9d77970153..9618c1fbe1 100644 --- a/wxPython/src/msw/_gdi.py +++ b/wxPython/src/msw/_gdi.py @@ -4049,6 +4049,8 @@ def MemoryDCFromDC(*args, **kwargs): #--------------------------------------------------------------------------- +BUFFER_VIRTUAL_AREA = _gdi_.BUFFER_VIRTUAL_AREA +BUFFER_CLIENT_AREA = _gdi_.BUFFER_CLIENT_AREA class BufferedDC(MemoryDC): """ This simple class provides a simple way to avoid flicker: when drawing @@ -4066,8 +4068,8 @@ class BufferedDC(MemoryDC): return "<%s.%s; proxy of C++ wxBufferedDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args): """ - __init__(self, DC dc, Bitmap buffer) -> BufferedDC - __init__(self, DC dc, Size area) -> BufferedDC + __init__(self, DC dc, Bitmap buffer, int style=BUFFER_CLIENT_AREA) -> BufferedDC + __init__(self, DC dc, Size area, int style=BUFFER_CLIENT_AREA) -> BufferedDC Constructs a buffered DC. """ @@ -4126,12 +4128,14 @@ class BufferedPaintDC(BufferedDC): + + """ def __repr__(self): return "<%s.%s; proxy of C++ wxBufferedPaintDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): """ - __init__(self, Window window, Bitmap buffer=NullBitmap) -> BufferedPaintDC + __init__(self, Window window, Bitmap buffer=NullBitmap, int style=BUFFER_CLIENT_AREA) -> BufferedPaintDC Create a buffered paint DC. As with `wx.BufferedDC`, you may either provide the bitmap to be used for buffering or let this object create diff --git a/wxPython/src/msw/_gdi_wrap.cpp b/wxPython/src/msw/_gdi_wrap.cpp index 8f4bcebc03..fce0b3109a 100644 --- a/wxPython/src/msw/_gdi_wrap.cpp +++ b/wxPython/src/msw/_gdi_wrap.cpp @@ -17905,11 +17905,13 @@ static PyObject *_wrap_new_BufferedDC__SWIG_0(PyObject *, PyObject *args) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; wxBitmap *arg2 = 0 ; + int arg3 = (int) wxBUFFER_CLIENT_AREA ; wxBufferedDC *result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:new_BufferedDC",&obj0,&obj1)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"OO|O:new_BufferedDC",&obj0,&obj1,&obj2)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -17920,10 +17922,16 @@ static PyObject *_wrap_new_BufferedDC__SWIG_0(PyObject *, PyObject *args) { } if (SWIG_arg_fail(2)) SWIG_fail; } + if (obj2) { + { + arg3 = (int)(SWIG_As_int(obj2)); + if (SWIG_arg_fail(3)) SWIG_fail; + } + } { if (!wxPyCheckForApp()) SWIG_fail; PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxBufferedDC *)new wxBufferedDC(arg1,(wxBitmap const &)*arg2); + result = (wxBufferedDC *)new wxBufferedDC(arg1,(wxBitmap const &)*arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -17939,22 +17947,30 @@ static PyObject *_wrap_new_BufferedDC__SWIG_1(PyObject *, PyObject *args) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; wxSize *arg2 = 0 ; + int arg3 = (int) wxBUFFER_CLIENT_AREA ; wxBufferedDC *result; wxSize temp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:new_BufferedDC",&obj0,&obj1)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"OO|O:new_BufferedDC",&obj0,&obj1,&obj2)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { arg2 = &temp2; if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; } + if (obj2) { + { + arg3 = (int)(SWIG_As_int(obj2)); + if (SWIG_arg_fail(3)) SWIG_fail; + } + } { if (!wxPyCheckForApp()) SWIG_fail; PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxBufferedDC *)new wxBufferedDC(arg1,(wxSize const &)*arg2); + result = (wxBufferedDC *)new wxBufferedDC(arg1,(wxSize const &)*arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -17968,14 +17984,14 @@ static PyObject *_wrap_new_BufferedDC__SWIG_1(PyObject *, PyObject *args) { static PyObject *_wrap_new_BufferedDC(PyObject *self, PyObject *args) { int argc; - PyObject *argv[3]; + PyObject *argv[4]; int ii; argc = PyObject_Length(args); - for (ii = 0; (ii < argc) && (ii < 2); ii++) { + for (ii = 0; (ii < argc) && (ii < 3); ii++) { argv[ii] = PyTuple_GetItem(args,ii); } - if (argc == 2) { + if ((argc >= 2) && (argc <= 3)) { int _v; { void *ptr; @@ -17997,11 +18013,17 @@ static PyObject *_wrap_new_BufferedDC(PyObject *self, PyObject *args) { } } if (_v) { - return _wrap_new_BufferedDC__SWIG_0(self,args); + if (argc <= 2) { + return _wrap_new_BufferedDC__SWIG_0(self,args); + } + _v = SWIG_Check_int(argv[2]); + if (_v) { + return _wrap_new_BufferedDC__SWIG_0(self,args); + } } } } - if (argc == 2) { + if ((argc >= 2) && (argc <= 3)) { int _v; { void *ptr; @@ -18017,7 +18039,13 @@ static PyObject *_wrap_new_BufferedDC(PyObject *self, PyObject *args) { _v = wxPySimple_typecheck(argv[1], wxT("wxSize"), 2); } if (_v) { - return _wrap_new_BufferedDC__SWIG_1(self,args); + if (argc <= 2) { + return _wrap_new_BufferedDC__SWIG_1(self,args); + } + _v = SWIG_Check_int(argv[2]); + if (_v) { + return _wrap_new_BufferedDC__SWIG_1(self,args); + } } } } @@ -18089,14 +18117,16 @@ static PyObject *_wrap_new_BufferedPaintDC(PyObject *, PyObject *args, PyObject wxWindow *arg1 = (wxWindow *) 0 ; wxBitmap const &arg2_defvalue = wxNullBitmap ; wxBitmap *arg2 = (wxBitmap *) &arg2_defvalue ; + int arg3 = (int) wxBUFFER_CLIENT_AREA ; wxBufferedPaintDC *result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { - (char *) "window",(char *) "buffer", NULL + (char *) "window",(char *) "buffer",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_BufferedPaintDC",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:new_BufferedPaintDC",kwnames,&obj0,&obj1,&obj2)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; if (obj1) { @@ -18109,10 +18139,16 @@ static PyObject *_wrap_new_BufferedPaintDC(PyObject *, PyObject *args, PyObject if (SWIG_arg_fail(2)) SWIG_fail; } } + if (obj2) { + { + arg3 = (int)(SWIG_As_int(obj2)); + if (SWIG_arg_fail(3)) SWIG_fail; + } + } { if (!wxPyCheckForApp()) SWIG_fail; PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxBufferedPaintDC *)new wxBufferedPaintDC(arg1,(wxBitmap const &)*arg2); + result = (wxBufferedPaintDC *)new wxBufferedPaintDC(arg1,(wxBitmap const &)*arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -23930,6 +23966,12 @@ SWIGEXPORT(void) SWIG_init(void) { { PyDict_SetItemString(d,"PLATFORM_MAC", SWIG_From_int((int)(wxPLATFORM_MAC))); } + { + PyDict_SetItemString(d,"BUFFER_VIRTUAL_AREA", SWIG_From_int((int)(wxBUFFER_VIRTUAL_AREA))); + } + { + PyDict_SetItemString(d,"BUFFER_CLIENT_AREA", SWIG_From_int((int)(wxBUFFER_CLIENT_AREA))); + } { PyDict_SetItemString(d,"IMAGELIST_DRAW_NORMAL", SWIG_From_int((int)(wxIMAGELIST_DRAW_NORMAL))); } diff --git a/wxPython/src/msw/xrc_wrap.cpp b/wxPython/src/msw/xrc_wrap.cpp index 5c47c6a40d..c0159f9434 100644 --- a/wxPython/src/msw/xrc_wrap.cpp +++ b/wxPython/src/msw/xrc_wrap.cpp @@ -4527,7 +4527,7 @@ static PyObject *_wrap_new_XmlDocumentFromStream(PyObject *, PyObject *args, PyO PyErr_Clear(); // clear the failure of the wxPyConvert above arg1 = wxPyCBInputStream_create(obj0, false); if (arg1 == NULL) { - PyErr_SetString(PyExc_TypeError, "Expected wxInputStream or Python file-like object."); + PyErr_SetString(PyExc_TypeError, "Expected wx.InputStream or Python file-like object."); SWIG_fail; } created1 = true; @@ -4549,8 +4549,7 @@ static PyObject *_wrap_new_XmlDocumentFromStream(PyObject *, PyObject *args, PyO } resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxXmlDocument, 1); { - if (created1) - delete arg1; + if (created1) delete arg1; } { if (temp2) @@ -4559,8 +4558,7 @@ static PyObject *_wrap_new_XmlDocumentFromStream(PyObject *, PyObject *args, PyO return resultobj; fail: { - if (created1) - delete arg1; + if (created1) delete arg1; } { if (temp2) @@ -4708,7 +4706,7 @@ static PyObject *_wrap_XmlDocument_LoadFromStream(PyObject *, PyObject *args, Py PyErr_Clear(); // clear the failure of the wxPyConvert above arg2 = wxPyCBInputStream_create(obj1, false); if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError, "Expected wxInputStream or Python file-like object."); + PyErr_SetString(PyExc_TypeError, "Expected wx.InputStream or Python file-like object."); SWIG_fail; } created2 = true; @@ -4732,8 +4730,7 @@ static PyObject *_wrap_XmlDocument_LoadFromStream(PyObject *, PyObject *args, Py resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); } { - if (created2) - delete arg2; + if (created2) delete arg2; } { if (temp3) @@ -4742,8 +4739,7 @@ static PyObject *_wrap_XmlDocument_LoadFromStream(PyObject *, PyObject *args, Py return resultobj; fail: { - if (created2) - delete arg2; + if (created2) delete arg2; } { if (temp3) diff --git a/wxPython/wxPython/_gdi.py b/wxPython/wxPython/_gdi.py index e6d25de5b8..0e09dad35d 100644 --- a/wxPython/wxPython/_gdi.py +++ b/wxPython/wxPython/_gdi.py @@ -488,6 +488,8 @@ wxDCPtr = wx._gdi.DCPtr wxMemoryDC = wx._gdi.MemoryDC wxMemoryDCPtr = wx._gdi.MemoryDCPtr wxMemoryDCFromDC = wx._gdi.MemoryDCFromDC +wxBUFFER_VIRTUAL_AREA = wx._gdi.BUFFER_VIRTUAL_AREA +wxBUFFER_CLIENT_AREA = wx._gdi.BUFFER_CLIENT_AREA wxBufferedDC = wx._gdi.BufferedDC wxBufferedDCPtr = wx._gdi.BufferedDCPtr wxBufferedPaintDC = wx._gdi.BufferedPaintDC -- 2.47.2