X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3543c79e6fe198f70130e13c9a2ea68754ba6274..4837b89e3b9ddc02a752d9937e3e1d9f92328851:/src/common/list.cpp

diff --git a/src/common/list.cpp b/src/common/list.cpp
index 9c5603a0fa..42368c0e51 100644
--- a/src/common/list.cpp
+++ b/src/common/list.cpp
@@ -17,10 +17,6 @@
 // headers
 // -----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "list.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -594,12 +590,6 @@ void wxObjectListNode::DeleteData()
 // wxStringList
 // ----------------------------------------------------------------------------
 
-static inline wxChar* MYcopystring(const wxString& s)
-{
-    wxChar* copy = new wxChar[s.length() + 1];
-    return wxStrcpy(copy, s.c_str());
-}
-
 static inline wxChar* MYcopystring(const wxChar* s)
 {
     wxChar* copy = new wxChar[wxStrlen(s) + 1];
@@ -664,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;
   }
 
@@ -762,7 +758,7 @@ wxNode *wxStringList::Prepend(const wxChar *s)
     WX_DEFINE_LIST(wxObjectList);
 
 // with wxUSE_STL wxStringList contains wxString objects, not pointers
-void wxStringListBase::DeleteFunction( const wxString X )
+void wxStringListBase::DeleteFunction( const wxString WXUNUSED(X) )
 {
 }