Make SaveFile and LoadFile virtual so they can be overridden

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

diff --git a/include/wx/hashmap.h b/include/wx/hashmap.h
index 7f7cc6a97fc08f8eb91c59306e97d842cfde174a..47d583b840b84de620cb42ef911f38d0dee8c393 100644 (file)
--- a/include/wx/hashmap.h
+++ b/include/wx/hashmap.h
@@ -13,6 +13,7 @@
 #define _WX_HASHMAP_H_
 
 #include "wx/string.h"
 #define _WX_HASHMAP_H_
 
 #include "wx/string.h"

+#include "wx/wxcrt.h"

 
 #if (defined(HAVE_EXT_HASH_MAP) || defined(HAVE_HASH_MAP)) \
     && (defined(HAVE_GNU_CXX_HASH_MAP) || defined(HAVE_STD_HASH_MAP))
 
 #if (defined(HAVE_EXT_HASH_MAP) || defined(HAVE_HASH_MAP)) \
     && (defined(HAVE_GNU_CXX_HASH_MAP) || defined(HAVE_STD_HASH_MAP))


@@ -143,8 +144,6 @@ public: \
         value_type m_value; \
     }; \
  \
         value_type m_value; \
     }; \
  \

-    CLASSEXP Iterator; \
-    friend CLASSEXP Iterator; \

 protected: \
     static void DeleteNode( _wxHashTable_NodeBase* node ) \
     { \
 protected: \
     static void DeleteNode( _wxHashTable_NodeBase* node ) \
     { \


@@ -185,6 +184,7 @@ public: \
             m_node = next ? next : GetNextNode(); \
         } \
     }; \
             m_node = next ? next : GetNextNode(); \
         } \
     }; \

+    friend class Iterator; \

  \
 public: \
     CLASSEXP iterator : public Iterator \
  \
 public: \
     CLASSEXP iterator : public Iterator \


@@ -271,9 +271,9 @@ public: \
     const_iterator end() const { return const_iterator( 0, this ); } \
     iterator end() { return iterator( 0, this ); } \
     const_iterator begin() const \
     const_iterator end() const { return const_iterator( 0, this ); } \
     iterator end() { return iterator( 0, this ); } \
     const_iterator begin() const \

-        { return const_iterator( (Node*)GetFirstNode( m_tableBuckets, (_wxHashTable_NodeBase**)m_table ), this ); }; \
+        { return const_iterator( (Node*)GetFirstNode( m_tableBuckets, (_wxHashTable_NodeBase**)m_table ), this ); }  \

     iterator begin() \
     iterator begin() \

-        { return iterator( (Node*)GetFirstNode( m_tableBuckets, (_wxHashTable_NodeBase**)m_table ), this ); }; \
+        { return iterator( (Node*)GetFirstNode( m_tableBuckets, (_wxHashTable_NodeBase**)m_table ), this ); }  \

  \
     size_type erase( const const_key_type& key ) \
     { \
  \
     size_type erase( const const_key_type& key ) \
     { \