Only do this Show on wxGTK as it is needed there but can cause display

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

diff --git a/src/common/string.cpp b/src/common/string.cpp
index 5e14e76ff9e449d872f53fa9e650bd991b01960c..0eae6299c973bd7dae141f2e55919ca3363a942e 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -1,11 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        string.cpp
 // Purpose:     wxString class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        string.cpp
 // Purpose:     wxString class

-// Author:      Vadim Zeitlin
+// Author:      Vadim Zeitlin, Ryan Norton

 // Modified by:
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Modified by:
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

+//              (c) 2004 Ryan Norton <wxprojects@comcast.net>

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -208,7 +209,7 @@ void wxStringBase::InitWith(const wxChar *psz, size_t nPos, size_t nLength)
       wxFAIL_MSG( _T("out of memory in wxStringBase::InitWith") );
       return;
     }
       wxFAIL_MSG( _T("out of memory in wxStringBase::InitWith") );
       return;
     }

-    memcpy(m_pchData, psz + nPos, nLength*sizeof(wxChar));
+    wxMemcpy(m_pchData, psz + nPos, nLength);

   }
 }
 
   }
 }
 


@@ -273,7 +274,7 @@ bool wxStringBase::CopyBeforeWrite()
       // allocation failures are handled by the caller
       return false;
     }
       // allocation failures are handled by the caller
       return false;
     }

-    memcpy(m_pchData, pData->data(), nLen*sizeof(wxChar));
+    wxMemcpy(m_pchData, pData->data(), nLen);

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


@@ -475,10 +476,10 @@ size_t wxStringBase::find(const wxStringBase& str, size_t nStart) const
   wxASSERT( nStart <= length() );
 
   //anchor
   wxASSERT( nStart <= length() );
 
   //anchor

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

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


@@ -486,14 +487,14 @@ size_t wxStringBase::find(const wxStringBase& str, size_t nStart) const
         wxMemcmp(p, str.c_str(), str.length()) )
   {
       //anchor again
         wxMemcmp(p, str.c_str(), str.length()) )
   {
       //anchor again

-      p = wxMemchr(++p, 
-                    str.c_str()[0], 
-                    length() - (p - c_str()));
+      p = (const wxChar*)wxMemchr(++p,
+                                  str.c_str()[0],
+                                  length() - (p - c_str()));

 
       if(!p)
           return npos;
   }
 
       if(!p)
           return npos;
   }

-       
+

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


@@ -506,7 +507,7 @@ size_t wxStringBase::find(wxChar ch, size_t nStart) const
 {
   wxASSERT( nStart <= length() );
 
 {
   wxASSERT( nStart <= length() );
 

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

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


@@ -609,7 +610,7 @@ size_t wxStringBase::find_last_of(const wxChar* sz, size_t nStart) const
     }
 
     size_t len = wxStrlen(sz);
     }
 
     size_t len = wxStrlen(sz);

