Removed conflicting wxEntry prototype

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

diff --git a/include/wx/hash.h b/include/wx/hash.h
index 5868ef8dff56f2db8ac4d9e25f0daab0bf2c0d24..b88d1648df2ff8039ad2b8cc9e2d675fd6580c14 100644 (file)
--- a/include/wx/hash.h
+++ b/include/wx/hash.h
@@ -12,7 +12,7 @@
 #ifndef _WX_HASH_H__
 #define _WX_HASH_H__
 
 #ifndef _WX_HASH_H__
 #define _WX_HASH_H__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "hash.h"
 #endif
 
 #pragma interface "hash.h"
 #endif
 


@@ -34,7 +34,7 @@
 // pointers to objects
 // ----------------------------------------------------------------------------
 
 // pointers to objects
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxHashTableBase : public wxObject
+class WXDLLIMPEXP_BASE wxHashTableBase : public wxObject

 {
 public:
     wxHashTableBase();
 {
 public:
     wxHashTableBase();


@@ -76,10 +76,11 @@ private:
 // a hash table which stores longs
 // ----------------------------------------------------------------------------
 
 // a hash table which stores longs
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxHashTableLong : public wxObject
+class WXDLLIMPEXP_BASE wxHashTableLong : public wxObject

 {
 public:
 {
 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);
     virtual ~wxHashTableLong();
 
     void Create(size_t size = wxHASH_SIZE_DEFAULT);


@@ -113,7 +114,7 @@ private:
 // wxStringHashTable: a hash table which indexes strings with longs
 // ----------------------------------------------------------------------------
 
 // wxStringHashTable: a hash table which indexes strings with longs
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxStringHashTable : public wxObject
+class WXDLLIMPEXP_BASE wxStringHashTable : public wxObject

 {
 public:
     wxStringHashTable(size_t sizeTable = wxHASH_SIZE_DEFAULT);
 {
 public:
     wxStringHashTable(size_t sizeTable = wxHASH_SIZE_DEFAULT);


@@ -126,6 +127,9 @@ public:
     // and the wasFound is set to FALSE if not NULL
     wxString Get(long key, bool *wasFound = NULL) const;
 
     // 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
+    bool Delete(long key) const;
+

     // clean up
     void Destroy();
 
     // clean up
     void Destroy();
 


@@ -143,7 +147,7 @@ private:
 // for compatibility only
 // ----------------------------------------------------------------------------
 
 // for compatibility only
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxHashTable : public wxObject
+class WXDLLIMPEXP_BASE wxHashTable : public wxObject

 {
 public:
     int n;
 {
 public:
     int n;


@@ -158,7 +162,8 @@ public:
     ~wxHashTable();
 
     // copy ctor and assignment operator
     ~wxHashTable();
 
     // copy ctor and assignment operator

-    wxHashTable(const wxHashTable& table) : wxObject() { 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; }