X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b9bd418c5ca5cfabf1d183db391893d1040b5f2..84a19decccc823884c8cc037dbc8469d251d35a9:/include/wx/dynarray.h?ds=sidebyside

diff --git a/include/wx/dynarray.h b/include/wx/dynarray.h
index 7b090023b2..a5b90b2b16 100644
--- a/include/wx/dynarray.h
+++ b/include/wx/dynarray.h
@@ -123,8 +123,8 @@ protected:
     /**
       Search the element in the array, starting from the either side
       @param bFromEnd if TRUE, start from the end
-      @return index of the first item matched or NOT_FOUND
-      @see NOT_FOUND
+      @return index of the first item matched or wxNOT_FOUND
+      @see wxNOT_FOUND
      */
   int Index(long lItem, bool bFromEnd = FALSE) const;
     /// search for an item using binary search in a sorted array
@@ -162,6 +162,9 @@ private:
 // types of sizeof()<=sizeof(long) or pointers if sizeof(pointer)<=sizeof(long)
 //
 // NB: it has only inline functions => takes no space at all
+// Mod by JACS: Salford C++ doesn't like 'var->operator=' syntax, as in:
+//    { ((wxBaseArray *)this)->operator=((const wxBaseArray&)src);
+// so using a temporary variable instead.
 // ----------------------------------------------------------------------------
 #define  _WX_DEFINE_ARRAY(T, name)                                  \
 typedef int (CMPFUNC_CONV *CMPFUNC##T)(T *pItem1, T *pItem2);       \
@@ -172,7 +175,8 @@ public:                                                             \
     { wxASSERT( sizeof(T) <= sizeof(long) ); }                      \
                                                                     \
   name& operator=(const name& src)                                  \
-    { ((wxBaseArray *)this)->operator=((const wxBaseArray&)src);    \
+    { wxBaseArray* temp = (wxBaseArray*) this;                      \
+      (*temp) = ((const wxBaseArray&)src);                          \
       return *this; }                                               \
                                                                     \
   T& operator[](size_t uiIndex) const                               \
@@ -193,7 +197,7 @@ public:                                                             \
   void Remove(size_t uiIndex) { wxBaseArray::Remove(uiIndex); }     \
   void Remove(T Item)                                               \
     { int iIndex = Index(Item);                                     \
-      wxCHECK2_MSG( iIndex != NOT_FOUND, return,                    \
+      wxCHECK2_MSG( iIndex != wxNOT_FOUND, return,                    \
         "removing inexisting element in wxArray::Remove" );         \
       wxBaseArray::Remove((size_t)iIndex); }                          \
                                                                     \
@@ -216,6 +220,9 @@ public:                                                             \
 // the normal arrays otherwise.
 //
 // NB: it has only inline functions => takes no space at all
+// Mod by JACS: Salford C++ doesn't like 'var->operator=' syntax, as in:
+//    { ((wxBaseArray *)this)->operator=((const wxBaseArray&)src);
+// so using a temporary variable instead.
 // ----------------------------------------------------------------------------
 #define  _WX_DEFINE_SORTED_ARRAY(T, name)                           \
 typedef int (CMPFUNC_CONV *SCMPFUNC##T)(T pItem1, T pItem2);        \
@@ -226,7 +233,8 @@ public:                                                             \
     { wxASSERT( sizeof(T) <= sizeof(long) ); m_fnCompare = fn; }    \
                                                                     \
   name& operator=(const name& src)                                  \
-    { ((wxBaseArray *)this)->operator=((const wxBaseArray&)src);    \
+    { wxBaseArray* temp = (wxBaseArray*) this;                      \
+      (*temp) = ((const wxBaseArray&)src);                          \
       m_fnCompare = src.m_fnCompare;                                \
       return *this; }                                               \
                                                                     \
@@ -246,7 +254,7 @@ public:                                                             \
   void Remove(size_t uiIndex) { wxBaseArray::Remove(uiIndex); }     \
   void Remove(T Item)                                               \
     { int iIndex = Index(Item);                                     \
-      wxCHECK2_MSG( iIndex != NOT_FOUND, return,                    \
+      wxCHECK2_MSG( iIndex != wxNOT_FOUND, return,                    \
         "removing inexisting element in wxArray::Remove" );         \
       wxBaseArray::Remove((size_t)iIndex); }                        \
                                                                     \
@@ -369,7 +377,7 @@ private:                                                            \
    @memo declare objarray class 'name' containing elements of type 'T'
   */
 #define WX_DECLARE_OBJARRAY(T, name)  typedef T _L##name;                 \
-                                      _WX_DECLARE_LIST(_L##name, name)
+                                      _WX_DECLARE_OBJARRAY(_L##name, name)
   /**
     To use an objarray class you must
     <ll>
@@ -428,6 +436,8 @@ WX_DEFINE_ARRAY(void *, wxArrayPtrVoid);
         {                                                                     \
             delete array[n];                                                  \
         }                                                                     \
+                                                                              \
+        array.Empty();                                                        \
     }
 #endif // _DYNARRAY_H