From a3957d3d2c72ce975a1ac2a2ff80513d26333fb1 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 7 Apr 2005 02:42:07 +0000 Subject: [PATCH] reSWIGged git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/contrib/animate/gtk/animate_wrap.cpp | 21 +++++++++++-------- wxPython/contrib/animate/mac/animate_wrap.cpp | 21 +++++++++++-------- wxPython/contrib/animate/msw/animate_wrap.cpp | 21 +++++++++++-------- wxPython/src/gtk/_controls.py | 9 ++++---- wxPython/src/gtk/_controls_wrap.cpp | 6 +++--- wxPython/src/mac/_controls.py | 7 ++++--- wxPython/src/mac/_controls_wrap.cpp | 6 +++--- wxPython/src/mac/_windows.py | 6 +++--- wxPython/src/msw/_controls.py | 7 ++++--- wxPython/src/msw/_controls_wrap.cpp | 6 +++--- wxPython/src/msw/_windows.py | 6 +++--- 11 files changed, 64 insertions(+), 52 deletions(-) diff --git a/wxPython/contrib/animate/gtk/animate_wrap.cpp b/wxPython/contrib/animate/gtk/animate_wrap.cpp index e6de42c8cd..9c9a008dd4 100644 --- a/wxPython/contrib/animate/gtk/animate_wrap.cpp +++ b/wxPython/contrib/animate/gtk/animate_wrap.cpp @@ -1361,10 +1361,9 @@ SWIG_Python_GetTypeList() { #define SWIGTYPE_ptrdiff_t swig_types[20] #define SWIGTYPE_p_wxControl swig_types[21] #define SWIGTYPE_p_wxPaperSize swig_types[22] -#define SWIGTYPE_p_wxImage swig_types[23] -#define SWIGTYPE_p_wxSize swig_types[24] -#define SWIGTYPE_p_int swig_types[25] -static swig_type_info *swig_types[27]; +#define SWIGTYPE_p_wxSize swig_types[23] +#define SWIGTYPE_p_int swig_types[24] +static swig_type_info *swig_types[26]; /* -------- TYPES TABLE (END) -------- */ @@ -2456,7 +2455,9 @@ static PyObject *_wrap_AnimationPlayer_GetFrame(PyObject *, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxImage, 0); + { + resultobj = wxPyMake_wxObject(result, 0); + } return resultobj; fail: return NULL; @@ -3015,7 +3016,9 @@ static PyObject *_wrap_AnimationBase_GetFrame(PyObject *, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxImage, 0); + { + resultobj = wxPyMake_wxObject(result, 0); + } return resultobj; fail: return NULL; @@ -3403,7 +3406,9 @@ static PyObject *_wrap_GIFAnimation_GetFrame(PyObject *, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxImage, 0); + { + resultobj = wxPyMake_wxObject(result, 0); + } return resultobj; fail: return NULL; @@ -4616,7 +4621,6 @@ static swig_type_info _swigt__std__ptrdiff_t[] = {{"_std__ptrdiff_t", 0, "std::p static swig_type_info _swigt__ptrdiff_t[] = {{"_ptrdiff_t", 0, "ptrdiff_t", 0, 0, 0, 0},{"_ptrdiff_t", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxControl[] = {{"_p_wxControl", 0, "wxControl *", 0, 0, 0, 0},{"_p_wxControl", 0, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxGIFAnimationCtrl", _p_wxGIFAnimationCtrlTo_p_wxControl, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPaperSize[] = {{"_p_wxPaperSize", 0, "enum wxPaperSize *|wxPaperSize *", 0, 0, 0, 0},{"_p_wxPaperSize", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; -static swig_type_info _swigt__p_wxImage[] = {{"_p_wxImage", 0, "wxImage *", 0, 0, 0, 0},{"_p_wxImage", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxSize[] = {{"_p_wxSize", 0, "wxSize *", 0, 0, 0, 0},{"_p_wxSize", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_int[] = {{"_p_int", 0, "int *|wxEventType *", 0, 0, 0, 0},{"_p_int", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; @@ -4644,7 +4648,6 @@ _swigt__std__ptrdiff_t, _swigt__ptrdiff_t, _swigt__p_wxControl, _swigt__p_wxPaperSize, -_swigt__p_wxImage, _swigt__p_wxSize, _swigt__p_int, 0 diff --git a/wxPython/contrib/animate/mac/animate_wrap.cpp b/wxPython/contrib/animate/mac/animate_wrap.cpp index e6de42c8cd..9c9a008dd4 100644 --- a/wxPython/contrib/animate/mac/animate_wrap.cpp +++ b/wxPython/contrib/animate/mac/animate_wrap.cpp @@ -1361,10 +1361,9 @@ SWIG_Python_GetTypeList() { #define SWIGTYPE_ptrdiff_t swig_types[20] #define SWIGTYPE_p_wxControl swig_types[21] #define SWIGTYPE_p_wxPaperSize swig_types[22] -#define SWIGTYPE_p_wxImage swig_types[23] -#define SWIGTYPE_p_wxSize swig_types[24] -#define SWIGTYPE_p_int swig_types[25] -static swig_type_info *swig_types[27]; +#define SWIGTYPE_p_wxSize swig_types[23] +#define SWIGTYPE_p_int swig_types[24] +static swig_type_info *swig_types[26]; /* -------- TYPES TABLE (END) -------- */ @@ -2456,7 +2455,9 @@ static PyObject *_wrap_AnimationPlayer_GetFrame(PyObject *, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxImage, 0); + { + resultobj = wxPyMake_wxObject(result, 0); + } return resultobj; fail: return NULL; @@ -3015,7 +3016,9 @@ static PyObject *_wrap_AnimationBase_GetFrame(PyObject *, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxImage, 0); + { + resultobj = wxPyMake_wxObject(result, 0); + } return resultobj; fail: return NULL; @@ -3403,7 +3406,9 @@ static PyObject *_wrap_GIFAnimation_GetFrame(PyObject *, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxImage, 0); + { + resultobj = wxPyMake_wxObject(result, 0); + } return resultobj; fail: return NULL; @@ -4616,7 +4621,6 @@ static swig_type_info _swigt__std__ptrdiff_t[] = {{"_std__ptrdiff_t", 0, "std::p static swig_type_info _swigt__ptrdiff_t[] = {{"_ptrdiff_t", 0, "ptrdiff_t", 0, 0, 0, 0},{"_ptrdiff_t", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxControl[] = {{"_p_wxControl", 0, "wxControl *", 0, 0, 0, 0},{"_p_wxControl", 0, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxGIFAnimationCtrl", _p_wxGIFAnimationCtrlTo_p_wxControl, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPaperSize[] = {{"_p_wxPaperSize", 0, "enum wxPaperSize *|wxPaperSize *", 0, 0, 0, 0},{"_p_wxPaperSize", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; -static swig_type_info _swigt__p_wxImage[] = {{"_p_wxImage", 0, "wxImage *", 0, 0, 0, 0},{"_p_wxImage", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxSize[] = {{"_p_wxSize", 0, "wxSize *", 0, 0, 0, 0},{"_p_wxSize", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_int[] = {{"_p_int", 0, "int *|wxEventType *", 0, 0, 0, 0},{"_p_int", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; @@ -4644,7 +4648,6 @@ _swigt__std__ptrdiff_t, _swigt__ptrdiff_t, _swigt__p_wxControl, _swigt__p_wxPaperSize, -_swigt__p_wxImage, _swigt__p_wxSize, _swigt__p_int, 0 diff --git a/wxPython/contrib/animate/msw/animate_wrap.cpp b/wxPython/contrib/animate/msw/animate_wrap.cpp index f2f05d1829..ae429bbf4a 100644 --- a/wxPython/contrib/animate/msw/animate_wrap.cpp +++ b/wxPython/contrib/animate/msw/animate_wrap.cpp @@ -1361,10 +1361,9 @@ SWIG_Python_GetTypeList() { #define SWIGTYPE_ptrdiff_t swig_types[20] #define SWIGTYPE_p_wxControl swig_types[21] #define SWIGTYPE_p_wxPaperSize swig_types[22] -#define SWIGTYPE_p_wxImage swig_types[23] -#define SWIGTYPE_p_wxSize swig_types[24] -#define SWIGTYPE_p_int swig_types[25] -static swig_type_info *swig_types[27]; +#define SWIGTYPE_p_wxSize swig_types[23] +#define SWIGTYPE_p_int swig_types[24] +static swig_type_info *swig_types[26]; /* -------- TYPES TABLE (END) -------- */ @@ -2456,7 +2455,9 @@ static PyObject *_wrap_AnimationPlayer_GetFrame(PyObject *, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxImage, 0); + { + resultobj = wxPyMake_wxObject(result, 0); + } return resultobj; fail: return NULL; @@ -3015,7 +3016,9 @@ static PyObject *_wrap_AnimationBase_GetFrame(PyObject *, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxImage, 0); + { + resultobj = wxPyMake_wxObject(result, 0); + } return resultobj; fail: return NULL; @@ -3403,7 +3406,9 @@ static PyObject *_wrap_GIFAnimation_GetFrame(PyObject *, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxImage, 0); + { + resultobj = wxPyMake_wxObject(result, 0); + } return resultobj; fail: return NULL; @@ -4616,7 +4621,6 @@ static swig_type_info _swigt__std__ptrdiff_t[] = {{"_std__ptrdiff_t", 0, "std::p static swig_type_info _swigt__ptrdiff_t[] = {{"_ptrdiff_t", 0, "ptrdiff_t", 0, 0, 0, 0},{"_ptrdiff_t", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxControl[] = {{"_p_wxControl", 0, "wxControl *", 0, 0, 0, 0},{"_p_wxControl", 0, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxGIFAnimationCtrl", _p_wxGIFAnimationCtrlTo_p_wxControl, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPaperSize[] = {{"_p_wxPaperSize", 0, "enum wxPaperSize *|wxPaperSize *", 0, 0, 0, 0},{"_p_wxPaperSize", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; -static swig_type_info _swigt__p_wxImage[] = {{"_p_wxImage", 0, "wxImage *", 0, 0, 0, 0},{"_p_wxImage", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxSize[] = {{"_p_wxSize", 0, "wxSize *", 0, 0, 0, 0},{"_p_wxSize", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_int[] = {{"_p_int", 0, "int *|wxEventType *", 0, 0, 0, 0},{"_p_int", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; @@ -4644,7 +4648,6 @@ _swigt__std__ptrdiff_t, _swigt__ptrdiff_t, _swigt__p_wxControl, _swigt__p_wxPaperSize, -_swigt__p_wxImage, _swigt__p_wxSize, _swigt__p_int, 0 diff --git a/wxPython/src/gtk/_controls.py b/wxPython/src/gtk/_controls.py index eff4002dda..6f06ba76bc 100644 --- a/wxPython/src/gtk/_controls.py +++ b/wxPython/src/gtk/_controls.py @@ -4763,10 +4763,11 @@ class ListCtrl(_core.Control): """InsertImageStringItem(self, long index, String label, int imageIndex) -> long""" return _controls_.ListCtrl_InsertImageStringItem(*args, **kwargs) - def InsertColumnInfo(*args, **kwargs): - """InsertColumnInfo(self, long col, ListItem info) -> long""" - return _controls_.ListCtrl_InsertColumnInfo(*args, **kwargs) + def InsertColumnItem(*args, **kwargs): + """InsertColumnItem(self, long col, ListItem info) -> long""" + return _controls_.ListCtrl_InsertColumnItem(*args, **kwargs) + InsertColumnInfo = InsertColumnItem def InsertColumn(*args, **kwargs): """ InsertColumn(self, long col, String heading, int format=LIST_FORMAT_LEFT, @@ -5148,7 +5149,7 @@ EVT_TREE_ITEM_MIDDLE_CLICK = wx.PyEventBinder(wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLI EVT_TREE_END_DRAG = wx.PyEventBinder(wxEVT_COMMAND_TREE_END_DRAG , 1) EVT_TREE_STATE_IMAGE_CLICK = wx.PyEventBinder(wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK, 1) EVT_TREE_ITEM_GETTOOLTIP = wx.PyEventBinder(wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP, 1) -EVT_COMMAND_TREE_ITEM_MENU = wx.PyEventBinder(wxEVT_COMMAND_TREE_ITEM_MENU, 1) +EVT_TREE_ITEM_MENU = wx.PyEventBinder(wxEVT_COMMAND_TREE_ITEM_MENU, 1) class TreeEvent(_core.NotifyEvent): """Proxy of C++ TreeEvent class""" diff --git a/wxPython/src/gtk/_controls_wrap.cpp b/wxPython/src/gtk/_controls_wrap.cpp index 5b7a1f2699..dca73fc68d 100644 --- a/wxPython/src/gtk/_controls_wrap.cpp +++ b/wxPython/src/gtk/_controls_wrap.cpp @@ -26081,7 +26081,7 @@ static PyObject *_wrap_ListCtrl_InsertImageStringItem(PyObject *, PyObject *args } -static PyObject *_wrap_ListCtrl_InsertColumnInfo(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_ListCtrl_InsertColumnItem(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ; long arg2 ; @@ -26094,7 +26094,7 @@ static PyObject *_wrap_ListCtrl_InsertColumnInfo(PyObject *, PyObject *args, PyO (char *) "self",(char *) "col",(char *) "info", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListCtrl_InsertColumnInfo",kwnames,&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListCtrl_InsertColumnItem",kwnames,&obj0,&obj1,&obj2)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyListCtrl, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -35523,7 +35523,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"ListCtrl_InsertStringItem", (PyCFunction) _wrap_ListCtrl_InsertStringItem, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ListCtrl_InsertImageItem", (PyCFunction) _wrap_ListCtrl_InsertImageItem, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ListCtrl_InsertImageStringItem", (PyCFunction) _wrap_ListCtrl_InsertImageStringItem, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"ListCtrl_InsertColumnInfo", (PyCFunction) _wrap_ListCtrl_InsertColumnInfo, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"ListCtrl_InsertColumnItem", (PyCFunction) _wrap_ListCtrl_InsertColumnItem, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ListCtrl_InsertColumn", (PyCFunction) _wrap_ListCtrl_InsertColumn, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ListCtrl_SetItemCount", (PyCFunction) _wrap_ListCtrl_SetItemCount, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ListCtrl_ScrollList", (PyCFunction) _wrap_ListCtrl_ScrollList, METH_VARARGS | METH_KEYWORDS, NULL}, diff --git a/wxPython/src/mac/_controls.py b/wxPython/src/mac/_controls.py index 6f0b8c3375..6259eb6413 100644 --- a/wxPython/src/mac/_controls.py +++ b/wxPython/src/mac/_controls.py @@ -4750,10 +4750,11 @@ class ListCtrl(_core.Control): """InsertImageStringItem(self, long index, String label, int imageIndex) -> long""" return _controls_.ListCtrl_InsertImageStringItem(*args, **kwargs) - def InsertColumnInfo(*args, **kwargs): - """InsertColumnInfo(self, long col, ListItem info) -> long""" - return _controls_.ListCtrl_InsertColumnInfo(*args, **kwargs) + def InsertColumnItem(*args, **kwargs): + """InsertColumnItem(self, long col, ListItem info) -> long""" + return _controls_.ListCtrl_InsertColumnItem(*args, **kwargs) + InsertColumnInfo = InsertColumnItem def InsertColumn(*args, **kwargs): """ InsertColumn(self, long col, String heading, int format=LIST_FORMAT_LEFT, diff --git a/wxPython/src/mac/_controls_wrap.cpp b/wxPython/src/mac/_controls_wrap.cpp index 716a3958cf..eb1d2e91c7 100644 --- a/wxPython/src/mac/_controls_wrap.cpp +++ b/wxPython/src/mac/_controls_wrap.cpp @@ -26013,7 +26013,7 @@ static PyObject *_wrap_ListCtrl_InsertImageStringItem(PyObject *, PyObject *args } -static PyObject *_wrap_ListCtrl_InsertColumnInfo(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_ListCtrl_InsertColumnItem(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ; long arg2 ; @@ -26026,7 +26026,7 @@ static PyObject *_wrap_ListCtrl_InsertColumnInfo(PyObject *, PyObject *args, PyO (char *) "self",(char *) "col",(char *) "info", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListCtrl_InsertColumnInfo",kwnames,&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListCtrl_InsertColumnItem",kwnames,&obj0,&obj1,&obj2)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyListCtrl, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -35453,7 +35453,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"ListCtrl_InsertStringItem", (PyCFunction) _wrap_ListCtrl_InsertStringItem, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ListCtrl_InsertImageItem", (PyCFunction) _wrap_ListCtrl_InsertImageItem, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ListCtrl_InsertImageStringItem", (PyCFunction) _wrap_ListCtrl_InsertImageStringItem, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"ListCtrl_InsertColumnInfo", (PyCFunction) _wrap_ListCtrl_InsertColumnInfo, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"ListCtrl_InsertColumnItem", (PyCFunction) _wrap_ListCtrl_InsertColumnItem, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ListCtrl_InsertColumn", (PyCFunction) _wrap_ListCtrl_InsertColumn, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ListCtrl_SetItemCount", (PyCFunction) _wrap_ListCtrl_SetItemCount, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ListCtrl_ScrollList", (PyCFunction) _wrap_ListCtrl_ScrollList, METH_VARARGS | METH_KEYWORDS, NULL}, diff --git a/wxPython/src/mac/_windows.py b/wxPython/src/mac/_windows.py index 0f5d7c7646..5748999486 100644 --- a/wxPython/src/mac/_windows.py +++ b/wxPython/src/mac/_windows.py @@ -524,8 +524,8 @@ class Frame(TopLevelWindow): Command = ProcessCommand def CreateStatusBar(*args, **kwargs): """ - CreateStatusBar(self, int number=1, long style=wxDEFAULT_STATUSBAR_STYLE, - int winid=0, String name=StatusLineNameStr) -> StatusBar + CreateStatusBar(self, int number=1, long style=DEFAULT_STATUSBAR_STYLE, int winid=0, + String name=StatusLineNameStr) -> StatusBar """ return _windows_.Frame_CreateStatusBar(*args, **kwargs) @@ -865,7 +865,7 @@ class StatusBar(_core.Window): return "<%s.%s; proxy of C++ wxStatusBar instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): """ - __init__(self, Window parent, int id=-1, long style=wxDEFAULT_STATUSBAR_STYLE, + __init__(self, Window parent, int id=-1, long style=DEFAULT_STATUSBAR_STYLE, String name=StatusLineNameStr) -> StatusBar """ newobj = _windows_.new_StatusBar(*args, **kwargs) diff --git a/wxPython/src/msw/_controls.py b/wxPython/src/msw/_controls.py index 98c7a4ae63..03d64bd9e3 100644 --- a/wxPython/src/msw/_controls.py +++ b/wxPython/src/msw/_controls.py @@ -4775,10 +4775,11 @@ class ListCtrl(_core.Control): """InsertImageStringItem(self, long index, String label, int imageIndex) -> long""" return _controls_.ListCtrl_InsertImageStringItem(*args, **kwargs) - def InsertColumnInfo(*args, **kwargs): - """InsertColumnInfo(self, long col, ListItem info) -> long""" - return _controls_.ListCtrl_InsertColumnInfo(*args, **kwargs) + def InsertColumnItem(*args, **kwargs): + """InsertColumnItem(self, long col, ListItem info) -> long""" + return _controls_.ListCtrl_InsertColumnItem(*args, **kwargs) + InsertColumnInfo = InsertColumnItem def InsertColumn(*args, **kwargs): """ InsertColumn(self, long col, String heading, int format=LIST_FORMAT_LEFT, diff --git a/wxPython/src/msw/_controls_wrap.cpp b/wxPython/src/msw/_controls_wrap.cpp index a377b89c65..52de0abb2a 100644 --- a/wxPython/src/msw/_controls_wrap.cpp +++ b/wxPython/src/msw/_controls_wrap.cpp @@ -26168,7 +26168,7 @@ static PyObject *_wrap_ListCtrl_InsertImageStringItem(PyObject *, PyObject *args } -static PyObject *_wrap_ListCtrl_InsertColumnInfo(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_ListCtrl_InsertColumnItem(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ; long arg2 ; @@ -26181,7 +26181,7 @@ static PyObject *_wrap_ListCtrl_InsertColumnInfo(PyObject *, PyObject *args, PyO (char *) "self",(char *) "col",(char *) "info", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListCtrl_InsertColumnInfo",kwnames,&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListCtrl_InsertColumnItem",kwnames,&obj0,&obj1,&obj2)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyListCtrl, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -35735,7 +35735,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"ListCtrl_InsertStringItem", (PyCFunction) _wrap_ListCtrl_InsertStringItem, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ListCtrl_InsertImageItem", (PyCFunction) _wrap_ListCtrl_InsertImageItem, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ListCtrl_InsertImageStringItem", (PyCFunction) _wrap_ListCtrl_InsertImageStringItem, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"ListCtrl_InsertColumnInfo", (PyCFunction) _wrap_ListCtrl_InsertColumnInfo, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"ListCtrl_InsertColumnItem", (PyCFunction) _wrap_ListCtrl_InsertColumnItem, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ListCtrl_InsertColumn", (PyCFunction) _wrap_ListCtrl_InsertColumn, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ListCtrl_SetItemCount", (PyCFunction) _wrap_ListCtrl_SetItemCount, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ListCtrl_ScrollList", (PyCFunction) _wrap_ListCtrl_ScrollList, METH_VARARGS | METH_KEYWORDS, NULL}, diff --git a/wxPython/src/msw/_windows.py b/wxPython/src/msw/_windows.py index dae6120186..3fb7bbd2c4 100644 --- a/wxPython/src/msw/_windows.py +++ b/wxPython/src/msw/_windows.py @@ -524,8 +524,8 @@ class Frame(TopLevelWindow): Command = ProcessCommand def CreateStatusBar(*args, **kwargs): """ - CreateStatusBar(self, int number=1, long style=wxDEFAULT_STATUSBAR_STYLE, - int winid=0, String name=StatusLineNameStr) -> StatusBar + CreateStatusBar(self, int number=1, long style=DEFAULT_STATUSBAR_STYLE, int winid=0, + String name=StatusLineNameStr) -> StatusBar """ return _windows_.Frame_CreateStatusBar(*args, **kwargs) @@ -865,7 +865,7 @@ class StatusBar(_core.Window): return "<%s.%s; proxy of C++ wxStatusBar instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): """ - __init__(self, Window parent, int id=-1, long style=wxDEFAULT_STATUSBAR_STYLE, + __init__(self, Window parent, int id=-1, long style=DEFAULT_STATUSBAR_STYLE, String name=StatusLineNameStr) -> StatusBar """ newobj = _windows_.new_StatusBar(*args, **kwargs) -- 2.45.2