]> git.saurik.com Git - wxWidgets.git/blobdiff - include/wx/arrimpl.cpp
compilation fix for wxBase
[wxWidgets.git] / include / wx / arrimpl.cpp
index 6496ca6b75ea5ea8c5cdeadf1e9fb55ccbbde9e3..cee3933129b59cfe391899942a9e70306e90ec10 100644 (file)
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        listimpl.cpp
+// Name:        wx/arrimpl.cpp
 // Purpose:     helper file for implementation of dynamic lists
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     helper file for implementation of dynamic lists
 // Author:      Vadim Zeitlin
 // Modified by:
 
 // 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,40 +47,48 @@ 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);                                                                \
 }                                                                             \
                                                                               \
-void name::Empty()                                                            \
+void name::DoEmpty()                                                          \
 {                                                                             \
   for ( size_t ui = 0; ui < Count(); ui++ )                                   \
 {                                                                             \
   for ( size_t ui = 0; ui < Count(); ui++ )                                   \
-    delete (T*)wxBaseArray::Item(ui);                                         \
-                                                                              \
-  wxBaseArray::Clear();                                                       \
+    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*)wxBaseArray::Item(uiIndex);                                      \
+  for (size_t i = 0; i < nRemove; i++ )                                       \
+    delete (T*)wxBaseArrayPtrVoid::Item(uiIndex + i);                         \
                                                                               \
                                                                               \
-  wxBaseArray::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                           \
@@ -94,7 +97,7 @@ int name::Index(const T& Item, bool bFromEnd) const                           \
     if ( Count() > 0 ) {                                                      \
       size_t ui = Count() - 1;                                                \
       do {                                                                    \
     if ( Count() > 0 ) {                                                      \
       size_t ui = Count() - 1;                                                \
       do {                                                                    \
-        if ( (T*)wxBaseArray::Item(ui) == &Item )                             \
+        if ( (T*)wxBaseArrayPtrVoid::Item(ui) == &Item )                      \
           return ui;                                                          \
         ui--;                                                                 \
       }                                                                       \
           return ui;                                                          \
         ui--;                                                                 \
       }                                                                       \
@@ -103,7 +106,7 @@ int name::Index(const T& Item, bool bFromEnd) const                           \
   }                                                                           \
   else {                                                                      \
     for( size_t ui = 0; ui < Count(); ui++ ) {                                \
   }                                                                           \
   else {                                                                      \
     for( size_t ui = 0; ui < Count(); ui++ ) {                                \
-      if( (T*)wxBaseArray::Item(ui) == &Item )                                \
+      if( (T*)wxBaseArrayPtrVoid::Item(ui) == &Item )                         \
         return ui;                                                            \
     }                                                                         \
   }                                                                           \
         return ui;                                                            \
     }                                                                         \
   }                                                                           \
@@ -114,4 +117,4 @@ int name::Index(const T& Item, bool bFromEnd) const                           \
 // 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
 // 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)