Redirect SetFocus Part II.

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

diff --git a/include/wx/hash.h b/include/wx/hash.h
index 79e8339577ce7f066dfdfe1322cd3551a8ae1f7a..557238d6a410a0aead0bc2b7a4b27895edb184a8 100644 (file)
--- a/include/wx/hash.h
+++ b/include/wx/hash.h
@@ -69,7 +69,7 @@ protected:
 
 private:
     // no copy ctor/assignment operator (yet)
-    DECLARE_NO_COPY_CLASS(wxHashTableBase);
+    DECLARE_NO_COPY_CLASS(wxHashTableBase)
 };
 
 // ----------------------------------------------------------------------------
@@ -79,7 +79,8 @@ private:
 class WXDLLEXPORT wxHashTableLong : public wxObject
 {
 public:
-    wxHashTableLong(size_t size = wxHASH_SIZE_DEFAULT) { Init(size); }
+    wxHashTableLong(size_t size = wxHASH_SIZE_DEFAULT)
+        { Init(size); }
     virtual ~wxHashTableLong();
 
     void Create(size_t size = wxHASH_SIZE_DEFAULT);
@@ -106,7 +107,7 @@ private:
     size_t m_count;
 
     // not implemented yet
-    DECLARE_NO_COPY_CLASS(wxHashTableLong);
+    DECLARE_NO_COPY_CLASS(wxHashTableLong)
 };
 
 // ----------------------------------------------------------------------------
@@ -136,7 +137,7 @@ private:
     // the size of array above
     size_t m_hashSize;
 
-    DECLARE_NO_COPY_CLASS(wxStringHashTable);
+    DECLARE_NO_COPY_CLASS(wxStringHashTable)
 };
 
 // ----------------------------------------------------------------------------
@@ -158,7 +159,8 @@ public:
     ~wxHashTable();
 
     // copy ctor and assignment operator
-    wxHashTable(const wxHashTable& table) { DoCopy(table); }
+    wxHashTable(const wxHashTable& table) : wxObject()
+        { DoCopy(table); }
     wxHashTable& operator=(const wxHashTable& table)
         { Clear(); DoCopy(table); return *this; }
 
@@ -274,7 +276,7 @@ private:
     protected:                                                                 \
         void DoPut(long key, long value, eltype *data)                         \
         {                                                                      \
-            size_t slot = (size_t)abs(key % m_hashSize);                       \
+            size_t slot = (size_t)abs((int)(key % (long)m_hashSize));          \
                                                                                \
             if ( !m_hashTable[slot] )                                          \
             {                                                                  \
@@ -297,5 +299,8 @@ private:
 #define WX_DECLARE_EXPORTED_HASH(el, list, hash)  \
     _WX_DECLARE_HASH(el, list, hash, class WXDLLEXPORT)
 
+#define WX_DECLARE_USER_EXPORTED_HASH(el, list, hash, usergoo)  \
+    _WX_DECLARE_HASH(el, list, hash, class usergoo)
+
 #endif
     // _WX_HASH_H__