Added some missing STL-like wxArray/wxArrayString constructors.
Added helper class wxCArrayString, better replacement for wxArrayString::GetStringArray. Added overloaded constructors and Create() methods taking a wxArrayString for wxCheckListBox, wxChoice, wxComboBox, wxListBox, wxRadioBox, wxSingleChoiceDialog, wxMultipleChoiceDialog. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25440 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -48,6 +48,29 @@ class WXDLLEXPORT wxComboBox : public wxChoice
|
||||
);
|
||||
}
|
||||
|
||||
inline wxComboBox( wxWindow* pParent
|
||||
,wxWindowID vId
|
||||
,const wxString& rsValue
|
||||
,const wxPoint& rPos
|
||||
,const wxSize& rSize
|
||||
,const wxArrayString& asChoices
|
||||
,long lStyle = 0
|
||||
,const wxValidator& rValidator = wxDefaultValidator
|
||||
,const wxString& rsName = wxComboBoxNameStr
|
||||
)
|
||||
{
|
||||
Create( pParent
|
||||
,vId
|
||||
,rsValue
|
||||
,rPos
|
||||
,rSize
|
||||
,asChoices
|
||||
,lStyle
|
||||
,rValidator
|
||||
,rsName
|
||||
);
|
||||
}
|
||||
|
||||
bool Create( wxWindow* pParent
|
||||
,wxWindowID vId
|
||||
,const wxString& rsValue = wxEmptyString
|
||||
@@ -60,6 +83,17 @@ class WXDLLEXPORT wxComboBox : public wxChoice
|
||||
,const wxString& rsName = wxComboBoxNameStr
|
||||
);
|
||||
|
||||
bool Create( wxWindow* pParent
|
||||
,wxWindowID vId
|
||||
,const wxString& rsValue
|
||||
,const wxPoint& rPos
|
||||
,const wxSize& rSize
|
||||
,const wxArrayString& asChoices
|
||||
,long lStyle = 0
|
||||
,const wxValidator& rValidator = wxDefaultValidator
|
||||
,const wxString& rsName = wxComboBoxNameStr
|
||||
);
|
||||
|
||||
//
|
||||
// List functions: see wxChoice
|
||||
//
|
||||
|
Reference in New Issue
Block a user