-    
+

     for ( const wxChar *p = c_str() + nStart; p >= c_str(); --p )
     {
         if ( wxMemchr(sz, *p, len) )
     for ( const wxChar *p = c_str() + nStart; p >= c_str(); --p )
     {
         if ( wxMemchr(sz, *p, len) )


@@ -741,7 +742,7 @@ wxStringBase& wxStringBase::replace(size_t nStart, size_t nLen,
 wxStringBase& wxStringBase::replace(size_t nStart, size_t nLen,
                                     size_t nCount, wxChar ch)
 {
 wxStringBase& wxStringBase::replace(size_t nStart, size_t nLen,
                                     size_t nCount, wxChar ch)
 {

-  return replace(nStart, nLen, wxStringBase(ch, nCount).c_str());
+  return replace(nStart, nLen, wxStringBase(nCount, ch).c_str());

 }
 
 wxStringBase& wxStringBase::replace(size_t nStart, size_t nLen,
 }
 
 wxStringBase& wxStringBase::replace(size_t nStart, size_t nLen,


@@ -985,7 +986,7 @@ int STRINGCLASS::compare(size_t nStart, size_t nLen,
 // ===========================================================================
 
 // ---------------------------------------------------------------------------
 // ===========================================================================
 
 // ---------------------------------------------------------------------------

-// construction
+// construction and conversion

 // ---------------------------------------------------------------------------
 
 #if wxUSE_UNICODE
 // ---------------------------------------------------------------------------
 
 #if wxUSE_UNICODE


@@ -1012,7 +1013,10 @@ wxString::wxString(const char *psz, wxMBConv& conv, size_t nLength)
     if ( psz )
     {
         // calculate the needed size ourselves or use the provided one
     if ( psz )
     {
         // calculate the needed size ourselves or use the provided one

-        nLen = conv.MB2WC(NULL, psz, 0);
+        if (nLength == npos)
+            nLen = strlen(psz);
+        else
+            nLen = nLength;

     }
     else
     {
     }
     else
     {


@@ -1020,31 +1024,51 @@ wxString::wxString(const char *psz, wxMBConv& conv, size_t nLength)
         nLen = 0;
     }
 
         nLen = 0;
     }
 

+

     // anything to do?
     if ( (nLen != 0) && (nLen != (size_t)-1) )
     {
     // anything to do?
     if ( (nLen != 0) && (nLen != (size_t)-1) )
     {

-        if ( !Alloc(nLen) )
-        {
-            wxFAIL_MSG( _T("out of memory in wxString::wxString") );
-        }
-        else
+        //Get length of converted string
+        size_t dwConvLen = conv.MB2WC(NULL, psz, 0, nLen);
+
+        //if valid, do the conversion
+        if (dwConvLen != (size_t) -1)

         {
         {

-            wxWCharBuffer buf(nLen);
-            // MB2WC wants the buffer size, not the string length hence +1
-            nLen = conv.MB2WC(buf.data(), psz, nLen + 1);
+            //Get internal buffer
+            wxStringBufferLength internalBuffer(*this, dwConvLen + 1);

 
 

-            if ( nLen != (size_t)-1 )
-            {
-                // initialized ok, set the real length as nLength specified by
-                // the caller could be greater than the real string length
-                assign(buf.data(), nLen);
-                return;
-            }
-            //else: the conversion failed -- leave the string empty (what else?)
+            //Do the actual conversion & Set the length of the buffer
+            internalBuffer.SetLength(
+                   conv.MB2WC(internalBuffer, psz, dwConvLen + 1, nLen)
+                                    );

         }
     }
 }
 
         }
     }
 }
 

+//Convert wxString in Unicode mode to a multi-byte string
+const wxCharBuffer wxString::mb_str(wxMBConv& conv) const
+{
+    //Get length of converted string
+    size_t dwConvLen = conv.WC2MB(NULL, (*this).c_str(), 0, length());
+
+    //if valid, do the conversion
+    if (dwConvLen != (size_t) -1)
+    {
+        //Create good buffer
+        wxCharBuffer buffer(dwConvLen + 1);
+
+        //Do the actual conversion
+        conv.WC2MB(buffer.data(), (*this).c_str(), dwConvLen + 1, length());
+
+        return buffer;
+    }
+
+    //create bogus buffer
+    wxCharBuffer buffer(1);
+    buffer.data()[0u] = 0;
+    return buffer;
+}
+

 #else // ANSI
 
 #if wxUSE_WCHAR_T
 #else // ANSI
 
 #if wxUSE_WCHAR_T


@@ -1070,7 +1094,10 @@ wxString::wxString(const wchar_t *pwz, wxMBConv& conv, size_t nLength)
     if ( pwz )
     {
         // calculate the needed size ourselves or use the provided one
     if ( pwz )
     {
         // calculate the needed size ourselves or use the provided one

-        nLen = conv.WC2MB(NULL, pwz, 0);
+        if (nLength == npos)
+            nLen = wxWcslen(pwz);
+        else
+            nLen = nLength;

     }
     else
     {
     }
     else
     {


@@ -1081,26 +1108,48 @@ wxString::wxString(const wchar_t *pwz, wxMBConv& conv, size_t nLength)
     // anything to do?
     if ( (nLen != 0) && (nLen != (size_t)-1) )
     {
     // anything to do?
     if ( (nLen != 0) && (nLen != (size_t)-1) )
     {

-        if ( !Alloc(nLen) )
-        {
-            wxFAIL_MSG( _T("out of memory in wxString::wxString") );
-        }
-        else
+        //Get length of converted string
+        size_t dwConvLen = conv.WC2MB(NULL, pwz, 0, nLen);
+
+        //if valid, do the conversion
+        if (dwConvLen != (size_t) -1)

         {
         {

-            wxCharBuffer buf(nLen);
-            // WC2MB wants the buffer size, not the string length
-            if ( conv.WC2MB(buf.data(), pwz, nLen + 1) != (size_t)-1 )
-            {
-                // initialized ok
-                assign(buf.data(), nLen);
-                return;
-            }
-            //else: the conversion failed -- leave the string empty (what else?)
+            //Get internal buffer
+            wxStringBufferLength internalBuffer(*this, dwConvLen + 1);
+
+            //Do the actual conversion & Set the length of the buffer
+            internalBuffer.SetLength(
+                   conv.WC2MB(internalBuffer, pwz, dwConvLen + 1, nLen)
+                                    );

         }
     }
         }
     }

+}
+
+//Converts this string to a wide character string if unicode
+//mode is not enabled and wxUSE_WCHAR_T is enabled
+const wxWCharBuffer wxString::wc_str(wxMBConv& conv) const
+{
+    //Get length of converted string
+    size_t dwConvLen = conv.MB2WC(NULL, (*this).c_str(), 0, length());
+
+    //if valid, do the conversion
+    if (dwConvLen != (size_t) -1)
+    {
+        //Create good buffer
+        wxWCharBuffer buffer(dwConvLen + 1);
+
+        //Do the actual conversion
+        conv.MB2WC(buffer.data(), (*this).c_str(), dwConvLen + 1, length());
+
+        return buffer;
+    }

 
 

-    // leave empty
+    //create bogus buffer
+    wxWCharBuffer buffer(1);
+    buffer.data()[0u] = 0;
+    return buffer;

 }
 }

+

 #endif // wxUSE_WCHAR_T
 
 #endif // Unicode/ANSI
 #endif // wxUSE_WCHAR_T
 
 #endif // Unicode/ANSI


@@ -1274,7 +1323,7 @@ static inline int wxDoCmpNoCase(const wxChar* s1, size_t l1,
             if(wxTolower(s1[i]) != wxTolower(s2[i]))
                 break;
         }
             if(wxTolower(s1[i]) != wxTolower(s2[i]))
                 break;
         }

-        return i == l1 ? 0 : s1[i] < s2[i] ? -1 : 1;
+        return i == l1 ? 0 : wxTolower(s1[i]) < wxTolower(s2[i]) ? -1 : 1;

     }
     else if( l1 < l2 )
     {
     }
     else if( l1 < l2 )
     {


@@ -1283,7 +1332,7 @@ static inline int wxDoCmpNoCase(const wxChar* s1, size_t l1,
             if(wxTolower(s1[i]) != wxTolower(s2[i]))
                 break;
         }
             if(wxTolower(s1[i]) != wxTolower(s2[i]))
                 break;
         }

-        return i == l1 ? -1 : s1[i] < s2[i] ? -1 : 1;
+        return i == l1 ? -1 : wxTolower(s1[i]) < wxTolower(s2[i]) ? -1 : 1;

     }
     else if( l1 > l2 )
     {
     }
     else if( l1 > l2 )
     {


@@ -1292,7 +1341,7 @@ static inline int wxDoCmpNoCase(const wxChar* s1, size_t l1,
             if(wxTolower(s1[i]) != wxTolower(s2[i]))
                 break;
         }
             if(wxTolower(s1[i]) != wxTolower(s2[i]))
                 break;
         }

-        return i == l2 ? 1 : s1[i] < s2[i] ? -1 : 1;
+        return i == l2 ? 1 : wxTolower(s1[i]) < wxTolower(s2[i]) ? -1 : 1;

     }
 
     wxFAIL;   // must never get there
     }
 
     wxFAIL;   // must never get there


