cleanup - fixed warnings, reformatting

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

diff --git a/include/wx/vector.h b/include/wx/vector.h
index 55d1b5c0155f753a59c9afce34ff28355731fd85..8ffc4a74f1389227550dc4dcc94a877438ab7c73 100644 (file)
--- a/include/wx/vector.h
+++ b/include/wx/vector.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     30.07.2001
 // Copyright:   (c) 2001 Lindsay Mathieson <lindsay@mathieson.org>
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_VECTOR_H_
@@ -13,16 +13,18 @@
 
 #include "wx/defs.h"
 
-class wxVectorBase
+class WXDLLIMPEXP_BASE wxVectorBase
 {
+public:
+    typedef size_t size_type;
 private:
-    int m_allocsize;
-    int m_size,
-        m_capacity;
+    size_type m_allocsize;
+    size_type m_size,
+              m_capacity;
     void **m_objects;
 
 protected:
-    bool Alloc(int sz)
+    bool Alloc(size_type sz)
     {
         // work in multiples of m_allocsize;
         sz = (sz / m_allocsize + 1) * m_allocsize;
@@ -37,37 +39,37 @@ protected:
         m_objects = (void **) mem;
         m_capacity = sz;
         return true;
-    };
+    }
 
     // untyped destructor of elements - must be overriden
     virtual void Free(void *) = 0;
     // untyped copy constructor of elements - must be overriden
     virtual void *Copy(const void *) const = 0;
 
-    const void *GetItem(int idx) const
+    const void *GetItem(size_type idx) const
     {
-        wxASSERT(idx >= 0 && idx < m_size);
+        wxASSERT(idx < m_size);
         return m_objects[idx];
-    };
+    }
 
     void Append(void *obj)
     {
         wxASSERT(m_size < m_capacity);
         m_objects[m_size] = obj;
         m_size++;
-    };
+    }
 
-    void RemoveAt(int 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(
-                m_objects + idx * sizeof(void *),
-                m_objects + (idx + 1) * sizeof(void *),
-                m_size - idx - 1);
+                m_objects + idx,
+                m_objects + idx + 1,
+                ( m_size - idx - 1 ) * sizeof(void*) );
         m_size--;
-    };
+    }
 
     bool copy(const wxVectorBase& vb)
     {
@@ -75,134 +77,136 @@ protected:
         if (! Alloc(vb.size()))
             return false;
 
-        for (int i = 0; i < vb.size(); i++)
+        for (size_type i = 0; i < vb.size(); i++)
         {
             void *o = vb.Copy(vb.GetItem(i));
             if (! o)
                 return false;
             Append(o);
-        };
+        }
 
         return true;
-    };
+    }
 
 public:
-    wxVectorBase() : m_objects(0), m_allocsize(16), m_size(0), m_capacity(0) {}
+    wxVectorBase() : m_allocsize(16), m_size(0), m_capacity(0), m_objects(0) {}
+    virtual ~wxVectorBase() {} // calm down GCC
+
     void clear()
     {
-        for (int i = 0; i < size(); i++)
+        for (size_type i = 0; i < size(); i++)
             Free(m_objects[i]);
         free(m_objects);
         m_objects = 0;
         m_size = m_capacity = 0;
-    };
+    }
 
-    void reserve(int n)
+    void reserve(size_type n)
     {
         if ( !Alloc(n) )
         {
             wxFAIL_MSG( _T("out of memory in wxVector::reserve()") );
         }
-    };
+    }
 
-    int size() const
+    size_type size() const
     {
         return m_size;
     }
 
-    int capacity() const
+    size_type capacity() const
     {
-        return m_size;
-    };
+        return m_capacity;
+    }
 
     bool empty() const
     {
         return size() == 0;
-    };
+    }
 
     wxVectorBase& operator = (const wxVectorBase& vb)
     {
-        bool rc = copy(vb);
-        wxASSERT(rc);
+        wxCHECK(copy(vb), *this);
         return *this;
     }
 };
 
 #define WX_DECLARE_VECTORBASE(obj, cls)\
-private:\
+protected:\
     virtual void Free(void *o)\
     {\
         delete (obj *) o;\
-    };\
+    }\
     virtual void *Copy(const void *o) const\
     {\
         return new obj(*(obj *) o);\
-    };\
+    }\
 public:\
     cls() {}\
-    cls(const cls& c)\
+    cls(const cls& c) : wxVectorBase()\
     {\
-        bool rc = copy(c);\
-        wxASSERT(rc);\
+        wxCHECK2(copy(c), return);\
     }\
     ~cls()\
     {\
         clear();\
     }
 
-#define WX_DECLARE_VECTOR(obj, cls)\
-class cls : public wxVectorBase\
+#define _WX_DECLARE_VECTOR(obj, cls, exp)\
+class exp cls : public wxVectorBase\
 {\
-    WX_DECLARE_STL_VECTORBASE(obj, cls);\
+    WX_DECLARE_VECTORBASE(obj, cls);\
 public:\
     void push_back(const obj& o)\
     {\
-        bool rc = Alloc(size() + 1);\
-        wxASSERT(rc);\
+        wxCHECK2(Alloc(size() + 1), return);\
         Append(new obj(o));\
-    };\
+    }\
     void pop_back()\
     {\
         RemoveAt(size() - 1);\
-    };\
-    const obj& at(int idx) const\
+    }\
+    const obj& at(size_type idx) const\
     {\
         return *(obj *) GetItem(idx);\
-    };\
-    obj& at(int idx)\
+    }\
+    obj& at(size_type idx)\
     {\
         return *(obj *) GetItem(idx);\
-    };\
-    const obj& operator[](int idx) const\
+    }\
+    const obj& operator[](size_type idx) const\
     {\
         return at(idx);\
-    };\
-    obj& operator[](int idx)\
+    }\
+    obj& operator[](size_type idx)\
     {\
         return at(idx);\
-    };\
+    }\
     const obj& front() const\
     {\
         return at(0);\
-    };\
+    }\
     obj& front()\
     {\
         return at(0);\
-    };\
+    }\
     const obj& back() const\
     {\
         return at(size() - 1);\
-    };\
+    }\
     obj& back()\
     {\
         return at(size() - 1);\
-    };\
-    int erase(int idx)\
+    }\
+    size_type erase(size_type idx)\
     {\
         RemoveAt(idx);\
         return idx;\
-    };\
+    }\
 }
 
+#define WX_DECLARE_VECTOR(obj, cls) \
+  _WX_DECLARE_VECTOR(obj, cls, WXDLLEXPORT)
+
 #endif // _WX_VECTOR_H_