X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/03ab016d6692ccceafb0f324a063bbf8f334f020..706bb5f973ccb44a924ee1f9aa79c7ee34eb2556:/src/common/string.cpp diff --git a/src/common/string.cpp b/src/common/string.cpp index 0566dae040..fbdedd721e 100644 --- a/src/common/string.cpp +++ b/src/common/string.cpp @@ -10,7 +10,7 @@ ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ -#pragma implementation "string.h" + #pragma implementation "string.h" #endif /* @@ -28,7 +28,7 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif #ifndef WX_PRECOMP @@ -42,7 +42,7 @@ #include #ifdef __SALFORDC__ -#include + #include #endif #if wxUSE_WCSRTOMBS @@ -63,7 +63,7 @@ // --------------------------------------------------------------------------- #ifdef wxSTD_STRING_COMPATIBILITY - const size_t wxString::npos = STRING_MAXLEN; + const size_t wxString::npos = wxSTRING_MAXLEN; #endif // wxSTD_STRING_COMPATIBILITY // ---------------------------------------------------------------------------- @@ -90,7 +90,7 @@ extern const char WXDLLEXPORT *g_szNul = &g_strEmpty.dummy; // function: for Unix this is done with configure, for Windows we test the // compiler explicitly. #ifdef __WXMSW__ - #ifdef _MSC_VER + #ifdef __VISUALC__ #define wxVsprintf _vsnprintf #endif #else // !Windows @@ -104,10 +104,26 @@ extern const char WXDLLEXPORT *g_szNul = &g_strEmpty.dummy; // always available), but it's unsafe because it doesn't check for buffer // size - so give a warning #define wxVsprintf(buffer,len,format,argptr) vsprintf(buffer,format, argptr) -#ifndef __SC__ +#if defined(__VISUALC__) #pragma message("Using sprintf() because no snprintf()-like function defined") -#endif -#endif +#elif defined(__GNUG__) + #warning "Using sprintf() because no snprintf()-like function defined" +#elif defined(__MWERKS__) + #warning "Using sprintf() because no snprintf()-like function defined" +#elif defined(__WATCOMC__) + // No warning +#elif defined(__BORLANDC__) + // No warning +#elif defined(__SUNCC__) + // nothing -- I don't know about "#warning" for Sun's CC +#elif defined(__DECCXX) + // nothing +#else + // change this to some analogue of '#warning' for your compiler + #error "Using sprintf() because no snprintf()-like function defined" +#endif //compiler + +#endif // no vsnprintf // ---------------------------------------------------------------------------- // global functions @@ -119,46 +135,18 @@ extern const char WXDLLEXPORT *g_szNul = &g_strEmpty.dummy; // iostream ones. // // ATTN: you can _not_ use both of these in the same program! -#if wxUSE_IOSTREAMH -#include -#define NAMESPACE -#else -#include -# ifdef _MSC_VER - using namespace std; -# endif -// for msvc (bcc50+ also) you don't need these NAMESPACE defines, -// using namespace std; takes care of that. -#define NAMESPACE std:: -#endif - -#ifdef __WXMSW__ - #ifdef _MSC_VER - #define wxVsprintf _vsnprintf - #endif -#else - #if defined ( HAVE_VSNPRINTF ) - #define wxVsprintf vsnprintf - #endif -#endif -#ifndef wxVsprintf - // vsprintf() is ANSI so we can always use it, but it's unsafe! - #define wxVsprintf(buffer,len,format,argptr) vsprintf(buffer,format, argptr) - #pragma message("Using sprintf() because no snprintf()-like function defined") -#endif - -NAMESPACE istream& operator>>(NAMESPACE istream& is, wxString& WXUNUSED(str)) +istream& operator>>(istream& is, wxString& WXUNUSED(str)) { #if 0 int w = is.width(0); if ( is.ipfx(0) ) { - NAMESPACE streambuf *sb = is.rdbuf(); + streambuf *sb = is.rdbuf(); str.erase(); while ( true ) { int ch = sb->sbumpc (); if ( ch == EOF ) { - is.setstate(NAMESPACE ios::eofbit); + is.setstate(ios::eofbit); break; } else if ( isspace(ch) ) { @@ -174,7 +162,7 @@ NAMESPACE istream& operator>>(NAMESPACE istream& is, wxString& WXUNUSED(str)) is.isfx(); if ( str.length() == 0 ) - is.setstate(NAMESPACE ios::failbit); + is.setstate(ios::failbit); #endif return is; } @@ -239,7 +227,7 @@ void wxString::InitWith(const char *psz, size_t nPos, size_t nLength) wxASSERT( nPos <= Strlen(psz) ); - if ( nLength == STRING_MAXLEN ) + if ( nLength == wxSTRING_MAXLEN ) nLength = Strlen(psz + nPos); STATISTICS_ADD(InitialLength, nLength); @@ -639,8 +627,8 @@ wxString wxString::Mid(size_t nFirst, size_t nCount) const wxStringData *pData = GetStringData(); size_t nLen = pData->nDataLength; - // default value of nCount is STRING_MAXLEN and means "till the end" - if ( nCount == STRING_MAXLEN ) + // default value of nCount is wxSTRING_MAXLEN and means "till the end" + if ( nCount == wxSTRING_MAXLEN ) { nCount = nLen - nFirst; } @@ -1099,6 +1087,15 @@ wxString wxString::Upper() const // convert to lower case, return the copy of the string wxString wxString::Lower() const { wxString s(*this); return s.MakeLower(); } +int wxString::sprintf(const char *pszFormat, ...) + { + va_list argptr; + va_start(argptr, pszFormat); + int iLen = PrintfV(pszFormat, argptr); + va_end(argptr); + return iLen; + } + // --------------------------------------------------------------------------- // standard C++ library string functions // --------------------------------------------------------------------------- @@ -1133,12 +1130,12 @@ size_t wxString::find(const wxString& str, size_t nStart) const } // VC++ 1.5 can't cope with the default argument in the header. -#if ! (defined(_MSC_VER) && !defined(__WIN32__)) +#if !defined(__VISUALC__) || defined(__WIN32__) size_t wxString::find(const char* sz, size_t nStart, size_t n) const { return find(wxString(sz, n == npos ? 0 : n), nStart); } -#endif +#endif // VC++ 1.5 // Gives a duplicate symbol (presumably a case-insensitivity problem) #if !defined(__BORLANDC__) @@ -1169,7 +1166,7 @@ size_t wxString::rfind(const wxString& str, size_t nStart) const } // VC++ 1.5 can't cope with the default argument in the header. -#if ! (defined(_MSC_VER) && !defined(__WIN32__)) +#if !defined(__VISUALC__) || defined(__WIN32__) size_t wxString::rfind(const char* sz, size_t nStart, size_t n) const { return rfind(wxString(sz, n == npos ? 0 : n), nStart); @@ -1183,7 +1180,7 @@ size_t wxString::rfind(char ch, size_t nStart) const return p == NULL ? npos : p - c_str(); } -#endif +#endif // VC++ 1.5 wxString wxString::substr(size_t nStart, size_t nLen) const { @@ -1453,10 +1450,83 @@ void wxArrayString::Remove(const char *sz) Remove(iIndex); } +// ---------------------------------------------------------------------------- +// sorting +// ---------------------------------------------------------------------------- + +// we can only sort one array at a time with the quick-sort based +// implementation +#if wxUSE_THREADS + #include + + // need a critical section to protect access to gs_compareFunction and + // gs_sortAscending variables + static wxCriticalSection *gs_critsectStringSort = NULL; + + // call this before the value of the global sort vars is changed/after + // you're finished with them + #define START_SORT() wxASSERT( !gs_critsectStringSort ); \ + gs_critsectStringSort = new wxCriticalSection; \ + gs_critsectStringSort->Enter() + #define END_SORT() gs_critsectStringSort->Leave(); \ + delete gs_critsectStringSort; \ + gs_critsectStringSort = NULL +#else // !threads + #define START_SORT() + #define END_SORT() +#endif // wxUSE_THREADS + +// function to use for string comparaison +static wxArrayString::CompareFunction gs_compareFunction = NULL; + +// if we don't use the compare function, this flag tells us if we sort the +// array in ascending or descending order +static bool gs_sortAscending = TRUE; + +// function which is called by quick sort +static int wxStringCompareFunction(const void *first, const void *second) +{ + wxString *strFirst = (wxString *)first; + wxString *strSecond = (wxString *)second; + + if ( gs_compareFunction ) { + return gs_compareFunction(*strFirst, *strSecond); + } + else { + int result = strcmp(strFirst->c_str(), strSecond->c_str()); + + return gs_sortAscending ? result : -result; + } +} + // sort array elements using passed comparaison function +void wxArrayString::Sort(CompareFunction compareFunction) +{ + START_SORT(); + + wxASSERT( !gs_compareFunction ); // must have been reset to NULL + gs_compareFunction = compareFunction; + + DoSort(); + + END_SORT(); +} + +void wxArrayString::Sort(bool reverseOrder) +{ + START_SORT(); + + wxASSERT( !gs_compareFunction ); // must have been reset to NULL + gs_sortAscending = !reverseOrder; + + DoSort(); + + END_SORT(); +} -void wxArrayString::Sort(bool WXUNUSED(bCase), bool WXUNUSED(bReverse) ) +void wxArrayString::DoSort() { - //@@@@ TO DO - //qsort(m_pItems, m_nCount, sizeof(char *), fCmp); + // just sort the pointers using qsort() - of course it only works because + // wxString() *is* a pointer to its data + qsort(m_pItems, m_nCount, sizeof(char *), wxStringCompareFunction); }