warnings (and some errors) fixes for wxUniv DLL build

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

diff --git a/include/wx/vector.h b/include/wx/vector.h
index fa01349ca5b124d95cafe9244a52d1b0fa77f4e3..2034a9eaa8bcfaaeda7e355aa3a553d1c715d610 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,11 +13,11 @@
 
 #include "wx/defs.h"
 
-class WXDLLEXPORT wxVectorBase
+class WXDLLIMPEXP_BASE wxVectorBase
 {
-private:
+public:
     typedef size_t size_type;
-
+private:
     size_type m_allocsize;
     size_type m_size,
               m_capacity;
@@ -126,8 +126,7 @@ public:
 
     wxVectorBase& operator = (const wxVectorBase& vb)
     {
-        bool rc = copy(vb);
-        wxASSERT(rc);
+        wxCHECK(copy(vb), *this);
         return *this;
     }
 };
@@ -146,8 +145,7 @@ public:\
     cls() {}\
     cls(const cls& c)\
     {\
-        bool rc = copy(c);\
-        wxASSERT(rc);\
+        wxCHECK2(copy(c), return);\
     }\
     ~cls()\
     {\
@@ -161,8 +159,7 @@ class exp cls : public wxVectorBase\
 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()\