Warning fix and source cleaning.

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

diff --git a/src/common/string.cpp b/src/common/string.cpp
index 6b21ca1b09588be2a81743b63c5c93ffc86c5c07..4d16458ff8dfc0cce4a77a088e1c48cbaca819cd 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -1024,7 +1024,7 @@ wxString::wxString(const char *psz, wxMBConv& conv, size_t nLength)
         size_t nRealSize;
         wxWCharBuffer theBuffer = conv.cMB2WC(psz, nLen, &nRealSize);
 
         size_t nRealSize;
         wxWCharBuffer theBuffer = conv.cMB2WC(psz, nLen, &nRealSize);
 

-        //Copy 
+        //Copy

         if (nRealSize)
             assign( theBuffer.data() , nRealSize - 1 );
     }
         if (nRealSize)
             assign( theBuffer.data() , nRealSize - 1 );
     }


@@ -1080,7 +1080,7 @@ wxString::wxString(const wchar_t *pwz, wxMBConv& conv, size_t nLength)
         size_t nRealSize;
         wxCharBuffer theBuffer = conv.cWC2MB(pwz, nLen, &nRealSize);
 
         size_t nRealSize;
         wxCharBuffer theBuffer = conv.cWC2MB(pwz, nLen, &nRealSize);
 

-        //Copy 
+        //Copy

         if (nRealSize)
             assign( theBuffer.data() , nRealSize - 1 );
     }
         if (nRealSize)
             assign( theBuffer.data() , nRealSize - 1 );
     }


@@ -1629,7 +1629,7 @@ inline int wxSafeIsspace(wxChar ch) { return (ch < 127) && wxIsspace(ch); }
 wxString& wxString::Trim(bool bFromRight)
 {
   // first check if we're going to modify the string at all
 wxString& wxString::Trim(bool bFromRight)
 {
   // first check if we're going to modify the string at all

-  if ( !IsEmpty() &&
+  if ( !empty() &&

        (
         (bFromRight && wxSafeIsspace(GetChar(Len() - 1))) ||
         (!bFromRight && wxSafeIsspace(GetChar(0u)))
        (
         (bFromRight && wxSafeIsspace(GetChar(Len() - 1))) ||
         (!bFromRight && wxSafeIsspace(GetChar(0u)))


@@ -2195,6 +2195,11 @@ wxString* wxArrayString::GetStringArray() const
     return array;
 }
 
     return array;
 }
 

+void wxArrayString::Remove(size_t nIndex, size_t nRemove)
+{
+    RemoveAt(nIndex, nRemove);
+}
+

 #endif // WXWIN_COMPATIBILITY_2_4
 
 // searches the array for an item (forward or backwards)
 #endif // WXWIN_COMPATIBILITY_2_4
 
 // searches the array for an item (forward or backwards)