fix rendering of wxGrid on wxMSW when a dialog is over the grid.

[wxWidgets.git] / tests / arrays / arrays.cpp

diff --git a/tests/arrays/arrays.cpp b/tests/arrays/arrays.cpp
index 1cd0537457da4fff063554ddfdf6901cdc3acce8..0913b8ab8e299338166d482457a02a1c46a9da06 100644 (file)
--- a/tests/arrays/arrays.cpp
+++ b/tests/arrays/arrays.cpp
@@ -314,6 +314,19 @@ void ArraysTestCase::wxStringArrayTest()
                                           _T("a") ,
                                           _T("a") ,
                                           _T("a") ) );
+
+    a5.assign(a1.end(), a1.end());
+    CPPUNIT_ASSERT( a5.empty() );
+
+    a5.assign(a1.begin(), a1.end());
+    CPPUNIT_ASSERT( a5 == a1 );
+
+#ifdef wxHAS_VECTOR_TEMPLATE_ASSIGN
+    const wxString months[] = { "Jan", "Feb", "Mar" };
+    a5.assign(months, months + WXSIZEOF(months));
+    CPPUNIT_ASSERT_EQUAL( WXSIZEOF(months), a5.size() );
+    CPPUNIT_ASSERT( COMPARE_3_VALUES(a5, "Jan", "Feb", "Mar") );
+#endif // wxHAS_VECTOR_TEMPLATE_ASSIGN
 }
 
 void ArraysTestCase::wxStringArraySplitTest()
@@ -609,11 +622,7 @@ void ArraysTestCase::Swap()
 {
     DoTestSwap("Foo", "Bar", "Baz", (wxArrayString *)NULL);
 
-    // VC6 can't compile this call with mysterious error about in DoTestSwap()
-#ifndef __VISUALC6__
     DoTestSwap(1, 10, 100, (wxArrayInt *)NULL);
-#endif
-
     DoTestSwap(6, 28, 496, (wxArrayLong *)NULL);
 }