Added forward declaration for wxWindow

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

diff --git a/include/wx/vector.h b/include/wx/vector.h
index 1132087a5e288f33bb507b718363ab848a2e395c..8cb76a7ee66f9f04fe5b3272b31d1a99535111f8 100644 (file)
--- a/include/wx/vector.h
+++ b/include/wx/vector.h
@@ -170,8 +170,8 @@ public:
             *(i - count) = *i;
 
         // erase items behind the new end of m_values:
-        for ( iterator i = end() - count; i < end(); ++i )
-            *i = value_type();
+        for ( iterator j = end() - count; j < end(); ++j )
+            *j = value_type();
 
         m_size -= count;
 
@@ -183,8 +183,9 @@ public:
 #endif // WXWIN_COMPATIBILITY_2_8
 
 private:
-    static const size_type ALLOC_INITIAL_SIZE = 16;
-    static const size_type ALLOC_MAX_SIZE = 4096;
+    // VC6 can't compile static const int members
+    enum { ALLOC_INITIAL_SIZE = 16 };
+    enum { ALLOC_MAX_SIZE = 4096 };
 
     void Copy(const wxVector& vb)
     {