// -----------------------------------------------------------------------------
// headers
// -----------------------------------------------------------------------------
+
#ifdef __GNUG__
-#pragma implementation "list.h"
+ #pragma implementation "list.h"
#endif
// For compilers that support precompilation, includes "wx.h".
#include "wx/utils.h" // for copystring() (beurk...)
#endif
-// -----------------------------------------------------------------------------
-// implementation of standard lists
-// -----------------------------------------------------------------------------
-
-#include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxWindowList);
-
// =============================================================================
// implementation
// =============================================================================
switch ( m_keyType )
{
default:
- wxFAIL_MSG(_T("bad key type."));
+ wxFAIL_MSG(wxT("bad key type."));
// let compiler optimize the line above away in release build
// by not putting return here...
break;
default:
- wxFAIL_MSG(_T("invalid key type"));
+ wxFAIL_MSG(wxT("invalid key type"));
}
if ( previous )
int wxNodeBase::IndexOf() const
{
- wxCHECK_MSG( m_list, wxNOT_FOUND, _T("node doesn't belong to a list in IndexOf"));
+ wxCHECK_MSG( m_list, wxNOT_FOUND, wxT("node doesn't belong to a list in IndexOf"));
// It would be more efficient to implement IndexOf() completely inside
// wxListBase (only traverse the list once), but this is probably a more
void wxListBase::DoCopy(const wxListBase& list)
{
wxASSERT_MSG( !list.m_destroy,
- _T("copying list which owns it's elements is a bad idea") );
+ wxT("copying list which owns it's elements is a bad idea") );
- m_count = list.m_count;
m_destroy = list.m_destroy;
m_keyType = list.m_keyType;
m_nodeFirst =
m_nodeLast = (wxNodeBase *) NULL;
- for ( wxNodeBase *node = list.GetFirst(); node; node = node->GetNext() )
+ switch (m_keyType)
{
- Append(node);
+ case wxKEY_INTEGER:
+ {
+ long key;
+ for ( wxNodeBase *node = list.GetFirst(); node; node = node->GetNext() )
+ {
+ key = node->GetKeyInteger();
+ Append(key, node->GetData());
+ }
+ break;
+ }
+
+ case wxKEY_STRING:
+ {
+ const wxChar *key;
+ for ( wxNodeBase *node = list.GetFirst(); node; node = node->GetNext() )
+ {
+ key = node->GetKeyString();
+ Append(key, node->GetData());
+ }
+ break;
+ }
+
+ default:
+ {
+ for ( wxNodeBase *node = list.GetFirst(); node; node = node->GetNext() )
+ {
+ Append(node->GetData());
+ }
+ break;
+ }
}
+
+ wxASSERT_MSG( m_count == list.m_count, _T("logic error in wxList::DoCopy") );
}
wxListBase::~wxListBase()
{
// all objects in a keyed list should have a key
wxCHECK_MSG( m_keyType == wxKEY_NONE, (wxNodeBase *)NULL,
- _T("need a key for the object to append") );
+ wxT("need a key for the object to append") );
- wxNodeBase *node = CreateNode(m_nodeLast, (wxNodeBase *)NULL, object);
+ // we use wxDefaultListKey even though it is the default parameter value
+ // because gcc under Mac OS X seems to miscompile this call otherwise
+ wxNodeBase *node = CreateNode(m_nodeLast, (wxNodeBase *)NULL, object,
+ wxDefaultListKey);
return AppendCommon(node);
}
wxCHECK_MSG( (m_keyType == wxKEY_INTEGER) ||
(m_keyType == wxKEY_NONE && m_count == 0),
(wxNodeBase *)NULL,
- _T("can't append object with numeric key to this list") );
+ wxT("can't append object with numeric key to this list") );
wxNodeBase *node = CreateNode(m_nodeLast, (wxNodeBase *)NULL, object, key);
return AppendCommon(node);
wxCHECK_MSG( (m_keyType == wxKEY_STRING) ||
(m_keyType == wxKEY_NONE && m_count == 0),
(wxNodeBase *)NULL,
- _T("can't append object with string key to this list") );
+ wxT("can't append object with string key to this list") );
wxNodeBase *node = CreateNode(m_nodeLast, (wxNodeBase *)NULL, object, key);
return AppendCommon(node);
{
// all objects in a keyed list should have a key
wxCHECK_MSG( m_keyType == wxKEY_NONE, (wxNodeBase *)NULL,
- _T("need a key for the object to insert") );
+ wxT("need a key for the object to insert") );
wxCHECK_MSG( !position || position->m_list == this, (wxNodeBase *)NULL,
- _T("can't insert before a node from another list") );
+ wxT("can't insert before a node from another list") );
// previous and next node for the node being inserted
wxNodeBase *prev, *next;
next = m_nodeFirst;
}
- wxNodeBase *node = CreateNode(prev, next, object);
+ // wxDefaultListKey: see comment in Append() above
+ wxNodeBase *node = CreateNode(prev, next, object, wxDefaultListKey);
if ( !m_nodeFirst )
{
m_nodeLast = node;
}
}
- wxFAIL_MSG( _T("invalid index in wxListBase::Item") );
+ wxFAIL_MSG( wxT("invalid index in wxListBase::Item") );
return (wxNodeBase *)NULL;
}
wxNodeBase *wxListBase::Find(const wxListKey& key) const
{
wxASSERT_MSG( m_keyType == key.GetKeyType(),
- _T("this list is not keyed on the type of this key") );
+ wxT("this list is not keyed on the type of this key") );
for ( wxNodeBase *current = GetFirst(); current; current = current->GetNext() )
{
wxNodeBase *wxListBase::DetachNode(wxNodeBase *node)
{
- wxCHECK_MSG( node, NULL, _T("detaching NULL wxNodeBase") );
+ wxCHECK_MSG( node, NULL, wxT("detaching NULL wxNodeBase") );
wxCHECK_MSG( node->m_list == this, NULL,
- _T("detaching node which is not from this list") );
+ wxT("detaching node which is not from this list") );
// update the list
wxNodeBase **prevNext = node->GetPrevious() ? &node->GetPrevious()->m_next
delete[] objArray;
}
+// ============================================================================
+// compatibility section from now on
+// ============================================================================
+
+#ifdef wxLIST_COMPATIBILITY
+
// -----------------------------------------------------------------------------
// wxList (a.k.a. wxObjectList)
// -----------------------------------------------------------------------------
+IMPLEMENT_DYNAMIC_CLASS(wxList, wxObject)
+
void wxObjectListNode::DeleteData()
{
delete (wxObject *)GetData();
// wxStringList
// -----------------------------------------------------------------------------
+IMPLEMENT_DYNAMIC_CLASS(wxStringList, wxObject)
+
// instead of WX_DEFINE_LIST(wxStringListBase) we define this function
// ourselves
void wxStringListNode::DeleteData()
// Makes new storage for the strings
wxStringList::wxStringList (const wxChar *first, ...)
{
+ DeleteContents(TRUE);
if ( !first )
return;
s = va_arg(ap, const wxChar *);
// if (s == NULL)
#ifdef __WXMSW__
- if ((int) s == 0)
+ if ((int)(long) s == 0)
#else
if ((long) s == 0)
#endif
return FALSE;
}
-static int
+extern "C" int LINKAGEMODE
wx_comparestrings(const void *arg1, const void *arg2)
{
wxChar **s1 = (wxChar **) arg1;
delete [] array;
}
+
+#endif // wxLIST_COMPATIBILITY
+
projects / wxWidgets.git / blobdiff