set eol-style

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

diff --git a/include/wx/stack.h b/include/wx/stack.h
index 5550fae633badf2f4e15685167c3e1c2efb8eaa3..53f5121c2cde1de81690dcca298a17fde305f196 100644 (file)
--- a/include/wx/stack.h
+++ b/include/wx/stack.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     30.07.2001
 // Copyright:   (c) 2001 Lindsay Mathieson <lindsay@mathieson.org>
 // Modified by:
 // Created:     30.07.2001
 // Copyright:   (c) 2001 Lindsay Mathieson <lindsay@mathieson.org>

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STACK_H_
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STACK_H_


@@ -16,28 +16,30 @@
 #define WX_DECLARE_STACK(obj, cls)\
 class cls : public wxVectorBase\
 {\
 #define WX_DECLARE_STACK(obj, cls)\
 class cls : public wxVectorBase\
 {\

-       WX_DECLARE_VECTORBASE(obj, cls);\
+    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)\
+    {\
+        if ( !Alloc(size() + 1) )\
+        {\
+            wxFAIL_MSG(_T("failed to extend stack"));\
+        }\
+        Append(new obj(o));\
+    };\

 \
 \

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

 \
 \

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

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