compilation fix for wxBase

[wxWidgets.git] / include / wx / arrimpl.cpp

diff --git a/include/wx/arrimpl.cpp b/include/wx/arrimpl.cpp
index 8c975cdbb9e7458d14b609a7fbb4a4eab7fb236e..cee3933129b59cfe391899942a9e70306e90ec10 100644 (file)
--- a/include/wx/arrimpl.cpp
+++ b/include/wx/arrimpl.cpp
@@ -22,12 +22,7 @@
 
 // needed to resolve the conflict between global T and macro parameter T
 
 
 // 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
+#define _WX_ERROR_REMOVE2(x)     wxT("bad index in ") wxT(#x) wxT("::RemoveAt()")

 
 // macro implements remaining (not inline) methods of template list
 // (it's private to this file)
 
 // macro implements remaining (not inline) methods of template list
 // (it's private to this file)


@@ -52,7 +47,7 @@ name& name::operator=(const name& src)                                        \
   return *this;                                                               \
 }                                                                             \
                                                                               \
   return *this;                                                               \
 }                                                                             \
                                                                               \

-name::name(const name& src)                                                   \
+name::name(const name& src) : wxArrayPtrVoid()                                \

 {                                                                             \
   DoCopy(src);                                                                \
 }                                                                             \
 {                                                                             \
   DoCopy(src);                                                                \
 }                                                                             \


@@ -63,27 +58,37 @@ void name::DoEmpty()                                                          \
     delete (T*)wxBaseArrayPtrVoid::Item(ui);                                  \
 }                                                                             \
                                                                               \
     delete (T*)wxBaseArrayPtrVoid::Item(ui);                                  \
 }                                                                             \
                                                                               \

-void name::RemoveAt(size_t uiIndex)                                           \
+void name::RemoveAt(size_t uiIndex, size_t nRemove)                           \

 {                                                                             \
   wxCHECK_RET( uiIndex < Count(), _WX_ERROR_REMOVE2(name) );                  \
                                                                               \
 {                                                                             \
   wxCHECK_RET( uiIndex < Count(), _WX_ERROR_REMOVE2(name) );                  \
                                                                               \

-  delete (T*)wxBaseArrayPtrVoid::Item(uiIndex);                               \
+  for (size_t i = 0; i < nRemove; i++ )                                       \
+    delete (T*)wxBaseArrayPtrVoid::Item(uiIndex + i);                         \

                                                                               \
                                                                               \

-  wxBaseArrayPtrVoid::RemoveAt(uiIndex);                                      \
+  wxBaseArrayPtrVoid::RemoveAt(uiIndex, nRemove);                             \

 }                                                                             \
                                                                               \
 }                                                                             \
                                                                               \

-void name::Add(const T& item)                                                 \
+void name::Add(const T& item, size_t nInsert)                                 \

 {                                                                             \
 {                                                                             \

+  if (nInsert == 0)                                                           \
+    return;                                                                   \

   T* pItem = new T(item);                                                     \
   T* pItem = new T(item);                                                     \

+  size_t nOldSize = GetCount();                                               \

   if ( pItem != NULL )                                                        \
   if ( pItem != NULL )                                                        \

-    Add(pItem);                                                               \
+    wxBaseArrayPtrVoid::Add(pItem, nInsert);                                  \
+  for (size_t i = 1; i < nInsert; i++)                                        \
+    wxBaseArrayPtrVoid::Item(nOldSize + i) = new T(item);                     \

 }                                                                             \
                                                                               \
 }                                                                             \
                                                                               \

-void name::Insert(const T& item, size_t uiIndex)                              \
+void name::Insert(const T& item, size_t uiIndex, size_t nInsert)              \

 {                                                                             \
 {                                                                             \

+  if (nInsert == 0)                                                           \
+    return;                                                                   \

   T* pItem = new T(item);                                                     \
   if ( pItem != NULL )                                                        \
   T* pItem = new T(item);                                                     \
   if ( pItem != NULL )                                                        \

-    Insert(pItem, uiIndex);                                                   \
+    wxBaseArrayPtrVoid::Insert(pItem, uiIndex, nInsert);                      \
+  for (size_t i = 1; i < nInsert; i++)                                        \
+    wxBaseArrayPtrVoid::Item(uiIndex + i) = new T(item);                      \

 }                                                                             \
                                                                               \
 int name::Index(const T& Item, bool bFromEnd) const                           \
 }                                                                             \
                                                                               \
 int name::Index(const T& Item, bool bFromEnd) const                           \