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

don't use implicit wxString->char*/wchar_t* conversion, it will not be available in wxUSE_STL build in the future

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46391 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-06-10 17:42:41 +00:00
parent 52de37c78f
commit 8650108199
51 changed files with 330 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/common/dynarray.cpp
View File

@@ -427,17 +427,31 @@ _WX_DEFINE_BASEARRAY(wxString, wxBaseArrayStringBase)
// extern "C" functions and the functions with C++ linkage and ptr_fun and
// wxStringCompareLess can't take wxStrcmp/wxStricmp directly as arguments in
// this case, we need the wrappers below to make this work
inline int wxStrcmpCppWrapper(const wxChar *p, const wxChar *q)
struct wxStringCmp
{
return wxStrcmp(p, q);
}
typedef wxString first_argument_type;
typedef wxString second_argument_type;
typedef int result_type;
inline int wxStricmpCppWrapper(const wxChar *p, const wxChar *q)
int operator()(const wxString& s1, const wxString& s2) const
{
return s1.compare(s2);
}
};
struct wxStringCmpNoCase
{
return wxStricmp(p, q);
}
typedef wxString first_argument_type;
typedef wxString second_argument_type;
typedef int result_type;
int wxArrayString::Index(const wxChar* sz, bool bCase, bool WXUNUSED(bFromEnd)) const
int operator()(const wxString& s1, const wxString& s2) const
{
return s1.CmpNoCase(s2);
}
};
int wxArrayString::Index(const wxString& str, bool bCase, bool WXUNUSED(bFromEnd)) const
{
wxArrayString::const_iterator it;
@@ -446,14 +460,14 @@ int wxArrayString::Index(const wxChar* sz, bool bCase, bool WXUNUSED(bFromEnd))
it = std::find_if(begin(), end(),
std::not1(
std::bind2nd(
std::ptr_fun(wxStrcmpCppWrapper), sz)));
wxStringCmp(), str)));
}
else // !bCase
{
it = std::find_if(begin(), end(),
std::not1(
std::bind2nd(
std::ptr_fun(wxStricmpCppWrapper), sz)));
wxStringCmpNoCase(), str)));
}
return it == end() ? wxNOT_FOUND : it - begin();
@@ -464,8 +478,6 @@ class wxStringCompareLess
{
public:
wxStringCompareLess(F f) : m_f(f) { }
bool operator()(const wxChar* s1, const wxChar* s2)
{ return m_f(s1, s2) < 0; }
bool operator()(const wxString& s1, const wxString& s2)
{ return m_f(s1, s2) < 0; }
private:
@@ -495,33 +507,32 @@ void wxArrayString::Sort(bool reverseOrder)
}
}
int wxSortedArrayString::Index(const wxChar* sz, bool bCase, bool WXUNUSED(bFromEnd)) const
int wxSortedArrayString::Index(const wxString& str, bool bCase, bool WXUNUSED(bFromEnd)) const
{
wxSortedArrayString::const_iterator it;
wxString s(sz);
if (bCase)
it = std::lower_bound(begin(), end(), s,
wxStringCompare(wxStrcmpCppWrapper));
it = std::lower_bound(begin(), end(), str,
wxStringCompare(wxStringCmp()));
else
it = std::lower_bound(begin(), end(), s,
wxStringCompare(wxStricmpCppWrapper));
it = std::lower_bound(begin(), end(), str,
wxStringCompare(wxStringCmpNoCase()));
if (it == end())
return wxNOT_FOUND;
if (bCase)
{
if (wxStrcmp(it->c_str(), sz) != 0)
if (str.Cmp(*it) != 0)
return wxNOT_FOUND;
}
else
{
if (wxStricmp(it->c_str(), sz) != 0)
if (str.CmpNoCase(*it) != 0)
return wxNOT_FOUND;
}
return it - begin();
}
#endif
#endif // wxUSE_STL