From 6bf324c043da2fb55bce5a55dff0e3acf9923524 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sat, 28 Apr 2018 18:26:49 -0700 Subject: [PATCH] Change winid parameter in wx.ScrolledWindow to id, for consistency --- CHANGES.rst | 3 +++ etg/scrolwin.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index d92b59c3..cb6a327c 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -67,6 +67,9 @@ Changes in this release include the following: * Fix wxGet to be able to use pip v10. (#817) +* Change winid parameter in wx.ScrolledWindow to id, for consistency. (#816) + + diff --git a/etg/scrolwin.py b/etg/scrolwin.py index 97ed1e54..c5241283 100644 --- a/etg/scrolwin.py +++ b/etg/scrolwin.py @@ -116,7 +116,7 @@ def run(): overloads=[ MethodDef(name='wxScrolledWindow', isCtor=True, items=[ ParamDef(name='parent', type='wxWindow*'), - ParamDef(name='winid', type='wxWindowID', default='wxID_ANY'), + ParamDef(name='id', type='wxWindowID', default='wxID_ANY'), ParamDef(name='pos', type='const wxPoint&', default='wxDefaultPosition'), ParamDef(name='size', type='const wxSize&', default='wxDefaultSize'), ParamDef(name='style', type='long', default='wxScrolledWindowStyle'),