Forbid setting hints for multi-line text controls.

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

diff --git a/include/wx/hashset.h b/include/wx/hashset.h
index 1be24e907b4f80c571029599cf1615c92e3a5284..1f3368c5bf7f79239946c5e5adc6b41cc3b03e73 100644 (file)
--- a/include/wx/hashset.h
+++ b/include/wx/hashset.h
@@ -14,7 +14,23 @@
 
 #include "wx/hashmap.h"
 
 
 #include "wx/hashmap.h"
 

-#if wxUSE_STL && defined(HAVE_STL_HASH_MAP)
+// see comment in wx/hashmap.h which also applies to different standard hash
+// set classes
+
+#if wxUSE_STD_CONTAINERS && \
+    (defined(HAVE_STD_UNORDERED_SET) || defined(HAVE_TR1_UNORDERED_SET))
+
+#if defined(HAVE_STD_UNORDERED_SET)
+    #include <unordered_set>
+    #define WX_HASH_SET_BASE_TEMPLATE std::unordered_set
+#elif defined(HAVE_TR1_UNORDERED_SET)
+    #include <tr1/unordered_set>
+    #define WX_HASH_SET_BASE_TEMPLATE std::tr1::unordered_set
+#else
+    #error Update this code: unordered_set is available, but I do not know where.
+#endif
+
+#elif wxUSE_STD_CONTAINERS && defined(HAVE_STL_HASH_MAP)

 
 #if defined(HAVE_EXT_HASH_MAP)
     #include <ext/hash_set>
 
 #if defined(HAVE_EXT_HASH_MAP)
     #include <ext/hash_set>


@@ -22,10 +38,38 @@
     #include <hash_set>
 #endif
 
     #include <hash_set>
 #endif
 

-#define _WX_DECLARE_HASH_SET( KEY_T, HASH_T, KEY_EQ_T, CLASSNAME, CLASSEXP )\
-    typedef WX_HASH_MAP_NAMESPACE::hash_set< KEY_T, HASH_T, KEY_EQ_T > CLASSNAME
+#define WX_HASH_SET_BASE_TEMPLATE WX_HASH_MAP_NAMESPACE::hash_set
+
+#endif // different hash_set/unordered_set possibilities

 
 

-#else // !wxUSE_STL || !defined(HAVE_STL_HASH_MAP)
+#ifdef WX_HASH_SET_BASE_TEMPLATE
+
+// we need to define the class declared by _WX_DECLARE_HASH_SET as a class and
+// not a typedef to allow forward declaring it
+#define _WX_DECLARE_HASH_SET( KEY_T, HASH_T, KEY_EQ_T, PTROP, CLASSNAME, CLASSEXP )  \
+CLASSEXP CLASSNAME                                                            \
+    : public WX_HASH_SET_BASE_TEMPLATE< KEY_T, HASH_T, KEY_EQ_T >             \
+{                                                                             \
+public:                                                                       \
+    explicit CLASSNAME(size_type n = 3,                                       \
+                       const hasher& h = hasher(),                            \
+                       const key_equal& ke = key_equal(),                     \
+                       const allocator_type& a = allocator_type())            \
+        : WX_HASH_SET_BASE_TEMPLATE< KEY_T, HASH_T, KEY_EQ_T >(n, h, ke, a)   \
+    {}                                                                        \
+    template <class InputIterator>                                            \
+    CLASSNAME(InputIterator f, InputIterator l,                               \
+              const hasher& h = hasher(),                                     \
+              const key_equal& ke = key_equal(),                              \
+              const allocator_type& a = allocator_type())                     \
+        : WX_HASH_SET_BASE_TEMPLATE< KEY_T, HASH_T, KEY_EQ_T >(f, l, h, ke, a)\
+    {}                                                                        \
+    CLASSNAME(const WX_HASH_SET_BASE_TEMPLATE< KEY_T, HASH_T, KEY_EQ_T >& s)  \
+        : WX_HASH_SET_BASE_TEMPLATE< KEY_T, HASH_T, KEY_EQ_T >(s)             \
+    {}                                                                        \
+}
+
+#else // no appropriate STL class, use our own implementation

 
 // this is a complex way of defining an easily inlineable identity function...
 #define _WX_DECLARE_HASH_SET_KEY_EX( KEY_T, CLASSNAME, CLASSEXP )            \
 
 // this is a complex way of defining an easily inlineable identity function...
 #define _WX_DECLARE_HASH_SET_KEY_EX( KEY_T, CLASSNAME, CLASSEXP )            \


@@ -45,9 +89,11 @@ public:                                                                      \
     CLASSNAME& operator=(const CLASSNAME&) { return *this; }                 \
 };
 
     CLASSNAME& operator=(const CLASSNAME&) { return *this; }                 \
 };
 

