From: Václav Slavík Date: Fri, 16 Mar 2007 12:57:46 +0000 (+0000) Subject: removed wxArrayString casting hack, it doesn't work with the new wxString class X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/b7452b3a0e502c1e6c9df113323561032280fcd2 removed wxArrayString casting hack, it doesn't work with the new wxString class git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44848 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/arrstr.h b/include/wx/arrstr.h index 95b3519e80..570d4672e8 100644 --- a/include/wx/arrstr.h +++ b/include/wx/arrstr.h @@ -80,21 +80,6 @@ public: #else // if !wxUSE_STL -// ---------------------------------------------------------------------------- -// The string array uses it's knowledge of internal structure of the wxString -// class to optimize string storage. Normally, we would store pointers to -// string, but as wxString is, in fact, itself a pointer (sizeof(wxString) is -// sizeof(char *)) we store these pointers instead. The cast to "wxString *" is -// really all we need to turn such pointer into a string! -// -// Of course, it can be called a dirty hack, but we use twice less memory and -// this approach is also more speed efficient, so it's probably worth it. -// -// Usage notes: when a string is added/inserted, a new copy of it is created, -// so the original string may be safely deleted. When a string is retrieved -// from the array (operator[] or Item() method), a reference is returned. -// ---------------------------------------------------------------------------- - class WXDLLIMPEXP_BASE wxArrayString { public: @@ -154,7 +139,7 @@ public: wxASSERT_MSG( nIndex < m_nCount, _T("wxArrayString: index out of bounds") ); - return *(wxString *)&(m_pItems[nIndex]); + return m_pItems[nIndex]; } // same as Item() @@ -273,8 +258,8 @@ public: { clear(); Add(v, n); } reference back() { return *(end() - 1); } const_reference back() const { return *(end() - 1); } - iterator begin() { return (wxString *)&(m_pItems[0]); } - const_iterator begin() const { return (wxString *)&(m_pItems[0]); } + iterator begin() { return m_pItems; } + const_iterator begin() const { return m_pItems; } size_type capacity() const { return m_nSize; } void clear() { Clear(); } bool empty() const { return IsEmpty(); } @@ -311,14 +296,13 @@ protected: private: void Grow(size_t nIncrement = 0); // makes array bigger if needed - void Free(); // free all the strings stored void DoSort(); // common part of all Sort() variants size_t m_nSize, // current size of the array m_nCount; // current number of elements - const wxChar **m_pItems; // pointer to data + wxString *m_pItems; // pointer to data bool m_autoSort; // if true, keep the array always sorted }; diff --git a/src/common/string.cpp b/src/common/string.cpp index 208a77c020..7b3805d3a3 100644 --- a/src/common/string.cpp +++ b/src/common/string.cpp @@ -2097,14 +2097,12 @@ wxArrayString::wxArrayString(size_t sz, const wxString* a) #define ARRAY_DEFAULT_INITIAL_SIZE (16) #endif -#define STRING(p) ((wxString *)(&(p))) - // ctor void wxArrayString::Init(bool autoSort) { m_nSize = m_nCount = 0; - m_pItems = (const wxChar **) NULL; + m_pItems = NULL; m_autoSort = autoSort; } @@ -2154,7 +2152,7 @@ void wxArrayString::Grow(size_t nIncrement) m_nSize = ARRAY_DEFAULT_INITIAL_SIZE; if (m_nSize < nIncrement) m_nSize = nIncrement; - m_pItems = new const wxChar *[m_nSize]; + m_pItems = new wxString[m_nSize]; } else { // otherwise when it's called for the first time, nIncrement would be 0 @@ -2167,10 +2165,11 @@ void wxArrayString::Grow(size_t nIncrement) if ( nIncrement < ndefIncrement ) nIncrement = ndefIncrement; m_nSize += nIncrement; - const wxChar **pNew = new const wxChar *[m_nSize]; + wxString *pNew = new wxString[m_nSize]; // copy data to new location - memcpy(pNew, m_pItems, m_nCount*sizeof(wxChar *)); + for ( size_t j = 0; j < m_nCount; j++ ) + pNew[j] = m_pItems[j]; // delete old memory (but do not release the strings!) wxDELETEA(m_pItems); @@ -2180,26 +2179,15 @@ void wxArrayString::Grow(size_t nIncrement) } } -void wxArrayString::Free() -{ - for ( size_t n = 0; n < m_nCount; n++ ) { - STRING(m_pItems[n])->GetStringData()->Unlock(); - } -} - // deletes all the strings from the list void wxArrayString::Empty() { - Free(); - m_nCount = 0; } // as Empty, but also frees memory void wxArrayString::Clear() { - Free(); - m_nSize = m_nCount = 0; @@ -2209,8 +2197,6 @@ void wxArrayString::Clear() // dtor wxArrayString::~wxArrayString() { - Free(); - wxDELETEA(m_pItems); } @@ -2224,11 +2210,12 @@ void wxArrayString::Alloc(size_t nSize) { // only if old buffer was not big enough if ( nSize > m_nSize ) { - const wxChar **pNew = new const wxChar *[nSize]; + wxString *pNew = new wxString[nSize]; if ( !pNew ) return; - memcpy(pNew, m_pItems, m_nCount*sizeof(wxChar *)); + for ( size_t j = 0; j < m_nCount; j++ ) + pNew[j] = m_pItems[j]; delete [] m_pItems; m_pItems = pNew; @@ -2242,10 +2229,11 @@ void wxArrayString::Shrink() // only do it if we have some memory to free if( m_nCount < m_nSize ) { // allocates exactly as much memory as we need - const wxChar **pNew = new const wxChar *[m_nCount]; + wxString *pNew = new wxString[m_nCount]; // copy data to new location - memcpy(pNew, m_pItems, m_nCount*sizeof(wxChar *)); + for ( size_t j = 0; j < m_nCount; j++ ) + pNew[j] = m_pItems[j]; delete [] m_pItems; m_pItems = pNew; } @@ -2283,7 +2271,7 @@ int wxArrayString::Index(const wxChar *sz, bool bCase, bool bFromEnd) const if ( m_nCount > 0 ) { size_t ui = m_nCount; do { - if ( STRING(m_pItems[--ui])->IsSameAs(sz, bCase) ) + if ( m_pItems[--ui].IsSameAs(sz, bCase) ) return ui; } while ( ui != 0 ); @@ -2291,7 +2279,7 @@ int wxArrayString::Index(const wxChar *sz, bool bCase, bool bFromEnd) const } else { for( size_t ui = 0; ui < m_nCount; ui++ ) { - if( STRING(m_pItems[ui])->IsSameAs(sz, bCase) ) + if( m_pItems[ui].IsSameAs(sz, bCase) ) return ui; } } @@ -2330,17 +2318,12 @@ size_t wxArrayString::Add(const wxString& str, size_t nInsert) return (size_t)lo; } else { - wxASSERT( str.GetStringData()->IsValid() ); - Grow(nInsert); for (size_t i = 0; i < nInsert; i++) { - // the string data must not be deleted! - str.GetStringData()->Lock(); - // just append - m_pItems[m_nCount + i] = str.c_str(); + m_pItems[m_nCount + i] = str; } size_t ret = m_nCount; m_nCount += nInsert; @@ -2351,21 +2334,18 @@ size_t wxArrayString::Add(const wxString& str, size_t nInsert) // add item at the given position void wxArrayString::Insert(const wxString& str, size_t nIndex, size_t nInsert) { - wxASSERT( str.GetStringData()->IsValid() ); - wxCHECK_RET( nIndex <= m_nCount, wxT("bad index in wxArrayString::Insert") ); wxCHECK_RET( m_nCount <= m_nCount + nInsert, wxT("array size overflow in wxArrayString::Insert") ); Grow(nInsert); - memmove(&m_pItems[nIndex + nInsert], &m_pItems[nIndex], - (m_nCount - nIndex)*sizeof(wxChar *)); + for (int j = m_nCount - nIndex - 1; j >= 0; j--) + m_pItems[nIndex + nInsert + j] = m_pItems[nIndex + j]; for (size_t i = 0; i < nInsert; i++) { - str.GetStringData()->Lock(); - m_pItems[nIndex + i] = str.c_str(); + m_pItems[nIndex + i] = str; } m_nCount += nInsert; } @@ -2401,7 +2381,7 @@ void wxArrayString::SetCount(size_t count) wxString s; while ( m_nCount < count ) - m_pItems[m_nCount++] = s.c_str(); + m_pItems[m_nCount++] = s; } // removes item from array (by index) @@ -2411,12 +2391,9 @@ void wxArrayString::RemoveAt(size_t nIndex, size_t nRemove) wxCHECK_RET( nIndex + nRemove <= m_nCount, wxT("removing too many elements in wxArrayString::Remove") ); - // release our lock - for (size_t i = 0; i < nRemove; i++) - Item(nIndex + i).GetStringData()->Unlock(); + for ( size_t j = 0; j < m_nCount - nIndex -nRemove; j++) + m_pItems[nIndex + j] = m_pItems[nIndex + nRemove + j]; - memmove(&m_pItems[nIndex], &m_pItems[nIndex + nRemove], - (m_nCount - nIndex - nRemove)*sizeof(wxChar *)); m_nCount -= nRemove; } @@ -2497,7 +2474,7 @@ extern "C" void wxArrayString::Sort(CompareFunction2 compareFunction) { - qsort(m_pItems, m_nCount, sizeof(wxChar *), (wxStringCompareFn)compareFunction); + qsort(m_pItems, m_nCount, sizeof(wxString), (wxStringCompareFn)compareFunction); } void wxArrayString::Sort(bool reverseOrder) @@ -2509,9 +2486,7 @@ void wxArrayString::DoSort() { wxCHECK_RET( !m_autoSort, wxT("can't use this method with sorted arrays") ); - // just sort the pointers using qsort() - of course it only works because - // wxString() *is* a pointer to its data - qsort(m_pItems, m_nCount, sizeof(wxChar *), wxStringCompareFunction); + qsort(m_pItems, m_nCount, sizeof(wxString), wxStringCompareFunction); } bool wxArrayString::operator==(const wxArrayString& a) const