Mirrors_UI_SDK/wxWidgets
1
0
Fork 0
mirror of https://github.com/wxWidgets/wxWidgets.git synced 2026-09-20 12:59:31 +08:00
Code Issues Actions 1 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
wxPython/src/mac/controls.py
+9 -1
View File
@@ -4158,14 +4158,22 @@ class TreeCtrl(core.Control):
"""Unselect()"""
return _controls.TreeCtrl_Unselect(*args, **kwargs)
def UnselectItem(*args, **kwargs):
"""UnselectItem(TreeItemId item)"""
return _controls.TreeCtrl_UnselectItem(*args, **kwargs)
def UnselectAll(*args, **kwargs):
"""UnselectAll()"""
return _controls.TreeCtrl_UnselectAll(*args, **kwargs)
def SelectItem(*args, **kwargs):
"""SelectItem(TreeItemId item)"""
"""SelectItem(TreeItemId item, bool select=True)"""
return _controls.TreeCtrl_SelectItem(*args, **kwargs)
def ToggleItemSelection(*args, **kwargs):
"""ToggleItemSelection(TreeItemId item)"""
return _controls.TreeCtrl_ToggleItemSelection(*args, **kwargs)
def EnsureVisible(*args, **kwargs):
"""EnsureVisible(TreeItemId item)"""
return _controls.TreeCtrl_EnsureVisible(*args, **kwargs)
wxPython/src/mac/controls_wrap.cpp
+124 -28
View File
@@ -2205,6 +2205,7 @@ static PyObject *_wrap_new_Choice(PyObject *self, PyObject *args, PyObject *kwar
wxChoice *result;
wxPoint temp3 ;
wxSize temp4 ;
bool temp5 = False ;
bool temp8 = False ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -2243,6 +2244,7 @@ static PyObject *_wrap_new_Choice(PyObject *self, PyObject *args, PyObject *kwar
SWIG_fail;
}
arg5 = new wxArrayString;
temp5 = True;
int i, len=PySequence_Length(obj4);
for (i=0; i<len; i++) {
PyObject* item = PySequence_GetItem(obj4, i);
@@ -2285,7 +2287,7 @@ static PyObject *_wrap_new_Choice(PyObject *self, PyObject *args, PyObject *kwar
}
resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxChoice, 1);
{
if (arg5) delete arg5;
if (temp5) delete arg5;
}
{
if (temp8)
@@ -2294,7 +2296,7 @@ static PyObject *_wrap_new_Choice(PyObject *self, PyObject *args, PyObject *kwar
return resultobj;
fail:
{
if (arg5) delete arg5;
if (temp5) delete arg5;
}
{
if (temp8)
@@ -2345,6 +2347,7 @@ static PyObject *_wrap_Choice_Create(PyObject *self, PyObject *args, PyObject *k
bool result;
wxPoint temp4 ;
wxSize temp5 ;
bool temp6 = False ;
bool temp9 = False ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -2385,6 +2388,7 @@ static PyObject *_wrap_Choice_Create(PyObject *self, PyObject *args, PyObject *k
SWIG_fail;
}
arg6 = new wxArrayString;
temp6 = True;
int i, len=PySequence_Length(obj5);
for (i=0; i<len; i++) {
PyObject* item = PySequence_GetItem(obj5, i);
@@ -2427,7 +2431,7 @@ static PyObject *_wrap_Choice_Create(PyObject *self, PyObject *args, PyObject *k
}
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
{
if (arg6) delete arg6;
if (temp6) delete arg6;
}
{
if (temp9)
@@ -2436,7 +2440,7 @@ static PyObject *_wrap_Choice_Create(PyObject *self, PyObject *args, PyObject *k
return resultobj;
fail:
{
if (arg6) delete arg6;
if (temp6) delete arg6;
}
{
if (temp9)
@@ -2667,6 +2671,7 @@ static PyObject *_wrap_new_ComboBox(PyObject *self, PyObject *args, PyObject *kw
bool temp3 = False ;
wxPoint temp4 ;
wxSize temp5 ;
bool temp6 = False ;
bool temp9 = False ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -2713,6 +2718,7 @@ static PyObject *_wrap_new_ComboBox(PyObject *self, PyObject *args, PyObject *kw
SWIG_fail;
}
arg6 = new wxArrayString;
temp6 = True;
int i, len=PySequence_Length(obj5);
for (i=0; i<len; i++) {
PyObject* item = PySequence_GetItem(obj5, i);
@@ -2759,7 +2765,7 @@ static PyObject *_wrap_new_ComboBox(PyObject *self, PyObject *args, PyObject *kw
delete arg3;
}
{
if (arg6) delete arg6;
if (temp6) delete arg6;
}
{
if (temp9)
@@ -2772,7 +2778,7 @@ static PyObject *_wrap_new_ComboBox(PyObject *self, PyObject *args, PyObject *kw
delete arg3;
}
{
if (arg6) delete arg6;
if (temp6) delete arg6;
}
{
if (temp9)
@@ -2826,6 +2832,7 @@ static PyObject *_wrap_ComboBox_Create(PyObject *self, PyObject *args, PyObject
bool temp4 = False ;
wxPoint temp5 ;
wxSize temp6 ;
bool temp7 = False ;
bool temp10 = False ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -2874,6 +2881,7 @@ static PyObject *_wrap_ComboBox_Create(PyObject *self, PyObject *args, PyObject
SWIG_fail;
}
arg7 = new wxArrayString;
temp7 = True;
int i, len=PySequence_Length(obj6);
for (i=0; i<len; i++) {
PyObject* item = PySequence_GetItem(obj6, i);
@@ -2920,7 +2928,7 @@ static PyObject *_wrap_ComboBox_Create(PyObject *self, PyObject *args, PyObject
delete arg4;
}
{
if (arg7) delete arg7;
if (temp7) delete arg7;
}
{
if (temp10)
@@ -2933,7 +2941,7 @@ static PyObject *_wrap_ComboBox_Create(PyObject *self, PyObject *args, PyObject
delete arg4;
}
{
if (arg7) delete arg7;
if (temp7) delete arg7;
}
{
if (temp10)
@@ -4930,6 +4938,7 @@ static PyObject *_wrap_new_ListBox(PyObject *self, PyObject *args, PyObject *kwa
wxListBox *result;
wxPoint temp3 ;
wxSize temp4 ;
bool temp5 = False ;
bool temp8 = False ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -4968,6 +4977,7 @@ static PyObject *_wrap_new_ListBox(PyObject *self, PyObject *args, PyObject *kwa
SWIG_fail;
}
arg5 = new wxArrayString;
temp5 = True;
int i, len=PySequence_Length(obj4);
for (i=0; i<len; i++) {
PyObject* item = PySequence_GetItem(obj4, i);
@@ -5010,7 +5020,7 @@ static PyObject *_wrap_new_ListBox(PyObject *self, PyObject *args, PyObject *kwa
}
resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxListBox, 1);
{
if (arg5) delete arg5;
if (temp5) delete arg5;
}
{
if (temp8)
@@ -5019,7 +5029,7 @@ static PyObject *_wrap_new_ListBox(PyObject *self, PyObject *args, PyObject *kwa
return resultobj;
fail:
{
if (arg5) delete arg5;
if (temp5) delete arg5;
}
{
if (temp8)
@@ -5070,6 +5080,7 @@ static PyObject *_wrap_ListBox_Create(PyObject *self, PyObject *args, PyObject *
bool result;
wxPoint temp4 ;
wxSize temp5 ;
bool temp6 = False ;
bool temp9 = False ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -5110,6 +5121,7 @@ static PyObject *_wrap_ListBox_Create(PyObject *self, PyObject *args, PyObject *
SWIG_fail;
}
arg6 = new wxArrayString;
temp6 = True;
int i, len=PySequence_Length(obj5);
for (i=0; i<len; i++) {
PyObject* item = PySequence_GetItem(obj5, i);
@@ -5152,7 +5164,7 @@ static PyObject *_wrap_ListBox_Create(PyObject *self, PyObject *args, PyObject *
}
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
{
if (arg6) delete arg6;
if (temp6) delete arg6;
}
{
if (temp9)
@@ -5161,7 +5173,7 @@ static PyObject *_wrap_ListBox_Create(PyObject *self, PyObject *args, PyObject *
return resultobj;
fail:
{
if (arg6) delete arg6;
if (temp6) delete arg6;
}
{
if (temp9)
@@ -5227,6 +5239,7 @@ static PyObject *_wrap_ListBox_InsertItems(PyObject *self, PyObject *args, PyObj
wxListBox *arg1 = (wxListBox *) 0 ;
wxArrayString *arg2 = 0 ;
int arg3 ;
bool temp2 = False ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ;
@@ -5242,6 +5255,7 @@ static PyObject *_wrap_ListBox_InsertItems(PyObject *self, PyObject *args, PyObj
SWIG_fail;
}
arg2 = new wxArrayString;
temp2 = True;
int i, len=PySequence_Length(obj1);
for (i=0; i<len; i++) {
PyObject* item = PySequence_GetItem(obj1, i);
@@ -5268,12 +5282,12 @@ static PyObject *_wrap_ListBox_InsertItems(PyObject *self, PyObject *args, PyObj
}
Py_INCREF(Py_None); resultobj = Py_None;
{
if (arg2) delete arg2;
if (temp2) delete arg2;
}
return resultobj;
fail:
{
if (arg2) delete arg2;
if (temp2) delete arg2;
}
return NULL;
}
@@ -5283,6 +5297,7 @@ static PyObject *_wrap_ListBox_Set(PyObject *self, PyObject *args, PyObject *kwa
PyObject *resultobj;
wxListBox *arg1 = (wxListBox *) 0 ;
wxArrayString *arg2 = 0 ;
bool temp2 = False ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char *kwnames[] = {
@@ -5297,6 +5312,7 @@ static PyObject *_wrap_ListBox_Set(PyObject *self, PyObject *args, PyObject *kwa
SWIG_fail;
}
arg2 = new wxArrayString;
temp2 = True;
int i, len=PySequence_Length(obj1);
for (i=0; i<len; i++) {
PyObject* item = PySequence_GetItem(obj1, i);
@@ -5319,12 +5335,12 @@ static PyObject *_wrap_ListBox_Set(PyObject *self, PyObject *args, PyObject *kwa
}
Py_INCREF(Py_None); resultobj = Py_None;
{
if (arg2) delete arg2;
if (temp2) delete arg2;
}
return resultobj;
fail:
{
if (arg2) delete arg2;
if (temp2) delete arg2;
}
return NULL;
}
@@ -5755,6 +5771,7 @@ static PyObject *_wrap_new_CheckListBox(PyObject *self, PyObject *args, PyObject
wxCheckListBox *result;
wxPoint temp3 ;
wxSize temp4 ;
bool temp5 = False ;
bool temp8 = False ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -5793,6 +5810,7 @@ static PyObject *_wrap_new_CheckListBox(PyObject *self, PyObject *args, PyObject
SWIG_fail;
}
arg5 = new wxArrayString;
temp5 = True;
int i, len=PySequence_Length(obj4);
for (i=0; i<len; i++) {
PyObject* item = PySequence_GetItem(obj4, i);
@@ -5835,7 +5853,7 @@ static PyObject *_wrap_new_CheckListBox(PyObject *self, PyObject *args, PyObject
}
resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxCheckListBox, 1);
{
if (arg5) delete arg5;
if (temp5) delete arg5;
}
{
if (temp8)
@@ -5844,7 +5862,7 @@ static PyObject *_wrap_new_CheckListBox(PyObject *self, PyObject *args, PyObject
return resultobj;
fail:
{
if (arg5) delete arg5;
if (temp5) delete arg5;
}
{
if (temp8)
@@ -5895,6 +5913,7 @@ static PyObject *_wrap_CheckListBox_Create(PyObject *self, PyObject *args, PyObj
bool result;
wxPoint temp4 ;
wxSize temp5 ;
bool temp6 = False ;
bool temp9 = False ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -5935,6 +5954,7 @@ static PyObject *_wrap_CheckListBox_Create(PyObject *self, PyObject *args, PyObj
SWIG_fail;
}
arg6 = new wxArrayString;
temp6 = True;
int i, len=PySequence_Length(obj5);
for (i=0; i<len; i++) {
PyObject* item = PySequence_GetItem(obj5, i);
@@ -5977,7 +5997,7 @@ static PyObject *_wrap_CheckListBox_Create(PyObject *self, PyObject *args, PyObj
}
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
{
if (arg6) delete arg6;
if (temp6) delete arg6;
}
{
if (temp9)
@@ -5986,7 +6006,7 @@ static PyObject *_wrap_CheckListBox_Create(PyObject *self, PyObject *args, PyObj
return resultobj;
fail:
{
if (arg6) delete arg6;
if (temp6) delete arg6;
}
{
if (temp9)
@@ -6478,6 +6498,7 @@ static PyObject *_wrap_TextAttr_SetTabs(PyObject *self, PyObject *args, PyObject
PyObject *resultobj;
wxTextAttr *arg1 = (wxTextAttr *) 0 ;
wxArrayInt *arg2 = 0 ;
bool temp2 = False ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char *kwnames[] = {
@@ -6492,6 +6513,7 @@ static PyObject *_wrap_TextAttr_SetTabs(PyObject *self, PyObject *args, PyObject
SWIG_fail;
}
arg2 = new wxArrayInt;
temp2 = True;
int i, len=PySequence_Length(obj1);
for (i=0; i<len; i++) {
PyObject* item = PySequence_GetItem(obj1, i);
@@ -6510,12 +6532,12 @@ static PyObject *_wrap_TextAttr_SetTabs(PyObject *self, PyObject *args, PyObject
}
Py_INCREF(Py_None); resultobj = Py_None;
{
if (arg2) delete arg2;
if (temp2) delete arg2;
}
return resultobj;
fail:
{
if (arg2) delete arg2;
if (temp2) delete arg2;
}
return NULL;
}
@@ -10624,6 +10646,7 @@ static PyObject *_wrap_new_RadioBox(PyObject *self, PyObject *args, PyObject *kw
bool temp3 = False ;
wxPoint temp4 ;
wxSize temp5 ;
bool temp6 = False ;
bool temp10 = False ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -10669,6 +10692,7 @@ static PyObject *_wrap_new_RadioBox(PyObject *self, PyObject *args, PyObject *kw
SWIG_fail;
}
arg6 = new wxArrayString;
temp6 = True;
int i, len=PySequence_Length(obj5);
for (i=0; i<len; i++) {
PyObject* item = PySequence_GetItem(obj5, i);
@@ -10721,7 +10745,7 @@ static PyObject *_wrap_new_RadioBox(PyObject *self, PyObject *args, PyObject *kw
delete arg3;
}
{
if (arg6) delete arg6;
if (temp6) delete arg6;
}
{
if (temp10)
@@ -10734,7 +10758,7 @@ static PyObject *_wrap_new_RadioBox(PyObject *self, PyObject *args, PyObject *kw
delete arg3;
}
{
if (arg6) delete arg6;
if (temp6) delete arg6;
}
{
if (temp10)
@@ -10788,6 +10812,7 @@ static PyObject *_wrap_RadioBox_Create(PyObject *self, PyObject *args, PyObject
bool temp4 = False ;
wxPoint temp5 ;
wxSize temp6 ;
bool temp7 = False ;
bool temp11 = False ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -10835,6 +10860,7 @@ static PyObject *_wrap_RadioBox_Create(PyObject *self, PyObject *args, PyObject
SWIG_fail;
}
arg7 = new wxArrayString;
temp7 = True;
int i, len=PySequence_Length(obj6);
for (i=0; i<len; i++) {
PyObject* item = PySequence_GetItem(obj6, i);
@@ -10887,7 +10913,7 @@ static PyObject *_wrap_RadioBox_Create(PyObject *self, PyObject *args, PyObject
delete arg4;
}
{
if (arg7) delete arg7;
if (temp7) delete arg7;
}
{
if (temp11)
@@ -10900,7 +10926,7 @@ static PyObject *_wrap_RadioBox_Create(PyObject *self, PyObject *args, PyObject
delete arg4;
}
{
if (arg7) delete arg7;
if (temp7) delete arg7;
}
{
if (temp11)
@@ -25522,6 +25548,36 @@ static PyObject *_wrap_TreeCtrl_Unselect(PyObject *self, PyObject *args, PyObjec
}
static PyObject *_wrap_TreeCtrl_UnselectItem(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
wxTreeItemId *arg2 = 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char *kwnames[] = {
(char *) "self",(char *) "item", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeCtrl_UnselectItem",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) {
PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->UnselectItem((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 },
wxPython/src/mac/core_wrap.cpp
+4 -2
View File
@@ -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<len; i++) {
PyObject* item = PySequence_GetItem(obj1, i);
@@ -31317,12 +31319,12 @@ static PyObject *_wrap_ItemContainer_AppendItems(PyObject *self, PyObject *args,
}
Py_INCREF(Py_None); resultobj = Py_None;
{
if (arg2) delete arg2;
if (temp2) delete arg2;
}
return resultobj;
fail:
{
if (arg2) delete arg2;
if (temp2) delete arg2;
}
return NULL;
}
wxPython/src/mac/gdi.py
+33 -25
View File
@@ -235,6 +235,10 @@ class Pen(GDIObject):
"""GetDashes() -> 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
wxPython/src/mac/gdi_wrap.cpp
+339 -61
View File
File diff suppressed because it is too large Load Diff
wxPython/src/mac/grid_wrap.cpp
+4 -2
View File
@@ -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; i<len; i++) {
PyObject* item = PySequence_GetItem(obj2, i);
@@ -8639,12 +8641,12 @@ static PyObject *_wrap_Grid_GetTextBoxSize(PyObject *self, PyObject *args, PyObj
resultobj = t_output_helper(resultobj,o);
}
{
if (arg3) delete arg3;
if (temp3) delete arg3;
}
return resultobj;
fail:
{
if (arg3) delete arg3;
if (temp3) delete arg3;
}
return NULL;
}
wxPython/src/mac/html.py
+12
View File
@@ -1056,6 +1056,18 @@ class HtmlWindow(windows.ScrolledWindow):
return _html.HtmlWindow_AddFilter(*args, **kwargs)
AddFilter = staticmethod(AddFilter)
def SelectWord(*args, **kwargs):
"""SelectWord(Point pos)"""
return _html.HtmlWindow_SelectWord(*args, **kwargs)
def SelectLine(*args, **kwargs):
"""SelectLine(Point pos)"""
return _html.HtmlWindow_SelectLine(*args, **kwargs)
def SelectAll(*args, **kwargs):
"""SelectAll()"""
return _html.HtmlWindow_SelectAll(*args, **kwargs)
def base_OnLinkClicked(*args, **kwargs):
"""base_OnLinkClicked(HtmlLinkInfo link)"""
return _html.HtmlWindow_base_OnLinkClicked(*args, **kwargs)
wxPython/src/mac/html_wrap.cpp
+89
View File
@@ -6566,6 +6566,92 @@ static PyObject *_wrap_HtmlWindow_AddFilter(PyObject *self, PyObject *args, PyOb
}
static PyObject *_wrap_HtmlWindow_SelectWord(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_SelectWord",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)->SelectWord((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 },
wxPython/src/mac/misc_wrap.cpp
+8 -6
View File
@@ -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; i<len; i++) {
PyObject* item = PySequence_GetItem(obj0, i);
@@ -11706,12 +11708,12 @@ static PyObject *_wrap_new_FileTypeInfoSequence(PyObject *self, PyObject *args,
}
resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxFileTypeInfo, 1);
{
if (arg1) delete arg1;
if (temp1) delete arg1;
}
return resultobj;
fail:
{
if (arg1) delete arg1;
if (temp1) delete arg1;
}
return NULL;
}
@@ -23460,12 +23462,12 @@ static PyObject *_wrap_DataFormat___eq____SWIG_0(PyObject *self, PyObject *args)
if(!PyArg_ParseTuple(args,(char *)"OO:DataFormat___eq__",&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;
@@ -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;
wxPython/src/mac/windows.py
+9
View File
@@ -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):
wxPython/src/mac/windows_wrap.cpp
+93 -33
View File
File diff suppressed because one or more lines are too long
wxPython/src/msw/controls.py
+12
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):
wxPython/src/msw/controls_wrap.cpp
+131
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 },
wxPython/src/msw/gdi.py
+4 -13
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,)
wxPython/src/msw/gdi_wrap.cpp
+15 -35
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 },