compilation fix

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

diff --git a/include/wx/dynarray.h b/include/wx/dynarray.h
index 3228aee579c9f13b9f7c0bc5152be7aa290f73f0..852ade1717f5f2555e9d861d38ef80d61f0f5cbe 100644 (file)
--- a/include/wx/dynarray.h
+++ b/include/wx/dynarray.h
@@ -24,9 +24,6 @@
     #include <vector>
     #include <algorithm>
     #include "wx/afterstd.h"
     #include <vector>
     #include <algorithm>
     #include "wx/afterstd.h"

-    #if defined(__WXMSW__) && defined(__MINGW32__)
-        #include "wx/msw/winundef.h"
-    #endif

 #endif
 
 /*
 #endif
 
 /*


@@ -89,9 +86,44 @@ typedef int (wxCMPFUNC_CONV *CMPFUNC)(const void* pItem1, const void* pItem2);
 
 #if wxUSE_STL
 
 
 #if wxUSE_STL
 

+template<class T>
+class WXDLLIMPEXP_BASE wxArray_SortFunction
+{
+public:
+    typedef int (wxCMPFUNC_CONV *CMPFUNC)(T* pItem1, T* pItem2);
+
+    wxArray_SortFunction(CMPFUNC f) : m_f(f) { }
+    bool operator()(const T& i1, const T& i2)
+      { return m_f((T*)&i1, (T*)&i2) < 0; }
+private:
+    CMPFUNC m_f;
+};
+
+template<class T, typename F>
+class WXDLLIMPEXP_BASE wxSortedArray_SortFunction
+{
+public:
+    typedef F CMPFUNC;
+
+    wxSortedArray_SortFunction(CMPFUNC f) : m_f(f) { }
+    bool operator()(const T& i1, const T& i2)
+      { return m_f(i1, i2) < 0; }
+private:
+    CMPFUNC m_f;
+};
+

 #define  _WX_DECLARE_BASEARRAY(T, name, classexp)                   \
 #define  _WX_DECLARE_BASEARRAY(T, name, classexp)                   \

+   typedef int (wxCMPFUNC_CONV *CMPFUN##name)(T pItem1, T pItem2);  \
+   typedef wxSortedArray_SortFunction<T, CMPFUN##name> name##_Predicate; \
+   _WX_DECLARE_BASEARRAY_2(T, name, name##_Predicate, classexp)
+
+#define  _WX_DECLARE_BASEARRAY_2(T, name, predicate, classexp)      \

 classexp name : public std::vector<T>                               \
 {                                                                   \
 classexp name : public std::vector<T>                               \
 {                                                                   \

+  typedef predicate Predicate;                                      \
+  typedef predicate::CMPFUNC SCMPFUNC;                              \
+public:                                                             \
+  typedef wxArray_SortFunction<T>::CMPFUNC CMPFUNC;                 \

 public:                                                             \
   void Empty() { clear(); }                                         \
   void Clear() { clear(); }                                         \
 public:                                                             \
   void Empty() { clear(); }                                         \
   void Clear() { clear(); }                                         \


@@ -123,19 +155,9 @@ protected:                                                          \
                                                                     \
   void Sort(CMPFUNC fCmp)                                           \
   {                                                                 \
                                                                     \
   void Sort(CMPFUNC fCmp)                                           \
   {                                                                 \

-    Predicate p(fCmp);                                              \
+    wxArray_SortFunction<T> p(fCmp);                                \

     std::sort(begin(), end(), p);                                   \
   }                                                                 \
     std::sort(begin(), end(), p);                                   \
   }                                                                 \

-private:                                                            \
-  class Predicate                                                   \
-  {                                                                 \
-    typedef CMPFUNC fnc;                                            \
-    fnc m_f;                                                        \
-  public:                                                           \
-    Predicate(fnc f) : m_f(f) { }                                   \
-    bool operator()(const T& i1, const T& i2)                       \
-      { return m_f((T*)&i1, (T*)&i2) < 0; /* const cast */ }        \
-  };                                                                \

 }
 
 #else // if !wxUSE_STL
 }
 
 #else // if !wxUSE_STL


