*** empty log message ***

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

diff --git a/include/wx/arrimpl.cpp b/include/wx/arrimpl.cpp
index 5131c7ac443f7b6916580b1699e54002e71e54a8..c2888057ddc74a7ac39f639b0a7aeb8ea42cb6a3 100644 (file)
--- a/include/wx/arrimpl.cpp
+++ b/include/wx/arrimpl.cpp
@@ -2,7 +2,7 @@
 // Name:        listimpl.cpp
 // Purpose:     helper file for implementation of dynamic lists
 // Author:      Vadim Zeitlin
 // Name:        listimpl.cpp
 // 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,9 @@
  *          4) WX_DEFINE_OBJARRAY                                            *
  *****************************************************************************/
 
  *          4) WX_DEFINE_OBJARRAY                                            *
  *****************************************************************************/
 

+// needed to resolve the conflict between global T and macro parameter T
+#define _WX_ERROR_REMOVE2(x)     wxT("bad index in " #x "::Remove()")
+

 // 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


@@ -58,7 +61,7 @@ void name::Empty()                                                            \
                                                                               \
 void name::Remove(size_t uiIndex)                                             \
 {                                                                             \
                                                                               \
 void name::Remove(size_t uiIndex)                                             \
 {                                                                             \

-  wxCHECK_RET( uiIndex < Count(), "bad index in " #name "::Remove()" );       \
+  wxCHECK_RET( uiIndex < Count(), _WX_ERROR_REMOVE2(name) );                  \

                                                                               \
   delete (T*)wxBaseArray::Item(uiIndex);                                      \
                                                                               \
                                                                               \
   delete (T*)wxBaseArray::Item(uiIndex);                                      \
                                                                               \


@@ -99,8 +102,8 @@ int name::Index(const T& Item, bool bFromEnd) const                           \
     }                                                                         \
   }                                                                           \
                                                                               \
     }                                                                         \
   }                                                                           \
                                                                               \

-  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
 
 // 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