Make wxSingleChoiceDialog::GetSelectionData() const.

[wxWidgets.git] / src / common / stringimpl.cpp

diff --git a/src/common/stringimpl.cpp b/src/common/stringimpl.cpp
index d0a7165ce747ccd118e478ca051eae38bdce542e..498793722e8f171a109b642db979fbcc0ff57ec6 100644 (file)
--- a/src/common/stringimpl.cpp
+++ b/src/common/stringimpl.cpp
@@ -77,9 +77,9 @@ const size_t wxStringImpl::npos = (size_t) -1;
 
 // FIXME-UTF8: get rid of this, have only one wxEmptyString
 #if wxUSE_UNICODE_UTF8
 
 // FIXME-UTF8: get rid of this, have only one wxEmptyString
 #if wxUSE_UNICODE_UTF8

-extern const wxStringCharType WXDLLIMPEXP_BASE *wxEmptyStringImpl = "";
+const wxStringCharType WXDLLIMPEXP_BASE *wxEmptyStringImpl = "";

 #endif
 #endif

-extern const wxChar WXDLLIMPEXP_BASE *wxEmptyString = _T("");
+const wxChar WXDLLIMPEXP_BASE *wxEmptyString = wxT("");

 
 #else
 
 
 #else
 


@@ -95,10 +95,10 @@ static const struct
 // empty C style string: points to 'string data' byte of g_strEmpty
 #if wxUSE_UNICODE_UTF8
 // FIXME-UTF8: get rid of this, have only one wxEmptyString
 // empty C style string: points to 'string data' byte of g_strEmpty
 #if wxUSE_UNICODE_UTF8
 // FIXME-UTF8: get rid of this, have only one wxEmptyString

-extern const wxStringCharType WXDLLIMPEXP_BASE *wxEmptyStringImpl = &g_strEmpty.dummy;
-extern const wxChar WXDLLIMPEXP_BASE *wxEmptyString = _T("");
+const wxStringCharType WXDLLIMPEXP_BASE *wxEmptyStringImpl = &g_strEmpty.dummy;
+const wxChar WXDLLIMPEXP_BASE *wxEmptyString = wxT("");

 #else
 #else

-extern const wxStringCharType WXDLLIMPEXP_BASE *wxEmptyString = &g_strEmpty.dummy;
+const wxStringCharType WXDLLIMPEXP_BASE *wxEmptyString = &g_strEmpty.dummy;

 #endif
 
 #endif
 #endif
 
 #endif


@@ -166,7 +166,7 @@ void wxStringImpl::InitWith(const wxStringCharType *psz,
 
   // if the length is not given, assume the string to be NUL terminated
   if ( nLength == npos ) {
 
   // if the length is not given, assume the string to be NUL terminated
   if ( nLength == npos ) {

-    wxASSERT_MSG( nPos <= wxStrlen(psz), _T("index out of bounds") );
+    wxASSERT_MSG( nPos <= wxStrlen(psz), wxT("index out of bounds") );

 
     nLength = wxStrlen(psz + nPos);
   }
 
     nLength = wxStrlen(psz + nPos);
   }


@@ -176,7 +176,7 @@ void wxStringImpl::InitWith(const wxStringCharType *psz,
   if ( nLength > 0 ) {
     // trailing '\0' is written in AllocBuffer()
     if ( !AllocBuffer(nLength) ) {
   if ( nLength > 0 ) {
     // trailing '\0' is written in AllocBuffer()
     if ( !AllocBuffer(nLength) ) {

-      wxFAIL_MSG( _T("out of memory in wxStringImpl::InitWith") );
+      wxFAIL_MSG( wxT("out of memory in wxStringImpl::InitWith") );

       return;
     }
     wxStringMemcpy(m_pchData, psz + nPos, nLength);
       return;
     }
     wxStringMemcpy(m_pchData, psz + nPos, nLength);


@@ -191,7 +191,7 @@ wxStringImpl::wxStringImpl(const_iterator first, const_iterator last)
   }
   else
   {
   }
   else
   {

-    wxFAIL_MSG( _T("first must be before last") );
+    wxFAIL_MSG( wxT("first must be before last") );

     Init();
   }
 }
     Init();
   }
 }


@@ -311,7 +311,7 @@ wxStringImpl& wxStringImpl::append(size_t n, wxStringCharType ch)
     size_type len = length();
 
     if ( !Alloc(len + n) || !CopyBeforeWrite() ) {
     size_type len = length();
 
     if ( !Alloc(len + n) || !CopyBeforeWrite() ) {

-      wxFAIL_MSG( _T("out of memory in wxStringImpl::append") );
+      wxFAIL_MSG( wxT("out of memory in wxStringImpl::append") );

       return *this;
     }
     GetStringData()->nDataLength = len + n;
       return *this;
     }
     GetStringData()->nDataLength = len + n;


