////////////////////////////////////////////////////////////////////////////////
-// Name: list.cpp
+// Name: src/common/list.cpp
// Purpose: wxList implementation
// Author: Julian Smart
// Modified by: VZ at 16/11/98: WX_DECLARE_LIST() and typesafe lists added
#include <string.h>
#ifndef WX_PRECOMP
- #include "wx/defs.h"
#include "wx/list.h"
+ #include "wx/crt.h"
#endif
-#if !wxUSE_STL
+#if !wxUSE_STD_CONTAINERS
// =============================================================================
// implementation
// by not putting return here...
case wxKEY_STRING:
- return wxStrcmp(m_key.string, value.string) == 0;
+ return *m_key.string == *value.string;
case wxKEY_INTEGER:
return m_key.integer == value.integer;
case wxKEY_STRING:
// to be free()d later
- m_key.string = wxStrdup(key.GetString());
+ m_key.string = new wxString(key.GetString());
break;
default:
{
if ( m_list->m_keyType == wxKEY_STRING )
{
- free(m_key.string);
+ delete m_key.string;
}
m_list->DetachNode(this);
void wxListBase::Init(wxKeyType keyType)
{
m_nodeFirst =
- m_nodeLast = (wxNodeBase *) NULL;
+ m_nodeLast = NULL;
m_count = 0;
m_destroy = false;
m_keyType = keyType;
m_destroy = list.m_destroy;
m_keyType = list.m_keyType;
m_nodeFirst =
- m_nodeLast = (wxNodeBase *) NULL;
+ m_nodeLast = NULL;
switch (m_keyType)
{
case wxKEY_INTEGER:
{
- long key;
for ( wxNodeBase *node = list.GetFirst(); node; node = node->GetNext() )
{
- key = node->GetKeyInteger();
- Append(key, node->GetData());
+ Append(node->GetKeyInteger(), 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());
+ Append(node->GetKeyString(), node->GetData());
}
break;
}
}
}
- wxASSERT_MSG( m_count == list.m_count, _T("logic error in wxList::DoCopy") );
+ wxASSERT_MSG( m_count == list.m_count, wxT("logic error in wxList::DoCopy") );
}
wxListBase::~wxListBase()
wxNodeBase *wxListBase::Append(void *object)
{
// all objects in a keyed list should have a key
- wxCHECK_MSG( m_keyType == wxKEY_NONE, (wxNodeBase *)NULL,
+ wxCHECK_MSG( m_keyType == wxKEY_NONE, NULL,
wxT("need a key for the object to append") );
// 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,
+ wxNodeBase *node = CreateNode(m_nodeLast, NULL, object,
wxDefaultListKey);
return AppendCommon(node);
{
wxCHECK_MSG( (m_keyType == wxKEY_INTEGER) ||
(m_keyType == wxKEY_NONE && m_count == 0),
- (wxNodeBase *)NULL,
+ NULL,
wxT("can't append object with numeric key to this list") );
- wxNodeBase *node = CreateNode(m_nodeLast, (wxNodeBase *)NULL, object, key);
+ wxNodeBase *node = CreateNode(m_nodeLast, NULL, object, key);
return AppendCommon(node);
}
-wxNodeBase *wxListBase::Append (const wxChar *key, void *object)
+wxNodeBase *wxListBase::Append (const wxString& key, void *object)
{
wxCHECK_MSG( (m_keyType == wxKEY_STRING) ||
(m_keyType == wxKEY_NONE && m_count == 0),
- (wxNodeBase *)NULL,
+ NULL,
wxT("can't append object with string key to this list") );
- wxNodeBase *node = CreateNode(m_nodeLast, (wxNodeBase *)NULL, object, key);
+ wxNodeBase *node = CreateNode(m_nodeLast, NULL, object, key);
return AppendCommon(node);
}
wxNodeBase *wxListBase::Insert(wxNodeBase *position, void *object)
{
// all objects in a keyed list should have a key
- wxCHECK_MSG( m_keyType == wxKEY_NONE, (wxNodeBase *)NULL,
+ wxCHECK_MSG( m_keyType == wxKEY_NONE, NULL,
wxT("need a key for the object to insert") );
- wxCHECK_MSG( !position || position->m_list == this, (wxNodeBase *)NULL,
+ wxCHECK_MSG( !position || position->m_list == this, NULL,
wxT("can't insert before a node from another list") );
// previous and next node for the node being inserted
else
{
// inserting in the beginning of the list
- prev = (wxNodeBase *)NULL;
+ prev = NULL;
next = m_nodeFirst;
}
wxFAIL_MSG( wxT("invalid index in wxListBase::Item") );
- return (wxNodeBase *)NULL;
+ return NULL;
}
wxNodeBase *wxListBase::Find(const wxListKey& key) const
}
// not found
- return (wxNodeBase *)NULL;
+ return NULL;
}
wxNodeBase *wxListBase::Find(const void *object) const
}
// not found
- return (wxNodeBase *)NULL;
+ return NULL;
}
int wxListBase::IndexOf(void *object) const
}
m_nodeFirst =
- m_nodeLast = (wxNodeBase *)NULL;
+ m_nodeLast = NULL;
m_count = 0;
}
return current->GetData();
}
- return (wxNodeBase *)NULL;
+ return NULL;
}
void *wxListBase::LastThat(wxListIterateFunction F)
return current->GetData();
}
- return (wxNodeBase *)NULL;
+ return NULL;
}
// (stefan.hammes@urz.uni-heidelberg.de)
// wxList (a.k.a. wxObjectList)
// -----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxList, wxObject)
-
wxList::wxList( int key_type )
: wxObjectList( (wxKeyType)key_type )
{
return wxStrcpy(copy, s);
}
-IMPLEMENT_DYNAMIC_CLASS(wxStringList, wxObject)
-
// instead of WX_DEFINE_LIST(wxStringListBase) we define this function
// ourselves
void wxStringListNode::DeleteData()
{
Add(s);
+ // icc gives this warning in its own va_arg() macro, argh
+#ifdef __INTELC__
+ #pragma warning(push)
+ #pragma warning(disable: 1684)
+#endif
+
s = va_arg(ap, const wxChar *);
- // if (s == NULL)
-#ifdef __WXMSW__
- if ((int)(long) s == 0)
-#else
- if ((long) s == 0)
+
+#ifdef __INTELC__
+ #pragma warning(pop)
#endif
+
+ if ( !s )
break;
}
}
#ifdef __WXWINCE__
-extern "C" int __cdecl
+extern "C"
+{
+static int __cdecl
#else
-extern "C" int LINKAGEMODE
+extern "C"
+{
+static int LINKAGEMODE
#endif
wx_comparestrings(const void *arg1, const void *arg2)
return wxStrcmp (*s1, *s2);
}
+} // end of extern "C" (required because of GCC Bug c++/33078
+
// Sort a list of strings - deallocates old nodes, allocates new
void wxStringList::Sort()
{
wxNode *wxStringList::Add(const wxChar *s)
{
- return (wxNode *)wxStringListBase::Append(MYcopystring(s));
+ return (wxNode *)(wxStringListBase::Node *)
+ wxStringListBase::Append(MYcopystring(s));
}
wxNode *wxStringList::Prepend(const wxChar *s)
{
- return (wxNode *)wxStringListBase::Insert(MYcopystring(s));
+ return (wxNode *)(wxStringListBase::Node *)
+ wxStringListBase::Insert(MYcopystring(s));
}
#endif // wxLIST_COMPATIBILITY
-#else // wxUSE_STL = 1
+#else // wxUSE_STD_CONTAINERS = 1
- #include <wx/listimpl.cpp>
- WX_DEFINE_LIST(wxObjectList);
+ #include "wx/listimpl.cpp"
+ WX_DEFINE_LIST(wxObjectList)
-// with wxUSE_STL wxStringList contains wxString objects, not pointers
-void wxStringListBase::DeleteFunction( const wxString WXUNUSED(X) )
+// with wxUSE_STD_CONTAINERS wxStringList contains wxString objects, not pointers
+void _WX_LIST_HELPER_wxStringListBase::DeleteFunction( wxString WXUNUSED(X) )
{
}
-#endif // !wxUSE_STL
+_WX_LIST_HELPER_wxStringListBase::BaseListType _WX_LIST_HELPER_wxStringListBase::EmptyList;
+#endif // !wxUSE_STD_CONTAINERS
projects / wxWidgets.git / blobdiff