X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5a1cad6ea487130bc074d858368cd93241ae2cf2..2adfb497e666354303ea6bb0e468f1e53811ad55:/include/wx/dynarray.h

diff --git a/include/wx/dynarray.h b/include/wx/dynarray.h
index 649e4b9797..1a7bf28d2f 100644
--- a/include/wx/dynarray.h
+++ b/include/wx/dynarray.h
@@ -94,6 +94,7 @@ public:                                                             \
   bool  IsEmpty() const { return m_nCount == 0; }                   \
   size_t  Count() const { return m_nCount; }                        \
                                                                     \
+  typedef T base_type;                                              \
 protected:                                                          \
   T& Item(size_t uiIndex) const                                     \
     { wxASSERT( uiIndex < m_nCount ); return m_pItems[uiIndex]; }   \
@@ -111,7 +112,6 @@ protected:                                                          \
   void Sort(CMPFUNC fnCompare);                                     \
                                                                     \
 private:                                                            \
-  typedef T base_type;                                              \
                                                                     \
   void    Grow();                                                   \
                                                                     \
@@ -463,11 +463,11 @@ private:                                                                 \
 // Some commonly used predefined base arrays
 // ----------------------------------------------------------------------------
 
-WX_DECLARE_EXPORTED_BASEARRAY(void *, wxBaseArrayPtrVoid);
-WX_DECLARE_EXPORTED_BASEARRAY(short,  wxBaseArrayShort);
-WX_DECLARE_EXPORTED_BASEARRAY(int,    wxBaseArrayInt);
-WX_DECLARE_EXPORTED_BASEARRAY(long,   wxBaseArrayLong);
-WX_DECLARE_EXPORTED_BASEARRAY(double, wxBaseArrayDouble);
+WX_DECLARE_EXPORTED_BASEARRAY(const void *, wxBaseArrayPtrVoid);
+WX_DECLARE_EXPORTED_BASEARRAY(short,        wxBaseArrayShort);
+WX_DECLARE_EXPORTED_BASEARRAY(int,          wxBaseArrayInt);
+WX_DECLARE_EXPORTED_BASEARRAY(long,         wxBaseArrayLong);
+WX_DECLARE_EXPORTED_BASEARRAY(double,       wxBaseArrayDouble);
 
 // ----------------------------------------------------------------------------
 // Convenience macros to define arrays from base arrays