change wxDataViewItem id to void*

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

diff --git a/include/wx/vector.h b/include/wx/vector.h
index 57543bd0c653f331fa9e74c05200d6f43345f7d7..1c181c2c18a0660dd9e4cbfcf829fbab05927522 100644 (file)
--- a/include/wx/vector.h
+++ b/include/wx/vector.h
@@ -2,9 +2,10 @@
 // Name:        wx/vector.h
 // Purpose:     STL vector clone
 // Author:      Lindsay Mathieson
 // Name:        wx/vector.h
 // Purpose:     STL vector clone
 // Author:      Lindsay Mathieson

-// Modified by:
+// Modified by: Vaclav Slavik - make it a template

 // Created:     30.07.2001
 // Created:     30.07.2001

-// Copyright:   (c) 2001 Lindsay Mathieson <lindsay@mathieson.org>
+// Copyright:   (c) 2001 Lindsay Mathieson <lindsay@mathieson.org>,
+//                  2007 Vaclav Slavik <vslavik@fastmail.fm>

 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 


@@ -13,17 +14,109 @@
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 

-class WXDLLIMPEXP_BASE wxVectorBase
+#if 0 // wxUSE_STL
+
+// FIXME: can't do this yet, wxVector::erase() is different (takes index,
+//        not iterator)
+#include <vector>
+#define wxVector std::vector
+
+#else // !wxUSE_STL
+
+template<typename T>
+class wxVector

 {
 public:
     typedef size_t size_type;
 {
 public:
     typedef size_t size_type;

-private:
-    size_type m_allocsize;
-    size_type m_size,
-              m_capacity;
-    void **m_objects;
+    typedef T value_type;
+
+    wxVector() : m_allocsize(16), m_size(0), m_capacity(0), m_objects(0) {}
+
+    wxVector(const wxVector& c)
+    {
+        wxCHECK2(Copy(c), return);
+    }
+
+    ~wxVector()
+    {
+        clear();
+    }
+
+    void clear()
+    {
+        for (size_type i = 0; i < size(); i++)
+            delete m_objects[i];
+        free(m_objects);
+        m_objects = 0;
+        m_size = m_capacity = 0;
+    }
+
+    void reserve(size_type n)
+    {
+        if ( !Alloc(n) )
+        {
+            wxFAIL_MSG( _T("out of memory in wxVector::reserve()") );
+        }
+    }
+
+    size_type size() const
+    {
+        return m_size;
+    }
+
+    size_type capacity() const
+    {
+        return m_capacity;
+    }
+
+    bool empty() const
+    {
+        return size() == 0;
+    }
+
+    wxVector& operator=(const wxVector& vb)
+    {
+        wxCHECK(Copy(vb), *this);
+        return *this;
+    }
+
+    void push_back(const value_type& o)
+    {
+        wxCHECK2(Alloc(size() + 1), return);
+        Append(new value_type(o));
+    }
+
+    void pop_back()
+    {
+        RemoveAt(size() - 1);
+    }
+
+    const value_type& at(size_type idx) const
+    {
+        wxASSERT(idx < m_size);
+        return *m_objects[idx];
+    }
+
+    value_type& at(size_type idx)
+    {
+        wxASSERT(idx < m_size);
+        return *m_objects[idx];
+    }

 
 

-protected:
+    const value_type& operator[](size_type idx) const  { return at(idx); }
+    value_type& operator[](size_type idx) { return at(idx); }
+    const value_type& front() const { return at(0); }
+    value_type& front() { return at(0); }
+    const value_type& back() const { return at(size() - 1); }
+    value_type& back() { return at(size() - 1); }
+
+    size_type erase(size_type idx)
+    {
+        RemoveAt(idx);
+        return idx;
+    }
+
+private:

     bool Alloc(size_type sz)
     {
         // work in multiples of m_allocsize;
     bool Alloc(size_type sz)
     {
         // work in multiples of m_allocsize;


@@ -32,27 +125,16 @@ protected:
             return true;
 
         // try to realloc
             return true;
 
         // try to realloc

-        void *mem = realloc(m_objects, sizeof(void *) * sz);
+        void *mem = realloc(m_objects, sizeof(value_type*) * sz);

         if (! mem)
             return false; // failed
         // success
         if (! mem)
             return false; // failed
         // success

-        m_objects = (void **) mem;
+        m_objects = (value_type **) mem;

         m_capacity = sz;
         return true;
     }
 
         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(size_type idx) const
-    {
-        wxASSERT(idx < m_size);
-        return m_objects[idx];
-    }
-
-    void Append(void *obj)
+    void Append(value_type *obj)

     {
         wxASSERT(m_size < m_capacity);
         m_objects[m_size] = obj;
     {
         wxASSERT(m_size < m_capacity);
         m_objects[m_size] = obj;


@@ -62,7 +144,7 @@ protected:
     void RemoveAt(size_type idx)
     {
         wxASSERT(idx < m_size);
     void RemoveAt(size_type idx)
     {
         wxASSERT(idx < m_size);

-        Free(m_objects[idx]);
+        delete m_objects[idx];

         if (idx < m_size - 1)
             memcpy(
                 m_objects + idx,
         if (idx < m_size - 1)
             memcpy(
                 m_objects + idx,


@@ -71,7 +153,7 @@ protected:
         m_size--;
     }
 
         m_size--;
     }
 

-    bool copy(const wxVectorBase& vb)
+    bool Copy(const wxVector& vb)

     {
         clear();
         if (! Alloc(vb.size()))
     {
         clear();
         if (! Alloc(vb.size()))


@@ -79,7 +161,7 @@ protected:
 
         for (size_type i = 0; i < vb.size(); i++)
         {
 
         for (size_type i = 0; i < vb.size(); i++)
         {

-            void *o = vb.Copy(vb.GetItem(i));
+            value_type *o = new value_type(vb.at(i));

             if (! o)
                 return false;
             Append(o);
             if (! o)
                 return false;
             Append(o);


@@ -88,125 +170,19 @@ protected:
         return true;
     }
 
         return true;
     }
 

-public:
-    wxVectorBase() : m_allocsize(16), m_size(0), m_capacity(0), m_objects(0) {}
-    virtual ~wxVectorBase() {} // calm down GCC
-
-    void clear()
-    {
-        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(size_type n)
-    {
-        if ( !Alloc(n) )
-        {
-            wxFAIL_MSG( _T("out of memory in wxVector::reserve()") );
-        }
-    }
-
-    size_type size() const
-    {
-        return m_size;
-    }
-
-    size_type capacity() const
-    {
-        return m_capacity;
-    }
-
-    bool empty() const
-    {
-        return size() == 0;
-    }
-
-    wxVectorBase& operator = (const wxVectorBase& vb)
-    {
-        wxCHECK(copy(vb), *this);
-        return *this;
-    }
+private:
+    size_type m_allocsize;
+    size_type m_size,
+              m_capacity;
+    value_type **m_objects;

 };
 
 };
 

-#define WX_DECLARE_VECTORBASE(obj, cls)\
-private:\
-    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) : wxVectorBase()\
-    {\
-        wxCHECK2(copy(c), return);\
-    }\
-    ~cls()\
-    {\
-        clear();\
-    }
-
-#define _WX_DECLARE_VECTOR(obj, cls, exp)\
-class exp cls : public wxVectorBase\
-{\
-    WX_DECLARE_VECTORBASE(obj, cls);\
-public:\
-    void push_back(const obj& o)\
-    {\
-        wxCHECK2(Alloc(size() + 1), return);\
-        Append(new obj(o));\
-    }\
-    void pop_back()\
-    {\
-        RemoveAt(size() - 1);\
-    }\
-    const obj& at(size_type idx) const\
-    {\
-        return *(obj *) GetItem(idx);\
-    }\
-    obj& at(size_type idx)\
-    {\
-        return *(obj *) GetItem(idx);\
-    }\
-    const obj& operator[](size_type idx) const\
-    {\
-        return at(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);\
-    }\
-    size_type erase(size_type idx)\
-    {\
-        RemoveAt(idx);\
-        return idx;\
-    }\
-}
-
-#define WX_DECLARE_VECTOR(obj, cls) \
-  _WX_DECLARE_VECTOR(obj, cls, WXDLLEXPORT)
+#endif // wxUSE_STL/!wxUSE_STL

 
 

-#endif // _WX_VECTOR_H_
+#if WXWIN_COMPATIBILITY_2_8
+    #define WX_DECLARE_VECTORBASE(obj, cls) typedef wxVector<obj> cls
+    #define _WX_DECLARE_VECTOR(obj, cls, exp) WX_DECLARE_VECTORBASE(obj, cls)
+    #define WX_DECLARE_VECTOR(obj, cls) WX_DECLARE_VECTORBASE(obj, cls)
+#endif // WXWIN_COMPATIBILITY_2_8

 
 

+#endif // _WX_VECTOR_H_