fixing warning and compile error against 10.4

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

diff --git a/include/wx/stack.h b/include/wx/stack.h
index e359111c40439985393d21bcfb29e0e51762a5c3..835b736a6361d9fa0b47da0490217d44f8d99f9a 100644 (file)
--- a/include/wx/stack.h
+++ b/include/wx/stack.h
@@ -13,31 +13,28 @@
 
 #include "wx/vector.h"
 
 
 #include "wx/vector.h"
 

-#define WX_DECLARE_STACK(obj, cls)\
-class cls : public wxVectorBase\
+#define WX_DECLARE_STACK(obj, cls) \
+class cls : public wxVector<obj> \

 {\
 {\

-       WX_DECLARE_VECTORBASE(obj, cls);\

 public:\
 public:\

-       void push(const obj& o)\
-       {\
-               bool rc = Alloc(size() + 1);\
-               wxASSERT(rc);\
-               Append(new obj(o));\
-       };\
+    void push(const obj& o)\
+    {\
+        push_back(o); \
+    };\

 \
 \

-       void pop()\
-       {\
-               RemoveAt(size() - 1);\
-       };\
+    void pop()\
+    {\
+        pop_back(); \
+    };\

 \
 \

-       obj& top()\
-       {\
-               return *(obj *) GetItem(size() - 1);\
-       };\
-       const obj& top() const\
-       {\
-               return *(obj *) GetItem(size() - 1);\
-       };\
+    obj& top()\
+    {\
+        return at(size() - 1);\
+    };\
+    const obj& top() const\
+    {\
+        return at(size() - 1); \
+    };\

 }
 
 #endif // _WX_STACK_H_
 }
 
 #endif // _WX_STACK_H_