fixes to my previous errors in stack/vector (patch 439378)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10924 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/stack.h b/include/wx/stack.h
index 8cd78bf271c9c565efae23d2665f7e22ad9a3ff4..5550fae633badf2f4e15685167c3e1c2efb8eaa3 100644 (file)
--- a/include/wx/stack.h
+++ b/include/wx/stack.h
@@ -13,10 +13,10 @@
 
 #include "wx/vector.h"
 
-#define WX_DECLARE_STL_STACK(obj, cls)\
+#define WX_DECLARE_STACK(obj, cls)\
 class cls : public wxVectorBase\
 {\
-       WX_DECLARE_STL_VECTORBASE(obj, cls);\
+       WX_DECLARE_VECTORBASE(obj, cls);\
 public:\
        void push(const obj& o)\
        {\

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)\
     {\