Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some changes in a vain attempt to make Salford C++ work; added FAQ files;

Browse Source 
started wxTime documentation.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1425 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1999-01-19 11:00:22 +00:00
parent 15d5ab6757
commit ce3ed50dbe
82 changed files with 951 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/string.cpp
View File

@@ -41,6 +41,10 @@
#include <string.h>
#include <stdlib.h>
#ifdef __SALFORDC__
#include <clib.h>
#endif
#if wxUSE_WCSRTOMBS
#include <wchar.h> // for wcsrtombs(), see comments where it's used
#endif // GNU
@@ -871,7 +875,7 @@ wxString& wxString::Trim(bool bFromRight)
psz++;
// fix up data and length
int nDataLength = GetStringData()->nDataLength - (psz - m_pchData);
int nDataLength = GetStringData()->nDataLength - (psz - (const char*) m_pchData);
memmove(m_pchData, psz, (nDataLength + 1)*sizeof(char));
GetStringData()->nDataLength = nDataLength;
}
@@ -919,7 +923,7 @@ int wxString::Find(char ch, bool bFromEnd) const
{
const char *psz = bFromEnd ? strrchr(m_pchData, ch) : strchr(m_pchData, ch);
return (psz == NULL) ? wxNOT_FOUND : psz - m_pchData;
return (psz == NULL) ? wxNOT_FOUND : psz - (const char*) m_pchData;
}
// find a sub-string (like strstr)
@@ -927,7 +931,7 @@ int wxString::Find(const char *pszSub) const
{
const char *psz = strstr(m_pchData, pszSub);
return (psz == NULL) ? wxNOT_FOUND : psz - m_pchData;
return (psz == NULL) ? wxNOT_FOUND : psz - (const char*) m_pchData;
}
// ---------------------------------------------------------------------------