really disable wxUSE_DISPLAY for wxMGL and wxOS2

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

diff --git a/src/common/string.cpp b/src/common/string.cpp
index be458021692ad9fb693bb132431d72e5038786d9..5bb461cb176b4f019fd5609950f8d2b4c09c2e36 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -39,10 +39,6 @@
 #include <string.h>
 #include <stdlib.h>
 
 #include <string.h>
 #include <stdlib.h>
 

-#ifndef __WXMSW__
-#include <errno.h>
-#endif
-

 #ifdef __SALFORDC__
   #include <clib.h>
 #endif
 #ifdef __SALFORDC__
   #include <clib.h>
 #endif


@@ -365,8 +361,8 @@ bool wxStringBase::Alloc(size_t nLen)
     if ( pData->IsEmpty() ) {
       nLen += EXTRA_ALLOC;
 
     if ( pData->IsEmpty() ) {
       nLen += EXTRA_ALLOC;
 

-      wxStringData* pData = (wxStringData*)
-          malloc(sizeof(wxStringData) + (nLen + 1)*sizeof(wxChar));
+      pData = (wxStringData *)
+                malloc(sizeof(wxStringData) + (nLen + 1)*sizeof(wxChar));

 
       if ( pData == NULL ) {
         // allocation failure handled by caller
 
       if ( pData == NULL ) {
         // allocation failure handled by caller


@@ -435,35 +431,35 @@ wxStringBase::iterator wxStringBase::erase(iterator it)
 
 wxStringBase& wxStringBase::erase(size_t nStart, size_t nLen)
 {
 
 wxStringBase& wxStringBase::erase(size_t nStart, size_t nLen)
 {

-  wxASSERT(nStart <= length());
-  size_t strLen = length() - nStart;
-  // delete nLen or up to the end of the string characters
-  nLen = strLen < nLen ? strLen : nLen;
-  wxString strTmp(c_str(), nStart);
-  strTmp.append(c_str() + nStart + nLen, length() - nStart - nLen);
+    wxASSERT(nStart <= length());
+    size_t strLen = length() - nStart;
+    // delete nLen or up to the end of the string characters
+    nLen = strLen < nLen ? strLen : nLen;
+    wxString strTmp(c_str(), nStart);
+    strTmp.append(c_str() + nStart + nLen, length() - nStart - nLen);

 
 

-  swap(strTmp);
-  return *this;
+    swap(strTmp);
+    return *this;

 }
 
 wxStringBase& wxStringBase::insert(size_t nPos, const wxChar *sz, size_t n)
 {
 }
 
 wxStringBase& wxStringBase::insert(size_t nPos, const wxChar *sz, size_t n)
 {

-  wxASSERT( nPos <= length() );
+    wxASSERT( nPos <= length() );

 
 

-  if ( n == npos ) n = wxStrlen(sz);
-  if ( n == 0 ) return *this;
+    if ( n == npos ) n = wxStrlen(sz);
+    if ( n == 0 ) return *this;

 
 

-  if ( !Alloc(length() + n) || !CopyBeforeWrite() ) {
-    wxFAIL_MSG( _T("out of memory in wxStringBase::insert") );
-  }
+    if ( !Alloc(length() + n) || !CopyBeforeWrite() ) {
+        wxFAIL_MSG( _T("out of memory in wxStringBase::insert") );
+    }

 
 

-  memmove(m_pchData + nPos + n, m_pchData + nPos,
-          (length() - nPos) * sizeof(wxChar));
-  memcpy(m_pchData + nPos, sz, n * sizeof(wxChar));
-  GetStringData()->nDataLength = length() + n;
-  m_pchData[length()] = '\0';
+    memmove(m_pchData + nPos + n, m_pchData + nPos,
+            (length() - nPos) * sizeof(wxChar));
+    memcpy(m_pchData + nPos, sz, n * sizeof(wxChar));
+    GetStringData()->nDataLength = length() + n;
+    m_pchData[length()] = '\0';

 
 

-  return *this;
+    return *this;

 }
 
 void wxStringBase::swap(wxStringBase& str)
 }
 
 void wxStringBase::swap(wxStringBase& str)


@@ -475,50 +471,50 @@ void wxStringBase::swap(wxStringBase& str)
 
 size_t wxStringBase::find(const wxStringBase& str, size_t nStart) const
 {
 
 size_t wxStringBase::find(const wxStringBase& str, size_t nStart) const
 {

-  wxASSERT( str.GetStringData()->IsValid() );
-  wxASSERT( nStart <= length() );
+    wxASSERT( str.GetStringData()->IsValid() );
+    wxASSERT( nStart <= length() );

 
 

-  //anchor
-  const wxChar* p = (const wxChar*)wxTmemchr(c_str() + nStart,
-                                            str.c_str()[0],
-                                            length() - nStart);
+    //anchor
+    const wxChar* p = (const wxChar*)wxTmemchr(c_str() + nStart,
+                                               str.c_str()[0],
+                                               length() - nStart);

 
 

-  if(!p)
-      return npos;
+    if(!p)
+        return npos;

 
 

-  while(p - c_str() + str.length() <= length() &&
-        wxTmemcmp(p, str.c_str(), str.length()) )
-  {
-      //Previosly passed as the first argument to wxTmemchr,
-      //but C/C++ standard does not specify evaluation order
-      //of arguments to functions -
-      //http://embedded.com/showArticle.jhtml?articleID=9900607
-      ++p;
-
-      //anchor again
-      p = (const wxChar*)wxTmemchr(p,
-                                  str.c_str()[0],
-                                  length() - (p - c_str()));
-
-      if(!p)
-          return npos;
-  }
+    while(p - c_str() + str.length() <= length() &&
+          wxTmemcmp(p, str.c_str(), str.length()) )
+    {
+        //Previosly passed as the first argument to wxTmemchr,
+        //but C/C++ standard does not specify evaluation order
+        //of arguments to functions -
+        //http://embedded.com/showArticle.jhtml?articleID=9900607
+        ++p;
+
+        //anchor again
+        p = (const wxChar*)wxTmemchr(p,
+                                     str.c_str()[0],
+                                     length() - (p - c_str()));

 
 

-   return (p - c_str() + str.length() <= length()) ? p - c_str() : npos;
+        if(!p)
+            return npos;
+    }
+
+    return (p - c_str() + str.length() <= length()) ? p - c_str() : npos;

 }
 
 size_t wxStringBase::find(const wxChar* sz, size_t nStart, size_t n) const
 {
 }
 
 size_t wxStringBase::find(const wxChar* sz, size_t nStart, size_t n) const
 {

-  return find(wxStringBase(sz, n), nStart);
+    return find(wxStringBase(sz, n), nStart);

 }
 
 size_t wxStringBase::find(wxChar ch, size_t nStart) const
 {
 }
 
 size_t wxStringBase::find(wxChar ch, size_t nStart) const
 {

-  wxASSERT( nStart <= length() );
+    wxASSERT( nStart <= length() );

 
 

-  const wxChar *p = (const wxChar*)wxTmemchr(c_str() + nStart, ch, length() - nStart);
+    const wxChar *p = (const wxChar*)wxTmemchr(c_str() + nStart, ch, length() - nStart);

 
 

-  return p == NULL ? npos : p - c_str();
+    return p == NULL ? npos : p - c_str();

 }
 
 size_t wxStringBase::rfind(const wxStringBase& str, size_t nStart) const
 }
 
 size_t wxStringBase::rfind(const wxStringBase& str, size_t nStart) const


@@ -1397,32 +1393,33 @@ const wxCharBuffer wxString::ToAscii() const
 // extract string of length nCount starting at nFirst
 wxString wxString::Mid(size_t nFirst, size_t nCount) const
 {
 // extract string of length nCount starting at nFirst
 wxString wxString::Mid(size_t nFirst, size_t nCount) const
 {

-  size_t nLen = length();
+    size_t nLen = length();

 
 

-  // default value of nCount is npos and means "till the end"
-  if ( nCount == npos )
-  {
-    nCount = nLen - nFirst;
-  }
+    // default value of nCount is npos and means "till the end"
+    if ( nCount == npos )
+    {
+        nCount = nLen - nFirst;
+    }

 
 

-  // out-of-bounds requests return sensible things
-  if ( nFirst + nCount > nLen )
-  {
-    nCount = nLen - nFirst;
-  }
+    // out-of-bounds requests return sensible things
+    if ( nFirst + nCount > nLen )
+    {
+        nCount = nLen - nFirst;
+    }

 
 

-  if ( nFirst > nLen )
-  {
-    // AllocCopy() will return empty string
-    nCount = 0;
-  }
+    if ( nFirst > nLen )
+    {
+        // AllocCopy() will return empty string
+        return wxEmptyString;
+    }

 
 

-  wxString dest(*this, nFirst, nCount);
-  if ( dest.length() != nCount ) {
-      wxFAIL_MSG( _T("out of memory in wxString::Mid") );
-  }
+    wxString dest(*this, nFirst, nCount);
+    if ( dest.length() != nCount )
+    {
+        wxFAIL_MSG( _T("out of memory in wxString::Mid") );
+    }

 
 

-  return dest;
+    return dest;

 }
 
 // check that the string starts with prefix and return the rest of the string
 }
 
 // check that the string starts with prefix and return the rest of the string


@@ -1816,7 +1813,7 @@ int wxString::PrintfV(const wxChar* pszFormat, va_list argptr)
     for ( ;; )
     {
         wxStringBuffer tmp(*this, size + 1);
     for ( ;; )
     {
         wxStringBuffer tmp(*this, size + 1);

-        wxChar* buf = tmp;
+        wxChar *buf = tmp;

 
         if ( !buf )
         {
 
         if ( !buf )
         {


@@ -1838,25 +1835,21 @@ int wxString::PrintfV(const wxChar* pszFormat, va_list argptr)
 
         // vsnprintf() may return either -1 (traditional Unix behaviour) or the
         // total number of characters which would have been written if the
 
         // vsnprintf() may return either -1 (traditional Unix behaviour) or the
         // total number of characters which would have been written if the

-        // buffer were large enough
-        if ( len >= 0 && len <= size )
+        // buffer were large enough (newer standards such as Unix98)
+        if ( len < 0 )

         {
         {

-            // ok, there was enough space
-            break;
+            // still not enough, as we don't know how much we need, double the
+            // current size of the buffer
+            size *= 2;

         }
         }

-
-#ifdef EOVERFLOW
-        // if the error is not due to not having enough space (it could be e.g.
-        // EILSEQ), break too -- we'd just eat all available memory uselessly
-        if ( errno != EOVERFLOW )
+        else if ( len > size )
+        {
+            size = len;
+        }
+        else // ok, there was enough space

         {
         {

-            // no sense in continuing

             break;
         }
             break;
         }

-#endif // EOVERFLOW
-
-        // still not enough, double it again
-        size *= 2;

     }
 
     // we could have overshot
     }
 
     // we could have overshot


@@ -2496,7 +2489,11 @@ void wxArrayString::Sort(CompareFunction compareFunction)
   END_SORT();
 }
 
   END_SORT();
 }
 

-typedef  int (wxC_CALLING_CONV * wxStringCompareFn)(const void *first, const void *second);
+extern "C"
+{
+    typedef int (wxC_CALLING_CONV * wxStringCompareFn)(const void *first,
+                                                       const void *second);
+}

 
 void wxArrayString::Sort(CompareFunction2 compareFunction)
 {
 
 void wxArrayString::Sort(CompareFunction2 compareFunction)
 {