fixing osx_cocoa

[wxWidgets.git] / src / common / arrstr.cpp

diff --git a/src/common/arrstr.cpp b/src/common/arrstr.cpp
index fa303bd756e3548e73331e76ccd5e45e1adb1edd..084196b83ee99a6f3878f5db5f570d8a4cbbc4a3 100644 (file)
--- a/src/common/arrstr.cpp
+++ b/src/common/arrstr.cpp
@@ -33,7 +33,7 @@
 
 wxArrayString::wxArrayString(size_t sz, const char** a)
 {
 
 wxArrayString::wxArrayString(size_t sz, const char** a)
 {

-#if !wxUSE_STL
+#if !wxUSE_STD_CONTAINERS

     Init(false);
 #endif
     for (size_t i=0; i < sz; i++)
     Init(false);
 #endif
     for (size_t i=0; i < sz; i++)


@@ -42,7 +42,7 @@ wxArrayString::wxArrayString(size_t sz, const char** a)
 
 wxArrayString::wxArrayString(size_t sz, const wchar_t** a)
 {
 
 wxArrayString::wxArrayString(size_t sz, const wchar_t** a)
 {

-#if !wxUSE_STL
+#if !wxUSE_STD_CONTAINERS

     Init(false);
 #endif
     for (size_t i=0; i < sz; i++)
     Init(false);
 #endif
     for (size_t i=0; i < sz; i++)


@@ -51,14 +51,14 @@ wxArrayString::wxArrayString(size_t sz, const wchar_t** a)
 
 wxArrayString::wxArrayString(size_t sz, const wxString* a)
 {
 
 wxArrayString::wxArrayString(size_t sz, const wxString* a)
 {

-#if !wxUSE_STL
+#if !wxUSE_STD_CONTAINERS

     Init(false);
 #endif
     for (size_t i=0; i < sz; i++)
         Add(a[i]);
 }
 
     Init(false);
 #endif
     for (size_t i=0; i < sz; i++)
         Add(a[i]);
 }
 

-#if !wxUSE_STL
+#if !wxUSE_STD_CONTAINERS

 
 // size increment = min(50% of current size, ARRAY_MAXSIZE_INCREMENT)
 #define   ARRAY_MAXSIZE_INCREMENT       4096
 
 // size increment = min(50% of current size, ARRAY_MAXSIZE_INCREMENT)
 #define   ARRAY_MAXSIZE_INCREMENT       4096


@@ -206,6 +206,7 @@ void wxArrayString::Shrink()
         pNew[j] = m_pItems[j];
     delete [] m_pItems;
     m_pItems = pNew;
         pNew[j] = m_pItems[j];
     delete [] m_pItems;
     m_pItems = pNew;

+    m_nSize = m_nCount;

   }
 }
 
   }
 }
 


@@ -344,6 +345,14 @@ wxArrayString::insert(iterator it, const_iterator first, const_iterator last)
     }
 }
 
     }
 }
 

+void wxArrayString::resize(size_type n, value_type v)
+{
+  if ( n < m_nCount )
+      m_nCount = n;
+  else if ( n > m_nCount )
+      Add(v, n - m_nCount);
+}
+

 // expand the array
 void wxArrayString::SetCount(size_t count)
 {
 // expand the array
 void wxArrayString::SetCount(size_t count)
 {


@@ -453,7 +462,7 @@ bool wxArrayString::operator==(const wxArrayString& a) const
     return true;
 }
 
     return true;
 }
 

-#endif // !wxUSE_STL
+#endif // !wxUSE_STD_CONTAINERS

 
 // ===========================================================================
 // wxJoin and wxSplit
 
 // ===========================================================================
 // wxJoin and wxSplit