projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
compilation warning fixed
[wxWidgets.git]
/
include
/
wx
/
arrimpl.cpp
diff --git
a/include/wx/arrimpl.cpp
b/include/wx/arrimpl.cpp
index 585893ccc75b283fdd2bd80c72621fdb23e5f32f..cf1e290613de8a451181146552657c2a793fae71 100644
(file)
--- a/
include/wx/arrimpl.cpp
+++ b/
include/wx/arrimpl.cpp
@@
-21,7
+21,13
@@
*****************************************************************************/
// 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()")
#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)
// macro implements remaining (not inline) methods of template list
// (it's private to this file)
@@
-51,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) \