From 0ffb2aa6e47721eebc485931efaad028b51b0565 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Fri, 13 Feb 2004 20:23:25 +0000 Subject: [PATCH] reSWIGged git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/contrib/gizmos/mac/gizmos_wrap.cpp | 6 +- wxPython/contrib/stc/stc_wrap.cpp | 2 +- wxPython/src/mac/controls.py | 10 +- wxPython/src/mac/controls_wrap.cpp | 152 ++++++-- wxPython/src/mac/core_wrap.cpp | 6 +- wxPython/src/mac/gdi.py | 58 +-- wxPython/src/mac/gdi_wrap.cpp | 398 +++++++++++++++++--- wxPython/src/mac/grid_wrap.cpp | 6 +- wxPython/src/mac/html.py | 12 + wxPython/src/mac/html_wrap.cpp | 89 +++++ wxPython/src/mac/misc_wrap.cpp | 14 +- wxPython/src/mac/windows.py | 9 + wxPython/src/mac/windows_wrap.cpp | 126 +++++-- wxPython/src/msw/controls.py | 12 + wxPython/src/msw/controls_wrap.cpp | 131 +++++++ wxPython/src/msw/gdi.py | 17 +- wxPython/src/msw/gdi_wrap.cpp | 50 +-- 17 files changed, 890 insertions(+), 208 deletions(-) diff --git a/wxPython/contrib/gizmos/mac/gizmos_wrap.cpp b/wxPython/contrib/gizmos/mac/gizmos_wrap.cpp index 45a23166b9..f43986ef93 100644 --- a/wxPython/contrib/gizmos/mac/gizmos_wrap.cpp +++ b/wxPython/contrib/gizmos/mac/gizmos_wrap.cpp @@ -1036,6 +1036,7 @@ static PyObject *_wrap_EditableListBox_SetStrings(PyObject *self, PyObject *args PyObject *resultobj; wxEditableListBox *arg1 = (wxEditableListBox *) 0 ; wxArrayString *arg2 = 0 ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -1050,6 +1051,7 @@ static PyObject *_wrap_EditableListBox_SetStrings(PyObject *self, PyObject *args SWIG_fail; } arg2 = new wxArrayString; + temp2 = True; int i, len=PySequence_Length(obj1); for (i=0; iUnselectItem((wxTreeItemId const &)*arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_TreeCtrl_UnselectAll(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ; @@ -25547,6 +25603,44 @@ static PyObject *_wrap_TreeCtrl_UnselectAll(PyObject *self, PyObject *args, PyOb static PyObject *_wrap_TreeCtrl_SelectItem(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ; + wxTreeItemId *arg2 = 0 ; + bool arg3 = (bool) True ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "item",(char *) "select", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:TreeCtrl_SelectItem",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxTreeItemId,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (arg2 == NULL) { + PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + } + if (obj2) { + { + arg3 = (bool) SWIG_PyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SelectItem((wxTreeItemId const &)*arg2,arg3); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_TreeCtrl_ToggleItemSelection(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ; wxTreeItemId *arg2 = 0 ; @@ -25556,7 +25650,7 @@ static PyObject *_wrap_TreeCtrl_SelectItem(PyObject *self, PyObject *args, PyObj (char *) "self",(char *) "item", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeCtrl_SelectItem",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeCtrl_ToggleItemSelection",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxTreeItemId,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { @@ -25564,7 +25658,7 @@ static PyObject *_wrap_TreeCtrl_SelectItem(PyObject *self, PyObject *args, PyObj } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SelectItem((wxTreeItemId const &)*arg2); + (arg1)->ToggleItemSelection((wxTreeItemId const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -29624,8 +29718,10 @@ static PyMethodDef SwigMethods[] = { { (char *)"TreeCtrl_CollapseAndReset", (PyCFunction) _wrap_TreeCtrl_CollapseAndReset, METH_VARARGS | METH_KEYWORDS }, { (char *)"TreeCtrl_Toggle", (PyCFunction) _wrap_TreeCtrl_Toggle, METH_VARARGS | METH_KEYWORDS }, { (char *)"TreeCtrl_Unselect", (PyCFunction) _wrap_TreeCtrl_Unselect, METH_VARARGS | METH_KEYWORDS }, + { (char *)"TreeCtrl_UnselectItem", (PyCFunction) _wrap_TreeCtrl_UnselectItem, METH_VARARGS | METH_KEYWORDS }, { (char *)"TreeCtrl_UnselectAll", (PyCFunction) _wrap_TreeCtrl_UnselectAll, METH_VARARGS | METH_KEYWORDS }, { (char *)"TreeCtrl_SelectItem", (PyCFunction) _wrap_TreeCtrl_SelectItem, METH_VARARGS | METH_KEYWORDS }, + { (char *)"TreeCtrl_ToggleItemSelection", (PyCFunction) _wrap_TreeCtrl_ToggleItemSelection, METH_VARARGS | METH_KEYWORDS }, { (char *)"TreeCtrl_EnsureVisible", (PyCFunction) _wrap_TreeCtrl_EnsureVisible, METH_VARARGS | METH_KEYWORDS }, { (char *)"TreeCtrl_ScrollTo", (PyCFunction) _wrap_TreeCtrl_ScrollTo, METH_VARARGS | METH_KEYWORDS }, { (char *)"TreeCtrl_EditLabel", (PyCFunction) _wrap_TreeCtrl_EditLabel, METH_VARARGS | METH_KEYWORDS }, diff --git a/wxPython/src/mac/core_wrap.cpp b/wxPython/src/mac/core_wrap.cpp index 2c79f39b98..070cda9f42 100644 --- a/wxPython/src/mac/core_wrap.cpp +++ b/wxPython/src/mac/core_wrap.cpp @@ -31281,6 +31281,7 @@ static PyObject *_wrap_ItemContainer_AppendItems(PyObject *self, PyObject *args, PyObject *resultobj; wxItemContainer *arg1 = (wxItemContainer *) 0 ; wxArrayString *arg2 = 0 ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -31295,6 +31296,7 @@ static PyObject *_wrap_ItemContainer_AppendItems(PyObject *self, PyObject *args, SWIG_fail; } arg2 = new wxArrayString; + temp2 = True; int i, len=PySequence_Length(obj1); for (i=0; i PyObject""" return _gdi.Pen_GetDashes(*args, **kwargs) + def __eq__(*args, **kwargs): + """__eq__(Pen pen) -> bool""" + return _gdi.Pen___eq__(*args, **kwargs) + def __nonzero__(self): return self.Ok() class PenPtr(Pen): @@ -556,9 +560,10 @@ class Mask(core.Object): return "<%s.%s; proxy of C++ wxMask instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): """ - __init__(Bitmap bitmap) -> Mask + __init__(Bitmap bitmap, Colour colour=NullColour) -> Mask - Constructs a mask from a monochrome bitmap. + Constructs a mask from a bitmap and a colour in that bitmap that indicates + the transparent portions of the mask, by default BLACK is used. """ newobj = _gdi.new_Mask(*args, **kwargs) self.this = newobj.this @@ -572,17 +577,7 @@ class MaskPtr(Mask): self.__class__ = Mask _gdi.Mask_swigregister(MaskPtr) -def MaskColour(*args, **kwargs): - """ - MaskColour(Bitmap bitmap, Colour colour) -> Mask - - Constructs a mask from a bitmap and a colour in that bitmap that indicates the - background. - """ - val = _gdi.new_MaskColour(*args, **kwargs) - val.thisown = 1 - return val - +MaskColour = Mask class Icon(GDIObject): def __repr__(self): return "<%s.%s; proxy of C++ wxIcon instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) @@ -2086,8 +2081,8 @@ _gdi.EncodingConverter_swigregister(EncodingConverterPtr) def GetTranslation(*args): """ - GetTranslation(String sz) -> String - GetTranslation(String sz1, String sz2, size_t n) -> String + GetTranslation(String str) -> String + GetTranslation(String str, String strPlural, size_t n) -> String """ return _gdi.GetTranslation(*args) @@ -2436,6 +2431,10 @@ class DC(core.Object): """ return _gdi.DC_GetMultiLineTextExtent(*args, **kwargs) + def GetPartialTextExtents(*args, **kwargs): + """GetPartialTextExtents(String text) -> wxArrayInt""" + return _gdi.DC_GetPartialTextExtents(*args, **kwargs) + def GetSize(*args, **kwargs): """ GetSize() -> Size @@ -2811,16 +2810,22 @@ def MemoryDCFromDC(*args, **kwargs): #--------------------------------------------------------------------------- +BUFFER_DC_OVERWRITE_BG = _gdi.BUFFER_DC_OVERWRITE_BG +BUFFER_DC_PRESERVE_BG = _gdi.BUFFER_DC_PRESERVE_BG +BUFFER_DC_DEFAULT = _gdi.BUFFER_DC_DEFAULT class BufferedDC(MemoryDC): def __repr__(self): return "<%s.%s; proxy of C++ wxBufferedDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) - def __init__(self, *args, **kwargs): - """__init__(DC dc, Bitmap buffer) -> BufferedDC""" - newobj = _gdi.new_BufferedDC(*args, **kwargs) + def __init__(self, *args): + """ + __init__(DC dc, Bitmap buffer) -> BufferedDC + __init__(DC dc, Size area, int flags=BUFFER_DC_DEFAULT) -> BufferedDC + """ + newobj = _gdi.new_BufferedDC(*args) self.this = newobj.this self.thisown = 1 del newobj.thisown - self._dc = args[0] # save a ref so the other dc will not be deleted before self + val._dc = args[0] # save a ref so the other dc will not be deleted before self def UnMask(*args, **kwargs): """UnMask()""" @@ -2834,9 +2839,9 @@ class BufferedDCPtr(BufferedDC): self.__class__ = BufferedDC _gdi.BufferedDC_swigregister(BufferedDCPtr) -def BufferedDCInternalBuffer(*args, **kwargs): - """BufferedDCInternalBuffer(DC dc, Size area) -> BufferedDC""" - val = _gdi.new_BufferedDCInternalBuffer(*args, **kwargs) +def BufferedDCInternalBuffer(*args): + """BufferedDCInternalBuffer(DC dc, Size area, int flags=BUFFER_DC_DEFAULT) -> BufferedDC""" + val = _gdi.new_BufferedDCInternalBuffer(*args) val.thisown = 1 val._dc = args[0] # save a ref so the other dc will not be deleted before self return val @@ -2844,9 +2849,12 @@ def BufferedDCInternalBuffer(*args, **kwargs): 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__(Window window, Bitmap buffer=NullBitmap) -> BufferedPaintDC""" - newobj = _gdi.new_BufferedPaintDC(*args, **kwargs) + def __init__(self, *args): + """ + __init__(Window window, Bitmap buffer) -> BufferedPaintDC + __init__(Window window, int flags=BUFFER_DC_DEFAULT) -> BufferedPaintDC + """ + newobj = _gdi.new_BufferedPaintDC(*args) self.this = newobj.this self.thisown = 1 del newobj.thisown diff --git a/wxPython/src/mac/gdi_wrap.cpp b/wxPython/src/mac/gdi_wrap.cpp index ff2cbf659e..0617e87738 100644 --- a/wxPython/src/mac/gdi_wrap.cpp +++ b/wxPython/src/mac/gdi_wrap.cpp @@ -485,6 +485,12 @@ void wxBitmap_SetMaskColour(wxBitmap *self,wxColour const &colour){ wxMask *mask = new wxMask(*self, colour); self->SetMask(mask); } +wxMask *new_wxMask(wxBitmap const &bitmap,wxColour const &colour){ + if ( !colour.Ok() ) + return new wxMask(bitmap, *wxBLACK); + else + return new wxMask(bitmap, colour); + } #include @@ -668,6 +674,11 @@ wxRect wxDC_GetClippingRect(wxDC *self){ self->GetClippingBox(rect); return rect; } +wxArrayInt wxDC_GetPartialTextExtents(wxDC *self,wxString const &text){ + wxArrayInt widths; + self->GetPartialTextExtents(text, widths); + return widths; + } PyObject *wxDC__DrawPointList(wxDC *self,PyObject *pyCoords,PyObject *pyPens,PyObject *pyBrushes){ return wxPyDrawXXXList(*self, wxPyDrawXXXPoint, pyCoords, pyPens, pyBrushes); } @@ -1924,6 +1935,37 @@ static PyObject *_wrap_Pen_GetDashes(PyObject *self, PyObject *args, PyObject *k } +static PyObject *_wrap_Pen___eq__(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxPen *arg1 = (wxPen *) 0 ; + wxPen *arg2 = 0 ; + bool result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "pen", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Pen___eq__",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (arg2 == NULL) { + PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->operator ==((wxPen const &)*arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + return resultobj; + fail: + return NULL; +} + + static PyObject * Pen_swigregister(PyObject *self, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; @@ -3087,35 +3129,8 @@ static PyObject * Bitmap_swigregister(PyObject *self, PyObject *args) { static PyObject *_wrap_new_Mask(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxBitmap *arg1 = 0 ; - wxMask *result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "bitmap", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_Mask",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg1 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxMask *)new wxMask((wxBitmap const &)*arg1); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxMask, 1); - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_new_MaskColour(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxBitmap *arg1 = 0 ; - wxColour *arg2 = 0 ; + wxColour const &arg2_defvalue = wxNullColour ; + wxColour *arg2 = (wxColour *) &arg2_defvalue ; wxMask *result; wxColour temp2 ; PyObject * obj0 = 0 ; @@ -3124,18 +3139,20 @@ static PyObject *_wrap_new_MaskColour(PyObject *self, PyObject *args, PyObject * (char *) "bitmap",(char *) "colour", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:new_MaskColour",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_Mask",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg1 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } - { - arg2 = &temp2; - if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail; + if (obj1) { + { + arg2 = &temp2; + if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxMask *)new wxMask((wxBitmap const &)*arg1,(wxColour const &)*arg2); + result = (wxMask *)new_wxMask((wxBitmap const &)*arg1,(wxColour const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -12647,6 +12664,55 @@ static PyObject *_wrap_DC_GetMultiLineTextExtent(PyObject *self, PyObject *args, } +static PyObject *_wrap_DC_GetPartialTextExtents(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxDC *arg1 = (wxDC *) 0 ; + wxString *arg2 = 0 ; + wxArrayInt result; + bool temp2 = False ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "text", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_GetPartialTextExtents",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = wxString_in_helper(obj1); + if (arg2 == NULL) SWIG_fail; + temp2 = True; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = wxDC_GetPartialTextExtents(arg1,(wxString const &)*arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = PyList_New(0); + size_t idx; + for (idx = 0; idx < (&result)->GetCount(); idx += 1) { + PyObject* val = PyInt_FromLong( (&result)->Item(idx) ); + PyList_Append(resultobj, val); + Py_DECREF(val); + } + } + { + if (temp2) + delete arg2; + } + return resultobj; + fail: + { + if (temp2) + delete arg2; + } + return NULL; +} + + static PyObject *_wrap_DC_GetSize(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; @@ -14478,18 +14544,15 @@ static PyObject * MemoryDC_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static PyObject *_wrap_new_BufferedDC(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_new_BufferedDC__SWIG_0(PyObject *self, PyObject *args) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; wxBitmap *arg2 = 0 ; wxBufferedDC *result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "dc",(char *) "buffer", NULL - }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:new_BufferedDC",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"OO:new_BufferedDC",&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { @@ -14509,27 +14572,144 @@ static PyObject *_wrap_new_BufferedDC(PyObject *self, PyObject *args, PyObject * } -static PyObject *_wrap_new_BufferedDCInternalBuffer(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_new_BufferedDC__SWIG_1(PyObject *self, PyObject *args) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; wxSize *arg2 = 0 ; + int arg3 = (int) wxBUFFER_DC_DEFAULT ; wxBufferedDC *result; wxSize temp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "dc",(char *) "area", NULL - }; + PyObject * obj2 = 0 ; + + if(!PyArg_ParseTuple(args,(char *)"OO|O:new_BufferedDC",&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxBufferedDC *)new wxBufferedDC(arg1,(wxSize const &)*arg2,arg3); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxBufferedDC, 1); + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_new_BufferedDC(PyObject *self, PyObject *args) { + int argc; + PyObject *argv[4]; + int ii; + + argc = PyObject_Length(args); + for (ii = 0; (ii < argc) && (ii < 3); ii++) { + argv[ii] = PyTuple_GetItem(args,ii); + } + if (argc == 2) { + int _v; + { + void *ptr; + if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_wxDC, 0) == -1) { + _v = 0; + PyErr_Clear(); + } else { + _v = 1; + } + } + if (_v) { + { + void *ptr; + if (SWIG_ConvertPtr(argv[1], (void **) &ptr, SWIGTYPE_p_wxBitmap, 0) == -1) { + _v = 0; + PyErr_Clear(); + } else { + _v = 1; + } + } + if (_v) { + return _wrap_new_BufferedDC__SWIG_0(self,args); + } + } + } + if ((argc >= 2) && (argc <= 3)) { + int _v; + { + void *ptr; + if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_wxDC, 0) == -1) { + _v = 0; + PyErr_Clear(); + } else { + _v = 1; + } + } + if (_v) { + { + _v = wxPySimple_typecheck(argv[1], wxT("wxSize"), 2); + } + if (_v) { + if (argc <= 2) { + return _wrap_new_BufferedDC__SWIG_1(self,args); + } + { + SWIG_PyObj_AsInt(argv[2]); + if (PyErr_Occurred()) { + _v = 0; + PyErr_Clear(); + } else { + _v = 1; + } + } + if (_v) { + return _wrap_new_BufferedDC__SWIG_1(self,args); + } + } + } + } - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:new_BufferedDCInternalBuffer",kwnames,&obj0,&obj1)) goto fail; + PyErr_SetString(PyExc_TypeError,"No matching function for overloaded 'new_BufferedDC'"); + return NULL; +} + + +static PyObject *_wrap_new_BufferedDCInternalBuffer(PyObject *self, PyObject *args) { + PyObject *resultobj; + wxDC *arg1 = (wxDC *) 0 ; + wxSize *arg2 = 0 ; + int arg3 = (int) wxBUFFER_DC_DEFAULT ; + wxBufferedDC *result; + wxSize temp2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + + if(!PyArg_ParseTuple(args,(char *)"OO|O:new_BufferedDCInternalBuffer",&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) 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; @@ -14572,29 +14752,53 @@ static PyObject * BufferedDC_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static PyObject *_wrap_new_BufferedPaintDC(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_new_BufferedPaintDC__SWIG_0(PyObject *self, PyObject *args) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; - wxBitmap const &arg2_defvalue = wxNullBitmap ; - wxBitmap *arg2 = (wxBitmap *) &arg2_defvalue ; + wxBitmap *arg2 = 0 ; wxBufferedPaintDC *result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "window",(char *) "buffer", NULL - }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_BufferedPaintDC",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"OO:new_BufferedPaintDC",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (arg2 == NULL) { + PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxBufferedPaintDC *)new wxBufferedPaintDC(arg1,(wxBitmap const &)*arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxBufferedPaintDC, 1); + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_new_BufferedPaintDC__SWIG_1(PyObject *self, PyObject *args) { + PyObject *resultobj; + wxWindow *arg1 = (wxWindow *) 0 ; + int arg2 = (int) wxBUFFER_DC_DEFAULT ; + wxBufferedPaintDC *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + + if(!PyArg_ParseTuple(args,(char *)"O|O:new_BufferedPaintDC",&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxBufferedPaintDC *)new wxBufferedPaintDC(arg1,(wxBitmap const &)*arg2); + result = (wxBufferedPaintDC *)new wxBufferedPaintDC(arg1,arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -14606,6 +14810,76 @@ static PyObject *_wrap_new_BufferedPaintDC(PyObject *self, PyObject *args, PyObj } +static PyObject *_wrap_new_BufferedPaintDC(PyObject *self, PyObject *args) { + int argc; + PyObject *argv[3]; + int ii; + + argc = PyObject_Length(args); + for (ii = 0; (ii < argc) && (ii < 2); ii++) { + argv[ii] = PyTuple_GetItem(args,ii); + } + if ((argc >= 1) && (argc <= 2)) { + int _v; + { + void *ptr; + if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_wxWindow, 0) == -1) { + _v = 0; + PyErr_Clear(); + } else { + _v = 1; + } + } + if (_v) { + if (argc <= 1) { + return _wrap_new_BufferedPaintDC__SWIG_1(self,args); + } + { + SWIG_PyObj_AsInt(argv[1]); + if (PyErr_Occurred()) { + _v = 0; + PyErr_Clear(); + } else { + _v = 1; + } + } + if (_v) { + return _wrap_new_BufferedPaintDC__SWIG_1(self,args); + } + } + } + if (argc == 2) { + int _v; + { + void *ptr; + if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_wxWindow, 0) == -1) { + _v = 0; + PyErr_Clear(); + } else { + _v = 1; + } + } + if (_v) { + { + void *ptr; + if (SWIG_ConvertPtr(argv[1], (void **) &ptr, SWIGTYPE_p_wxBitmap, 0) == -1) { + _v = 0; + PyErr_Clear(); + } else { + _v = 1; + } + } + if (_v) { + return _wrap_new_BufferedPaintDC__SWIG_0(self,args); + } + } + } + + PyErr_SetString(PyExc_TypeError,"No matching function for overloaded 'new_BufferedPaintDC'"); + return NULL; +} + + static PyObject * BufferedPaintDC_swigregister(PyObject *self, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; @@ -17418,6 +17692,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"Pen_SetWidth", (PyCFunction) _wrap_Pen_SetWidth, METH_VARARGS | METH_KEYWORDS }, { (char *)"Pen_SetDashes", (PyCFunction) _wrap_Pen_SetDashes, METH_VARARGS | METH_KEYWORDS }, { (char *)"Pen_GetDashes", (PyCFunction) _wrap_Pen_GetDashes, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Pen___eq__", (PyCFunction) _wrap_Pen___eq__, METH_VARARGS | METH_KEYWORDS }, { (char *)"Pen_swigregister", Pen_swigregister, METH_VARARGS }, { (char *)"new_PyPen", (PyCFunction) _wrap_new_PyPen, METH_VARARGS | METH_KEYWORDS }, { (char *)"delete_PyPen", (PyCFunction) _wrap_delete_PyPen, METH_VARARGS | METH_KEYWORDS }, @@ -17459,7 +17734,6 @@ static PyMethodDef SwigMethods[] = { { (char *)"Bitmap_SetDepth", (PyCFunction) _wrap_Bitmap_SetDepth, METH_VARARGS | METH_KEYWORDS }, { (char *)"Bitmap_swigregister", Bitmap_swigregister, METH_VARARGS }, { (char *)"new_Mask", (PyCFunction) _wrap_new_Mask, METH_VARARGS | METH_KEYWORDS }, - { (char *)"new_MaskColour", (PyCFunction) _wrap_new_MaskColour, METH_VARARGS | METH_KEYWORDS }, { (char *)"Mask_swigregister", Mask_swigregister, METH_VARARGS }, { (char *)"new_Icon", (PyCFunction) _wrap_new_Icon, METH_VARARGS | METH_KEYWORDS }, { (char *)"delete_Icon", (PyCFunction) _wrap_delete_Icon, METH_VARARGS | METH_KEYWORDS }, @@ -17743,6 +18017,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"DC_GetTextExtent", (PyCFunction) _wrap_DC_GetTextExtent, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_GetFullTextExtent", (PyCFunction) _wrap_DC_GetFullTextExtent, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_GetMultiLineTextExtent", (PyCFunction) _wrap_DC_GetMultiLineTextExtent, METH_VARARGS | METH_KEYWORDS }, + { (char *)"DC_GetPartialTextExtents", (PyCFunction) _wrap_DC_GetPartialTextExtents, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_GetSize", (PyCFunction) _wrap_DC_GetSize, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_GetSizeTuple", (PyCFunction) _wrap_DC_GetSizeTuple, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_GetSizeMM", (PyCFunction) _wrap_DC_GetSizeMM, METH_VARARGS | METH_KEYWORDS }, @@ -17804,11 +18079,11 @@ static PyMethodDef SwigMethods[] = { { (char *)"new_MemoryDCFromDC", (PyCFunction) _wrap_new_MemoryDCFromDC, METH_VARARGS | METH_KEYWORDS }, { (char *)"MemoryDC_SelectObject", (PyCFunction) _wrap_MemoryDC_SelectObject, METH_VARARGS | METH_KEYWORDS }, { (char *)"MemoryDC_swigregister", MemoryDC_swigregister, METH_VARARGS }, - { (char *)"new_BufferedDC", (PyCFunction) _wrap_new_BufferedDC, METH_VARARGS | METH_KEYWORDS }, - { (char *)"new_BufferedDCInternalBuffer", (PyCFunction) _wrap_new_BufferedDCInternalBuffer, METH_VARARGS | METH_KEYWORDS }, + { (char *)"new_BufferedDC", _wrap_new_BufferedDC, METH_VARARGS }, + { (char *)"new_BufferedDCInternalBuffer", _wrap_new_BufferedDCInternalBuffer, METH_VARARGS }, { (char *)"BufferedDC_UnMask", (PyCFunction) _wrap_BufferedDC_UnMask, METH_VARARGS | METH_KEYWORDS }, { (char *)"BufferedDC_swigregister", BufferedDC_swigregister, METH_VARARGS }, - { (char *)"new_BufferedPaintDC", (PyCFunction) _wrap_new_BufferedPaintDC, METH_VARARGS | METH_KEYWORDS }, + { (char *)"new_BufferedPaintDC", _wrap_new_BufferedPaintDC, METH_VARARGS }, { (char *)"BufferedPaintDC_swigregister", BufferedPaintDC_swigregister, METH_VARARGS }, { (char *)"new_ScreenDC", (PyCFunction) _wrap_new_ScreenDC, METH_VARARGS | METH_KEYWORDS }, { (char *)"ScreenDC_StartDrawingOnTopWin", (PyCFunction) _wrap_ScreenDC_StartDrawingOnTopWin, METH_VARARGS | METH_KEYWORDS }, @@ -18811,6 +19086,9 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d,"PLATFORM_WINDOWS", SWIG_PyObj_FromInt((int)wxPLATFORM_WINDOWS)); PyDict_SetItemString(d,"PLATFORM_OS2", SWIG_PyObj_FromInt((int)wxPLATFORM_OS2)); PyDict_SetItemString(d,"PLATFORM_MAC", SWIG_PyObj_FromInt((int)wxPLATFORM_MAC)); + PyDict_SetItemString(d,"BUFFER_DC_OVERWRITE_BG", SWIG_PyObj_FromInt((int)wxBUFFER_DC_OVERWRITE_BG)); + PyDict_SetItemString(d,"BUFFER_DC_PRESERVE_BG", SWIG_PyObj_FromInt((int)wxBUFFER_DC_PRESERVE_BG)); + PyDict_SetItemString(d,"BUFFER_DC_DEFAULT", SWIG_PyObj_FromInt((int)wxBUFFER_DC_DEFAULT)); PyDict_SetItemString(d,"IMAGELIST_DRAW_NORMAL", SWIG_PyObj_FromInt((int)wxIMAGELIST_DRAW_NORMAL)); PyDict_SetItemString(d,"IMAGELIST_DRAW_TRANSPARENT", SWIG_PyObj_FromInt((int)wxIMAGELIST_DRAW_TRANSPARENT)); PyDict_SetItemString(d,"IMAGELIST_DRAW_SELECTED", SWIG_PyObj_FromInt((int)wxIMAGELIST_DRAW_SELECTED)); diff --git a/wxPython/src/mac/grid_wrap.cpp b/wxPython/src/mac/grid_wrap.cpp index 12bec787a8..63962f9d02 100644 --- a/wxPython/src/mac/grid_wrap.cpp +++ b/wxPython/src/mac/grid_wrap.cpp @@ -8586,6 +8586,7 @@ static PyObject *_wrap_Grid_GetTextBoxSize(PyObject *self, PyObject *args, PyObj wxArrayString *arg3 = 0 ; long *arg4 = (long *) 0 ; long *arg5 = (long *) 0 ; + bool temp3 = False ; long temp4 ; long temp5 ; PyObject * obj0 = 0 ; @@ -8609,6 +8610,7 @@ static PyObject *_wrap_Grid_GetTextBoxSize(PyObject *self, PyObject *args, PyObj SWIG_fail; } arg3 = new wxArrayString; + temp3 = True; int i, len=PySequence_Length(obj2); for (i=0; iSelectWord((wxPoint const &)*arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_HtmlWindow_SelectLine(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ; + wxPoint *arg2 = 0 ; + wxPoint temp2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "pos", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlWindow_SelectLine",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyHtmlWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SelectLine((wxPoint const &)*arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_HtmlWindow_SelectAll(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:HtmlWindow_SelectAll",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyHtmlWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SelectAll(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_HtmlWindow_base_OnLinkClicked(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ; @@ -10217,6 +10303,9 @@ static PyMethodDef SwigMethods[] = { { (char *)"HtmlWindow_ScrollToAnchor", (PyCFunction) _wrap_HtmlWindow_ScrollToAnchor, METH_VARARGS | METH_KEYWORDS }, { (char *)"HtmlWindow_HasAnchor", (PyCFunction) _wrap_HtmlWindow_HasAnchor, METH_VARARGS | METH_KEYWORDS }, { (char *)"HtmlWindow_AddFilter", (PyCFunction) _wrap_HtmlWindow_AddFilter, METH_VARARGS | METH_KEYWORDS }, + { (char *)"HtmlWindow_SelectWord", (PyCFunction) _wrap_HtmlWindow_SelectWord, METH_VARARGS | METH_KEYWORDS }, + { (char *)"HtmlWindow_SelectLine", (PyCFunction) _wrap_HtmlWindow_SelectLine, METH_VARARGS | METH_KEYWORDS }, + { (char *)"HtmlWindow_SelectAll", (PyCFunction) _wrap_HtmlWindow_SelectAll, METH_VARARGS | METH_KEYWORDS }, { (char *)"HtmlWindow_base_OnLinkClicked", (PyCFunction) _wrap_HtmlWindow_base_OnLinkClicked, METH_VARARGS | METH_KEYWORDS }, { (char *)"HtmlWindow_base_OnSetTitle", (PyCFunction) _wrap_HtmlWindow_base_OnSetTitle, METH_VARARGS | METH_KEYWORDS }, { (char *)"HtmlWindow_base_OnCellMouseHover", (PyCFunction) _wrap_HtmlWindow_base_OnCellMouseHover, METH_VARARGS | METH_KEYWORDS }, diff --git a/wxPython/src/mac/misc_wrap.cpp b/wxPython/src/mac/misc_wrap.cpp index 907d541933..fef531c692 100644 --- a/wxPython/src/mac/misc_wrap.cpp +++ b/wxPython/src/mac/misc_wrap.cpp @@ -11672,6 +11672,7 @@ static PyObject *_wrap_new_FileTypeInfoSequence(PyObject *self, PyObject *args, PyObject *resultobj; wxArrayString *arg1 = 0 ; wxFileTypeInfo *result; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "sArray", NULL @@ -11684,6 +11685,7 @@ static PyObject *_wrap_new_FileTypeInfoSequence(PyObject *self, PyObject *args, SWIG_fail; } arg1 = new wxArrayString; + temp1 = True; int i, len=PySequence_Length(obj0); for (i=0; ioperator ==(arg2); + result = (bool)((wxDataFormat const *)arg1)->operator ==((wxDataFormatId )arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -23488,12 +23490,12 @@ static PyObject *_wrap_DataFormat___ne____SWIG_0(PyObject *self, PyObject *args) if(!PyArg_ParseTuple(args,(char *)"OO:DataFormat___ne__",&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDataFormat,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (int) SWIG_PyObj_AsInt(obj1); + arg2 = (wxDataFormatId) SWIG_PyObj_AsInt(obj1); if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxDataFormat const *)arg1)->operator !=(arg2); + result = (bool)((wxDataFormat const *)arg1)->operator !=((wxDataFormatId )arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; diff --git a/wxPython/src/mac/windows.py b/wxPython/src/mac/windows.py index 05133e33bb..80f3eea0e7 100644 --- a/wxPython/src/mac/windows.py +++ b/wxPython/src/mac/windows.py @@ -2601,6 +2601,7 @@ PRINT_MODE_NONE = _windows.PRINT_MODE_NONE PRINT_MODE_PREVIEW = _windows.PRINT_MODE_PREVIEW PRINT_MODE_FILE = _windows.PRINT_MODE_FILE PRINT_MODE_PRINTER = _windows.PRINT_MODE_PRINTER +PRINT_MODE_STREAM = _windows.PRINT_MODE_STREAM class PrintData(core.Object): def __repr__(self): return "<%s.%s; proxy of C++ wxPrintData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) @@ -2780,6 +2781,14 @@ class PrintData(core.Object): """SetPrintMode(int printMode)""" return _windows.PrintData_SetPrintMode(*args, **kwargs) + def GetOutputStream(*args, **kwargs): + """GetOutputStream() -> OutputStream""" + return _windows.PrintData_GetOutputStream(*args, **kwargs) + + def SetOutputStream(*args, **kwargs): + """SetOutputStream(OutputStream outputstream)""" + return _windows.PrintData_SetOutputStream(*args, **kwargs) + def __nonzero__(self): return self.Ok() class PrintDataPtr(PrintData): diff --git a/wxPython/src/mac/windows_wrap.cpp b/wxPython/src/mac/windows_wrap.cpp index eae2267306..c6b46c9147 100644 --- a/wxPython/src/mac/windows_wrap.cpp +++ b/wxPython/src/mac/windows_wrap.cpp @@ -280,40 +280,41 @@ SWIGIMPORT(float) SWIG_PyObj_AsFloatConv(PyObject *obj, py_objasdbl_co #define SWIGTYPE_p_wxMDIParentFrame swig_types[47] #define SWIGTYPE_p_wxPoint swig_types[48] #define SWIGTYPE_p_wxObject swig_types[49] -#define SWIGTYPE_p_unsigned_long swig_types[50] -#define SWIGTYPE_p_wxMDIClientWindow swig_types[51] -#define SWIGTYPE_p_wxTipWindow swig_types[52] -#define SWIGTYPE_p_wxPyPopupTransientWindow swig_types[53] -#define SWIGTYPE_p_wxSashLayoutWindow swig_types[54] -#define SWIGTYPE_p_wxSplitterWindow swig_types[55] -#define SWIGTYPE_p_wxPyVScrolledWindow swig_types[56] -#define SWIGTYPE_p_wxPopupWindow swig_types[57] -#define SWIGTYPE_p_wxSashWindow swig_types[58] -#define SWIGTYPE_p_wxTopLevelWindow swig_types[59] -#define SWIGTYPE_p_wxWindow swig_types[60] -#define SWIGTYPE_p_wxScrolledWindow swig_types[61] -#define SWIGTYPE_p_wxSplashScreenWindow swig_types[62] -#define SWIGTYPE_p_wxMenuBar swig_types[63] -#define SWIGTYPE_p_wxPrintPreview swig_types[64] -#define SWIGTYPE_p_wxSashEvent swig_types[65] -#define SWIGTYPE_p_wxString swig_types[66] -#define SWIGTYPE_p_wxPyPrintPreview swig_types[67] -#define SWIGTYPE_p_wxPageSetupDialog swig_types[68] +#define SWIGTYPE_p_wxOutputStream swig_types[50] +#define SWIGTYPE_p_unsigned_long swig_types[51] +#define SWIGTYPE_p_wxMDIClientWindow swig_types[52] +#define SWIGTYPE_p_wxTipWindow swig_types[53] +#define SWIGTYPE_p_wxPyPopupTransientWindow swig_types[54] +#define SWIGTYPE_p_wxSashLayoutWindow swig_types[55] +#define SWIGTYPE_p_wxSplitterWindow swig_types[56] +#define SWIGTYPE_p_wxPyVScrolledWindow swig_types[57] +#define SWIGTYPE_p_wxPopupWindow swig_types[58] +#define SWIGTYPE_p_wxSashWindow swig_types[59] +#define SWIGTYPE_p_wxTopLevelWindow swig_types[60] +#define SWIGTYPE_p_wxWindow swig_types[61] +#define SWIGTYPE_p_wxScrolledWindow swig_types[62] +#define SWIGTYPE_p_wxSplashScreenWindow swig_types[63] +#define SWIGTYPE_p_wxMenuBar swig_types[64] +#define SWIGTYPE_p_wxPrintPreview swig_types[65] +#define SWIGTYPE_p_wxSashEvent swig_types[66] +#define SWIGTYPE_p_wxString swig_types[67] +#define SWIGTYPE_p_wxPyPrintPreview swig_types[68] #define SWIGTYPE_p_wxFontDialog swig_types[69] #define SWIGTYPE_p_wxDirDialog swig_types[70] #define SWIGTYPE_p_wxColourDialog swig_types[71] #define SWIGTYPE_p_wxDialog swig_types[72] #define SWIGTYPE_p_wxPanel swig_types[73] -#define SWIGTYPE_p_wxPrintDialog swig_types[74] -#define SWIGTYPE_p_wxBitmap swig_types[75] -#define SWIGTYPE_p_wxCommandEvent swig_types[76] -#define SWIGTYPE_p_wxPreviewControlBar swig_types[77] -#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[78] -#define SWIGTYPE_p_wxColour swig_types[79] -#define SWIGTYPE_p_wxToolBar swig_types[80] -#define SWIGTYPE_p_wxPageSetupDialogData swig_types[81] -#define SWIGTYPE_p_wxPrintDialogData swig_types[82] -static swig_type_info *swig_types[84]; +#define SWIGTYPE_p_wxPageSetupDialog swig_types[74] +#define SWIGTYPE_p_wxPrintDialog swig_types[75] +#define SWIGTYPE_p_wxBitmap swig_types[76] +#define SWIGTYPE_p_wxCommandEvent swig_types[77] +#define SWIGTYPE_p_wxPreviewControlBar swig_types[78] +#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[79] +#define SWIGTYPE_p_wxColour swig_types[80] +#define SWIGTYPE_p_wxToolBar swig_types[81] +#define SWIGTYPE_p_wxPageSetupDialogData swig_types[82] +#define SWIGTYPE_p_wxPrintDialogData swig_types[83] +static swig_type_info *swig_types[85]; /* -------- TYPES TABLE (END) -------- */ @@ -11799,6 +11800,7 @@ static PyObject *_wrap_MultiChoiceDialog_SetSelections(PyObject *self, PyObject PyObject *resultobj; wxMultiChoiceDialog *arg1 = (wxMultiChoiceDialog *) 0 ; wxArrayInt *arg2 = 0 ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -11813,6 +11815,7 @@ static PyObject *_wrap_MultiChoiceDialog_SetSelections(PyObject *self, PyObject SWIG_fail; } arg2 = new wxArrayInt; + temp2 = True; int i, len=PySequence_Length(obj1); for (i=0; iGetOutputStream(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxOutputStream, 0); + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_PrintData_SetOutputStream(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxPrintData *arg1 = (wxPrintData *) 0 ; + wxOutputStream *arg2 = (wxOutputStream *) 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "outputstream", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetOutputStream",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxOutputStream,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetOutputStream(arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject * PrintData_swigregister(PyObject *self, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; @@ -22827,6 +22882,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"PrintData_SetPrinterTranslateY", (PyCFunction) _wrap_PrintData_SetPrinterTranslateY, METH_VARARGS | METH_KEYWORDS }, { (char *)"PrintData_SetPrinterTranslation", (PyCFunction) _wrap_PrintData_SetPrinterTranslation, METH_VARARGS | METH_KEYWORDS }, { (char *)"PrintData_SetPrintMode", (PyCFunction) _wrap_PrintData_SetPrintMode, METH_VARARGS | METH_KEYWORDS }, + { (char *)"PrintData_GetOutputStream", (PyCFunction) _wrap_PrintData_GetOutputStream, METH_VARARGS | METH_KEYWORDS }, + { (char *)"PrintData_SetOutputStream", (PyCFunction) _wrap_PrintData_SetOutputStream, METH_VARARGS | METH_KEYWORDS }, { (char *)"PrintData_swigregister", PrintData_swigregister, METH_VARARGS }, { (char *)"new_PageSetupDialogData", (PyCFunction) _wrap_new_PageSetupDialogData, METH_VARARGS | METH_KEYWORDS }, { (char *)"delete_PageSetupDialogData", (PyCFunction) _wrap_delete_PageSetupDialogData, METH_VARARGS | METH_KEYWORDS }, @@ -24058,6 +24115,7 @@ static swig_type_info _swigt__p_wxStatusBar[] = {{"_p_wxStatusBar", 0, "wxStatus static swig_type_info _swigt__p_wxMDIParentFrame[] = {{"_p_wxMDIParentFrame", 0, "wxMDIParentFrame *", 0},{"_p_wxMDIParentFrame"},{0}}; static swig_type_info _swigt__p_wxPoint[] = {{"_p_wxPoint", 0, "wxPoint *", 0},{"_p_wxPoint"},{0}}; static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0},{"_p_wxQueryLayoutInfoEvent", _p_wxQueryLayoutInfoEventTo_p_wxObject},{"_p_wxLayoutConstraints", _p_wxLayoutConstraintsTo_p_wxObject},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxObject},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxObject},{"_p_wxGBSizerItem", _p_wxGBSizerItemTo_p_wxObject},{"_p_wxSizerItem", _p_wxSizerItemTo_p_wxObject},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxObject},{"_p_wxIndividualLayoutConstraint", _p_wxIndividualLayoutConstraintTo_p_wxObject},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxObject},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxObject},{"_p_wxSizer", _p_wxSizerTo_p_wxObject},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxObject},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxObject},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxObject},{"_p_wxMenu", _p_wxMenuTo_p_wxObject},{"_p_wxFontData", _p_wxFontDataTo_p_wxObject},{"_p_wxPrintData", _p_wxPrintDataTo_p_wxObject},{"_p_wxEvent", _p_wxEventTo_p_wxObject},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxObject},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxObject},{"_p_wxTaskBarIcon", _p_wxTaskBarIconTo_p_wxObject},{"_p_wxLayoutAlgorithm", _p_wxLayoutAlgorithmTo_p_wxObject},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxObject},{"_p_wxFindDialogEvent", _p_wxFindDialogEventTo_p_wxObject},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxObject},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxObject},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxObject},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxObject},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxObject},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxObject},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxObject},{"_p_wxControl", _p_wxControlTo_p_wxObject},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxObject},{"_p_wxSplitterEvent", _p_wxSplitterEventTo_p_wxObject},{"_p_wxFSFile", _p_wxFSFileTo_p_wxObject},{"_p_wxFindReplaceData", _p_wxFindReplaceDataTo_p_wxObject},{"_p_wxPySizer", _p_wxPySizerTo_p_wxObject},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxObject},{"_p_wxColourData", _p_wxColourDataTo_p_wxObject},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxObject},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxObject},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxObject},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxObject},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxObject},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxObject},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxObject},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxObject},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxObject},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxObject},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxObject},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxObject},{"_p_wxPrinter", _p_wxPrinterTo_p_wxObject},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxObject},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxObject},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxObject},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxObject},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject},{"_p_wxMenuItem", _p_wxMenuItemTo_p_wxObject},{"_p_wxCalculateLayoutEvent", _p_wxCalculateLayoutEventTo_p_wxObject},{"_p_wxEvtHandler", _p_wxEvtHandlerTo_p_wxObject},{"_p_wxTIFFHandler", _p_wxTIFFHandlerTo_p_wxObject},{"_p_wxImageHandler", _p_wxImageHandlerTo_p_wxObject},{"_p_wxBMPHandler", _p_wxBMPHandlerTo_p_wxObject},{"_p_wxICOHandler", _p_wxICOHandlerTo_p_wxObject},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxObject},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxObject},{"_p_wxPNGHandler", _p_wxPNGHandlerTo_p_wxObject},{"_p_wxGIFHandler", _p_wxGIFHandlerTo_p_wxObject},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_p_wxObject},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxObject},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxObject},{"_p_wxXPMHandler", _p_wxXPMHandlerTo_p_wxObject},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxObject},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxObject},{"_p_wxAcceleratorTable", _p_wxAcceleratorTableTo_p_wxObject},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxObject},{"_p_wxImage", _p_wxImageTo_p_wxObject},{"_p_wxFrame", _p_wxFrameTo_p_wxObject},{"_p_wxPyPrintout", _p_wxPyPrintoutTo_p_wxObject},{"_p_wxTaskBarIconEvent", _p_wxTaskBarIconEventTo_p_wxObject},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxObject},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxObject},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxObject},{"_p_wxObject"},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxObject},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxObject},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxObject},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxObject},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxObject},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxObject},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxObject},{"_p_wxWindow", _p_wxWindowTo_p_wxObject},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxObject},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxObject},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxObject},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxObject},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxObject},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxObject},{"_p_wxSashEvent", _p_wxSashEventTo_p_wxObject},{"_p_wxPrintPreview", _p_wxPrintPreviewTo_p_wxObject},{"_p_wxPyPrintPreview", _p_wxPyPrintPreviewTo_p_wxObject},{"_p_wxPanel", _p_wxPanelTo_p_wxObject},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxObject},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxObject},{"_p_wxDialog", _p_wxDialogTo_p_wxObject},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxObject},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxObject},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxObject},{"_p_wxFileSystem", _p_wxFileSystemTo_p_wxObject},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxObject},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxObject},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxObject},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxObject},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxObject},{"_p_wxPyApp", _p_wxPyAppTo_p_wxObject},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxObject},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxObject},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxObject},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxObject},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxObject},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxObject},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxObject},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxObject},{"_p_wxPageSetupDialogData", _p_wxPageSetupDialogDataTo_p_wxObject},{"_p_wxPrintDialogData", _p_wxPrintDialogDataTo_p_wxObject},{"_p_wxValidator", _p_wxValidatorTo_p_wxObject},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxObject},{0}}; +static swig_type_info _swigt__p_wxOutputStream[] = {{"_p_wxOutputStream", 0, "wxOutputStream *", 0},{"_p_wxOutputStream"},{0}}; static swig_type_info _swigt__p_unsigned_long[] = {{"_p_unsigned_long", 0, "unsigned long *", 0},{"_p_unsigned_long"},{0}}; static swig_type_info _swigt__p_wxMDIClientWindow[] = {{"_p_wxMDIClientWindow", 0, "wxMDIClientWindow *", 0},{"_p_wxMDIClientWindow"},{0}}; static swig_type_info _swigt__p_wxTipWindow[] = {{"_p_wxTipWindow", 0, "wxTipWindow *", 0},{"_p_wxTipWindow"},{0}}; @@ -24076,12 +24134,12 @@ static swig_type_info _swigt__p_wxPrintPreview[] = {{"_p_wxPrintPreview", 0, "wx static swig_type_info _swigt__p_wxSashEvent[] = {{"_p_wxSashEvent", 0, "wxSashEvent *", 0},{"_p_wxSashEvent"},{0}}; static swig_type_info _swigt__p_wxString[] = {{"_p_wxString", 0, "wxString *", 0},{"_p_wxString"},{0}}; static swig_type_info _swigt__p_wxPyPrintPreview[] = {{"_p_wxPyPrintPreview", 0, "wxPyPrintPreview *", 0},{"_p_wxPyPrintPreview"},{0}}; -static swig_type_info _swigt__p_wxPageSetupDialog[] = {{"_p_wxPageSetupDialog", 0, "wxPageSetupDialog *", 0},{"_p_wxPageSetupDialog"},{0}}; static swig_type_info _swigt__p_wxFontDialog[] = {{"_p_wxFontDialog", 0, "wxFontDialog *", 0},{"_p_wxFontDialog"},{0}}; static swig_type_info _swigt__p_wxDirDialog[] = {{"_p_wxDirDialog", 0, "wxDirDialog *", 0},{"_p_wxDirDialog"},{0}}; static swig_type_info _swigt__p_wxColourDialog[] = {{"_p_wxColourDialog", 0, "wxColourDialog *", 0},{"_p_wxColourDialog"},{0}}; static swig_type_info _swigt__p_wxDialog[] = {{"_p_wxDialog", 0, "wxDialog *", 0},{"_p_wxDialog"},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxDialog},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxDialog},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxDialog},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxDialog},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxDialog},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxDialog},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxDialog},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxDialog},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxDialog},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxDialog},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxDialog},{0}}; static swig_type_info _swigt__p_wxPanel[] = {{"_p_wxPanel", 0, "wxPanel *", 0},{"_p_wxPanel"},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxPanel},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxPanel},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxPanel},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxPanel},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxPanel},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxPanel},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxPanel},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxPanel},{0}}; +static swig_type_info _swigt__p_wxPageSetupDialog[] = {{"_p_wxPageSetupDialog", 0, "wxPageSetupDialog *", 0},{"_p_wxPageSetupDialog"},{0}}; static swig_type_info _swigt__p_wxPrintDialog[] = {{"_p_wxPrintDialog", 0, "wxPrintDialog *", 0},{"_p_wxPrintDialog"},{0}}; static swig_type_info _swigt__p_wxBitmap[] = {{"_p_wxBitmap", 0, "wxBitmap *", 0},{"_p_wxBitmap"},{0}}; static swig_type_info _swigt__p_wxCommandEvent[] = {{"_p_wxCommandEvent", 0, "wxCommandEvent *", 0},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxCommandEvent},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxCommandEvent},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxCommandEvent},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxCommandEvent},{"_p_wxFindDialogEvent", _p_wxFindDialogEventTo_p_wxCommandEvent},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxCommandEvent},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxCommandEvent},{"_p_wxSplitterEvent", _p_wxSplitterEventTo_p_wxCommandEvent},{"_p_wxCommandEvent"},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxCommandEvent},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxCommandEvent},{"_p_wxSashEvent", _p_wxSashEventTo_p_wxCommandEvent},{0}}; @@ -24143,6 +24201,7 @@ _swigt__p_wxStatusBar, _swigt__p_wxMDIParentFrame, _swigt__p_wxPoint, _swigt__p_wxObject, +_swigt__p_wxOutputStream, _swigt__p_unsigned_long, _swigt__p_wxMDIClientWindow, _swigt__p_wxTipWindow, @@ -24161,12 +24220,12 @@ _swigt__p_wxPrintPreview, _swigt__p_wxSashEvent, _swigt__p_wxString, _swigt__p_wxPyPrintPreview, -_swigt__p_wxPageSetupDialog, _swigt__p_wxFontDialog, _swigt__p_wxDirDialog, _swigt__p_wxColourDialog, _swigt__p_wxDialog, _swigt__p_wxPanel, +_swigt__p_wxPageSetupDialog, _swigt__p_wxPrintDialog, _swigt__p_wxBitmap, _swigt__p_wxCommandEvent, @@ -24322,6 +24381,7 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d,"PRINT_MODE_PREVIEW", SWIG_PyObj_FromInt((int)wxPRINT_MODE_PREVIEW)); PyDict_SetItemString(d,"PRINT_MODE_FILE", SWIG_PyObj_FromInt((int)wxPRINT_MODE_FILE)); PyDict_SetItemString(d,"PRINT_MODE_PRINTER", SWIG_PyObj_FromInt((int)wxPRINT_MODE_PRINTER)); + PyDict_SetItemString(d,"PRINT_MODE_STREAM", SWIG_PyObj_FromInt((int)wxPRINT_MODE_STREAM)); PyDict_SetItemString(d,"PRINTER_NO_ERROR", SWIG_PyObj_FromInt((int)wxPRINTER_NO_ERROR)); PyDict_SetItemString(d,"PRINTER_CANCELLED", SWIG_PyObj_FromInt((int)wxPRINTER_CANCELLED)); PyDict_SetItemString(d,"PRINTER_ERROR", SWIG_PyObj_FromInt((int)wxPRINTER_ERROR)); diff --git a/wxPython/src/msw/controls.py b/wxPython/src/msw/controls.py index ce2e790841..1a22d5cfbd 100644 --- a/wxPython/src/msw/controls.py +++ b/wxPython/src/msw/controls.py @@ -802,6 +802,18 @@ class ListBox(core.ControlWithItems): """IsSorted() -> bool""" return _controls.ListBox_IsSorted(*args, **kwargs) + def SetItemForegroundColour(*args, **kwargs): + """SetItemForegroundColour(int item, Colour c)""" + return _controls.ListBox_SetItemForegroundColour(*args, **kwargs) + + def SetItemBackgroundColour(*args, **kwargs): + """SetItemBackgroundColour(int item, Colour c)""" + return _controls.ListBox_SetItemBackgroundColour(*args, **kwargs) + + def SetItemFont(*args, **kwargs): + """SetItemFont(int item, Font f)""" + return _controls.ListBox_SetItemFont(*args, **kwargs) + class ListBoxPtr(ListBox): def __init__(self, this): diff --git a/wxPython/src/msw/controls_wrap.cpp b/wxPython/src/msw/controls_wrap.cpp index 92317790e8..fd0b693e04 100644 --- a/wxPython/src/msw/controls_wrap.cpp +++ b/wxPython/src/msw/controls_wrap.cpp @@ -424,6 +424,24 @@ PyObject *wxListBox_GetSelections(wxListBox *self){ } return tup; } +void wxListBox_SetItemForegroundColour(wxListBox *self,int item,wxColour const &c){ + #ifdef __WXMSW__ + if (self->GetWindowStyle() & wxLB_OWNERDRAW) + self->GetItem(item)->SetTextColour(c); + #endif + } +void wxListBox_SetItemBackgroundColour(wxListBox *self,int item,wxColour const &c){ + #ifdef __WXMSW__ + if (self->GetWindowStyle() & wxLB_OWNERDRAW) + self->GetItem(item)->SetBackgroundColour(c); + #endif + } +void wxListBox_SetItemFont(wxListBox *self,int item,wxFont const &f){ + #ifdef __WXMSW__ + if (self->GetWindowStyle() & wxLB_OWNERDRAW) + self->GetItem(item)->SetFont(f); + #endif + } static const wxString wxPyTextCtrlNameStr(wxTextCtrlNameStr); static PyObject* t_output_helper(PyObject* target, PyObject* o) { @@ -5812,6 +5830,116 @@ static PyObject *_wrap_ListBox_IsSorted(PyObject *self, PyObject *args, PyObject } +static PyObject *_wrap_ListBox_SetItemForegroundColour(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxListBox *arg1 = (wxListBox *) 0 ; + int arg2 ; + wxColour *arg3 = 0 ; + wxColour temp3 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "item",(char *) "c", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListBox_SetItemForegroundColour",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = &temp3; + if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxListBox_SetItemForegroundColour(arg1,arg2,(wxColour const &)*arg3); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_ListBox_SetItemBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxListBox *arg1 = (wxListBox *) 0 ; + int arg2 ; + wxColour *arg3 = 0 ; + wxColour temp3 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "item",(char *) "c", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListBox_SetItemBackgroundColour",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = &temp3; + if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxListBox_SetItemBackgroundColour(arg1,arg2,(wxColour const &)*arg3); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_ListBox_SetItemFont(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxListBox *arg1 = (wxListBox *) 0 ; + int arg2 ; + wxFont *arg3 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "item",(char *) "f", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListBox_SetItemFont",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (arg3 == NULL) { + PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxListBox_SetItemFont(arg1,arg2,(wxFont const &)*arg3); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject * ListBox_swigregister(PyObject *self, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; @@ -29617,6 +29745,9 @@ static PyMethodDef SwigMethods[] = { { (char *)"ListBox_EnsureVisible", (PyCFunction) _wrap_ListBox_EnsureVisible, METH_VARARGS | METH_KEYWORDS }, { (char *)"ListBox_AppendAndEnsureVisible", (PyCFunction) _wrap_ListBox_AppendAndEnsureVisible, METH_VARARGS | METH_KEYWORDS }, { (char *)"ListBox_IsSorted", (PyCFunction) _wrap_ListBox_IsSorted, METH_VARARGS | METH_KEYWORDS }, + { (char *)"ListBox_SetItemForegroundColour", (PyCFunction) _wrap_ListBox_SetItemForegroundColour, METH_VARARGS | METH_KEYWORDS }, + { (char *)"ListBox_SetItemBackgroundColour", (PyCFunction) _wrap_ListBox_SetItemBackgroundColour, METH_VARARGS | METH_KEYWORDS }, + { (char *)"ListBox_SetItemFont", (PyCFunction) _wrap_ListBox_SetItemFont, METH_VARARGS | METH_KEYWORDS }, { (char *)"ListBox_swigregister", ListBox_swigregister, METH_VARARGS }, { (char *)"new_CheckListBox", (PyCFunction) _wrap_new_CheckListBox, METH_VARARGS | METH_KEYWORDS }, { (char *)"new_PreCheckListBox", (PyCFunction) _wrap_new_PreCheckListBox, METH_VARARGS | METH_KEYWORDS }, diff --git a/wxPython/src/msw/gdi.py b/wxPython/src/msw/gdi.py index a3135fcbdd..e64a6900a9 100644 --- a/wxPython/src/msw/gdi.py +++ b/wxPython/src/msw/gdi.py @@ -588,9 +588,10 @@ class Mask(core.Object): return "<%s.%s; proxy of C++ wxMask instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): """ - __init__(Bitmap bitmap) -> Mask + __init__(Bitmap bitmap, Colour colour=NullColour) -> Mask - Constructs a mask from a monochrome bitmap. + Constructs a mask from a bitmap and a colour in that bitmap that indicates + the transparent portions of the mask, by default BLACK is used. """ newobj = _gdi.new_Mask(*args, **kwargs) self.this = newobj.this @@ -604,17 +605,7 @@ class MaskPtr(Mask): self.__class__ = Mask _gdi.Mask_swigregister(MaskPtr) -def MaskColour(*args, **kwargs): - """ - MaskColour(Bitmap bitmap, Colour colour) -> Mask - - Constructs a mask from a bitmap and a colour in that bitmap that indicates the - background. - """ - val = _gdi.new_MaskColour(*args, **kwargs) - val.thisown = 1 - return val - +MaskColour = Mask class Icon(GDIObject): def __repr__(self): return "<%s.%s; proxy of C++ wxIcon instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) diff --git a/wxPython/src/msw/gdi_wrap.cpp b/wxPython/src/msw/gdi_wrap.cpp index fcf5a5574f..dc8e2fc97d 100644 --- a/wxPython/src/msw/gdi_wrap.cpp +++ b/wxPython/src/msw/gdi_wrap.cpp @@ -484,6 +484,12 @@ void wxBitmap_SetMaskColour(wxBitmap *self,wxColour const &colour){ wxMask *mask = new wxMask(*self, colour); self->SetMask(mask); } +wxMask *new_wxMask(wxBitmap const &bitmap,wxColour const &colour){ + if ( !colour.Ok() ) + return new wxMask(bitmap, *wxBLACK); + else + return new wxMask(bitmap, colour); + } #include @@ -3294,35 +3300,8 @@ static PyObject * Bitmap_swigregister(PyObject *self, PyObject *args) { static PyObject *_wrap_new_Mask(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxBitmap *arg1 = 0 ; - wxMask *result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "bitmap", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_Mask",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg1 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxMask *)new wxMask((wxBitmap const &)*arg1); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxMask, 1); - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_new_MaskColour(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxBitmap *arg1 = 0 ; - wxColour *arg2 = 0 ; + wxColour const &arg2_defvalue = wxNullColour ; + wxColour *arg2 = (wxColour *) &arg2_defvalue ; wxMask *result; wxColour temp2 ; PyObject * obj0 = 0 ; @@ -3331,18 +3310,20 @@ static PyObject *_wrap_new_MaskColour(PyObject *self, PyObject *args, PyObject * (char *) "bitmap",(char *) "colour", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:new_MaskColour",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_Mask",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg1 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } - { - arg2 = &temp2; - if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail; + if (obj1) { + { + arg2 = &temp2; + if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxMask *)new wxMask((wxBitmap const &)*arg1,(wxColour const &)*arg2); + result = (wxMask *)new_wxMask((wxBitmap const &)*arg1,(wxColour const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -18589,7 +18570,6 @@ static PyMethodDef SwigMethods[] = { { (char *)"Bitmap_SetQuality", (PyCFunction) _wrap_Bitmap_SetQuality, METH_VARARGS | METH_KEYWORDS }, { (char *)"Bitmap_swigregister", Bitmap_swigregister, METH_VARARGS }, { (char *)"new_Mask", (PyCFunction) _wrap_new_Mask, METH_VARARGS | METH_KEYWORDS }, - { (char *)"new_MaskColour", (PyCFunction) _wrap_new_MaskColour, METH_VARARGS | METH_KEYWORDS }, { (char *)"Mask_swigregister", Mask_swigregister, METH_VARARGS }, { (char *)"new_Icon", (PyCFunction) _wrap_new_Icon, METH_VARARGS | METH_KEYWORDS }, { (char *)"delete_Icon", (PyCFunction) _wrap_delete_Icon, METH_VARARGS | METH_KEYWORDS }, -- 2.45.2