Compilation fix

[wxWidgets.git] / include / wx / hash.h

diff --git a/include/wx/hash.h b/include/wx/hash.h
index 704e42101af9483af1a6e9e0a5fe907036329063..07ece7d0aa5f6cc4be706c1a474f968d42a534d4 100644 (file)
--- a/include/wx/hash.h
+++ b/include/wx/hash.h
@@ -12,10 +12,6 @@
 #ifndef _WX_HASH_H__
 #define _WX_HASH_H__
 
 #ifndef _WX_HASH_H__
 #define _WX_HASH_H__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "hash.h"
-#endif
-

 #include "wx/defs.h"
 
 #if !wxUSE_STL && WXWIN_COMPATIBILITY_2_4
 #include "wx/defs.h"
 
 #if !wxUSE_STL && WXWIN_COMPATIBILITY_2_4


@@ -355,32 +351,32 @@ public:
     // key and value are the same
     void Put(long value, wxObject *object)
         { DoPut( value, value, object ); }
     // 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(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 ); }
 
     // 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(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 ); }
 
     // 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(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
 
     // Construct your own integer key from a string, e.g. in case
     // you need to combine it with something


@@ -397,8 +393,6 @@ public:
 
     size_t GetCount() const { return wxHashTableBase::GetCount(); }
 protected:
 
     size_t GetCount() const { return wxHashTableBase::GetCount(); }
 protected:

-    virtual void DoDeleteContents( wxHashTableBase_Node* node );
-

     // copy helper
     void DoCopy( const wxHashTable& copy );
 
     // copy helper
     void DoCopy( const wxHashTable& copy );
 


@@ -406,6 +400,8 @@ protected:
     // m_curr to it and m_currBucket to its bucket
     void GetNextNode( size_t bucketStart );
 private:
     // m_curr to it and m_currBucket to its bucket
     void GetNextNode( size_t bucketStart );
 private:

+    virtual void DoDeleteContents( wxHashTableBase_Node* node );
+

     // current node
     Node* m_curr;
 
     // current node
     Node* m_curr;
 


@@ -521,15 +517,15 @@ private:
         virtual ~hashclass() { Destroy(); }                                   \
                                                                               \
         void Put(long key, eltype *data) { DoPut(key, key, (void*)data); }    \
         virtual ~hashclass() { Destroy(); }                                   \
                                                                               \
         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 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 key) { return (eltype*)DoDelete(key, key); }      \

-        eltype *Delete(long hash, long key)                                   \
-            { return (eltype*)DoDelete(key, hash); }                          \
-    protected:                                                                \
+        eltype *Delete(long lhash, long key)                                  \
+            { return (eltype*)DoDelete(key, lhash); }                         \
+    private:                                                                  \

         virtual void DoDeleteContents( wxHashTableBase_Node* node )           \
             { delete (eltype*)node->GetData(); }                              \
                                                                               \
         virtual void DoDeleteContents( wxHashTableBase_Node* node )           \
             { delete (eltype*)node->GetData(); }                              \
                                                                               \