Applied patch for wxComboBox and wxListBox to

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

diff --git a/include/wx/hash.h b/include/wx/hash.h
index af9cbbce94d97ce381255a8b75fad2b91f3660ef..873536e13985dbea060c22f460ff5cf6c46dd018 100644 (file)
--- a/include/wx/hash.h
+++ b/include/wx/hash.h
@@ -69,7 +69,7 @@ protected:
 
 private:
     // no copy ctor/assignment operator (yet)
 
 private:
     // no copy ctor/assignment operator (yet)

-    DECLARE_NO_COPY_CLASS(wxHashTableBase);
+    DECLARE_NO_COPY_CLASS(wxHashTableBase)

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -106,7 +106,37 @@ private:
     size_t m_count;
 
     // not implemented yet
     size_t m_count;
 
     // not implemented yet

-    DECLARE_NO_COPY_CLASS(wxHashTableLong);
+    DECLARE_NO_COPY_CLASS(wxHashTableLong)
+};
+
+// ----------------------------------------------------------------------------
+// wxStringHashTable: a hash table which indexes strings with longs
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxStringHashTable : public wxObject
+{
+public:
+    wxStringHashTable(size_t sizeTable = wxHASH_SIZE_DEFAULT);
+    virtual ~wxStringHashTable();
+
+    // add a string associated with this key to the table
+    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
+    wxString Get(long key, bool *wasFound = NULL) const;
+
+    // clean up
+    void Destroy();
+
+private:
+    wxArrayLong **m_keys;
+    wxArrayString **m_values;
+
+    // the size of array above
+    size_t m_hashSize;
+
+    DECLARE_NO_COPY_CLASS(wxStringHashTable)

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -128,7 +158,7 @@ public:
     ~wxHashTable();
 
     // copy ctor and assignment operator
     ~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; }
 
     wxHashTable& operator=(const wxHashTable& table)
         { Clear(); DoCopy(table); return *this; }
 


@@ -244,7 +274,7 @@ private:
     protected:                                                                 \
         void DoPut(long key, long value, eltype *data)                         \
         {                                                                      \
     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] )                                          \
             {                                                                  \
                                                                                \
             if ( !m_hashTable[slot] )                                          \
             {                                                                  \