Fix so OGL can build without wxBuffer

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

diff --git a/include/wx/hashmap.h b/include/wx/hashmap.h
index 8323cf26d0e9ea5531bdb74ad22058afa5834730..1715c403f84624650bc9a6789587e171eac5184b 100644 (file)
--- a/include/wx/hashmap.h
+++ b/include/wx/hashmap.h
@@ -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: \


@@ -109,13 +109,13 @@ protected: \
     }; \
  \
     struct Iterator; \
     }; \
  \
     struct Iterator; \

-    friend struct CLASSNAME::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 */ \
     /*                  */ \