ANSI+Unicode compatibility fixes to wxArrayString

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47009 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-06-28 18:56:00 +00:00
parent 3a0b1f421f
commit cfa3d7ba83
3 changed files with 19 additions and 7 deletions

View File

@@ -27,7 +27,16 @@
// ArrayString
// ============================================================================
wxArrayString::wxArrayString(size_t sz, const wxChar** a)
wxArrayString::wxArrayString(size_t sz, const char** a)
{
#if !wxUSE_STL
Init(false);
#endif
for (size_t i=0; i < sz; i++)
Add(a[i]);
}
wxArrayString::wxArrayString(size_t sz, const wchar_t** a)
{
#if !wxUSE_STL
Init(false);
@@ -355,7 +364,7 @@ void wxArrayString::RemoveAt(size_t nIndex, size_t nRemove)
}
// removes item from array (by value)
void wxArrayString::Remove(const wxChar *sz)
void wxArrayString::Remove(const wxString& sz)
{
int iIndex = Index(sz);