applied patch 103575 (more efficient wxString comparison)

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

diff --git a/include/wx/arrimpl.cpp b/include/wx/arrimpl.cpp
index 6496ca6b75ea5ea8c5cdeadf1e9fb55ccbbde9e3..cf1e290613de8a451181146552657c2a793fae71 100644 (file)
--- a/include/wx/arrimpl.cpp
+++ b/include/wx/arrimpl.cpp
@@ -57,21 +57,19 @@ name::name(const name& src)                                                   \
   DoCopy(src);                                                                \
 }                                                                             \
                                                                               \
   DoCopy(src);                                                                \
 }                                                                             \
                                                                               \

-void name::Empty()                                                            \
+void name::DoEmpty()                                                          \

 {                                                                             \
   for ( size_t ui = 0; ui < Count(); ui++ )                                   \
     delete (T*)wxBaseArray::Item(ui);                                         \
 {                                                                             \
   for ( size_t ui = 0; ui < Count(); ui++ )                                   \
     delete (T*)wxBaseArray::Item(ui);                                         \

-                                                                              \
-  wxBaseArray::Clear();                                                       \

 }                                                                             \
                                                                               \
 }                                                                             \
                                                                               \

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

 {                                                                             \
   wxCHECK_RET( uiIndex < Count(), _WX_ERROR_REMOVE2(name) );                  \
                                                                               \
   delete (T*)wxBaseArray::Item(uiIndex);                                      \
                                                                               \
 {                                                                             \
   wxCHECK_RET( uiIndex < Count(), _WX_ERROR_REMOVE2(name) );                  \
                                                                               \
   delete (T*)wxBaseArray::Item(uiIndex);                                      \
                                                                               \

-  wxBaseArray::RemoveAt(uiIndex);                                               \
+  wxBaseArray::RemoveAt(uiIndex);                                             \

 }                                                                             \
                                                                               \
 void name::Add(const T& item)                                                 \
 }                                                                             \
                                                                               \
 void name::Add(const T& item)                                                 \