Remove connection of MyDllApp::OnIdle() handler in the dll sample.

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

diff --git a/include/wx/vector.h b/include/wx/vector.h
index 982cd0862697c51db1c8669889a5c1ed7f7bd7a9..b56b42e52daa3f4259c8a04dd693cbd45284e74d 100644 (file)
--- a/include/wx/vector.h
+++ b/include/wx/vector.h
@@ -14,7 +14,7 @@
 
 #include "wx/defs.h"
 
-#if wxUSE_STL
+#if wxUSE_STD_CONTAINERS
 
 #include <vector>
 #include <algorithm>
@@ -26,9 +26,8 @@ inline void wxVectorSort(wxVector<T>& v)
     std::sort(v.begin(), v.end());
 }
 
-#else // !wxUSE_STL
+#else // !wxUSE_STD_CONTAINERS
 
-#include "wx/utils.h"
 #include "wx/scopeguard.h"
 #include "wx/meta/movable.h"
 #include "wx/meta/if.h"
@@ -37,6 +36,15 @@ inline void wxVectorSort(wxVector<T>& v)
 #include <new> // for placement new
 #include "wx/afterstd.h"
 
+// wxQsort is declared in wx/utils.h, but can't include that file here,
+// it indirectly includes this file. Just lovely...
+typedef int (*wxSortCallback)(const void* pItem1,
+                              const void* pItem2,
+                              const void* user_data);
+WXDLLIMPEXP_BASE void wxQsort(void* pbase, size_t total_elems,
+                              size_t size, wxSortCallback cmp,
+                              const void* user_data);
+
 namespace wxPrivate
 {
 
@@ -118,7 +126,10 @@ private:
     // Note that we use typedef instead of privately deriving from this (which
     // would allowed us to omit "Ops::" prefixes below) to keep VC6 happy,
     // it can't compile code that derives from wxIf<...>::value.
-    typedef typename wxIf< wxIsMovable<T>::value,
+    //
+    // Note that bcc needs the extra parentheses for non-type template
+    // arguments to compile this expression.
+    typedef typename wxIf< (wxIsMovable<T>::value),
                            wxPrivate::wxVectorMemOpsMovable<T>,
                            wxPrivate::wxVectorMemOpsGeneric<T> >::value
             Ops;
@@ -202,6 +213,14 @@ public:
         clear();
     }
 
+    void assign(size_type p_size, const value_type& v)
+    {
+        clear();
+        reserve(p_size);
+        for ( size_t n = 0; n < p_size; n++ )
+            push_back(v);
+    }
+
     void swap(wxVector& v)
     {
         wxSwap(m_size, v.m_size);
@@ -231,10 +250,12 @@ public:
         // increase the size twice, unless we're already too big or unless
         // more is requested
         //
-        // NB: casts to size_type are needed to suppress mingw32 warnings about
-        //     mixing enums and ints in the same expression
+        // NB: casts to size_type are needed to suppress warnings about
+        //     mixing enumeral and non-enumeral type in conditional expression
         const size_type increment = m_size > 0
-                                     ? wxMin(m_size, (size_type)ALLOC_MAX_SIZE)
+                                     ? m_size < ALLOC_MAX_SIZE
+                                        ? m_size
+                                        : (size_type)ALLOC_MAX_SIZE
                                      : (size_type)ALLOC_INITIAL_SIZE;
         if ( m_capacity + increment > n )
             n = m_capacity + increment;
@@ -452,9 +473,9 @@ namespace wxPrivate
 // This is a helper for the wxVectorSort function, and should not be used
 // directly in user's code.
 template<typename T>
-struct wxVectorSort
+struct wxVectorComparator
 {
-    static int wxCMPFUNC_CONV
+    static int
     Compare(const void* pitem1, const void* pitem2, const void* )
     {
         const T& item1 = *reinterpret_cast<const T*>(pitem1);
@@ -477,12 +498,12 @@ template<typename T>
 void wxVectorSort(wxVector<T>& v)
 {
     wxQsort(v.begin(), v.size(), sizeof(T),
-            wxPrivate::wxVectorSort<T>::Compare, NULL);
+            wxPrivate::wxVectorComparator<T>::Compare, NULL);
 }
 
 
 
-#endif // wxUSE_STL/!wxUSE_STL
+#endif // wxUSE_STD_CONTAINERS/!wxUSE_STD_CONTAINERS
 
 #if WXWIN_COMPATIBILITY_2_8
     #define WX_DECLARE_VECTORBASE(obj, cls) typedef wxVector<obj> cls