fixes to menu stock items support (patch 1547639)

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

diff --git a/include/wx/vector.h b/include/wx/vector.h
index 38a8f906305aacea4e3f775810c064063a070d15..8ffc4a74f1389227550dc4dcc94a877438ab7c73 100644 (file)
--- a/include/wx/vector.h
+++ b/include/wx/vector.h
@@ -48,7 +48,7 @@ protected:
 
     const void *GetItem(size_type idx) const
     {
 
     const void *GetItem(size_type idx) const
     {

-        wxASSERT(idx >= 0 && idx < m_size);
+        wxASSERT(idx < m_size);

         return m_objects[idx];
     }
 
         return m_objects[idx];
     }
 


@@ -61,7 +61,7 @@ protected:
 
     void RemoveAt(size_type idx)
     {
 
     void RemoveAt(size_type idx)
     {

-        wxASSERT(idx >= 0 && idx < m_size);
+        wxASSERT(idx < m_size);

         Free(m_objects[idx]);
         if (idx < m_size - 1)
             memcpy(
         Free(m_objects[idx]);
         if (idx < m_size - 1)
             memcpy(


@@ -132,7 +132,7 @@ public:
 };
 
 #define WX_DECLARE_VECTORBASE(obj, cls)\
 };
 
 #define WX_DECLARE_VECTORBASE(obj, cls)\

-private:\
+protected:\

     virtual void Free(void *o)\
     {\
         delete (obj *) o;\
     virtual void Free(void *o)\
     {\
         delete (obj *) o;\


@@ -143,7 +143,7 @@ private:\
     }\
 public:\
     cls() {}\
     }\
 public:\
     cls() {}\

-    cls(const cls& c)\
+    cls(const cls& c) : wxVectorBase()\

     {\
         wxCHECK2(copy(c), return);\
     }\
     {\
         wxCHECK2(copy(c), return);\
     }\