Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reSWIGged

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-02-13 20:23:25 +00:00
parent 8492b560bf
commit 0ffb2aa6e4
17 changed files with 891 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
wxPython/src/msw/controls.py
View File

@@ -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):

131
wxPython/src/msw/controls_wrap.cpp
View File

@@ -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 },

17
wxPython/src/msw/gdi.py
View File

@@ -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,)

50
wxPython/src/msw/gdi_wrap.cpp
View File

@@ -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 <wx/iconbndl.h>
@@ -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 },