Made choice convenient dialog more, well, convenient: fixed lack of vertical

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

diff --git a/src/common/string.cpp b/src/common/string.cpp
index 7d77c76f8f9a188f70129eb8571bf3e82546c8d1..9b8823d05f07f7504df6bdceb3a556081dfb20a4 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -1077,16 +1077,21 @@ wxChar *wxString::GetWriteBuf(size_t nLen)
 // put string back in a reasonable state after GetWriteBuf
 void wxString::UngetWriteBuf()
 {
-  GetStringData()->nDataLength = wxStrlen(m_pchData);
-  GetStringData()->Validate(true);
+  UngetWriteBuf(wxStrlen(m_pchData));
 }
 
 void wxString::UngetWriteBuf(size_t nLen)
 {
-  GetStringData()->nDataLength = nLen;
-  GetStringData()->Validate(true);
+  wxStringData * const pData = GetStringData();
+
+  wxASSERT_MSG( nLen < pData->nAllocLength, _T("buffer overrun") );
+
+  // the strings we store are always NUL-terminated
+  pData->data()[nLen] = _T('\0');
+  pData->nDataLength = nLen;
+  pData->Validate(true);
 }
-#endif
+#endif // !wxUSE_STL
 
 // ---------------------------------------------------------------------------
 // data access
@@ -1832,15 +1837,29 @@ int wxString::PrintfV(const wxChar* pszFormat, va_list argptr)
         // buffer were large enough (newer standards such as Unix98)
         if ( len < 0 )
         {
+#if wxUSE_WXVSNPRINTF
+            // we know that our own implementation of wxVsnprintf() returns -1
+            // only for a format error - thus there's something wrong with
+            // the user's format string
+            return -1;
+#else // assume that system version only returns error if not enough space
             // still not enough, as we don't know how much we need, double the
             // current size of the buffer
             size *= 2;
+#endif // wxUSE_WXVSNPRINTF/!wxUSE_WXVSNPRINTF
         }
         else if ( len >= size )
         {
+#if wxUSE_WXVSNPRINTF
+            // we know that our own implementation of wxVsnprintf() returns 
+            // size+1 when there's not enough space but that's not the size
+            // of the required buffer!
+            size *= 2;      // so we just double the current size of the buffer
+#else
             // some vsnprintf() implementations NUL-terminate the buffer and
             // some don't in len == size case, to be safe always add 1
             size = len + 1;
+#endif
         }
         else // ok, there was enough space
         {
@@ -2065,7 +2084,7 @@ void wxArrayString::Init(bool autoSort)
 {
   m_nSize  =
   m_nCount = 0;
-  m_pItems = (wxChar **) NULL;
+  m_pItems = (const wxChar **) NULL;
   m_autoSort = autoSort;
 }
 
@@ -2115,7 +2134,7 @@ void wxArrayString::Grow(size_t nIncrement)
       m_nSize = ARRAY_DEFAULT_INITIAL_SIZE;
       if (m_nSize < nIncrement)
           m_nSize = nIncrement;
-      m_pItems = new wxChar *[m_nSize];
+      m_pItems = new const wxChar *[m_nSize];
     }
     else {
       // otherwise when it's called for the first time, nIncrement would be 0
@@ -2128,7 +2147,7 @@ void wxArrayString::Grow(size_t nIncrement)
       if ( nIncrement < ndefIncrement )
         nIncrement = ndefIncrement;
       m_nSize += nIncrement;
-      wxChar **pNew = new wxChar *[m_nSize];
+      const wxChar **pNew = new const wxChar *[m_nSize];
 
       // copy data to new location
       memcpy(pNew, m_pItems, m_nCount*sizeof(wxChar *));
@@ -2185,7 +2204,7 @@ void wxArrayString::Alloc(size_t nSize)
 {
   // only if old buffer was not big enough
   if ( nSize > m_nSize ) {
-    wxChar **pNew = new wxChar *[nSize];
+    const wxChar **pNew = new const wxChar *[nSize];
     if ( !pNew )
         return;
 
@@ -2203,7 +2222,7 @@ 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
-    wxChar **pNew = new wxChar *[m_nCount];
+    const wxChar **pNew = new const wxChar *[m_nCount];
 
     // copy data to new location
     memcpy(pNew, m_pItems, m_nCount*sizeof(wxChar *));
@@ -2325,7 +2344,7 @@ size_t wxArrayString::Add(const wxString& str, size_t nInsert)
         str.GetStringData()->Lock();
 
         // just append
-        m_pItems[m_nCount + i] = (wxChar *)str.c_str(); // const_cast
+        m_pItems[m_nCount + i] = str.c_str();
     }
     size_t ret = m_nCount;
     m_nCount += nInsert;
@@ -2350,7 +2369,7 @@ void wxArrayString::Insert(const wxString& str, size_t nIndex, size_t nInsert)
   for (size_t i = 0; i < nInsert; i++)
   {
       str.GetStringData()->Lock();
-      m_pItems[nIndex + i] = (wxChar *)str.c_str();
+      m_pItems[nIndex + i] = str.c_str();
   }
   m_nCount += nInsert;
 }
@@ -2386,7 +2405,7 @@ void wxArrayString::SetCount(size_t count)
 
     wxString s;
     while ( m_nCount < count )
-        m_pItems[m_nCount++] = (wxChar *)s.c_str();
+        m_pItems[m_nCount++] = s.c_str();
 }
 
 // removes item from array (by index)