Remove apparently erroneous -1 from DrawBitmap() in wxMSW wxGC code.

[wxWidgets.git] / src / common / list.cpp

diff --git a/src/common/list.cpp b/src/common/list.cpp
index 4bdefdba206de4c34ba73b947f251673b6eb7b47..8049c945fbdb97b776ac2554ddc22c9bfd608b7a 100644 (file)
--- a/src/common/list.cpp
+++ b/src/common/list.cpp
@@ -33,7 +33,7 @@
     #include "wx/crt.h"
 #endif
 
     #include "wx/crt.h"
 #endif
 

-#if !wxUSE_STL
+#if !wxUSE_STD_CONTAINERS

 
 // =============================================================================
 // implementation
 
 // =============================================================================
 // implementation


@@ -201,7 +201,7 @@ void wxListBase::DoCopy(const wxListBase& list)
             }
     }
 
             }
     }
 

-    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()
 }
 
 wxListBase::~wxListBase()


@@ -756,16 +756,16 @@ wxNode *wxStringList::Prepend(const wxChar *s)
 
 #endif // wxLIST_COMPATIBILITY
 
 
 #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
+// with wxUSE_STD_CONTAINERS wxStringList contains wxString objects, not pointers

 void _WX_LIST_HELPER_wxStringListBase::DeleteFunction( wxString WXUNUSED(X) )
 {
 }
 
 wxStringListBase::BaseListType wxStringListBase::EmptyList;
 
 void _WX_LIST_HELPER_wxStringListBase::DeleteFunction( wxString WXUNUSED(X) )
 {
 }
 
 wxStringListBase::BaseListType wxStringListBase::EmptyList;
 

-#endif // !wxUSE_STL
+#endif // !wxUSE_STD_CONTAINERS