Upported combobox changes and another fix.

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

diff --git a/include/wx/arrimpl.cpp b/include/wx/arrimpl.cpp
index e7bca61b232ce90c7501a0435d558cdcc5348fce..46f94e5dabae6b8075eb9625bd94458d34ab4aa4 100644 (file)
--- 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
 // 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>
 // 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                                            *
  *****************************************************************************/
 
  *          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
 // macro implements remaining (not inline) methods of template list
 // (it's private to this file)
 #undef  _DEFINE_OBJARRAY


@@ -43,40 +52,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::Remove(size_t uiIndex)                                             \
+void name::RemoveAt(size_t uiIndex, size_t nRemove)                           \

 {                                                                             \
 {                                                                             \

-  wxCHECK_RET( uiIndex < Count(), _T("bad index in " #name "::Remove()") );   \
+  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::Remove(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                           \


@@ -85,7 +102,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--;                                                                 \
       }                                                                       \


@@ -94,15 +111,15 @@ 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;                                                            \
     }                                                                         \
   }                                                                           \
                                                                               \

-  return wxNOT_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
 
 // 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)