added wxEncodingToCodepage() and implemented it properly (using in32 API instead...

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

diff --git a/include/wx/vector.h b/include/wx/vector.h
index 55d1b5c0155f753a59c9afce34ff28355731fd85..716494056da214f33c478ce5bba3f064c0c9a150 100644 (file)
--- a/include/wx/vector.h
+++ b/include/wx/vector.h
@@ -112,7 +112,7 @@ public:
 
     int capacity() const
     {
-        return m_size;
+        return m_capacity;
     };
 
     bool empty() const
@@ -153,7 +153,7 @@ public:\
 #define WX_DECLARE_VECTOR(obj, cls)\
 class cls : public wxVectorBase\
 {\
-    WX_DECLARE_STL_VECTORBASE(obj, cls);\
+    WX_DECLARE_VECTORBASE(obj, cls);\
 public:\
     void push_back(const obj& o)\
     {\