misleading wxASSERT() corrected

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

diff --git a/src/common/string.cpp b/src/common/string.cpp
index 744a0fd7e60b2353dd01a346b2a5eb53dea4b06d..415a533501561901915533a4c83b979bd77df2dd 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -153,7 +153,7 @@ wxString::wxString(char ch, size_t nLength)
 
   if ( nLength > 0 ) {
     AllocBuffer(nLength);
 
   if ( nLength > 0 ) {
     AllocBuffer(nLength);

-    
+

     wxASSERT( sizeof(char) == 1 );  // can't use memset if not
 
     memset(m_pchData, ch, nLength);
     wxASSERT( sizeof(char) == 1 );  // can't use memset if not
 
     memset(m_pchData, ch, nLength);


@@ -282,14 +282,14 @@ void wxString::AllocBeforeWrite(size_t nLen)
   wxASSERT( nLen != 0 );  // doesn't make any sense
 
   // must not share string and must have enough space
   wxASSERT( nLen != 0 );  // doesn't make any sense
 
   // must not share string and must have enough space

-  register wxStringData* pData = GetStringData();  
+  register wxStringData* pData = GetStringData();

   if ( pData->IsShared() || (nLen > pData->nAllocLength) ) {
     // can't work with old buffer, get new one
     pData->Unlock();
     AllocBuffer(nLen);
   }
 
   if ( pData->IsShared() || (nLen > pData->nAllocLength) ) {
     // can't work with old buffer, get new one
     pData->Unlock();
     AllocBuffer(nLen);
   }
 

-  wxASSERT( !pData->IsShared() );  // we must be the only owner
+  wxASSERT( !GetStringData()->IsShared() );  // we must be the only owner

 }
 
 // get the pointer to writable buffer of (at least) nLen bytes
 }
 
 // get the pointer to writable buffer of (at least) nLen bytes