@@ -1359,12 +1408,13 @@ const wxCharBuffer wxString::ToAscii() const
     // this will allocate enough space for the terminating NUL too
     wxCharBuffer buffer(length());
 
     // this will allocate enough space for the terminating NUL too
     wxCharBuffer buffer(length());
 

-    signed char *dest = (signed char *)buffer.data();
+
+    char *dest = buffer.data();

 
     const wchar_t *pwc = c_str();
     for ( ;; )
     {
 
     const wchar_t *pwc = c_str();
     for ( ;; )
     {

-        *dest++ = *pwc > SCHAR_MAX ? '_' : *pwc;
+        *dest++ = (char)(*pwc > SCHAR_MAX ? wxT('_') : *pwc);

 
         // the output string can't have embedded NULs anyhow, so we can safely
         // stop at first of them even if we do have any
 
         // the output string can't have embedded NULs anyhow, so we can safely
         // stop at first of them even if we do have any


@@ -1586,7 +1636,7 @@ bool wxString::IsNumber() const
 {
   const wxChar *s = (const wxChar*) *this;
   if (wxStrlen(s))
 {
   const wxChar *s = (const wxChar*) *this;
   if (wxStrlen(s))

-     if ((s[0] == '-') || (s[0] == '+')) s++;
+     if ((s[0] == wxT('-')) || (s[0] == wxT('+'))) s++;

   while(*s){
     if(!wxIsdigit(*s)) return(false);
     s++;
   while(*s){
     if(!wxIsdigit(*s)) return(false);
     s++;