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
This commit is contained in:
@@ -13,10 +13,10 @@
|
|||||||
|
|
||||||
#include "wx/vector.h"
|
#include "wx/vector.h"
|
||||||
|
|
||||||
#define WX_DECLARE_STL_STACK(obj, cls)\
|
#define WX_DECLARE_STACK(obj, cls)\
|
||||||
class cls : public wxVectorBase\
|
class cls : public wxVectorBase\
|
||||||
{\
|
{\
|
||||||
WX_DECLARE_STL_VECTORBASE(obj, cls);\
|
WX_DECLARE_VECTORBASE(obj, cls);\
|
||||||
public:\
|
public:\
|
||||||
void push(const obj& o)\
|
void push(const obj& o)\
|
||||||
{\
|
{\
|
||||||
|
@@ -112,7 +112,7 @@ public:
|
|||||||
|
|
||||||
int capacity() const
|
int capacity() const
|
||||||
{
|
{
|
||||||
return m_size;
|
return m_capacity;
|
||||||
};
|
};
|
||||||
|
|
||||||
bool empty() const
|
bool empty() const
|
||||||
@@ -153,7 +153,7 @@ public:\
|
|||||||
#define WX_DECLARE_VECTOR(obj, cls)\
|
#define WX_DECLARE_VECTOR(obj, cls)\
|
||||||
class cls : public wxVectorBase\
|
class cls : public wxVectorBase\
|
||||||
{\
|
{\
|
||||||
WX_DECLARE_STL_VECTORBASE(obj, cls);\
|
WX_DECLARE_VECTORBASE(obj, cls);\
|
||||||
public:\
|
public:\
|
||||||
void push_back(const obj& o)\
|
void push_back(const obj& o)\
|
||||||
{\
|
{\
|
||||||
|
Reference in New Issue
Block a user