-#define _WX_DECLARE_HASH_SET( KEY_T, HASH_T, KEY_EQ_T, CLASSNAME, CLASSEXP )\
+#define _WX_DECLARE_HASH_SET( KEY_T, HASH_T, KEY_EQ_T, PTROP, CLASSNAME, CLASSEXP )\

 _WX_DECLARE_HASH_SET_KEY_EX( KEY_T, CLASSNAME##_wxImplementation_KeyEx, CLASSEXP ) \
 _WX_DECLARE_HASH_SET_KEY_EX( KEY_T, CLASSNAME##_wxImplementation_KeyEx, CLASSEXP ) \

-_WX_DECLARE_HASHTABLE( KEY_T, KEY_T, HASH_T, CLASSNAME##_wxImplementation_KeyEx, KEY_EQ_T, CLASSNAME##_wxImplementation_HashTable, CLASSEXP, grow_lf70, never_shrink ) \
+_WX_DECLARE_HASHTABLE( KEY_T, KEY_T, HASH_T,                                 \
+    CLASSNAME##_wxImplementation_KeyEx, KEY_EQ_T, PTROP,                     \
+    CLASSNAME##_wxImplementation_HashTable, CLASSEXP, grow_lf70, never_shrink ) \

 CLASSEXP CLASSNAME:public CLASSNAME##_wxImplementation_HashTable             \
 {                                                                            \
 public:                                                                      \
 CLASSEXP CLASSNAME:public CLASSNAME##_wxImplementation_HashTable             \
 {                                                                            \
 public:                                                                      \


@@ -81,25 +127,36 @@ public:                                                                      \
     void erase( const const_iterator& it ) { erase( *it ); }                 \
                                                                              \
     /* count() == 0 | 1 */                                                   \
     void erase( const const_iterator& it ) { erase( *it ); }                 \
                                                                              \
     /* count() == 0 | 1 */                                                   \

-    size_type count( const const_key_type& key )                             \
+    size_type count( const const_key_type& key ) const                       \

         { return GetNode( key ) ? 1 : 0; }                                   \
 }
 
         { return GetNode( key ) ? 1 : 0; }                                   \
 }
 

-#endif // !wxUSE_STL || !defined(HAVE_STL_HASH_MAP)
+#endif // STL/wx implementations
+

 
 // these macros are to be used in the user code
 #define WX_DECLARE_HASH_SET( KEY_T, HASH_T, KEY_EQ_T, CLASSNAME) \
 
 // these macros are to be used in the user code
 #define WX_DECLARE_HASH_SET( KEY_T, HASH_T, KEY_EQ_T, CLASSNAME) \

-    _WX_DECLARE_HASH_SET( KEY_T, HASH_T, KEY_EQ_T, CLASSNAME, class )
+    _WX_DECLARE_HASH_SET( KEY_T, HASH_T, KEY_EQ_T, wxPTROP_NORMAL, CLASSNAME, class )

 
 // and these do exactly the same thing but should be used inside the
 // library
 #define WX_DECLARE_HASH_SET_WITH_DECL( KEY_T, HASH_T, KEY_EQ_T, CLASSNAME, DECL) \
 
 // and these do exactly the same thing but should be used inside the
 // library
 #define WX_DECLARE_HASH_SET_WITH_DECL( KEY_T, HASH_T, KEY_EQ_T, CLASSNAME, DECL) \

-    _WX_DECLARE_HASH_SET( KEY_T, HASH_T, KEY_EQ_T, CLASSNAME, DECL )
+    _WX_DECLARE_HASH_SET( KEY_T, HASH_T, KEY_EQ_T, wxPTROP_NORMAL, CLASSNAME, DECL )

 
 #define WX_DECLARE_EXPORTED_HASH_SET( KEY_T, HASH_T, KEY_EQ_T, CLASSNAME) \
     WX_DECLARE_HASH_SET_WITH_DECL( KEY_T, HASH_T, KEY_EQ_T, \
                                    CLASSNAME, class WXDLLIMPEXP_CORE )
 
 
 #define WX_DECLARE_EXPORTED_HASH_SET( KEY_T, HASH_T, KEY_EQ_T, CLASSNAME) \
     WX_DECLARE_HASH_SET_WITH_DECL( KEY_T, HASH_T, KEY_EQ_T, \
                                    CLASSNAME, class WXDLLIMPEXP_CORE )
 

+// Finally these versions allow to define hash sets of non-objects (including
+// pointers, hence the confusing but wxArray-compatible name) without
+// operator->() which can't be used for them. This is mostly used inside the
+// library itself to avoid warnings when using such hash sets with some less
+// common compilers (notably Sun CC).
+#define WX_DECLARE_HASH_SET_PTR( KEY_T, HASH_T, KEY_EQ_T, CLASSNAME) \
+    _WX_DECLARE_HASH_SET( KEY_T, HASH_T, KEY_EQ_T, wxPTROP_NOP, CLASSNAME, class )
+#define WX_DECLARE_HASH_SET_WITH_DECL_PTR( KEY_T, HASH_T, KEY_EQ_T, CLASSNAME, DECL) \
+    _WX_DECLARE_HASH_SET( KEY_T, HASH_T, KEY_EQ_T, wxPTROP_NOP, CLASSNAME, DECL )
+

 // delete all hash elements
 //
 // NB: the class declaration of the hash elements must be visible from the
 // delete all hash elements
 //
 // NB: the class declaration of the hash elements must be visible from the