From: Robin Dunn Date: Thu, 7 Mar 2002 21:47:30 +0000 (+0000) Subject: Bugfix for wxTreeCtrl.InsertItemBefore and more SWIGged updates for wxMSW X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/3999941a70a9a1f8ebb0b70a6d861323185e321e?ds=inline Bugfix for wxTreeCtrl.InsertItemBefore and more SWIGged updates for wxMSW git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14486 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/wxPython/src/controls2.i b/wxPython/src/controls2.i index c870ad4320..ea64625404 100644 --- a/wxPython/src/controls2.i +++ b/wxPython/src/controls2.i @@ -1220,7 +1220,7 @@ public: size_t before, const wxString& text, int image = -1, int selectedImage = -1, - wxTreeItemData *data = NULL); + wxPyTreeItemData *data = NULL); wxTreeItemId AppendItem(const wxTreeItemId& parent, const wxString& text, int image = -1, int selectedImage = -1, diff --git a/wxPython/src/msw/controls2.cpp b/wxPython/src/msw/controls2.cpp index 13074c0dc7..5e4b68ae08 100644 --- a/wxPython/src/msw/controls2.cpp +++ b/wxPython/src/msw/controls2.cpp @@ -8456,7 +8456,7 @@ static PyObject *_wrap_wxTreeCtrl_InsertItemBefore(PyObject *self, PyObject *arg wxString * _arg3; int _arg4 = (int ) -1; int _arg5 = (int ) -1; - wxTreeItemData * _arg6 = (wxTreeItemData *) NULL; + wxPyTreeItemData * _arg6 = (wxPyTreeItemData *) NULL; PyObject * _argo0 = 0; PyObject * _argo1 = 0; PyObject * _obj3 = 0; @@ -8501,8 +8501,8 @@ static PyObject *_wrap_wxTreeCtrl_InsertItemBefore(PyObject *self, PyObject *arg } if (_argo6) { if (_argo6 == Py_None) { _arg6 = NULL; } - else if (SWIG_GetPtrObj(_argo6,(void **) &_arg6,"_wxTreeItemData_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 7 of wxTreeCtrl_InsertItemBefore. Expected _wxTreeItemData_p."); + else if (SWIG_GetPtrObj(_argo6,(void **) &_arg6,"_wxPyTreeItemData_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 7 of wxTreeCtrl_InsertItemBefore. Expected _wxPyTreeItemData_p."); return NULL; } } diff --git a/wxPython/src/msw/help.cpp b/wxPython/src/msw/help.cpp index 464d9072f4..b8d3f2f353 100644 --- a/wxPython/src/msw/help.cpp +++ b/wxPython/src/msw/help.cpp @@ -1238,7 +1238,6 @@ SWIGEXPORT(void) inithelpc() { PyDict_SetItemString(d,"wxID_CONTEXT_HELP", PyInt_FromLong((long) wxID_CONTEXT_HELP)); PyDict_SetItemString(d,"wxEVT_HELP", PyInt_FromLong((long) wxEVT_HELP)); PyDict_SetItemString(d,"wxEVT_DETAILED_HELP", PyInt_FromLong((long) wxEVT_DETAILED_HELP)); - PyDict_SetItemString(d,"wxEVT_CONTEXT_MENU", PyInt_FromLong((long) wxEVT_CONTEXT_MENU)); { int i; for (i = 0; _swig_mapping[i].n1; i++) diff --git a/wxPython/src/msw/help.py b/wxPython/src/msw/help.py index 9da1a4e532..570421d35d 100644 --- a/wxPython/src/msw/help.py +++ b/wxPython/src/msw/help.py @@ -26,9 +26,6 @@ def EVT_DETAILED_HELP(win, id, func): def EVT_DETAILED_HELP_RANGE(win, id, id2, func): win.Connect(id, id2, wxEVT_DETAILED_HELP, func) -def EVT_CONTEXT_MENU(win, func): - win.Connect(-1, -1, wxEVT_CONTEXT_MENU, func) - class wxHelpEventPtr(wxCommandEventPtr): def __init__(self,this): self.this = this @@ -186,7 +183,6 @@ wxDIALOG_EX_CONTEXTHELP = helpc.wxDIALOG_EX_CONTEXTHELP wxID_CONTEXT_HELP = helpc.wxID_CONTEXT_HELP wxEVT_HELP = helpc.wxEVT_HELP wxEVT_DETAILED_HELP = helpc.wxEVT_DETAILED_HELP -wxEVT_CONTEXT_MENU = helpc.wxEVT_CONTEXT_MENU #-------------- USER INCLUDE ----------------------- diff --git a/wxPython/src/msw/wx.cpp b/wxPython/src/msw/wx.cpp index 9fa3386fde..d4720b992a 100644 --- a/wxPython/src/msw/wx.cpp +++ b/wxPython/src/msw/wx.cpp @@ -2625,6 +2625,7 @@ SWIGEXPORT(void) initwxc() { PyDict_SetItemString(d,"wxEVT_MENU_OPEN", PyInt_FromLong((long) wxEVT_MENU_OPEN)); PyDict_SetItemString(d,"wxEVT_MENU_CLOSE", PyInt_FromLong((long) wxEVT_MENU_CLOSE)); PyDict_SetItemString(d,"wxEVT_MENU_HIGHLIGHT", PyInt_FromLong((long) wxEVT_MENU_HIGHLIGHT)); + PyDict_SetItemString(d,"wxEVT_CONTEXT_MENU", PyInt_FromLong((long) wxEVT_CONTEXT_MENU)); PyDict_SetItemString(d,"wxEVT_SYS_COLOUR_CHANGED", PyInt_FromLong((long) wxEVT_SYS_COLOUR_CHANGED)); PyDict_SetItemString(d,"wxEVT_DISPLAY_CHANGED", PyInt_FromLong((long) wxEVT_DISPLAY_CHANGED)); PyDict_SetItemString(d,"wxEVT_SETTING_CHANGED", PyInt_FromLong((long) wxEVT_SETTING_CHANGED)); diff --git a/wxPython/src/msw/wx.py b/wxPython/src/msw/wx.py index 9751f99fdd..7243842c58 100644 --- a/wxPython/src/msw/wx.py +++ b/wxPython/src/msw/wx.py @@ -857,6 +857,7 @@ wxEVT_PAINT_ICON = wxc.wxEVT_PAINT_ICON wxEVT_MENU_OPEN = wxc.wxEVT_MENU_OPEN wxEVT_MENU_CLOSE = wxc.wxEVT_MENU_CLOSE wxEVT_MENU_HIGHLIGHT = wxc.wxEVT_MENU_HIGHLIGHT +wxEVT_CONTEXT_MENU = wxc.wxEVT_CONTEXT_MENU wxEVT_SYS_COLOUR_CHANGED = wxc.wxEVT_SYS_COLOUR_CHANGED wxEVT_DISPLAY_CHANGED = wxc.wxEVT_DISPLAY_CHANGED wxEVT_SETTING_CHANGED = wxc.wxEVT_SETTING_CHANGED @@ -1443,19 +1444,6 @@ def EVT_TOGGLEBUTTON(win, id, func): -# Help events -def EVT_HELP(win, id, func): - win.Connect(id, -1, wxEVT_HELP, func) - -def EVT_HELP_RANGE(win, id, id2, func): - win.Connect(id, id2, wxEVT_HELP, func) - -def EVT_DETAILED_HELP(win, id, func): - win.Connect(id, -1, wxEVT_DETAILED_HELP, func) - -def EVT_DETAILED_HELP_RANGE(win, id, id2, func): - win.Connect(id, id2, wxEVT_DETAILED_HELP, func) - def EVT_CONTEXT_MENU(win, func): win.Connect(-1, -1, wxEVT_CONTEXT_MENU, func)