Forward port recent changes on the 2.8 branch to HEAD
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46083 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -170,6 +170,8 @@ enum {
|
||||
wxEL_ALLOW_NEW,
|
||||
wxEL_ALLOW_EDIT,
|
||||
wxEL_ALLOW_DELETE,
|
||||
wxEL_NO_REORDER,
|
||||
wxEL_DEFAULT_STYLE
|
||||
};
|
||||
|
||||
|
||||
@@ -190,9 +192,16 @@ public:
|
||||
const wxString& label = wxPyEmptyString,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
long style = wxEL_ALLOW_NEW | wxEL_ALLOW_EDIT | wxEL_ALLOW_DELETE,
|
||||
long style = wxEL_DEFAULT_STYLE,
|
||||
const wxString& name = wxPyEditableListBoxNameStr);
|
||||
%RenameCtor(PreEditableListBox, wxEditableListBox());
|
||||
|
||||
bool Create(wxWindow *parent, wxWindowID id,
|
||||
const wxString& label,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
long style = wxEL_DEFAULT_STYLE,
|
||||
const wxString& name = wxEditableListBoxNameStr);
|
||||
|
||||
void SetStrings(const wxArrayString& strings);
|
||||
|
||||
|
Reference in New Issue
Block a user