// Modified by: VZ at 25.02.00: type safe hashes with WX_DECLARE_HASH()
// Created: 01/02/97
// RCS-ID: $Id$
-// Copyright: (c)
+// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#include "wx/defs.h"
+#if !wxUSE_STL && WXWIN_COMPATIBILITY_2_4
+ #define wxUSE_OLD_HASH_TABLE 1
+#else
+ #define wxUSE_OLD_HASH_TABLE 0
+#endif
+
#if !wxUSE_STL
#include "wx/object.h"
- #include "wx/list.h"
#else
class WXDLLIMPEXP_BASE wxObject;
#endif
+#if wxUSE_OLD_HASH_TABLE
+ #include "wx/list.h"
+#endif
#if WXWIN_COMPATIBILITY_2_4
#include "wx/dynarray.h"
#endif
// pointers to objects
// ----------------------------------------------------------------------------
-#if !wxUSE_STL
+#if wxUSE_OLD_HASH_TABLE
class WXDLLIMPEXP_BASE wxHashTableBase : public wxObject
{
DECLARE_NO_COPY_CLASS(wxHashTableBase)
};
-#else // if wxUSE_STL
+#else // if !wxUSE_OLD_HASH_TABLE
#if !defined(wxENUM_KEY_TYPE_DEFINED)
#define wxENUM_KEY_TYPE_DEFINED
wxChar *string;
};
+// for some compilers (AIX xlC), defining it as friend inside the class is not
+// enough, so provide a real forward declaration
+class WXDLLIMPEXP_BASE wxHashTableBase;
+
class WXDLLIMPEXP_BASE wxHashTableBase_Node
{
friend class WXDLLIMPEXP_BASE wxHashTableBase;
typedef wxHashTableBase_Node Node;
wxHashTableBase();
- virtual ~wxHashTableBase();
+ virtual ~wxHashTableBase() { };
void Create( wxKeyType keyType = wxKEY_INTEGER,
size_t size = wxHASH_SIZE_DEFAULT );
DECLARE_NO_COPY_CLASS(wxHashTableBase)
};
-#endif // !wxUSE_STL
+#endif // wxUSE_OLD_HASH_TABLE
#if !wxUSE_STL
void Put(long key, const wxString& value);
// get the string from the key: if not found, an empty string is returned
- // and the wasFound is set to FALSE if not NULL
+ // and the wasFound is set to false if not NULL
wxString Get(long key, bool *wasFound = NULL) const;
- // remove the item, returning TRUE if the item was found and deleted
+ // remove the item, returning true if the item was found and deleted
bool Delete(long key) const;
// clean up
#endif // WXWIN_COMPATIBILITY_2_4
-#endif // !wxUSE_STL
+#endif // !wxUSE_STL
// ----------------------------------------------------------------------------
// for compatibility only
// ----------------------------------------------------------------------------
-#if wxUSE_STL
+#if !wxUSE_OLD_HASH_TABLE
class WXDLLIMPEXP_BASE wxHashTable_Node : public wxHashTableBase_Node
{
: wxHashTableBase() { Create( keyType, size ); BeginFind(); }
wxHashTable( const wxHashTable& table );
- const wxHashTable& operator=( const wxHashTable& );
+ virtual ~wxHashTable() { Destroy(); }
- void Destroy() { Clear(); }
+ const wxHashTable& operator=( const wxHashTable& );
// key and value are the same
void Put(long value, wxObject *object)
{ DoPut( value, value, object ); }
- void Put(long hash, long value, wxObject *object)
- { DoPut( value, hash, object ); }
+ void Put(long lhash, long value, wxObject *object)
+ { DoPut( value, lhash, object ); }
void Put(const wxChar *value, wxObject *object)
{ DoPut( value, MakeKey( value ), object ); }
- void Put(long hash, const wxChar *value, wxObject *object)
- { DoPut( value, hash, object ); }
+ void Put(long lhash, const wxChar *value, wxObject *object)
+ { DoPut( value, lhash, object ); }
// key and value are the same
wxObject *Get(long value) const
{ return (wxObject*)DoGet( value, value ); }
- wxObject *Get(long hash, long value) const
- { return (wxObject*)DoGet( value, hash ); }
+ wxObject *Get(long lhash, long value) const
+ { return (wxObject*)DoGet( value, lhash ); }
wxObject *Get(const wxChar *value) const
{ return (wxObject*)DoGet( value, MakeKey( value ) ); }
- wxObject *Get(long hash, const wxChar *value) const
- { return (wxObject*)DoGet( value, hash ); }
+ wxObject *Get(long lhash, const wxChar *value) const
+ { return (wxObject*)DoGet( value, lhash ); }
// Deletes entry and returns data if found
wxObject *Delete(long key)
{ return (wxObject*)DoDelete( key, key ); }
- wxObject *Delete(long hash, long key)
- { return (wxObject*)DoDelete( key, hash ); }
+ wxObject *Delete(long lhash, long key)
+ { return (wxObject*)DoDelete( key, lhash ); }
wxObject *Delete(const wxChar *key)
{ return (wxObject*)DoDelete( key, MakeKey( key ) ); }
- wxObject *Delete(long hash, const wxChar *key)
- { return (wxObject*)DoDelete( key, hash ); }
+ wxObject *Delete(long lhash, const wxChar *key)
+ { return (wxObject*)DoDelete( key, lhash ); }
// Construct your own integer key from a string, e.g. in case
// you need to combine it with something
size_t m_currBucket;
};
-#else // if !wxUSE_STL
+#else // if wxUSE_OLD_HASH_TABLE
class WXDLLIMPEXP_BASE wxHashTable : public wxObject
{
DECLARE_DYNAMIC_CLASS(wxHashTable)
};
-#endif
+#endif // wxUSE_OLD_HASH_TABLE
-#if wxUSE_STL
+#if !wxUSE_OLD_HASH_TABLE
// defines a new type safe hash table which stores the elements of type eltype
// in lists of class listclass
size_t size = wxHASH_SIZE_DEFAULT) \
: wxHashTableBase() { Create(keyType, size); } \
\
- ~hashclass() { Destroy(); } \
+ virtual ~hashclass() { Destroy(); } \
\
- void Destroy() { Clear(); } \
void Put(long key, eltype *data) { DoPut(key, key, (void*)data); } \
- void Put(long hash, long key, eltype *data) \
- { DoPut(key, hash, (void*)data); } \
+ void Put(long lhash, long key, eltype *data) \
+ { DoPut(key, lhash, (void*)data); } \
eltype *Get(long key) const { return (eltype*)DoGet(key, key); } \
- eltype *Get(long hash, long key) const \
- { return (eltype*)DoGet(key, hash); } \
+ eltype *Get(long lhash, long key) const \
+ { return (eltype*)DoGet(key, lhash); } \
eltype *Delete(long key) { return (eltype*)DoDelete(key, key); } \
- eltype *Delete(long hash, long key) \
- { return (eltype*)DoDelete(key, hash); } \
+ eltype *Delete(long lhash, long key) \
+ { return (eltype*)DoDelete(key, lhash); } \
protected: \
virtual void DoDeleteContents( wxHashTableBase_Node* node ) \
{ delete (eltype*)node->GetData(); } \
DECLARE_NO_COPY_CLASS(hashclass) \
}
-#else // if !wxUSE_STL
+#else // if wxUSE_OLD_HASH_TABLE
#define _WX_DECLARE_HASH(eltype, listclass, hashclass, classexp) \
classexp hashclass : public wxHashTableBase \
{ \
m_hashTable[slot] = new listclass(m_keyType); \
if ( m_deleteContents ) \
- m_hashTable[slot]->DeleteContents(TRUE); \
+ m_hashTable[slot]->DeleteContents(true); \
} \
\
((listclass *)m_hashTable[slot])->Append(value, data); \
DECLARE_NO_COPY_CLASS(hashclass) \
}
-#endif
+#endif // wxUSE_OLD_HASH_TABLE
// this macro is to be used in the user code
#define WX_DECLARE_HASH(el, list, hash) \
projects / wxWidgets.git / blobdiff