fixed the channel order for Mac (alpha comes first)

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

diff --git a/include/wx/dynarray.h b/include/wx/dynarray.h
index 6ff3d60383d3e8ace8cb25d40512a0f18fb3301b..fb4b3f6d8baaa8e8748924cea59c0100a9507faf 100644 (file)
--- a/include/wx/dynarray.h
+++ b/include/wx/dynarray.h
@@ -6,7 +6,7 @@
 // Created:     12.09.97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     12.09.97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef   _DYNARRAY_H
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef   _DYNARRAY_H


@@ -168,12 +168,12 @@ public:                                                               \
     { return (T&)(base::Item(Count() - 1)); }                         \
                                                                       \
   int Index(T Item, bool bFromEnd = FALSE) const                      \
     { return (T&)(base::Item(Count() - 1)); }                         \
                                                                       \
   int Index(T Item, bool bFromEnd = FALSE) const                      \

-    { return base::Index(Item, bFromEnd); }                           \
+    { return base::Index((base_type)Item, bFromEnd); }                \

                                                                       \
   void Add(T Item, size_t nInsert = 1)                                \
                                                                       \
   void Add(T Item, size_t nInsert = 1)                                \

-    { base::Add(Item, nInsert); }                                     \
+    { base::Add((base_type)Item, nInsert); }                          \

   void Insert(T Item, size_t uiIndex, size_t nInsert = 1)             \
   void Insert(T Item, size_t uiIndex, size_t nInsert = 1)             \

-    { base::Insert(Item, uiIndex, nInsert) ; }                        \
+    { base::Insert((base_type)Item, uiIndex, nInsert) ; }             \

                                                                       \
   void RemoveAt(size_t uiIndex, size_t nRemove = 1)                   \
     { base::RemoveAt(uiIndex, nRemove); }                             \
                                                                       \
   void RemoveAt(size_t uiIndex, size_t nRemove = 1)                   \
     { base::RemoveAt(uiIndex, nRemove); }                             \