merge from 2.8 branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44403 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -81,7 +81,7 @@ public:
|
||||
long style = 0,
|
||||
const wxValidator& validator = wxDefaultValidator,
|
||||
const wxString& name = wxPyComboBoxNameStr),
|
||||
"__init__(Window parent, int id, String value=EmptyString,
|
||||
"__init__(Window parent, int id=-1, String value=EmptyString,
|
||||
Point pos=DefaultPosition, Size size=DefaultSize,
|
||||
List choices=EmptyList, long style=0, Validator validator=DefaultValidator,
|
||||
String name=ComboBoxNameStr) -> ComboBox",
|
||||
@@ -102,7 +102,7 @@ public:
|
||||
long style = 0,
|
||||
const wxValidator& validator = wxDefaultValidator,
|
||||
const wxString& name = wxPyChoiceNameStr),
|
||||
"Create(Window parent, int id, String value=EmptyString,
|
||||
"Create(Window parent, int id=-1, String value=EmptyString,
|
||||
Point pos=DefaultPosition, Size size=DefaultSize,
|
||||
List choices=EmptyList, long style=0, Validator validator=DefaultValidator,
|
||||
String name=ChoiceNameStr) -> bool",
|
||||
|
Reference in New Issue
Block a user