From: Robin Dunn Date: Wed, 1 Jun 2005 02:36:03 +0000 (+0000) Subject: reSWIGed X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/db67f999c040cbaeccfb63842bd868eeabf3d7ae reSWIGed git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34484 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/wxPython/src/msw/_core.py b/wxPython/src/msw/_core.py index b0ee1dcaa8..2748c07e8d 100644 --- a/wxPython/src/msw/_core.py +++ b/wxPython/src/msw/_core.py @@ -3589,7 +3589,8 @@ wxEVT_SCROLL_PAGEUP = _core_.wxEVT_SCROLL_PAGEUP wxEVT_SCROLL_PAGEDOWN = _core_.wxEVT_SCROLL_PAGEDOWN wxEVT_SCROLL_THUMBTRACK = _core_.wxEVT_SCROLL_THUMBTRACK wxEVT_SCROLL_THUMBRELEASE = _core_.wxEVT_SCROLL_THUMBRELEASE -wxEVT_SCROLL_ENDSCROLL = _core_.wxEVT_SCROLL_ENDSCROLL +wxEVT_SCROLL_CHANGED = _core_.wxEVT_SCROLL_CHANGED +wxEVT_SCROLL_ENDSCROLL = wxEVT_SCROLL_CHANGED wxEVT_SCROLLWIN_TOP = _core_.wxEVT_SCROLLWIN_TOP wxEVT_SCROLLWIN_BOTTOM = _core_.wxEVT_SCROLLWIN_BOTTOM wxEVT_SCROLLWIN_LINEUP = _core_.wxEVT_SCROLLWIN_LINEUP @@ -3745,7 +3746,7 @@ EVT_SCROLL = wx.PyEventBinder([ wxEVT_SCROLL_TOP, wxEVT_SCROLL_PAGEDOWN, wxEVT_SCROLL_THUMBTRACK, wxEVT_SCROLL_THUMBRELEASE, - wxEVT_SCROLL_ENDSCROLL, + wxEVT_SCROLL_CHANGED, ]) EVT_SCROLL_TOP = wx.PyEventBinder( wxEVT_SCROLL_TOP ) @@ -3756,8 +3757,9 @@ EVT_SCROLL_PAGEUP = wx.PyEventBinder( wxEVT_SCROLL_PAGEUP ) EVT_SCROLL_PAGEDOWN = wx.PyEventBinder( wxEVT_SCROLL_PAGEDOWN ) EVT_SCROLL_THUMBTRACK = wx.PyEventBinder( wxEVT_SCROLL_THUMBTRACK ) EVT_SCROLL_THUMBRELEASE = wx.PyEventBinder( wxEVT_SCROLL_THUMBRELEASE ) -EVT_SCROLL_ENDSCROLL = wx.PyEventBinder( wxEVT_SCROLL_ENDSCROLL ) - +EVT_SCROLL_CHANGED = wx.PyEventBinder( wxEVT_SCROLL_CHANGED ) +EVT_SCROLL_ENDSCROLL = EVT_SCROLL_CHANGED + # Scrolling from wx.Slider and wx.ScrollBar, with an id EVT_COMMAND_SCROLL = wx.PyEventBinder([ wxEVT_SCROLL_TOP, wxEVT_SCROLL_BOTTOM, @@ -3767,7 +3769,7 @@ EVT_COMMAND_SCROLL = wx.PyEventBinder([ wxEVT_SCROLL_TOP, wxEVT_SCROLL_PAGEDOWN, wxEVT_SCROLL_THUMBTRACK, wxEVT_SCROLL_THUMBRELEASE, - wxEVT_SCROLL_ENDSCROLL, + wxEVT_SCROLL_CHANGED, ], 1) EVT_COMMAND_SCROLL_TOP = wx.PyEventBinder( wxEVT_SCROLL_TOP, 1) @@ -3778,7 +3780,8 @@ EVT_COMMAND_SCROLL_PAGEUP = wx.PyEventBinder( wxEVT_SCROLL_PAGEUP, 1) EVT_COMMAND_SCROLL_PAGEDOWN = wx.PyEventBinder( wxEVT_SCROLL_PAGEDOWN, 1) EVT_COMMAND_SCROLL_THUMBTRACK = wx.PyEventBinder( wxEVT_SCROLL_THUMBTRACK, 1) EVT_COMMAND_SCROLL_THUMBRELEASE = wx.PyEventBinder( wxEVT_SCROLL_THUMBRELEASE, 1) -EVT_COMMAND_SCROLL_ENDSCROLL = wx.PyEventBinder( wxEVT_SCROLL_ENDSCROLL, 1) +EVT_COMMAND_SCROLL_CHANGED = wx.PyEventBinder( wxEVT_SCROLL_CHANGED, 1) +EVT_COMMAND_SCROLL_ENDSCROLL = EVT_COMMAND_SCROLL_CHANGED EVT_BUTTON = wx.PyEventBinder( wxEVT_COMMAND_BUTTON_CLICKED, 1) EVT_CHECKBOX = wx.PyEventBinder( wxEVT_COMMAND_CHECKBOX_CLICKED, 1) @@ -10548,6 +10551,16 @@ class MenuBar(Window): """Detach(self)""" return _core_.MenuBar_Detach(*args, **kwargs) + def SetAutoWindowMenu(*args, **kwargs): + """SetAutoWindowMenu(bool enable)""" + return _core_.MenuBar_SetAutoWindowMenu(*args, **kwargs) + + SetAutoWindowMenu = staticmethod(SetAutoWindowMenu) + def GetAutoWindowMenu(*args, **kwargs): + """GetAutoWindowMenu() -> bool""" + return _core_.MenuBar_GetAutoWindowMenu(*args, **kwargs) + + GetAutoWindowMenu = staticmethod(GetAutoWindowMenu) class MenuBarPtr(MenuBar): def __init__(self, this): @@ -10556,6 +10569,14 @@ class MenuBarPtr(MenuBar): self.__class__ = MenuBar _core_.MenuBar_swigregister(MenuBarPtr) +def MenuBar_SetAutoWindowMenu(*args, **kwargs): + """MenuBar_SetAutoWindowMenu(bool enable)""" + return _core_.MenuBar_SetAutoWindowMenu(*args, **kwargs) + +def MenuBar_GetAutoWindowMenu(*args, **kwargs): + """MenuBar_GetAutoWindowMenu() -> bool""" + return _core_.MenuBar_GetAutoWindowMenu(*args, **kwargs) + #--------------------------------------------------------------------------- class MenuItem(Object): diff --git a/wxPython/src/msw/_core_wrap.cpp b/wxPython/src/msw/_core_wrap.cpp index 66d5655700..4756001676 100644 --- a/wxPython/src/msw/_core_wrap.cpp +++ b/wxPython/src/msw/_core_wrap.cpp @@ -2785,6 +2785,8 @@ static PyObject *wxMenu_GetMenuItems(wxMenu *self){ wxMenuItemList& list = self->GetMenuItems(); return wxPy_ConvertList(&list); } +static void MenuBar_SetAutoWindowMenu(bool enable){} +static bool MenuBar_GetAutoWindowMenu(){ return false; } static const wxString wxPyControlNameStr(wxControlNameStr); static int wxItemContainer_Append(wxItemContainer *self,wxString const &item,PyObject *clientData=NULL){ if (clientData) { @@ -35983,6 +35985,57 @@ static PyObject *_wrap_MenuBar_Detach(PyObject *, PyObject *args, PyObject *kwar } +static PyObject *_wrap_MenuBar_SetAutoWindowMenu(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + bool arg1 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "enable", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuBar_SetAutoWindowMenu",kwnames,&obj0)) goto fail; + { + arg1 = (bool)(SWIG_As_bool(obj0)); + if (SWIG_arg_fail(1)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + MenuBar_SetAutoWindowMenu(arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_MenuBar_GetAutoWindowMenu(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + bool result; + char *kwnames[] = { + NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":MenuBar_GetAutoWindowMenu",kwnames)) goto fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)MenuBar_GetAutoWindowMenu(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; + fail: + return NULL; +} + + static PyObject * MenuBar_swigregister(PyObject *, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; @@ -46415,6 +46468,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"MenuBar_IsAttached", (PyCFunction) _wrap_MenuBar_IsAttached, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"MenuBar_Attach", (PyCFunction) _wrap_MenuBar_Attach, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"MenuBar_Detach", (PyCFunction) _wrap_MenuBar_Detach, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"MenuBar_SetAutoWindowMenu", (PyCFunction) _wrap_MenuBar_SetAutoWindowMenu, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"MenuBar_GetAutoWindowMenu", (PyCFunction) _wrap_MenuBar_GetAutoWindowMenu, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"MenuBar_swigregister", MenuBar_swigregister, METH_VARARGS, NULL}, { (char *)"new_MenuItem", (PyCFunction) _wrap_new_MenuItem, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"MenuItem_GetMenu", (PyCFunction) _wrap_MenuItem_GetMenu, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -49943,7 +49998,7 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d, "wxEVT_SCROLL_PAGEDOWN", PyInt_FromLong(wxEVT_SCROLL_PAGEDOWN)); PyDict_SetItemString(d, "wxEVT_SCROLL_THUMBTRACK", PyInt_FromLong(wxEVT_SCROLL_THUMBTRACK)); PyDict_SetItemString(d, "wxEVT_SCROLL_THUMBRELEASE", PyInt_FromLong(wxEVT_SCROLL_THUMBRELEASE)); - PyDict_SetItemString(d, "wxEVT_SCROLL_ENDSCROLL", PyInt_FromLong(wxEVT_SCROLL_ENDSCROLL)); + PyDict_SetItemString(d, "wxEVT_SCROLL_CHANGED", PyInt_FromLong(wxEVT_SCROLL_CHANGED)); PyDict_SetItemString(d, "wxEVT_SCROLLWIN_TOP", PyInt_FromLong(wxEVT_SCROLLWIN_TOP)); PyDict_SetItemString(d, "wxEVT_SCROLLWIN_BOTTOM", PyInt_FromLong(wxEVT_SCROLLWIN_BOTTOM)); PyDict_SetItemString(d, "wxEVT_SCROLLWIN_LINEUP", PyInt_FromLong(wxEVT_SCROLLWIN_LINEUP));