Two corrections to const fix

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36944 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/list.h b/include/wx/list.h
index 47281cb1d5275ab6d17538a04050639b92cbb24a..a83cff416650e4c95b7b71930516dd9b6690a8a0 100644 (file)
--- a/include/wx/list.h
+++ b/include/wx/list.h
@@ -136,7 +136,7 @@ private:
 #endif // defined( __VISUALC__ )
 
 // Visual C++ 2005 complains about the const
-#if defined(__VISUALC__) && __VISUALC__ >= 1400
+#if (defined(__VISUALC__) && __VISUALC__ >= 1400) || defined(__MWERKS__)
 #define _WX_DELETEFUNCTIONCONST
 #else
 #define _WX_DELETEFUNCTIONCONST const

diff --git a/src/common/list.cpp b/src/common/list.cpp
index d400eff51791f56ac3dbc1db7850c0cb785bcd78..bd111c8ad23b28cde57931c3ae48eb4a58930db9 100644 (file)
--- a/src/common/list.cpp
+++ b/src/common/list.cpp
@@ -758,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 WXUNUSED(X) )
+void wxStringListBase::DeleteFunction( _WX_DELETEFUNCTIONCONST wxString WXUNUSED(X) )
 {
 }