@@ -143,6 +165,7 @@ private:                                                            \
 #define  _WX_DECLARE_BASEARRAY(T, name, classexp)                   \
 classexp name                                                       \
 {                                                                   \
 #define  _WX_DECLARE_BASEARRAY(T, name, classexp)                   \
 classexp name                                                       \
 {                                                                   \

+  typedef CMPFUNC SCMPFUNC; /* for compatibility wuth wxUSE_STL */  \

 public:                                                             \
   name();                                                           \
   name(const name& array);                                          \
 public:                                                             \
   name();                                                           \
   name(const name& array);                                          \


@@ -284,9 +307,14 @@ public:                                                               \
   void Sort(CMPFUNC##T fCmp) { base::Sort((CMPFUNC)fCmp); }           \
 }
 
   void Sort(CMPFUNC##T fCmp) { base::Sort((CMPFUNC)fCmp); }           \
 }
 

+#define  _WX_DEFINE_TYPEARRAY_NO_PTR(T, name, base, classexp)         \
+               _WX_DEFINE_TYPEARRAY(T, name, base, classexp)
+

 #else // if !wxUSE_STL
 
 #else // if !wxUSE_STL
 

-#define  _WX_DEFINE_TYPEARRAY(T, name, base, classexp)                \
+// common declaration used by both _WX_DEFINE_TYPEARRAY and
+// _WX_DEFINE_TYPEARRAY_NO_PTR
+#define  _WX_DEFINE_TYPEARRAY_HELPER(T, name, base, classexp, ptrop)  \

 wxCOMPILE_TIME_ASSERT2(sizeof(T) <= sizeof(base::base_type),          \
                        TypeTooBigToBeStoredIn##base,                  \
                        name);                                         \
 wxCOMPILE_TIME_ASSERT2(sizeof(T) <= sizeof(base::base_type),          \
                        TypeTooBigToBeStoredIn##base,                  \
                        name);                                         \


@@ -366,7 +394,7 @@ public:                                                               \
     reverse_iterator(pointer ptr) : m_ptr(ptr) { }                    \
     reverse_iterator(const itor& it) : m_ptr(it.m_ptr) { }            \
     reference operator*() const { return *m_ptr; }                    \
     reverse_iterator(pointer ptr) : m_ptr(ptr) { }                    \
     reverse_iterator(const itor& it) : m_ptr(it.m_ptr) { }            \
     reference operator*() const { return *m_ptr; }                    \

-    pointer operator->() const { return m_ptr; }                      \
+    ptrop                                                             \

     itor operator++() { --m_ptr; return *this; }                      \
     itor operator++(int)                                              \
       { reverse_iterator tmp = *this; --m_ptr; return tmp; }          \
     itor operator++() { --m_ptr; return *this; }                      \
     itor operator++(int)                                              \
       { reverse_iterator tmp = *this; --m_ptr; return tmp; }          \


@@ -399,7 +427,7 @@ public:                                                               \
     const_reverse_iterator(const itor& it) : m_ptr(it.m_ptr) { }      \
     const_reverse_iterator(const reverse_iterator& it) : m_ptr(it.m_ptr) { }\
     reference operator*() const { return *m_ptr; }                    \
     const_reverse_iterator(const itor& it) : m_ptr(it.m_ptr) { }      \
     const_reverse_iterator(const reverse_iterator& it) : m_ptr(it.m_ptr) { }\
     reference operator*() const { return *m_ptr; }                    \

-    pointer operator->() const { return m_ptr; }                      \
+    ptrop                                                             \

     itor operator++() { --m_ptr; return *this; }                      \
     itor operator++(int)                                              \
       { itor tmp = *this; --m_ptr; return tmp; }                      \
     itor operator++() { --m_ptr; return *this; }                      \
     itor operator++(int)                                              \
       { itor tmp = *this; --m_ptr; return tmp; }                      \


@@ -448,6 +476,13 @@ public:                                                               \
   size_type size() const { return base::size(); }                     \
 }
 
   size_type size() const { return base::size(); }                     \
 }
 

+#define _WX_PTROP pointer operator->() const { return m_ptr; }
+#define _WX_PTROP_NONE
+
+#define _WX_DEFINE_TYPEARRAY(T, name, base, classexp)                 \
+    _WX_DEFINE_TYPEARRAY_HELPER(T, name, base, classexp, _WX_PTROP)
+#define _WX_DEFINE_TYPEARRAY_NO_PTR(T, name, base, classexp)          \
+    _WX_DEFINE_TYPEARRAY_HELPER(T, name, base, classexp, _WX_PTROP_NONE)

 
 #endif // !wxUSE_STL
 
 
 #endif // !wxUSE_STL
 


