added (and documented) trivial but useful IsSingleLine() and IsMultiLine() text contr...

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

diff --git a/include/wx/arrimpl.cpp b/include/wx/arrimpl.cpp
index 6496ca6b75ea5ea8c5cdeadf1e9fb55ccbbde9e3..8296608a019b2155b8c41ae55b633a13a0a0ec84 100644 (file)
--- a/include/wx/arrimpl.cpp
+++ b/include/wx/arrimpl.cpp
@@ -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:


@@ -52,40 +52,44 @@ 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)                                 \

 {                                                                             \
   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)              \

 {                                                                             \
   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 +98,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 +107,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 +118,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)