X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/22692cf6eab5cb2ee12853b96bbf53afd73d5d66..4b37e99afcedd67292c24e93677a83b76dc6b625:/include/wx/arrimpl.cpp?ds=sidebyside

diff --git a/include/wx/arrimpl.cpp b/include/wx/arrimpl.cpp
index e52d81def3..b16c18bded 100644
--- a/include/wx/arrimpl.cpp
+++ b/include/wx/arrimpl.cpp
@@ -1,8 +1,8 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        listimpl.cpp
+// Name:        wx/arrimpl.cpp
 // Purpose:     helper file for implementation of dynamic lists
 // Author:      Vadim Zeitlin
-// Modified by: 
+// Modified by:
 // Created:     16.10.97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
@@ -20,6 +20,15 @@
  *          4) WX_DEFINE_OBJARRAY                                            *
  *****************************************************************************/
 
+// needed to resolve the conflict between global T and macro parameter T
+
+// VC++ can't cope with string concatenation in Unicode mode
+#if defined(wxUSE_UNICODE) && wxUSE_UNICODE
+#define _WX_ERROR_REMOVE2(x)     wxT("bad index in ::RemoveAt()")
+#else
+#define _WX_ERROR_REMOVE2(x)     wxT("bad index in " #x "::RemoveAt()")
+#endif
+
 // macro implements remaining (not inline) methods of template list
 // (it's private to this file)
 #undef  _DEFINE_OBJARRAY
@@ -48,21 +57,19 @@ name::name(const name& src)                                                   \
   DoCopy(src);                                                                \
 }                                                                             \
                                                                               \
-void name::Empty()                                                            \
+void name::DoEmpty()                                                          \
 {                                                                             \
   for ( size_t ui = 0; ui < Count(); ui++ )                                   \
     delete (T*)wxBaseArray::Item(ui);                                         \
-                                                                              \
-  wxBaseArray::Clear();                                                       \
 }                                                                             \
                                                                               \
-void name::Remove(size_t uiIndex)                                             \
+void name::RemoveAt(size_t uiIndex)                                           \
 {                                                                             \
-  wxCHECK_RET( uiIndex < Count(), "bad index in " #name "::Remove()" );       \
+  wxCHECK_RET( uiIndex < Count(), _WX_ERROR_REMOVE2(name) );                  \
                                                                               \
   delete (T*)wxBaseArray::Item(uiIndex);                                      \
                                                                               \
-  wxBaseArray::Remove(uiIndex);                                               \
+  wxBaseArray::RemoveAt(uiIndex);                                             \
 }                                                                             \
                                                                               \
 void name::Add(const T& item)                                                 \
@@ -99,10 +106,10 @@ int name::Index(const T& Item, bool bFromEnd) const                           \
     }                                                                         \
   }                                                                           \
                                                                               \
-  return NOT_FOUND;                                                           \
-}                                                                             
+  return wxNOT_FOUND;                                                         \
+}
 
 // redefine the macro so that now it will generate the class implementation
 // old value would provoke a compile-time error if this file is not included
 #undef  WX_DEFINE_OBJARRAY
-#define WX_DEFINE_OBJARRAY(name) _DEFINE_OBJARRAY(_L##name, name)
+#define WX_DEFINE_OBJARRAY(name) _DEFINE_OBJARRAY(_wxObjArray##name, name)