X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/84523830d52acd2865ec6f1b4f6b62b1f2bd9930..2a45803fc3877afd0ae3ce356dfe216505165882:/include/wx/vector.h

diff --git a/include/wx/vector.h b/include/wx/vector.h
index 74dcbf4080..b56b42e52d 100644
--- a/include/wx/vector.h
+++ b/include/wx/vector.h
@@ -36,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
 {
 
@@ -241,12 +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
                                      ? m_size < ALLOC_MAX_SIZE
                                         ? m_size
-                                        : ALLOC_MAX_SIZE
+                                        : (size_type)ALLOC_MAX_SIZE
                                      : (size_type)ALLOC_INITIAL_SIZE;
         if ( m_capacity + increment > n )
             n = m_capacity + increment;