Don't use "Cancel" button in the about dialog of the listctrl sample.

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

diff --git a/src/common/arrstr.cpp b/src/common/arrstr.cpp
index be461cc639ccd1a361631d4217c14e32c4520f4e..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


@@ -462,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