Minor changes to test/show expanded array functions.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15299 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/console/console.cpp b/samples/console/console.cpp
index 33fdf6d3711f91c907ece08a250fe5e1437c590b..8d363fc5f9f65b133f9433474301e795476a3eb0 100644 (file)
--- a/samples/console/console.cpp
+++ b/samples/console/console.cpp
@@ -5163,9 +5163,9 @@ static void TestArrayOf ## name ## s()                                        \
                                                                               \
     wxArray##name a;                                                          \
     a.Add(1);                                                                 \
-    a.Add(17);                                                                \
-    a.Add(5);                                                                 \
-    a.Add(3);                                                                 \
+    a.Add(17,2);                                                              \
+    a.Add(5,3);                                                               \
+    a.Add(3,4);                                                               \
                                                                               \
     puts("Initially:");                                                       \
     PrintArray("a", a);                                                       \
@@ -5197,17 +5197,23 @@ static void TestArrayOfObjects()
 
     {
         ArrayBars bars;
-        Bar bar("second bar");
+        Bar bar("second bar (two copies!)");
 
         printf("Initially: %u objects in the array, %u objects total.\n",
                bars.GetCount(), Bar::GetNumber());
 
         bars.Add(new Bar("first bar"));
-        bars.Add(bar);
+        bars.Add(bar,2);
 
         printf("Now: %u objects in the array, %u objects total.\n",
                bars.GetCount(), Bar::GetNumber());
 
+       bars.RemoveAt(1, bars.GetCount() - 1);
+
+        printf("After removing all but first element: %u objects in the "
+              "array, %u objects total.\n",
+               bars.GetCount(), Bar::GetNumber());
+
         bars.Empty();
 
         printf("After Empty(): %u objects in the array, %u objects total.\n",
@@ -5724,7 +5730,7 @@ int main(int argc, char **argv)
         wxArrayString a1;
         a1.Add("tiger");
         a1.Add("cat");
-        a1.Add("lion");
+        a1.Add("lion", 3);
         a1.Add("dog");
         a1.Add("human");
         a1.Add("ape");
@@ -5739,8 +5745,8 @@ int main(int argc, char **argv)
         wxSortedArrayString a3(a1);
         PrintArray("a3", a3);
 
-        puts("*** After deleting a string from a1");
-        a1.Remove(2);
+        puts("*** After deleting three strings from a1");
+        a1.Remove(2,3);
 
         PrintArray("a1", a1);
         PrintArray("a2", a2);