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

removed WXWIN_COMPATIBILITY_2_4 from common and wxMSW files (patch 1675546)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44625 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-03-07 11:35:04 +00:00
parent a0369cb367
commit c1dc9f8394
73 changed files with 22 additions and 2085 deletions
Download Patch File Download Diff File Expand all files Collapse all files

219
src/common/hash.cpp
View File

@@ -116,225 +116,6 @@ wxNodeBase *wxHashTableBase::GetNode(long key, long value) const
return node;
}
#if WXWIN_COMPATIBILITY_2_4
// ----------------------------------------------------------------------------
// wxHashTableLong
// ----------------------------------------------------------------------------
wxHashTableLong::~wxHashTableLong()
{
Destroy();
}
void wxHashTableLong::Init(size_t size)
{
m_hashSize = size;
m_values = new wxArrayLong *[size];
m_keys = new wxArrayLong *[size];
for ( size_t n = 0; n < m_hashSize; n++ )
{
m_values[n] =
m_keys[n] = (wxArrayLong *)NULL;
}
m_count = 0;
}
void wxHashTableLong::Create(size_t size)
{
Init(size);
}
void wxHashTableLong::Destroy()
{
for ( size_t n = 0; n < m_hashSize; n++ )
{
delete m_values[n];
delete m_keys[n];
}
delete [] m_values;
delete [] m_keys;
m_hashSize = 0;
m_count = 0;
}
void wxHashTableLong::Put(long key, long value)
{
wxCHECK_RET( m_hashSize, _T("must call Create() first") );
size_t slot = (size_t)abs((int)(key % (long)m_hashSize));
if ( !m_keys[slot] )
{
m_keys[slot] = new wxArrayLong;
m_values[slot] = new wxArrayLong;
}
m_keys[slot]->Add(key);
m_values[slot]->Add(value);
m_count++;
}
long wxHashTableLong::Get(long key) const
{
wxCHECK_MSG( m_hashSize, wxNOT_FOUND, _T("must call Create() first") );
size_t slot = (size_t)abs((int)(key % (long)m_hashSize));
wxArrayLong *keys = m_keys[slot];
if ( keys )
{
size_t count = keys->GetCount();
for ( size_t n = 0; n < count; n++ )
{
if ( keys->Item(n) == key )
{
return m_values[slot]->Item(n);
}
}
}
return wxNOT_FOUND;
}
long wxHashTableLong::Delete(long key)
{
wxCHECK_MSG( m_hashSize, wxNOT_FOUND, _T("must call Create() first") );
size_t slot = (size_t)abs((int)(key % (long)m_hashSize));
wxArrayLong *keys = m_keys[slot];
if ( keys )
{
size_t count = keys->GetCount();
for ( size_t n = 0; n < count; n++ )
{
if ( keys->Item(n) == key )
{
long val = m_values[slot]->Item(n);
keys->RemoveAt(n);
m_values[slot]->RemoveAt(n);
m_count--;
return val;
}
}
}
return wxNOT_FOUND;
}
// ----------------------------------------------------------------------------
// wxStringHashTable: more efficient than storing strings in a list
// ----------------------------------------------------------------------------
wxStringHashTable::wxStringHashTable(size_t sizeTable)
{
m_keys = new wxArrayLong *[sizeTable];
m_values = new wxArrayString *[sizeTable];
m_hashSize = sizeTable;
for ( size_t n = 0; n < m_hashSize; n++ )
{
m_values[n] = (wxArrayString *)NULL;
m_keys[n] = (wxArrayLong *)NULL;
}
}
wxStringHashTable::~wxStringHashTable()
{
Destroy();
}
void wxStringHashTable::Destroy()
{
for ( size_t n = 0; n < m_hashSize; n++ )
{
delete m_values[n];
delete m_keys[n];
}
delete [] m_values;
delete [] m_keys;
m_hashSize = 0;
}
void wxStringHashTable::Put(long key, const wxString& value)
{
wxCHECK_RET( m_hashSize, _T("must call Create() first") );
size_t slot = (size_t)abs((int)(key % (long)m_hashSize));
if ( !m_keys[slot] )
{
m_keys[slot] = new wxArrayLong;
m_values[slot] = new wxArrayString;
}
m_keys[slot]->Add(key);
m_values[slot]->Add(value);
}
wxString wxStringHashTable::Get(long key, bool *wasFound) const
{
wxCHECK_MSG( m_hashSize, wxEmptyString, _T("must call Create() first") );
size_t slot = (size_t)abs((int)(key % (long)m_hashSize));
wxArrayLong *keys = m_keys[slot];
if ( keys )
{
size_t count = keys->GetCount();
for ( size_t n = 0; n < count; n++ )
{
if ( keys->Item(n) == key )
{
if ( wasFound )
*wasFound = true;
return m_values[slot]->Item(n);
}
}
}
if ( wasFound )
*wasFound = false;
return wxEmptyString;
}
bool wxStringHashTable::Delete(long key) const
{
wxCHECK_MSG( m_hashSize, false, _T("must call Create() first") );
size_t slot = (size_t)abs((int)(key % (long)m_hashSize));
wxArrayLong *keys = m_keys[slot];
if ( keys )
{
size_t count = keys->GetCount();
for ( size_t n = 0; n < count; n++ )
{
if ( keys->Item(n) == key )
{
keys->RemoveAt(n);
m_values[slot]->RemoveAt(n);
return true;
}
}
}
return false;
}
#endif // WXWIN_COMPATIBILITY_2_4
// ----------------------------------------------------------------------------
// old not type safe wxHashTable
// ----------------------------------------------------------------------------