some more SetIcon() calls added; cleanup indentation of some samples

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

diff --git a/tests/arrays/arrays.cpp b/tests/arrays/arrays.cpp
index bca37379db8053a5ec518916f085b6f0f0ce46c5..a5a26644f3e631a8c365acc8afebd2d2669859fd 100644 (file)
--- a/tests/arrays/arrays.cpp
+++ b/tests/arrays/arrays.cpp
@@ -94,7 +94,7 @@ size_t Bar::ms_bars = 0;
 
 WX_DECLARE_OBJARRAY(Bar, ArrayBars);
 #include "wx/arrimpl.cpp"
 
 WX_DECLARE_OBJARRAY(Bar, ArrayBars);
 #include "wx/arrimpl.cpp"

-WX_DEFINE_OBJARRAY(ArrayBars);
+WX_DEFINE_OBJARRAY(ArrayBars)

 
 // ----------------------------------------------------------------------------
 // helpers for sorting arrays and comparing items
 
 // ----------------------------------------------------------------------------
 // helpers for sorting arrays and comparing items


@@ -125,9 +125,9 @@ int wxCMPFUNC_CONV name ## RevCompare(T* first, T* second)                    \
 
 typedef unsigned short ushort;
 
 
 typedef unsigned short ushort;
 

-DEFINE_COMPARE(Char, char);
-DEFINE_COMPARE(UShort, ushort);
-DEFINE_COMPARE(Int, int);
+DEFINE_COMPARE(Char, char)
+DEFINE_COMPARE(UShort, ushort)
+DEFINE_COMPARE(Int, int)

 
 WX_DEFINE_ARRAY_CHAR(char, wxArrayChar);
 WX_DEFINE_SORTED_ARRAY_CHAR(char, wxSortedArrayCharNoCmp);
 
 WX_DEFINE_ARRAY_CHAR(char, wxArrayChar);
 WX_DEFINE_SORTED_ARRAY_CHAR(char, wxSortedArrayCharNoCmp);


@@ -539,11 +539,11 @@ void ArraysTestCase::wxArray ## name ## Test()                                \
     CPPUNIT_ASSERT( b.Index( 17 ) == 3 );                                     \
 }
 
     CPPUNIT_ASSERT( b.Index( 17 ) == 3 );                                     \
 }
 

-TestArrayOf(UShort);
+TestArrayOf(UShort)

 
 

-TestArrayOf(Char);
+TestArrayOf(Char)

 
 

-TestArrayOf(Int);
+TestArrayOf(Int)

 
 void ArraysTestCase::Alloc()
 {
 
 void ArraysTestCase::Alloc()
 {


@@ -608,6 +608,7 @@ void DoTestSwap(T v1, T v2, T v3,
 void ArraysTestCase::Swap()
 {
     DoTestSwap("Foo", "Bar", "Baz", (wxArrayString *)NULL);
 void ArraysTestCase::Swap()
 {
     DoTestSwap("Foo", "Bar", "Baz", (wxArrayString *)NULL);

+

     DoTestSwap(1, 10, 100, (wxArrayInt *)NULL);
     DoTestSwap(6, 28, 496, (wxArrayLong *)NULL);
 }
     DoTestSwap(1, 10, 100, (wxArrayInt *)NULL);
     DoTestSwap(6, 28, 496, (wxArrayLong *)NULL);
 }