Fixed wxPGMultiButton (event handling, FinalizePosition() -> Finalize(), no longer...

[wxWidgets.git] / include / wx / cppunit.h

diff --git a/include/wx/cppunit.h b/include/wx/cppunit.h
index db93e87aa8011fd42801670a9d603c68958cd838..503ed3e8e06724ad9b59d581d382f8af592876ec 100644 (file)
--- a/include/wx/cppunit.h
+++ b/include/wx/cppunit.h
@@ -55,6 +55,8 @@
 #include <cppunit/CompilerOutputter.h>
 #include "wx/afterstd.h"
 
 #include <cppunit/CompilerOutputter.h>
 #include "wx/afterstd.h"
 

+#include "wx/string.h"
+

 
 ///////////////////////////////////////////////////////////////////////////////
 // Set of helpful test macros.
 
 ///////////////////////////////////////////////////////////////////////////////
 // Set of helpful test macros.


@@ -114,17 +116,6 @@ assertEquals(int expected,
     assertEquals(size_t(expected), actual, sourceLine, message);
 }
 
     assertEquals(size_t(expected), actual, sourceLine, message);
 }
 

-// and another, slightly different, for checking that result of potentially
-// different time_t type is the same as given time_t value
-inline void
-assertEquals(time_t expected,
-             long actual,
-             CppUnit::SourceLine sourceLine,
-             const std::string& message)
-{
-    assertEquals(expected, time_t(actual), sourceLine, message);
-}
-

 CPPUNIT_NS_END
 
 // Use this macro to compare a wxArrayString with the pipe-separated elements
 CPPUNIT_NS_END
 
 // Use this macro to compare a wxArrayString with the pipe-separated elements