fixed bug in wxString::DoCopy - it called Sort on already sorted array (thanks to...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5107 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/string.cpp b/src/common/string.cpp
index 7773d3b5528cef20338a33f21e147a64233e6fca..da23dda0f4862e0c0769879fa8e78c1aac0cb1a5 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -1802,20 +1802,8 @@ void wxArrayString::Copy(const wxArrayString& src)
   if ( src.m_nCount > ARRAY_DEFAULT_INITIAL_SIZE )
     Alloc(src.m_nCount);
 
   if ( src.m_nCount > ARRAY_DEFAULT_INITIAL_SIZE )
     Alloc(src.m_nCount);
 

-  // we can't just copy the pointers here because otherwise we would share
-  // the strings with another array because strings are ref counted
-#if 0
-  if ( m_nCount != 0 )
-    memcpy(m_pItems, src.m_pItems, m_nCount*sizeof(wxChar *));
-#endif // 0
-

   for ( size_t n = 0; n < src.m_nCount; n++ )
     Add(src[n]);
   for ( size_t n = 0; n < src.m_nCount; n++ )
     Add(src[n]);

-
-  // if the other array is auto sorted too, we're already sorted, but
-  // otherwise we should rearrange the items
-  if ( m_autoSort && !src.m_autoSort )
-    Sort();

 }
 
 // grow the array
 }
 
 // grow the array