projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wxXmlNode::GetAttribute's pointer argument must not be NULL, check for it
[wxWidgets.git]
/
src
/
common
/
list.cpp
diff --git
a/src/common/list.cpp
b/src/common/list.cpp
index 6a32377fb41c914a639d6e2be8cc1606ae879993..2c1fd19ad92dabd8a703508f382dba25b21f663b 100644
(file)
--- a/
src/common/list.cpp
+++ b/
src/common/list.cpp
@@
-1,5
+1,5
@@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
-// 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
// Purpose: wxList implementation
// Author: Julian Smart
// Modified by: VZ at 16/11/98: WX_DECLARE_LIST() and typesafe lists added
@@
-29,8
+29,8
@@
#include <string.h>
#ifndef WX_PRECOMP
#include <string.h>
#ifndef WX_PRECOMP
- #include "wx/defs.h"
#include "wx/list.h"
#include "wx/list.h"
+ #include "wx/crt.h"
#endif
#if !wxUSE_STL
#endif
#if !wxUSE_STL
@@
-54,7
+54,7
@@
bool wxListKey::operator==(wxListKeyValue value) const
// by not putting return here...
case wxKEY_STRING:
// 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_INTEGER:
return m_key.integer == value.integer;
@@
-85,7
+85,7
@@
wxNodeBase::wxNodeBase(wxListBase *list,
case wxKEY_STRING:
// to be free()d later
case wxKEY_STRING:
// to be free()d later
- m_key.string =
wxStrdup
(key.GetString());
+ m_key.string =
new wxString
(key.GetString());
break;
default:
break;
default:
@@
-108,7
+108,7
@@
wxNodeBase::~wxNodeBase()
{
if ( m_list->m_keyType == wxKEY_STRING )
{
{
if ( m_list->m_keyType == wxKEY_STRING )
{
-
free(m_key.string)
;
+
delete m_key.string
;
}
m_list->DetachNode(this);
}
m_list->DetachNode(this);
@@
-258,7
+258,7
@@
wxNodeBase *wxListBase::Append(long key, void *object)
return AppendCommon(node);
}
return AppendCommon(node);
}
-wxNodeBase *wxListBase::Append (const wx
Char *
key, void *object)
+wxNodeBase *wxListBase::Append (const wx
String&
key, void *object)
{
wxCHECK_MSG( (m_keyType == wxKEY_STRING) ||
(m_keyType == wxKEY_NONE && m_count == 0),
{
wxCHECK_MSG( (m_keyType == wxKEY_STRING) ||
(m_keyType == wxKEY_NONE && m_count == 0),
@@
-654,13
+654,19
@@
wxStringList::wxStringList (const wxChar *first, ...)
{
Add(s);
{
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 *);
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
#endif
+
+ if ( !s )
break;
}
break;
}
@@
-736,25
+742,28
@@
void wxStringList::Sort()
wxNode *wxStringList::Add(const wxChar *s)
{
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)
{
}
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
}
#endif // wxLIST_COMPATIBILITY
#else // wxUSE_STL = 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
// with wxUSE_STL wxStringList contains wxString objects, not pointers
-void
wxStringListBase::DeleteFunction( const
wxString WXUNUSED(X) )
+void
_WX_LIST_HELPER_wxStringListBase::DeleteFunction(
wxString WXUNUSED(X) )
{
}
{
}
-#endif // !wxUSE_STL
+wxStringListBase::BaseListType wxStringListBase::EmptyList;
+#endif // !wxUSE_STL