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

Quick and dirty fix for building with COMPATIBILITY_2_4 off.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21580 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2003-07-02 17:11:19 +00:00
parent c04b9739f6
commit f526f7526b
6 changed files with 63 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/common/list.cpp
View File

@@ -35,7 +35,6 @@
#ifndef WX_PRECOMP
#include "wx/defs.h"
#include "wx/list.h"
#include "wx/utils.h" // for copystring() (beurk...)
#endif
// =============================================================================
@@ -572,9 +571,21 @@ void wxObjectListNode::DeleteData()
delete (wxObject *)GetData();
}
// -----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// wxStringList
// -----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
static inline wxChar* MYcopystring(const wxString& s)
{
wxChar* copy = new wxChar[s.length() + 1];
return wxStrcpy(copy, s.c_str());
}
static inline wxChar* MYcopystring(const wxChar* s)
{
wxChar* copy = new wxChar[wxStrlen(s) + 1];
return wxStrcpy(copy, s);
}
IMPLEMENT_DYNAMIC_CLASS(wxStringList, wxObject)
@@ -656,7 +667,7 @@ wxChar **wxStringList::ListToArray(bool new_copies) const
{
wxChar *s = node->GetData();
if ( new_copies )
string_array[i] = copystring(s);
string_array[i] = MYcopystring(s);
else
string_array[i] = s;
node = node->GetNext();
@@ -709,5 +720,15 @@ void wxStringList::Sort()
delete [] array;
}
wxNode *wxStringList::Add(const wxChar *s)
{
return (wxNode *)wxStringListBase::Append(MYcopystring(s));
}
wxNode *wxStringList::Prepend(const wxChar *s)
{
return (wxNode *)wxStringListBase::Insert(MYcopystring(s));
}
#endif // wxLIST_COMPATIBILITY