exposed background theme

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

diff --git a/include/wx/hashmap.h b/include/wx/hashmap.h
index f2a3f6642e5d97bc18fef9fabfbf86bbe152f4f0..33cd821d6db7beae29c631a9136b392f2d70443f 100644 (file)
--- a/include/wx/hashmap.h
+++ b/include/wx/hashmap.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        hashmap.cpp
+// Name:        hashmap.h

 // Purpose:     wxHashMap class
 // Author:      Mattia Barbon
 // Modified by:
 // Purpose:     wxHashMap class
 // Author:      Mattia Barbon
 // Modified by:


@@ -16,7 +16,7 @@
 #pragma interface "hashmap.h"
 #endif
 
 #pragma interface "hashmap.h"
 #endif
 

-#include <wx/string.h>
+#include "wx/string.h"

 
 // private
 struct WXDLLEXPORT _wxHashTable_NodeBase
 
 // private
 struct WXDLLEXPORT _wxHashTable_NodeBase


@@ -86,18 +86,18 @@ public: \
     /* should these be protected? */ \
     typedef const KEY_T const_key_type; \
     typedef const VALUE_T const_mapped_type; \
     /* should these be protected? */ \
     typedef const KEY_T const_key_type; \
     typedef const VALUE_T const_mapped_type; \

-protected: \
+public: \

     struct Node; \
     typedef KEY_EX_T key_extractor; \
     typedef CLASSNAME Self; \
     struct Node; \
     typedef KEY_EX_T key_extractor; \
     typedef CLASSNAME Self; \

- \
+protected: \

     Node** m_table; \
     size_t m_tableBuckets; \
     size_t m_items; \
     hasher m_hasher; \
     key_equal m_equals; \
     key_extractor m_getKey; \
     Node** m_table; \
     size_t m_tableBuckets; \
     size_t m_items; \
     hasher m_hasher; \
     key_equal m_equals; \
     key_extractor m_getKey; \

- \
+public: \

     struct Node:public _wxHashTable_NodeBase \
     { \
     public: \
     struct Node:public _wxHashTable_NodeBase \
     { \
     public: \


@@ -110,12 +110,12 @@ protected: \
  \
     struct Iterator; \
     friend struct Iterator; \
  \
     struct Iterator; \
     friend struct Iterator; \

- \
+protected: \

     static void DeleteNode( _wxHashTable_NodeBase* node ) \
     { \
         delete (Node*)node; \
     } \
     static void DeleteNode( _wxHashTable_NodeBase* node ) \
     { \
         delete (Node*)node; \
     } \

- \
+public: \

     /*                  */ \
     /* forward iterator */ \
     /*                  */ \
     /*                  */ \
     /* forward iterator */ \
     /*                  */ \


@@ -365,7 +365,7 @@ CLASSEXP CLASSNAME \
 { \
 public: \
     CLASSNAME() { } \
 { \
 public: \
     CLASSNAME() { } \

-    KEY_T operator()( PAIR_T pair ) const { return pair.first; } \
+    const KEY_T& operator()( const PAIR_T& pair ) const { return pair.first; }\

     \
     /* the dummy assignment operator is needed to suppress compiler */ \
     /* warnings from hash table class' operator=(): gcc complains about */ \
     \
     /* the dummy assignment operator is needed to suppress compiler */ \
     /* warnings from hash table class' operator=(): gcc complains about */ \