tried to make wxArrayString(bool autosort) ctor more explicit, e.g. prevent it from being used in implicit conversions from char * to wxArrayString
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13676 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1904,7 +1904,7 @@ wxString& wxString::replace(size_t nStart, size_t nLen,
|
||||
#define STRING(p) ((wxString *)(&(p)))
|
||||
|
||||
// ctor
|
||||
wxArrayString::wxArrayString(bool autoSort)
|
||||
void wxArrayString::Init(bool autoSort)
|
||||
{
|
||||
m_nSize =
|
||||
m_nCount = 0;
|
||||
@@ -1915,10 +1915,7 @@ wxArrayString::wxArrayString(bool autoSort)
|
||||
// copy ctor
|
||||
wxArrayString::wxArrayString(const wxArrayString& src)
|
||||
{
|
||||
m_nSize =
|
||||
m_nCount = 0;
|
||||
m_pItems = (wxChar **) NULL;
|
||||
m_autoSort = src.m_autoSort;
|
||||
Init(src.m_autoSort);
|
||||
|
||||
*this = src;
|
||||
}
|
||||
|
Reference in New Issue
Block a user