X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6aa33060cd9132116fa3431b4889342e2f655853..682214d5c6ec3e56dbdfd0c97d70d87e614b38c2:/include/wx/hash.h

diff --git a/include/wx/hash.h b/include/wx/hash.h
index 194302ae7a..247a844637 100644
--- a/include/wx/hash.h
+++ b/include/wx/hash.h
@@ -111,6 +111,10 @@ union wxHashKeyValue
     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;
@@ -281,10 +285,10 @@ public:
     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
@@ -348,8 +352,6 @@ public:
 
     const wxHashTable& operator=( const wxHashTable& );
 
-    void Destroy() { Clear(); }
-
     // key and value are the same
     void Put(long value, wxObject *object)
         { DoPut( value, value, object ); }
@@ -518,7 +520,6 @@ private:
                                                                               \
         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); }                                \
@@ -587,7 +588,7 @@ private:
             {                                                                  \
                 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);             \