@@ -457,11 +492,12 @@ public:                                                               \
 // ----------------------------------------------------------------------------
 
 #define _WX_DEFINE_SORTED_TYPEARRAY_2(T, name, base, defcomp, classexp, comptype)\
 // ----------------------------------------------------------------------------
 
 #define _WX_DEFINE_SORTED_TYPEARRAY_2(T, name, base, defcomp, classexp, comptype)\

-wxCOMPILE_TIME_ASSERT2(sizeof(T) <= sizeof(void *),                   \
+wxCOMPILE_TIME_ASSERT2(sizeof(T) <= sizeof(base::base_type),          \

                        TypeTooBigToBeStoredInSorted##base,            \
                        name);                                         \
 classexp name : public base                                           \
 {                                                                     \
                        TypeTooBigToBeStoredInSorted##base,            \
                        name);                                         \
 classexp name : public base                                           \
 {                                                                     \

+  typedef comptype SCMPFUNC;                                          \

 public:                                                               \
   name(comptype fn defcomp) { m_fnCompare = fn; }                     \
                                                                       \
 public:                                                               \
   name(comptype fn defcomp) { m_fnCompare = fn; }                     \
                                                                       \


@@ -607,16 +643,29 @@ private:                                                                 \
 #define WX_DEFINE_TYPEARRAY(T, name, base)                        \
     WX_DEFINE_TYPEARRAY_WITH_DECL(T, name, base, class wxARRAY_DEFAULT_EXPORT)
 
 #define WX_DEFINE_TYPEARRAY(T, name, base)                        \
     WX_DEFINE_TYPEARRAY_WITH_DECL(T, name, base, class wxARRAY_DEFAULT_EXPORT)
 

+#define WX_DEFINE_TYPEARRAY_NO_PTR(T, name, base)                        \
+    WX_DEFINE_TYPEARRAY_WITH_DECL_NO_PTR(T, name, base, class wxARRAY_DEFAULT_EXPORT)
+

 #define WX_DEFINE_EXPORTED_TYPEARRAY(T, name, base)               \
     WX_DEFINE_TYPEARRAY_WITH_DECL(T, name, base, class WXDLLEXPORT)
 
 #define WX_DEFINE_EXPORTED_TYPEARRAY(T, name, base)               \
     WX_DEFINE_TYPEARRAY_WITH_DECL(T, name, base, class WXDLLEXPORT)
 

+#define WX_DEFINE_EXPORTED_TYPEARRAY_NO_PTR(T, name, base)               \
+    WX_DEFINE_TYPEARRAY_WITH_DECL_NO_PTR(T, name, base, class WXDLLEXPORT)
+

 #define WX_DEFINE_USER_EXPORTED_TYPEARRAY(T, name, base, expdecl) \
     WX_DEFINE_TYPEARRAY_WITH_DECL(T, name, base, class expdecl)
 
 #define WX_DEFINE_USER_EXPORTED_TYPEARRAY(T, name, base, expdecl) \
     WX_DEFINE_TYPEARRAY_WITH_DECL(T, name, base, class expdecl)
 

+#define WX_DEFINE_USER_EXPORTED_TYPEARRAY_NO_PTR(T, name, base, expdecl) \
+    WX_DEFINE_TYPEARRAY_WITH_DECL_NO_PTR(T, name, base, class expdecl)
+

 #define WX_DEFINE_TYPEARRAY_WITH_DECL(T, name, base, classdecl) \
     typedef T _wxArray##name;                                   \
     _WX_DEFINE_TYPEARRAY(_wxArray##name, name, base, classdecl)
 
 #define WX_DEFINE_TYPEARRAY_WITH_DECL(T, name, base, classdecl) \
     typedef T _wxArray##name;                                   \
     _WX_DEFINE_TYPEARRAY(_wxArray##name, name, base, classdecl)
 

+#define WX_DEFINE_TYPEARRAY_WITH_DECL_NO_PTR(T, name, base, classdecl) \
+    typedef T _wxArray##name;                                          \
+    _WX_DEFINE_TYPEARRAY_NO_PTR(_wxArray##name, name, base, classdecl)
+

 // ----------------------------------------------------------------------------
 // WX_DEFINE_SORTED_TYPEARRAY: this is the same as the previous macro, but it
 // defines a sorted array.
 // ----------------------------------------------------------------------------
 // WX_DEFINE_SORTED_TYPEARRAY: this is the same as the previous macro, but it
 // defines a sorted array.


@@ -732,9 +781,12 @@ private:                                                                 \
 #define WX_DECLARE_EXPORTED_OBJARRAY(T, name)               \
     WX_DECLARE_USER_EXPORTED_OBJARRAY(T, name, WXDLLEXPORT)
 
 #define WX_DECLARE_EXPORTED_OBJARRAY(T, name)               \
     WX_DECLARE_USER_EXPORTED_OBJARRAY(T, name, WXDLLEXPORT)
 

-#define WX_DECLARE_USER_EXPORTED_OBJARRAY(T, name, expmode) \
+#define WX_DECLARE_OBJARRAY_WITH_DECL(T, name, decl) \

     typedef T _wxObjArray##name;                            \
     typedef T _wxObjArray##name;                            \

-    _WX_DECLARE_OBJARRAY(_wxObjArray##name, name, wxArrayPtrVoid, class expmode)
+    _WX_DECLARE_OBJARRAY(_wxObjArray##name, name, wxArrayPtrVoid, decl)
+    
+#define WX_DECLARE_USER_EXPORTED_OBJARRAY(T, name, expmode) \
+    WX_DECLARE_OBJARRAY_WITH_DECL(T, name, class expmode)

 
 // WX_DEFINE_OBJARRAY is going to be redefined when arrimpl.cpp is included,
 // try to provoke a human-understandable error if it used incorrectly.
 
 // WX_DEFINE_OBJARRAY is going to be redefined when arrimpl.cpp is included,
 // try to provoke a human-understandable error if it used incorrectly.


@@ -751,14 +803,10 @@ private:                                                                 \
 
 WX_DECLARE_USER_EXPORTED_BASEARRAY(const void *, wxBaseArrayPtrVoid,
                                    WXDLLIMPEXP_BASE);
 
 WX_DECLARE_USER_EXPORTED_BASEARRAY(const void *, wxBaseArrayPtrVoid,
                                    WXDLLIMPEXP_BASE);

-WX_DECLARE_USER_EXPORTED_BASEARRAY(short,        wxBaseArrayShort,
-                                   WXDLLIMPEXP_BASE);
-WX_DECLARE_USER_EXPORTED_BASEARRAY(int,          wxBaseArrayInt,
-                                   WXDLLIMPEXP_BASE);
-WX_DECLARE_USER_EXPORTED_BASEARRAY(long,         wxBaseArrayLong,
-                                   WXDLLIMPEXP_BASE);
-WX_DECLARE_USER_EXPORTED_BASEARRAY(double,       wxBaseArrayDouble,
-                                   WXDLLIMPEXP_BASE);
+WX_DECLARE_USER_EXPORTED_BASEARRAY(short, wxBaseArrayShort, WXDLLIMPEXP_BASE);
+WX_DECLARE_USER_EXPORTED_BASEARRAY(int, wxBaseArrayInt, WXDLLIMPEXP_BASE);
+WX_DECLARE_USER_EXPORTED_BASEARRAY(long, wxBaseArrayLong, WXDLLIMPEXP_BASE);
+WX_DECLARE_USER_EXPORTED_BASEARRAY(double, wxBaseArrayDouble, WXDLLIMPEXP_BASE);

 
 // ----------------------------------------------------------------------------
 // Convenience macros to define arrays from base arrays
 
 // ----------------------------------------------------------------------------
 // Convenience macros to define arrays from base arrays


@@ -766,38 +814,44 @@ WX_DECLARE_USER_EXPORTED_BASEARRAY(double,       wxBaseArrayDouble,
 
 #define WX_DEFINE_ARRAY(T, name)                                       \
     WX_DEFINE_TYPEARRAY(T, name, wxBaseArrayPtrVoid)
 
 #define WX_DEFINE_ARRAY(T, name)                                       \
     WX_DEFINE_TYPEARRAY(T, name, wxBaseArrayPtrVoid)

+#define WX_DEFINE_ARRAY_NO_PTR(T, name)                                \
+    WX_DEFINE_TYPEARRAY_NO_PTR(T, name, wxBaseArrayPtrVoid)

 #define WX_DEFINE_EXPORTED_ARRAY(T, name)                              \
     WX_DEFINE_EXPORTED_TYPEARRAY(T, name, wxBaseArrayPtrVoid)
 #define WX_DEFINE_EXPORTED_ARRAY(T, name)                              \
     WX_DEFINE_EXPORTED_TYPEARRAY(T, name, wxBaseArrayPtrVoid)

+#define WX_DEFINE_EXPORTED_ARRAY_NO_PTR(T, name)                       \
+    WX_DEFINE_EXPORTED_TYPEARRAY_NO_PTR(T, name, wxBaseArrayPtrVoid)

 #define WX_DEFINE_USER_EXPORTED_ARRAY(T, name, expmode)                \
     WX_DEFINE_TYPEARRAY_WITH_DECL(T, name, wxBaseArrayPtrVoid, expmode)
 #define WX_DEFINE_USER_EXPORTED_ARRAY(T, name, expmode)                \
     WX_DEFINE_TYPEARRAY_WITH_DECL(T, name, wxBaseArrayPtrVoid, expmode)

+#define WX_DEFINE_USER_EXPORTED_ARRAY_NO_PTR(T, name, expmode)         \
+    WX_DEFINE_TYPEARRAY_WITH_DECL_NO_PTR(T, name, wxBaseArrayPtrVoid, expmode)

 
 #define WX_DEFINE_ARRAY_SHORT(T, name)                                 \
 
 #define WX_DEFINE_ARRAY_SHORT(T, name)                                 \

-    WX_DEFINE_TYPEARRAY(T, name, wxBaseArrayShort)
+    WX_DEFINE_TYPEARRAY_NO_PTR(T, name, wxBaseArrayShort)

 #define WX_DEFINE_EXPORTED_ARRAY_SHORT(T, name)                        \
 #define WX_DEFINE_EXPORTED_ARRAY_SHORT(T, name)                        \

-    WX_DEFINE_EXPORTED_TYPEARRAY(T, name, wxBaseArrayShort)
+    WX_DEFINE_EXPORTED_TYPEARRAY_NO_PTR(T, name, wxBaseArrayShort)

 #define WX_DEFINE_USER_EXPORTED_ARRAY_SHORT(T, name, expmode)          \
 #define WX_DEFINE_USER_EXPORTED_ARRAY_SHORT(T, name, expmode)          \

-    WX_DEFINE_TYPEARRAY_WITH_DECL(T, name, wxBaseArrayShort, expmode)
+    WX_DEFINE_TYPEARRAY_WITH_DECL_NO_PTR(T, name, wxBaseArrayShort, expmode)

 
 #define WX_DEFINE_ARRAY_INT(T, name)                                   \
 
 #define WX_DEFINE_ARRAY_INT(T, name)                                   \

-    WX_DEFINE_TYPEARRAY(T, name, wxBaseArrayInt)
+    WX_DEFINE_TYPEARRAY_NO_PTR(T, name, wxBaseArrayInt)

 #define WX_DEFINE_EXPORTED_ARRAY_INT(T, name)                          \
 #define WX_DEFINE_EXPORTED_ARRAY_INT(T, name)                          \

-    WX_DEFINE_EXPORTED_TYPEARRAY(T, name, wxBaseArrayInt)
+    WX_DEFINE_EXPORTED_TYPEARRAY_NO_PTR(T, name, wxBaseArrayInt)

 #define WX_DEFINE_USER_EXPORTED_ARRAY_INT(T, name, expmode)            \
 #define WX_DEFINE_USER_EXPORTED_ARRAY_INT(T, name, expmode)            \

-    WX_DEFINE_TYPEARRAY_WITH_DECL(T, name, wxBaseArrayInt, expmode)
+    WX_DEFINE_TYPEARRAY_WITH_DECL_NO_PTR(T, name, wxBaseArrayInt, expmode)

 
 #define WX_DEFINE_ARRAY_LONG(T, name)                                  \
 
 #define WX_DEFINE_ARRAY_LONG(T, name)                                  \

-    WX_DEFINE_TYPEARRAY(T, name, wxBaseArrayLong)
+    WX_DEFINE_TYPEARRAY_NO_PTR(T, name, wxBaseArrayLong)

 #define WX_DEFINE_EXPORTED_ARRAY_LONG(T, name)                         \
 #define WX_DEFINE_EXPORTED_ARRAY_LONG(T, name)                         \

-    WX_DEFINE_EXPORTED_TYPEARRAY(T, name, wxBaseArrayLong)
+    WX_DEFINE_EXPORTED_TYPEARRAY_NO_PTR(T, name, wxBaseArrayLong)

 #define WX_DEFINE_USER_EXPORTED_ARRAY_LONG(T, name, expmode)           \
 #define WX_DEFINE_USER_EXPORTED_ARRAY_LONG(T, name, expmode)           \

-    WX_DEFINE_TYPEARRAY_WITH_DECL(T, name, wxBaseArrayLong, expmode)
+    WX_DEFINE_TYPEARRAY_WITH_DECL_NO_PTR(T, name, wxBaseArrayLong, expmode)

 
 #define WX_DEFINE_ARRAY_DOUBLE(T, name)                                \
 
 #define WX_DEFINE_ARRAY_DOUBLE(T, name)                                \

-    WX_DEFINE_TYPEARRAY(T, name, wxBaseArrayDouble)
+    WX_DEFINE_TYPEARRAY_NO_PTR(T, name, wxBaseArrayDouble)

 #define WX_DEFINE_EXPORTED_ARRAY_DOUBLE(T, name)                       \
 #define WX_DEFINE_EXPORTED_ARRAY_DOUBLE(T, name)                       \

-    WX_DEFINE_EXPORTED_TYPEARRAY(T, name, wxBaseArrayDouble)
+    WX_DEFINE_EXPORTED_TYPEARRAY_NO_PTR(T, name, wxBaseArrayDouble)

 #define WX_DEFINE_USER_EXPORTED_ARRAY_DOUBLE(T, name, expmode)         \
 #define WX_DEFINE_USER_EXPORTED_ARRAY_DOUBLE(T, name, expmode)         \

-    WX_DEFINE_TYPEARRAY_WITH_DECL(T, name, wxBaseArrayDouble, expmode)
+    WX_DEFINE_TYPEARRAY_WITH_DECL_NO_PTR(T, name, wxBaseArrayDouble, expmode)

 
 // ----------------------------------------------------------------------------
 // Convenience macros to define sorted arrays from base arrays
 
 // ----------------------------------------------------------------------------
 // Convenience macros to define sorted arrays from base arrays


@@ -875,10 +929,10 @@ WX_DECLARE_USER_EXPORTED_BASEARRAY(double,       wxBaseArrayDouble,
 // Some commonly used predefined arrays
 // ----------------------------------------------------------------------------
 
 // Some commonly used predefined arrays
 // ----------------------------------------------------------------------------
 

-WX_DEFINE_USER_EXPORTED_ARRAY_SHORT (short,  wxArrayShort,   class WXDLLIMPEXP_BASE);
-WX_DEFINE_USER_EXPORTED_ARRAY_INT   (int,    wxArrayInt,     class WXDLLIMPEXP_BASE);
-WX_DEFINE_USER_EXPORTED_ARRAY_LONG  (long,   wxArrayLong,    class WXDLLIMPEXP_BASE);
-WX_DEFINE_USER_EXPORTED_ARRAY       (void *, wxArrayPtrVoid, class WXDLLIMPEXP_BASE);
+WX_DEFINE_USER_EXPORTED_ARRAY_SHORT(short, wxArrayShort, class WXDLLIMPEXP_BASE);
+WX_DEFINE_USER_EXPORTED_ARRAY_INT(int, wxArrayInt, class WXDLLIMPEXP_BASE);
+WX_DEFINE_USER_EXPORTED_ARRAY_LONG(long, wxArrayLong, class WXDLLIMPEXP_BASE);
+WX_DEFINE_USER_EXPORTED_ARRAY_NO_PTR(void *, wxArrayPtrVoid, class WXDLLIMPEXP_BASE);

 
 // -----------------------------------------------------------------------------
 // convenience macros
 
 // -----------------------------------------------------------------------------
 // convenience macros