@@ -395,14 +395,14 @@ bool wxStringImpl::Alloc(size_t nLen)
 
 wxStringImpl::iterator wxStringImpl::begin()
 {
 
 wxStringImpl::iterator wxStringImpl::begin()
 {

-    if (length() > 0)
+    if ( !empty() )

         CopyBeforeWrite();
     return m_pchData;
 }
 
 wxStringImpl::iterator wxStringImpl::end()
 {
         CopyBeforeWrite();
     return m_pchData;
 }
 
 wxStringImpl::iterator wxStringImpl::end()
 {

-    if (length() > 0)
+    if ( !empty() )

         CopyBeforeWrite();
     return m_pchData + length();
 }
         CopyBeforeWrite();
     return m_pchData + length();
 }


@@ -436,7 +436,7 @@ wxStringImpl& wxStringImpl::insert(size_t nPos,
     if ( n == 0 ) return *this;
 
     if ( !Alloc(length() + n) || !CopyBeforeWrite() ) {
     if ( n == 0 ) return *this;
 
     if ( !Alloc(length() + n) || !CopyBeforeWrite() ) {

-        wxFAIL_MSG( _T("out of memory in wxStringImpl::insert") );
+        wxFAIL_MSG( wxT("out of memory in wxStringImpl::insert") );

         return *this;
     }
 
         return *this;
     }
 


@@ -528,7 +528,7 @@ size_t wxStringImpl::rfind(const wxStringImpl& str, size_t nStart) const
     if ( length() >= str.length() )
     {
         // avoids a corner case later
     if ( length() >= str.length() )
     {
         // avoids a corner case later

-        if ( length() == 0 && str.length() == 0 )
+        if ( empty() && str.empty() )

             return 0;
 
         // "top" is the point where search starts from
             return 0;
 
         // "top" is the point where search starts from


@@ -587,7 +587,7 @@ wxStringImpl& wxStringImpl::replace(size_t nStart, size_t nLen,
     const size_t lenOld = length();
 
     wxASSERT_MSG( nStart <= lenOld,
     const size_t lenOld = length();
 
     wxASSERT_MSG( nStart <= lenOld,

-                  _T("index out of bounds in wxStringImpl::replace") );
+                  wxT("index out of bounds in wxStringImpl::replace") );

     size_t nEnd = nStart + nLen;
     if ( nLen > lenOld - nStart )
     {
     size_t nEnd = nStart + nLen;
     if ( nLen > lenOld - nStart )
     {


@@ -655,7 +655,7 @@ wxStringImpl& wxStringImpl::operator=(wxStringCharType ch)
 {
   wxStringCharType c(ch);
   if ( !AssignCopy(1, &c) ) {
 {
   wxStringCharType c(ch);
   if ( !AssignCopy(1, &c) ) {

-    wxFAIL_MSG( _T("out of memory in wxStringImpl::operator=(wxStringCharType)") );
+    wxFAIL_MSG( wxT("out of memory in wxStringImpl::operator=(wxStringCharType)") );

   }
   return *this;
 }
   }
   return *this;
 }


@@ -664,7 +664,7 @@ wxStringImpl& wxStringImpl::operator=(wxStringCharType ch)
 wxStringImpl& wxStringImpl::operator=(const wxStringCharType *psz)
 {
   if ( !AssignCopy(wxStrlen(psz), psz) ) {
 wxStringImpl& wxStringImpl::operator=(const wxStringCharType *psz)
 {
   if ( !AssignCopy(wxStrlen(psz), psz) ) {

-    wxFAIL_MSG( _T("out of memory in wxStringImpl::operator=(const wxStringCharType *)") );
+    wxFAIL_MSG( wxT("out of memory in wxStringImpl::operator=(const wxStringCharType *)") );

   }
   return *this;
 }
   }
   return *this;
 }


@@ -681,7 +681,11 @@ bool wxStringImpl::AssignCopy(size_t nSrcLen,
       // allocation failure handled by caller
       return false;
     }
       // allocation failure handled by caller
       return false;
     }

-    memcpy(m_pchData, pszSrcData, nSrcLen*sizeof(wxStringCharType));
+
+    // use memmove() and not memcpy() here as we might be copying from our own
+    // buffer in case of assignment such as "s = s.c_str()" (see #11294)
+    memmove(m_pchData, pszSrcData, nSrcLen*sizeof(wxStringCharType));
+

     GetStringData()->nDataLength = nSrcLen;
     m_pchData[nSrcLen] = wxT('\0');
   }
     GetStringData()->nDataLength = nSrcLen;
     m_pchData[nSrcLen] = wxT('\0');
   }


@@ -784,10 +788,10 @@ void wxStringImpl::DoUngetWriteBuf(size_t nLen)
 {
   wxStringData * const pData = GetStringData();
 
 {
   wxStringData * const pData = GetStringData();
 

-  wxASSERT_MSG( nLen < pData->nAllocLength, _T("buffer overrun") );
+  wxASSERT_MSG( nLen < pData->nAllocLength, wxT("buffer overrun") );

 
   // the strings we store are always NUL-terminated
 
   // the strings we store are always NUL-terminated

-  pData->data()[nLen] = _T('\0');
+  pData->data()[nLen] = wxT('\0');

   pData->nDataLength = nLen;
   pData->Validate(true);
 }
   pData->nDataLength = nLen;
   pData->Validate(true);
 }