added wxConvUI which determines the conversion used for the UI elements and can be...

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

diff --git a/include/wx/hash.h b/include/wx/hash.h
index cefc7996bd6defa472c703577d0598152bdf1374..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


@@ -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;
 


@@ -529,7 +525,7 @@ private:
         eltype *Delete(long key) { return (eltype*)DoDelete(key, key); }      \
         eltype *Delete(long lhash, long key)                                  \
             { return (eltype*)DoDelete(key, lhash); }                         \
         eltype *Delete(long key) { return (eltype*)DoDelete(key, key); }      \
         eltype *Delete(long lhash, long key)                                  \
             { return (eltype*)DoDelete(key, lhash); }                         \

-    protected:                                                                \
+    private:                                                                  \

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