diff --git a/include/wx/stack.h b/include/wx/stack.h
index 8cd78bf271..5550fae633 100644
--- 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 55d1b5c015..716494056d 100644
--- 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)\
     {\