second merge of the 2.2 branch (RL)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2000-08-08 06:11:51 +00:00
parent 8fb3bfe20f
commit 3ca6a5f046
138 changed files with 4941 additions and 2278 deletions

View File

@@ -104,7 +104,7 @@ void wxHashTableBase::DeleteContents(bool flag)
wxNodeBase *wxHashTableBase::GetNode(long key, long value) const
{
size_t slot = (size_t)abs(key % (long)m_hashSize);
size_t slot = (size_t)abs((int)(key % (long)m_hashSize));
wxNodeBase *node;
if ( m_hashTable[slot] )
@@ -161,7 +161,7 @@ void wxHashTableLong::Put(long key, long value)
{
wxCHECK_RET( m_hashSize, _T("must call Create() first") );
size_t slot = (size_t)abs(key % (long)m_hashSize);
size_t slot = (size_t)abs((int)(key % (long)m_hashSize));
if ( !m_keys[slot] )
{
@@ -179,7 +179,7 @@ long wxHashTableLong::Get(long key) const
{
wxCHECK_MSG( m_hashSize, wxNOT_FOUND, _T("must call Create() first") );
size_t slot = (size_t)abs(key % (long)m_hashSize);
size_t slot = (size_t)abs((int)(key % (long)m_hashSize));
wxArrayLong *keys = m_keys[slot];
if ( keys )
@@ -201,7 +201,7 @@ long wxHashTableLong::Delete(long key)
{
wxCHECK_MSG( m_hashSize, wxNOT_FOUND, _T("must call Create() first") );
size_t slot = (size_t)abs(key % (long)m_hashSize);
size_t slot = (size_t)abs((int)(key % (long)m_hashSize));
wxArrayLong *keys = m_keys[slot];
if ( keys )