Wrappers for *ToText

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

diff --git a/include/wx/vector.h b/include/wx/vector.h
index 39f2fbd14550a49d1d8808704d26d4f6194551c9..2034a9eaa8bcfaaeda7e355aa3a553d1c715d610 100644 (file)
--- a/include/wx/vector.h
+++ b/include/wx/vector.h
@@ -13,7 +13,7 @@
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 

-class WXDLLEXPORT wxVectorBase
+class WXDLLIMPEXP_BASE wxVectorBase

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


@@ -126,8 +126,7 @@ public:
 
     wxVectorBase& operator = (const wxVectorBase& vb)
     {
 
     wxVectorBase& operator = (const wxVectorBase& vb)
     {

-        bool rc = copy(vb);
-        wxASSERT(rc);
+        wxCHECK(copy(vb), *this);

         return *this;
     }
 };
         return *this;
     }
 };


@@ -146,8 +145,7 @@ public:\
     cls() {}\
     cls(const cls& c)\
     {\
     cls() {}\
     cls(const cls& c)\
     {\

-        bool rc = copy(c);\
-        wxASSERT(rc);\
+        wxCHECK2(copy(c), return);\

     }\
     ~cls()\
     {\
     }\
     ~cls()\
     {\


@@ -161,8 +159,7 @@ class exp cls : public wxVectorBase\
 public:\
     void push_back(const obj& o)\
     {\
 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()\
         Append(new obj(o));\
     };\
     void pop_back()\