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

Split this out from other changes to keep things sane..

Browse Source 
wxDeprecated KeyCode.
wxDeprecated old wxList compat methods.
Replaced a large number of them in the gtk build already, but there are
still plenty more so feel free to help nuke them as you find them.
s/^I/    / and s/TRUE/true/ etc. a couple of these too.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ron Lee
2003-01-13 05:17:41 +00:00
parent 5797172366
commit b1d4dd7add
59 changed files with 1099 additions and 996 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/common/list.cpp
View File

@@ -513,9 +513,9 @@ void wxListBase::Sort(const wxSortCompareFunction compfunc)
// go through the list and put the pointers into the array
wxNodeBase *node;
for ( node = GetFirst(); node; node = node->Next() )
for ( node = GetFirst(); node; node = node->GetNext() )
{
*objPtr++ = node->Data();
*objPtr++ = node->GetData();
}
// sort the array
@@ -523,7 +523,7 @@ void wxListBase::Sort(const wxSortCompareFunction compfunc)
// put the sorted pointers back into the list
objPtr = objArray;
for ( node = GetFirst(); node; node = node->Next() )
for ( node = GetFirst(); node; node = node->GetNext() )
{
node->SetData(*objPtr++);
}
@@ -538,12 +538,35 @@ void wxListBase::Sort(const wxSortCompareFunction compfunc)
#ifdef wxLIST_COMPATIBILITY
// -----------------------------------------------------------------------------
// wxNodeBase deprecated methods
// -----------------------------------------------------------------------------
wxNode *wxNodeBase::Next() const { return (wxNode *)GetNext(); }
wxNode *wxNodeBase::Previous() const { return (wxNode *)GetPrevious(); }
wxObject *wxNodeBase::Data() const { return (wxObject *)GetData(); }
// -----------------------------------------------------------------------------
// wxListBase deprecated methods
// -----------------------------------------------------------------------------
int wxListBase::Number() const { return GetCount(); }
wxNode *wxListBase::First() const { return (wxNode *)GetFirst(); }
wxNode *wxListBase::Last() const { return (wxNode *)GetLast(); }
wxNode *wxListBase::Nth(size_t n) const { return (wxNode *)Item(n); }
wxListBase::operator wxList&() const { return *(wxList*)this; }
// -----------------------------------------------------------------------------
// wxList (a.k.a. wxObjectList)
// -----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxList, wxObject)
wxList::wxList( int key_type )
: wxObjectList( (wxKeyType)key_type )
{
}
void wxObjectListNode::DeleteData()
{
delete (wxObject *)GetData();
@@ -590,6 +613,11 @@ void wxStringList::DoCopy(const wxStringList& other)
}
}
wxStringList::wxStringList()
{
DeleteContents(TRUE);
}
// Variable argument list, terminated by a zero
// Makes new storage for the strings
wxStringList::wxStringList (const wxChar *first, ...)