Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxObjArrays code compiles again

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1352 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-01-09 00:29:40 +00:00
parent bee503b05f
commit 22692cf6ea
1 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
include/wx/arrimpl.cpp
View File

@@ -22,7 +22,8 @@
// macro implements remaining (not inline) methods of template list // macro implements remaining (not inline) methods of template list
// (it's private to this file) // (it's private to this file)
#define _DEFINE_OBJARRAY(T, name) \ #undef _DEFINE_OBJARRAY
#define _DEFINE_OBJARRAY(T, name) \
name::~name() \ name::~name() \
{ \ { \
Empty(); \ Empty(); \
@@ -30,7 +31,7 @@ name::~name() \
\ \
void name::DoCopy(const name& src) \ void name::DoCopy(const name& src) \
{ \ { \
for ( uint ui = 0; ui < src.Count(); ui++ ) \ for ( size_t ui = 0; ui < src.Count(); ui++ ) \
Add(src[ui]); \ Add(src[ui]); \
} \ } \
\ \
@@ -49,19 +50,19 @@ name::name(const name& src) \
\ \
void name::Empty() \ void name::Empty() \
{ \ { \
for ( uint ui = 0; ui < Count(); ui++ ) \ for ( size_t ui = 0; ui < Count(); ui++ ) \
delete (T*)BaseArray::Item(ui); \ delete (T*)wxBaseArray::Item(ui); \
\ \
BaseArray::Clear(); \ wxBaseArray::Clear(); \
} \ } \
\ \
void name::Remove(uint uiIndex) \ void name::Remove(size_t uiIndex) \
{ \ { \
wxCHECK( uiIndex < Count() ); \ wxCHECK_RET( uiIndex < Count(), "bad index in " #name "::Remove()" ); \
\ \
delete (T*)BaseArray::Item(uiIndex); \ delete (T*)wxBaseArray::Item(uiIndex); \
\ \
BaseArray::Remove(uiIndex); \ wxBaseArray::Remove(uiIndex); \
} \ } \
\ \
void name::Add(const T& item) \ void name::Add(const T& item) \
@@ -71,20 +72,20 @@ void name::Add(const T& item) \
Add(pItem); \ Add(pItem); \
} \ } \
\ \
void name::Insert(const T& item, uint uiIndex) \ void name::Insert(const T& item, size_t uiIndex) \
{ \ { \
T* pItem = new T(item); \ T* pItem = new T(item); \
if ( pItem != NULL ) \ if ( pItem != NULL ) \
Insert(pItem, uiIndex); \ Insert(pItem, uiIndex); \
} \ } \
\ \
int name::Index(const T& Item, Bool bFromEnd) const \ int name::Index(const T& Item, bool bFromEnd) const \
{ \ { \
if ( bFromEnd ) { \ if ( bFromEnd ) { \
if ( Count() > 0 ) { \ if ( Count() > 0 ) { \
uint ui = Count() - 1; \ size_t ui = Count() - 1; \
do { \ do { \
if ( (T*)BaseArray::Item(ui) == &Item ) \ if ( (T*)wxBaseArray::Item(ui) == &Item ) \
return ui; \ return ui; \
ui--; \ ui--; \
} \ } \
@@ -92,8 +93,8 @@ int name::Index(const T& Item, Bool bFromEnd) const \
} \ } \
} \ } \
else { \ else { \
for( uint ui = 0; ui < Count(); ui++ ) { \ for( size_t ui = 0; ui < Count(); ui++ ) { \
if( (T*)BaseArray::Item(ui) == &Item ) \ if( (T*)wxBaseArray::Item(ui) == &Item ) \
return ui; \ return ui; \
} \ } \
} \ } \
@@ -105,7 +106,3 @@ int name::Index(const T& Item, Bool bFromEnd) const \
// old value would provoke a compile-time error if this file is not included // old value would provoke a compile-time error if this file is not included
#undef WX_DEFINE_OBJARRAY #undef WX_DEFINE_OBJARRAY
#define WX_DEFINE_OBJARRAY(name) _DEFINE_OBJARRAY(_L##name, name) #define WX_DEFINE_OBJARRAY(name) _DEFINE_OBJARRAY(_L##name, name)
// don't pollute preprocessor's name space
#undef _DEFINE_OBJARRAY