From e18e17f9ed9e9c76e7cd9e5bbd6bbc9987625c73 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin <vadim@wxwidgets.org> Date: Mon, 9 Jul 2001 22:44:26 +0000 Subject: [PATCH] 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 --- include/wx/stack.h | 4 ++-- include/wx/vector.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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)\ {\ -- 2.47.2