Added wxNB_LEFT,RIGHT,BOTTOM for notebook tab placement

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

diff --git a/include/wx/hash.h b/include/wx/hash.h
index a1ae912a67c1e03facd1efa3d5b8d79bbc8ed483..ec71b9b8c1b95f84f301dc9d7885f06f49d505ee 100644 (file)
--- a/include/wx/hash.h
+++ b/include/wx/hash.h
@@ -9,8 +9,8 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __WXHASHH__
-#define __WXHASHH__
+#ifndef _WX_WXHASHH__
+#define _WX_WXHASHH__
 
 #ifdef __GNUG__
 #pragma interface "hash.h"
@@ -40,6 +40,8 @@ class WXDLLEXPORT wxHashTable: public wxObject
 
   wxHashTable(int the_key_type = wxKEY_INTEGER, int size = 1000);
   ~wxHashTable(void);
+  
+  void Destroy(void);  // Robert Roebling
 
   bool Create(int the_key_type = wxKEY_INTEGER, int size = 1000);
 
@@ -57,30 +59,30 @@ class WXDLLEXPORT wxHashTable: public wxObject
 
   // key and value are NOT necessarily the same
   void Put(long key, long value, wxObject *object);
-  void Put(long key, const char *value, wxObject *object);
+  void Put(long key, const wxChar *value, wxObject *object);
 
   // key and value are the same
   void Put(long value, wxObject *object);
-  void Put(const char *value, wxObject *object);
+  void Put(const wxChar *value, wxObject *object);
 
   // key and value not the same
   wxObject *Get(long key, long value) const;
-  wxObject *Get(long key, const char *value) const;
+  wxObject *Get(long key, const wxChar *value) const;
 
   // key and value are the same
   wxObject *Get(long value) const;
-  wxObject *Get(const char *value) const;
+  wxObject *Get(const wxChar *value) const;
 
   // Deletes entry and returns data if found
   wxObject *Delete(long key);
-  wxObject *Delete(const char *key);
+  wxObject *Delete(const wxChar *key);
 
   wxObject *Delete(long key, int value);
-  wxObject *Delete(long key, const char *value);
+  wxObject *Delete(long key, const wxChar *value);
 
   // Construct your own integer key from a string, e.g. in case
   // you need to combine it with something
-  long MakeKey(const char *string) const;
+  long MakeKey(const wxChar *string) const;
 
   // Way of iterating through whole hash table (e.g. to delete everything)
   // Not necessary, of course, if you're only storing pointers to
@@ -95,4 +97,4 @@ class WXDLLEXPORT wxHashTable: public wxObject
 };
 
 #endif
-    // __WXHASHH__
+    // _WX_WXHASHH__