X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..73c902d669217bf89cf1e1105622c63cbfe3befb:/src/common/list.cpp diff --git a/src/common/list.cpp b/src/common/list.cpp index 6a32377fb4..d400eff517 100644 --- 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 @@ -654,13 +654,19 @@ wxStringList::wxStringList (const wxChar *first, ...) { 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; } @@ -748,8 +754,8 @@ wxNode *wxStringList::Prepend(const wxChar *s) #else // wxUSE_STL = 1 - #include - 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) ) @@ -757,4 +763,3 @@ void wxStringListBase::DeleteFunction( const wxString WXUNUSED(X) ) } #endif // !wxUSE_STL -