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

Moved some methods/classes inside COMPATIBILITY_2_4.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21616 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2003-07-03 21:59:55 +00:00
parent 2ea4a2f552
commit ba8c160144
19 changed files with 132 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/common/string.cpp
View File

@@ -1906,6 +1906,8 @@ void wxArrayString::Shrink()
}
}
#if WXWIN_COMPATIBILITY_2_4
// return a wxString[] as required for some control ctors.
wxString* wxArrayString::GetStringArray() const
{
@@ -1921,6 +1923,8 @@ wxString* wxArrayString::GetStringArray() const
return array;
}
#endif // WXWIN_COMPATIBILITY_2_4
// searches the array for an item (forward or backwards)
int wxArrayString::Index(const wxChar *sz, bool bCase, bool bFromEnd) const
{
@@ -2051,7 +2055,7 @@ void wxArrayString::SetCount(size_t count)
}
// removes item from array (by index)
void wxArrayString::Remove(size_t nIndex, size_t nRemove)
void wxArrayString::RemoveAt(size_t nIndex, size_t nRemove)
{
wxCHECK_RET( nIndex < m_nCount, wxT("bad index in wxArrayString::Remove") );
wxCHECK_RET( nIndex + nRemove <= m_nCount,
@@ -2074,7 +2078,7 @@ void wxArrayString::Remove(const wxChar *sz)
wxCHECK_RET( iIndex != wxNOT_FOUND,
wxT("removing inexistent element in wxArrayString::Remove") );
Remove(iIndex);
RemoveAt(iIndex);
}
// ----------------------------------------------------------------------------
@@ -2142,18 +2146,22 @@ void wxArrayString::Sort(CompareFunction compareFunction)
END_SORT();
}
typedef int (wxC_CALLING_CONV * wxStringCompareFn)(const void *first, const void *second);
void wxArrayString::Sort(CompareFunction2 compareFunction)
{
qsort(m_pItems, m_nCount, sizeof(wxChar *), (wxStringCompareFn)compareFunction);
}
#if WXWIN_COMPATIBILITY_2_4
void wxArrayString::Sort(bool reverseOrder)
{
START_SORT();
wxASSERT( !gs_compareFunction ); // must have been reset to NULL
gs_sortAscending = !reverseOrder;
DoSort();
END_SORT();
Sort(reverseOrder ? wxStringSortDescending : wxStringSortAscending);
}
#endif // WXWIN_COMPATIBILITY_2_4
void wxArrayString::DoSort()
{
wxCHECK_RET( !m_autoSort, wxT("can't use this method with sorted arrays") );
@@ -2177,3 +2185,12 @@ bool wxArrayString::operator==(const wxArrayString& a) const
return TRUE;
}
int wxStringSortAscending(wxString* s1, wxString* s2)
{
return wxStrcmp(s1->c_str(), s2->c_str());
}
int wxStringSortDescending(wxString* s1, wxString* s2)
{
return -wxStrcmp(s1->c_str(), s2->c_str());
}