From 70b63a9909bd6accf8ffd385ada2243ba44423b7 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Mon, 11 Dec 2006 18:28:11 +0000 Subject: [PATCH] reSWIGged git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43933 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/src/gtk/_controls.py | 28 ++++++++++---------- wxPython/src/gtk/_controls_wrap.cpp | 40 ++++++++++++++--------------- wxPython/src/gtk/_core.py | 4 +-- wxPython/src/mac/_controls.py | 28 ++++++++++---------- wxPython/src/mac/_controls_wrap.cpp | 40 ++++++++++++++--------------- wxPython/src/mac/_core.py | 4 +-- wxPython/src/msw/_controls.py | 28 ++++++++++---------- wxPython/src/msw/_controls_wrap.cpp | 40 ++++++++++++++--------------- wxPython/src/msw/_core.py | 4 +-- 9 files changed, 108 insertions(+), 108 deletions(-) diff --git a/wxPython/src/gtk/_controls.py b/wxPython/src/gtk/_controls.py index f24a83da6b..2046f1f4fc 100644 --- a/wxPython/src/gtk/_controls.py +++ b/wxPython/src/gtk/_controls.py @@ -7162,21 +7162,21 @@ class SearchCtrl(TextCtrl): """GetMenu(self) -> Menu""" return _controls_.SearchCtrl_GetMenu(*args, **kwargs) - def SetSearchButtonVisible(*args, **kwargs): - """SetSearchButtonVisible(self, bool show)""" - return _controls_.SearchCtrl_SetSearchButtonVisible(*args, **kwargs) + def ShowSearchButton(*args, **kwargs): + """ShowSearchButton(self, bool show)""" + return _controls_.SearchCtrl_ShowSearchButton(*args, **kwargs) - def GetSearchButtonVisible(*args, **kwargs): - """GetSearchButtonVisible(self) -> bool""" - return _controls_.SearchCtrl_GetSearchButtonVisible(*args, **kwargs) + def IsSearchButtonVisible(*args, **kwargs): + """IsSearchButtonVisible(self) -> bool""" + return _controls_.SearchCtrl_IsSearchButtonVisible(*args, **kwargs) - def SetCancelButtonVisible(*args, **kwargs): - """SetCancelButtonVisible(self, bool show)""" - return _controls_.SearchCtrl_SetCancelButtonVisible(*args, **kwargs) + def ShowCancelButton(*args, **kwargs): + """ShowCancelButton(self, bool show)""" + return _controls_.SearchCtrl_ShowCancelButton(*args, **kwargs) - def GetCancelButtonVisible(*args, **kwargs): - """GetCancelButtonVisible(self) -> bool""" - return _controls_.SearchCtrl_GetCancelButtonVisible(*args, **kwargs) + def IsCancelButtonVisible(*args, **kwargs): + """IsCancelButtonVisible(self) -> bool""" + return _controls_.SearchCtrl_IsCancelButtonVisible(*args, **kwargs) def SetSearchBitmap(*args, **kwargs): """SetSearchBitmap(self, Bitmap bitmap)""" @@ -7191,8 +7191,8 @@ class SearchCtrl(TextCtrl): return _controls_.SearchCtrl_SetCancelBitmap(*args, **kwargs) Menu = property(GetMenu,SetMenu) - SearchButtonVisible = property(GetSearchButtonVisible,SetSearchButtonVisible) - CancelButtonVisible = property(GetCancelButtonVisible,SetCancelButtonVisible) + SearchButtonVisible = property(IsSearchButtonVisible,ShowSearchButton) + CancelButtonVisible = property(IsCancelButtonVisible,ShowCancelButton) _controls_.SearchCtrl_swigregister(SearchCtrl) SearchCtrlNameStr = cvar.SearchCtrlNameStr diff --git a/wxPython/src/gtk/_controls_wrap.cpp b/wxPython/src/gtk/_controls_wrap.cpp index 128a49b46b..852b4a79ff 100644 --- a/wxPython/src/gtk/_controls_wrap.cpp +++ b/wxPython/src/gtk/_controls_wrap.cpp @@ -46382,7 +46382,7 @@ fail: } -SWIGINTERN PyObject *_wrap_SearchCtrl_SetSearchButtonVisible(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_SearchCtrl_ShowSearchButton(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxSearchCtrl *arg1 = (wxSearchCtrl *) 0 ; bool arg2 ; @@ -46396,20 +46396,20 @@ SWIGINTERN PyObject *_wrap_SearchCtrl_SetSearchButtonVisible(PyObject *SWIGUNUSE (char *) "self",(char *) "show", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SearchCtrl_SetSearchButtonVisible",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SearchCtrl_ShowSearchButton",kwnames,&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSearchCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SearchCtrl_SetSearchButtonVisible" "', expected argument " "1"" of type '" "wxSearchCtrl *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SearchCtrl_ShowSearchButton" "', expected argument " "1"" of type '" "wxSearchCtrl *""'"); } arg1 = reinterpret_cast< wxSearchCtrl * >(argp1); ecode2 = SWIG_AsVal_bool(obj1, &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SearchCtrl_SetSearchButtonVisible" "', expected argument " "2"" of type '" "bool""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SearchCtrl_ShowSearchButton" "', expected argument " "2"" of type '" "bool""'"); } arg2 = static_cast< bool >(val2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetSearchButtonVisible(arg2); + (arg1)->ShowSearchButton(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -46420,7 +46420,7 @@ fail: } -SWIGINTERN PyObject *_wrap_SearchCtrl_GetSearchButtonVisible(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_SearchCtrl_IsSearchButtonVisible(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxSearchCtrl *arg1 = (wxSearchCtrl *) 0 ; bool result; @@ -46432,12 +46432,12 @@ SWIGINTERN PyObject *_wrap_SearchCtrl_GetSearchButtonVisible(PyObject *SWIGUNUSE swig_obj[0] = args; res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSearchCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SearchCtrl_GetSearchButtonVisible" "', expected argument " "1"" of type '" "wxSearchCtrl const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SearchCtrl_IsSearchButtonVisible" "', expected argument " "1"" of type '" "wxSearchCtrl const *""'"); } arg1 = reinterpret_cast< wxSearchCtrl * >(argp1); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxSearchCtrl const *)arg1)->GetSearchButtonVisible(); + result = (bool)((wxSearchCtrl const *)arg1)->IsSearchButtonVisible(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -46450,7 +46450,7 @@ fail: } -SWIGINTERN PyObject *_wrap_SearchCtrl_SetCancelButtonVisible(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_SearchCtrl_ShowCancelButton(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxSearchCtrl *arg1 = (wxSearchCtrl *) 0 ; bool arg2 ; @@ -46464,20 +46464,20 @@ SWIGINTERN PyObject *_wrap_SearchCtrl_SetCancelButtonVisible(PyObject *SWIGUNUSE (char *) "self",(char *) "show", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SearchCtrl_SetCancelButtonVisible",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SearchCtrl_ShowCancelButton",kwnames,&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSearchCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SearchCtrl_SetCancelButtonVisible" "', expected argument " "1"" of type '" "wxSearchCtrl *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SearchCtrl_ShowCancelButton" "', expected argument " "1"" of type '" "wxSearchCtrl *""'"); } arg1 = reinterpret_cast< wxSearchCtrl * >(argp1); ecode2 = SWIG_AsVal_bool(obj1, &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SearchCtrl_SetCancelButtonVisible" "', expected argument " "2"" of type '" "bool""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SearchCtrl_ShowCancelButton" "', expected argument " "2"" of type '" "bool""'"); } arg2 = static_cast< bool >(val2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetCancelButtonVisible(arg2); + (arg1)->ShowCancelButton(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -46488,7 +46488,7 @@ fail: } -SWIGINTERN PyObject *_wrap_SearchCtrl_GetCancelButtonVisible(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_SearchCtrl_IsCancelButtonVisible(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxSearchCtrl *arg1 = (wxSearchCtrl *) 0 ; bool result; @@ -46500,12 +46500,12 @@ SWIGINTERN PyObject *_wrap_SearchCtrl_GetCancelButtonVisible(PyObject *SWIGUNUSE swig_obj[0] = args; res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSearchCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SearchCtrl_GetCancelButtonVisible" "', expected argument " "1"" of type '" "wxSearchCtrl const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SearchCtrl_IsCancelButtonVisible" "', expected argument " "1"" of type '" "wxSearchCtrl const *""'"); } arg1 = reinterpret_cast< wxSearchCtrl * >(argp1); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxSearchCtrl const *)arg1)->GetCancelButtonVisible(); + result = (bool)((wxSearchCtrl const *)arg1)->IsCancelButtonVisible(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -47715,10 +47715,10 @@ static PyMethodDef SwigMethods[] = { { (char *)"SearchCtrl_Create", (PyCFunction) _wrap_SearchCtrl_Create, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"SearchCtrl_SetMenu", (PyCFunction) _wrap_SearchCtrl_SetMenu, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"SearchCtrl_GetMenu", (PyCFunction)_wrap_SearchCtrl_GetMenu, METH_O, NULL}, - { (char *)"SearchCtrl_SetSearchButtonVisible", (PyCFunction) _wrap_SearchCtrl_SetSearchButtonVisible, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"SearchCtrl_GetSearchButtonVisible", (PyCFunction)_wrap_SearchCtrl_GetSearchButtonVisible, METH_O, NULL}, - { (char *)"SearchCtrl_SetCancelButtonVisible", (PyCFunction) _wrap_SearchCtrl_SetCancelButtonVisible, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"SearchCtrl_GetCancelButtonVisible", (PyCFunction)_wrap_SearchCtrl_GetCancelButtonVisible, METH_O, NULL}, + { (char *)"SearchCtrl_ShowSearchButton", (PyCFunction) _wrap_SearchCtrl_ShowSearchButton, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"SearchCtrl_IsSearchButtonVisible", (PyCFunction)_wrap_SearchCtrl_IsSearchButtonVisible, METH_O, NULL}, + { (char *)"SearchCtrl_ShowCancelButton", (PyCFunction) _wrap_SearchCtrl_ShowCancelButton, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"SearchCtrl_IsCancelButtonVisible", (PyCFunction)_wrap_SearchCtrl_IsCancelButtonVisible, METH_O, NULL}, { (char *)"SearchCtrl_SetSearchBitmap", (PyCFunction) _wrap_SearchCtrl_SetSearchBitmap, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"SearchCtrl_SetSearchMenuBitmap", (PyCFunction) _wrap_SearchCtrl_SetSearchMenuBitmap, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"SearchCtrl_SetCancelBitmap", (PyCFunction) _wrap_SearchCtrl_SetCancelBitmap, METH_VARARGS | METH_KEYWORDS, NULL}, diff --git a/wxPython/src/gtk/_core.py b/wxPython/src/gtk/_core.py index dbe7f46a8c..8cd90f30c7 100644 --- a/wxPython/src/gtk/_core.py +++ b/wxPython/src/gtk/_core.py @@ -8396,7 +8396,7 @@ class Window(EvtHandler): Raise(self) Raises the window to the top of the window hierarchy. In current - version of wxWidgets this works both for manage and child windows. + version of wxWidgets this works both for managed and child windows. """ return _core_.Window_Raise(*args, **kwargs) @@ -8405,7 +8405,7 @@ class Window(EvtHandler): Lower(self) Lowers the window to the bottom of the window hierarchy. In current - version of wxWidgets this works both for manage and child windows. + version of wxWidgets this works both for managed and child windows. """ return _core_.Window_Lower(*args, **kwargs) diff --git a/wxPython/src/mac/_controls.py b/wxPython/src/mac/_controls.py index d249504783..eb81e91d6a 100644 --- a/wxPython/src/mac/_controls.py +++ b/wxPython/src/mac/_controls.py @@ -7155,21 +7155,21 @@ class SearchCtrl(TextCtrl): """GetMenu(self) -> Menu""" return _controls_.SearchCtrl_GetMenu(*args, **kwargs) - def SetSearchButtonVisible(*args, **kwargs): - """SetSearchButtonVisible(self, bool show)""" - return _controls_.SearchCtrl_SetSearchButtonVisible(*args, **kwargs) + def ShowSearchButton(*args, **kwargs): + """ShowSearchButton(self, bool show)""" + return _controls_.SearchCtrl_ShowSearchButton(*args, **kwargs) - def GetSearchButtonVisible(*args, **kwargs): - """GetSearchButtonVisible(self) -> bool""" - return _controls_.SearchCtrl_GetSearchButtonVisible(*args, **kwargs) + def IsSearchButtonVisible(*args, **kwargs): + """IsSearchButtonVisible(self) -> bool""" + return _controls_.SearchCtrl_IsSearchButtonVisible(*args, **kwargs) - def SetCancelButtonVisible(*args, **kwargs): - """SetCancelButtonVisible(self, bool show)""" - return _controls_.SearchCtrl_SetCancelButtonVisible(*args, **kwargs) + def ShowCancelButton(*args, **kwargs): + """ShowCancelButton(self, bool show)""" + return _controls_.SearchCtrl_ShowCancelButton(*args, **kwargs) - def GetCancelButtonVisible(*args, **kwargs): - """GetCancelButtonVisible(self) -> bool""" - return _controls_.SearchCtrl_GetCancelButtonVisible(*args, **kwargs) + def IsCancelButtonVisible(*args, **kwargs): + """IsCancelButtonVisible(self) -> bool""" + return _controls_.SearchCtrl_IsCancelButtonVisible(*args, **kwargs) def SetSearchBitmap(*args, **kwargs): """SetSearchBitmap(self, Bitmap ?)""" @@ -7184,8 +7184,8 @@ class SearchCtrl(TextCtrl): return _controls_.SearchCtrl_SetCancelBitmap(*args, **kwargs) Menu = property(GetMenu,SetMenu) - SearchButtonVisible = property(GetSearchButtonVisible,SetSearchButtonVisible) - CancelButtonVisible = property(GetCancelButtonVisible,SetCancelButtonVisible) + SearchButtonVisible = property(IsSearchButtonVisible,ShowSearchButton) + CancelButtonVisible = property(IsCancelButtonVisible,ShowCancelButton) _controls_.SearchCtrl_swigregister(SearchCtrl) SearchCtrlNameStr = cvar.SearchCtrlNameStr diff --git a/wxPython/src/mac/_controls_wrap.cpp b/wxPython/src/mac/_controls_wrap.cpp index 23daeebf20..f8d893c9b5 100644 --- a/wxPython/src/mac/_controls_wrap.cpp +++ b/wxPython/src/mac/_controls_wrap.cpp @@ -46309,7 +46309,7 @@ fail: } -SWIGINTERN PyObject *_wrap_SearchCtrl_SetSearchButtonVisible(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_SearchCtrl_ShowSearchButton(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxSearchCtrl *arg1 = (wxSearchCtrl *) 0 ; bool arg2 ; @@ -46323,20 +46323,20 @@ SWIGINTERN PyObject *_wrap_SearchCtrl_SetSearchButtonVisible(PyObject *SWIGUNUSE (char *) "self",(char *) "show", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SearchCtrl_SetSearchButtonVisible",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SearchCtrl_ShowSearchButton",kwnames,&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSearchCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SearchCtrl_SetSearchButtonVisible" "', expected argument " "1"" of type '" "wxSearchCtrl *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SearchCtrl_ShowSearchButton" "', expected argument " "1"" of type '" "wxSearchCtrl *""'"); } arg1 = reinterpret_cast< wxSearchCtrl * >(argp1); ecode2 = SWIG_AsVal_bool(obj1, &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SearchCtrl_SetSearchButtonVisible" "', expected argument " "2"" of type '" "bool""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SearchCtrl_ShowSearchButton" "', expected argument " "2"" of type '" "bool""'"); } arg2 = static_cast< bool >(val2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetSearchButtonVisible(arg2); + (arg1)->ShowSearchButton(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -46347,7 +46347,7 @@ fail: } -SWIGINTERN PyObject *_wrap_SearchCtrl_GetSearchButtonVisible(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_SearchCtrl_IsSearchButtonVisible(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxSearchCtrl *arg1 = (wxSearchCtrl *) 0 ; bool result; @@ -46359,12 +46359,12 @@ SWIGINTERN PyObject *_wrap_SearchCtrl_GetSearchButtonVisible(PyObject *SWIGUNUSE swig_obj[0] = args; res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSearchCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SearchCtrl_GetSearchButtonVisible" "', expected argument " "1"" of type '" "wxSearchCtrl const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SearchCtrl_IsSearchButtonVisible" "', expected argument " "1"" of type '" "wxSearchCtrl const *""'"); } arg1 = reinterpret_cast< wxSearchCtrl * >(argp1); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxSearchCtrl const *)arg1)->GetSearchButtonVisible(); + result = (bool)((wxSearchCtrl const *)arg1)->IsSearchButtonVisible(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -46377,7 +46377,7 @@ fail: } -SWIGINTERN PyObject *_wrap_SearchCtrl_SetCancelButtonVisible(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_SearchCtrl_ShowCancelButton(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxSearchCtrl *arg1 = (wxSearchCtrl *) 0 ; bool arg2 ; @@ -46391,20 +46391,20 @@ SWIGINTERN PyObject *_wrap_SearchCtrl_SetCancelButtonVisible(PyObject *SWIGUNUSE (char *) "self",(char *) "show", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SearchCtrl_SetCancelButtonVisible",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SearchCtrl_ShowCancelButton",kwnames,&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSearchCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SearchCtrl_SetCancelButtonVisible" "', expected argument " "1"" of type '" "wxSearchCtrl *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SearchCtrl_ShowCancelButton" "', expected argument " "1"" of type '" "wxSearchCtrl *""'"); } arg1 = reinterpret_cast< wxSearchCtrl * >(argp1); ecode2 = SWIG_AsVal_bool(obj1, &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SearchCtrl_SetCancelButtonVisible" "', expected argument " "2"" of type '" "bool""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SearchCtrl_ShowCancelButton" "', expected argument " "2"" of type '" "bool""'"); } arg2 = static_cast< bool >(val2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetCancelButtonVisible(arg2); + (arg1)->ShowCancelButton(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -46415,7 +46415,7 @@ fail: } -SWIGINTERN PyObject *_wrap_SearchCtrl_GetCancelButtonVisible(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_SearchCtrl_IsCancelButtonVisible(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxSearchCtrl *arg1 = (wxSearchCtrl *) 0 ; bool result; @@ -46427,12 +46427,12 @@ SWIGINTERN PyObject *_wrap_SearchCtrl_GetCancelButtonVisible(PyObject *SWIGUNUSE swig_obj[0] = args; res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSearchCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SearchCtrl_GetCancelButtonVisible" "', expected argument " "1"" of type '" "wxSearchCtrl const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SearchCtrl_IsCancelButtonVisible" "', expected argument " "1"" of type '" "wxSearchCtrl const *""'"); } arg1 = reinterpret_cast< wxSearchCtrl * >(argp1); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxSearchCtrl const *)arg1)->GetCancelButtonVisible(); + result = (bool)((wxSearchCtrl const *)arg1)->IsCancelButtonVisible(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -47640,10 +47640,10 @@ static PyMethodDef SwigMethods[] = { { (char *)"SearchCtrl_Create", (PyCFunction) _wrap_SearchCtrl_Create, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"SearchCtrl_SetMenu", (PyCFunction) _wrap_SearchCtrl_SetMenu, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"SearchCtrl_GetMenu", (PyCFunction)_wrap_SearchCtrl_GetMenu, METH_O, NULL}, - { (char *)"SearchCtrl_SetSearchButtonVisible", (PyCFunction) _wrap_SearchCtrl_SetSearchButtonVisible, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"SearchCtrl_GetSearchButtonVisible", (PyCFunction)_wrap_SearchCtrl_GetSearchButtonVisible, METH_O, NULL}, - { (char *)"SearchCtrl_SetCancelButtonVisible", (PyCFunction) _wrap_SearchCtrl_SetCancelButtonVisible, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"SearchCtrl_GetCancelButtonVisible", (PyCFunction)_wrap_SearchCtrl_GetCancelButtonVisible, METH_O, NULL}, + { (char *)"SearchCtrl_ShowSearchButton", (PyCFunction) _wrap_SearchCtrl_ShowSearchButton, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"SearchCtrl_IsSearchButtonVisible", (PyCFunction)_wrap_SearchCtrl_IsSearchButtonVisible, METH_O, NULL}, + { (char *)"SearchCtrl_ShowCancelButton", (PyCFunction) _wrap_SearchCtrl_ShowCancelButton, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"SearchCtrl_IsCancelButtonVisible", (PyCFunction)_wrap_SearchCtrl_IsCancelButtonVisible, METH_O, NULL}, { (char *)"SearchCtrl_SetSearchBitmap", (PyCFunction) _wrap_SearchCtrl_SetSearchBitmap, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"SearchCtrl_SetSearchMenuBitmap", (PyCFunction) _wrap_SearchCtrl_SetSearchMenuBitmap, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"SearchCtrl_SetCancelBitmap", (PyCFunction) _wrap_SearchCtrl_SetCancelBitmap, METH_VARARGS | METH_KEYWORDS, NULL}, diff --git a/wxPython/src/mac/_core.py b/wxPython/src/mac/_core.py index dbe7f46a8c..8cd90f30c7 100644 --- a/wxPython/src/mac/_core.py +++ b/wxPython/src/mac/_core.py @@ -8396,7 +8396,7 @@ class Window(EvtHandler): Raise(self) Raises the window to the top of the window hierarchy. In current - version of wxWidgets this works both for manage and child windows. + version of wxWidgets this works both for managed and child windows. """ return _core_.Window_Raise(*args, **kwargs) @@ -8405,7 +8405,7 @@ class Window(EvtHandler): Lower(self) Lowers the window to the bottom of the window hierarchy. In current - version of wxWidgets this works both for manage and child windows. + version of wxWidgets this works both for managed and child windows. """ return _core_.Window_Lower(*args, **kwargs) diff --git a/wxPython/src/msw/_controls.py b/wxPython/src/msw/_controls.py index 91b0d44c4f..347d972883 100644 --- a/wxPython/src/msw/_controls.py +++ b/wxPython/src/msw/_controls.py @@ -7181,21 +7181,21 @@ class SearchCtrl(TextCtrl): """GetMenu(self) -> Menu""" return _controls_.SearchCtrl_GetMenu(*args, **kwargs) - def SetSearchButtonVisible(*args, **kwargs): - """SetSearchButtonVisible(self, bool show)""" - return _controls_.SearchCtrl_SetSearchButtonVisible(*args, **kwargs) + def ShowSearchButton(*args, **kwargs): + """ShowSearchButton(self, bool show)""" + return _controls_.SearchCtrl_ShowSearchButton(*args, **kwargs) - def GetSearchButtonVisible(*args, **kwargs): - """GetSearchButtonVisible(self) -> bool""" - return _controls_.SearchCtrl_GetSearchButtonVisible(*args, **kwargs) + def IsSearchButtonVisible(*args, **kwargs): + """IsSearchButtonVisible(self) -> bool""" + return _controls_.SearchCtrl_IsSearchButtonVisible(*args, **kwargs) - def SetCancelButtonVisible(*args, **kwargs): - """SetCancelButtonVisible(self, bool show)""" - return _controls_.SearchCtrl_SetCancelButtonVisible(*args, **kwargs) + def ShowCancelButton(*args, **kwargs): + """ShowCancelButton(self, bool show)""" + return _controls_.SearchCtrl_ShowCancelButton(*args, **kwargs) - def GetCancelButtonVisible(*args, **kwargs): - """GetCancelButtonVisible(self) -> bool""" - return _controls_.SearchCtrl_GetCancelButtonVisible(*args, **kwargs) + def IsCancelButtonVisible(*args, **kwargs): + """IsCancelButtonVisible(self) -> bool""" + return _controls_.SearchCtrl_IsCancelButtonVisible(*args, **kwargs) def SetSearchBitmap(*args, **kwargs): """SetSearchBitmap(self, Bitmap bitmap)""" @@ -7210,8 +7210,8 @@ class SearchCtrl(TextCtrl): return _controls_.SearchCtrl_SetCancelBitmap(*args, **kwargs) Menu = property(GetMenu,SetMenu) - SearchButtonVisible = property(GetSearchButtonVisible,SetSearchButtonVisible) - CancelButtonVisible = property(GetCancelButtonVisible,SetCancelButtonVisible) + SearchButtonVisible = property(IsSearchButtonVisible,ShowSearchButton) + CancelButtonVisible = property(IsCancelButtonVisible,ShowCancelButton) _controls_.SearchCtrl_swigregister(SearchCtrl) SearchCtrlNameStr = cvar.SearchCtrlNameStr diff --git a/wxPython/src/msw/_controls_wrap.cpp b/wxPython/src/msw/_controls_wrap.cpp index 09cf7467ec..6383baa408 100644 --- a/wxPython/src/msw/_controls_wrap.cpp +++ b/wxPython/src/msw/_controls_wrap.cpp @@ -46594,7 +46594,7 @@ fail: } -SWIGINTERN PyObject *_wrap_SearchCtrl_SetSearchButtonVisible(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_SearchCtrl_ShowSearchButton(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxSearchCtrl *arg1 = (wxSearchCtrl *) 0 ; bool arg2 ; @@ -46608,20 +46608,20 @@ SWIGINTERN PyObject *_wrap_SearchCtrl_SetSearchButtonVisible(PyObject *SWIGUNUSE (char *) "self",(char *) "show", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SearchCtrl_SetSearchButtonVisible",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SearchCtrl_ShowSearchButton",kwnames,&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSearchCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SearchCtrl_SetSearchButtonVisible" "', expected argument " "1"" of type '" "wxSearchCtrl *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SearchCtrl_ShowSearchButton" "', expected argument " "1"" of type '" "wxSearchCtrl *""'"); } arg1 = reinterpret_cast< wxSearchCtrl * >(argp1); ecode2 = SWIG_AsVal_bool(obj1, &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SearchCtrl_SetSearchButtonVisible" "', expected argument " "2"" of type '" "bool""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SearchCtrl_ShowSearchButton" "', expected argument " "2"" of type '" "bool""'"); } arg2 = static_cast< bool >(val2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetSearchButtonVisible(arg2); + (arg1)->ShowSearchButton(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -46632,7 +46632,7 @@ fail: } -SWIGINTERN PyObject *_wrap_SearchCtrl_GetSearchButtonVisible(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_SearchCtrl_IsSearchButtonVisible(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxSearchCtrl *arg1 = (wxSearchCtrl *) 0 ; bool result; @@ -46644,12 +46644,12 @@ SWIGINTERN PyObject *_wrap_SearchCtrl_GetSearchButtonVisible(PyObject *SWIGUNUSE swig_obj[0] = args; res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSearchCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SearchCtrl_GetSearchButtonVisible" "', expected argument " "1"" of type '" "wxSearchCtrl const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SearchCtrl_IsSearchButtonVisible" "', expected argument " "1"" of type '" "wxSearchCtrl const *""'"); } arg1 = reinterpret_cast< wxSearchCtrl * >(argp1); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxSearchCtrl const *)arg1)->GetSearchButtonVisible(); + result = (bool)((wxSearchCtrl const *)arg1)->IsSearchButtonVisible(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -46662,7 +46662,7 @@ fail: } -SWIGINTERN PyObject *_wrap_SearchCtrl_SetCancelButtonVisible(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_SearchCtrl_ShowCancelButton(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxSearchCtrl *arg1 = (wxSearchCtrl *) 0 ; bool arg2 ; @@ -46676,20 +46676,20 @@ SWIGINTERN PyObject *_wrap_SearchCtrl_SetCancelButtonVisible(PyObject *SWIGUNUSE (char *) "self",(char *) "show", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SearchCtrl_SetCancelButtonVisible",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SearchCtrl_ShowCancelButton",kwnames,&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSearchCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SearchCtrl_SetCancelButtonVisible" "', expected argument " "1"" of type '" "wxSearchCtrl *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SearchCtrl_ShowCancelButton" "', expected argument " "1"" of type '" "wxSearchCtrl *""'"); } arg1 = reinterpret_cast< wxSearchCtrl * >(argp1); ecode2 = SWIG_AsVal_bool(obj1, &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SearchCtrl_SetCancelButtonVisible" "', expected argument " "2"" of type '" "bool""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SearchCtrl_ShowCancelButton" "', expected argument " "2"" of type '" "bool""'"); } arg2 = static_cast< bool >(val2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetCancelButtonVisible(arg2); + (arg1)->ShowCancelButton(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -46700,7 +46700,7 @@ fail: } -SWIGINTERN PyObject *_wrap_SearchCtrl_GetCancelButtonVisible(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_SearchCtrl_IsCancelButtonVisible(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxSearchCtrl *arg1 = (wxSearchCtrl *) 0 ; bool result; @@ -46712,12 +46712,12 @@ SWIGINTERN PyObject *_wrap_SearchCtrl_GetCancelButtonVisible(PyObject *SWIGUNUSE swig_obj[0] = args; res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSearchCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SearchCtrl_GetCancelButtonVisible" "', expected argument " "1"" of type '" "wxSearchCtrl const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SearchCtrl_IsCancelButtonVisible" "', expected argument " "1"" of type '" "wxSearchCtrl const *""'"); } arg1 = reinterpret_cast< wxSearchCtrl * >(argp1); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxSearchCtrl const *)arg1)->GetCancelButtonVisible(); + result = (bool)((wxSearchCtrl const *)arg1)->IsCancelButtonVisible(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -47932,10 +47932,10 @@ static PyMethodDef SwigMethods[] = { { (char *)"SearchCtrl_Create", (PyCFunction) _wrap_SearchCtrl_Create, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"SearchCtrl_SetMenu", (PyCFunction) _wrap_SearchCtrl_SetMenu, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"SearchCtrl_GetMenu", (PyCFunction)_wrap_SearchCtrl_GetMenu, METH_O, NULL}, - { (char *)"SearchCtrl_SetSearchButtonVisible", (PyCFunction) _wrap_SearchCtrl_SetSearchButtonVisible, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"SearchCtrl_GetSearchButtonVisible", (PyCFunction)_wrap_SearchCtrl_GetSearchButtonVisible, METH_O, NULL}, - { (char *)"SearchCtrl_SetCancelButtonVisible", (PyCFunction) _wrap_SearchCtrl_SetCancelButtonVisible, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"SearchCtrl_GetCancelButtonVisible", (PyCFunction)_wrap_SearchCtrl_GetCancelButtonVisible, METH_O, NULL}, + { (char *)"SearchCtrl_ShowSearchButton", (PyCFunction) _wrap_SearchCtrl_ShowSearchButton, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"SearchCtrl_IsSearchButtonVisible", (PyCFunction)_wrap_SearchCtrl_IsSearchButtonVisible, METH_O, NULL}, + { (char *)"SearchCtrl_ShowCancelButton", (PyCFunction) _wrap_SearchCtrl_ShowCancelButton, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"SearchCtrl_IsCancelButtonVisible", (PyCFunction)_wrap_SearchCtrl_IsCancelButtonVisible, METH_O, NULL}, { (char *)"SearchCtrl_SetSearchBitmap", (PyCFunction) _wrap_SearchCtrl_SetSearchBitmap, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"SearchCtrl_SetSearchMenuBitmap", (PyCFunction) _wrap_SearchCtrl_SetSearchMenuBitmap, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"SearchCtrl_SetCancelBitmap", (PyCFunction) _wrap_SearchCtrl_SetCancelBitmap, METH_VARARGS | METH_KEYWORDS, NULL}, diff --git a/wxPython/src/msw/_core.py b/wxPython/src/msw/_core.py index f9cf4a8438..cc39b63f7c 100644 --- a/wxPython/src/msw/_core.py +++ b/wxPython/src/msw/_core.py @@ -8396,7 +8396,7 @@ class Window(EvtHandler): Raise(self) Raises the window to the top of the window hierarchy. In current - version of wxWidgets this works both for manage and child windows. + version of wxWidgets this works both for managed and child windows. """ return _core_.Window_Raise(*args, **kwargs) @@ -8405,7 +8405,7 @@ class Window(EvtHandler): Lower(self) Lowers the window to the bottom of the window hierarchy. In current - version of wxWidgets this works both for manage and child windows. + version of wxWidgets this works both for managed and child windows. """ return _core_.Window_Lower(*args, **kwargs) -- 2.45.2