Implement attributes support in generic wxDataViewIconTextRenderer.

[wxWidgets.git] / tests / testprec.h

diff --git a/tests/testprec.h b/tests/testprec.h
index ba2cf67c56b6ba726529c81617bc371e3c6cda20..b5178c8d1ed3e0453c7bb4506af0886ab63238eb 100644 (file)
--- a/tests/testprec.h
+++ b/tests/testprec.h
@@ -5,13 +5,42 @@
 #if (defined(__VISUALC__) && (__VISUALC__ >= 1300)) || \
     (defined(__GNUC__) && (__GNUC__ >= 3))
     #define wxHAVE_U_ESCAPE
 #if (defined(__VISUALC__) && (__VISUALC__ >= 1300)) || \
     (defined(__GNUC__) && (__GNUC__ >= 3))
     #define wxHAVE_U_ESCAPE

+
+    // and disable warning that using them results in with MSVC 8+
+    #if wxCHECK_VISUALC_VERSION(8)
+        // universal-character-name encountered in source
+        #pragma warning(disable:4428)
+    #endif

 #endif
 
 // thrown when assert fails in debug build
 #endif
 
 // thrown when assert fails in debug build

-class TestAssertFailure { };
+class TestAssertFailure
+{
+public:
+    TestAssertFailure(const wxString& file,
+                      int line,
+                      const wxString& func,
+                      const wxString& cond,
+                      const wxString& msg)
+        : m_file(file),
+          m_line(line),
+          m_func(func),
+          m_cond(cond),
+          m_msg(msg)
+    {
+    }
+
+    const wxString m_file;
+    const int m_line;
+    const wxString m_func;
+    const wxString m_cond;
+    const wxString m_msg;
+
+    wxDECLARE_NO_ASSIGN_CLASS(TestAssertFailure);
+};

 
 // macro to use for the functions which are supposed to fail an assertion
 
 // macro to use for the functions which are supposed to fail an assertion

-#ifdef __WXDEBUG__
+#if wxDEBUG_LEVEL

     // some old cppunit versions don't define CPPUNIT_ASSERT_THROW so roll our
     // own
     #define WX_ASSERT_FAILS_WITH_ASSERT(cond) \
     // some old cppunit versions don't define CPPUNIT_ASSERT_THROW so roll our
     // own
     #define WX_ASSERT_FAILS_WITH_ASSERT(cond) \


@@ -23,14 +52,18 @@ class TestAssertFailure { };
                 CPPUNIT_FAIL("expected assertion not generated"); \
         }
 #else
                 CPPUNIT_FAIL("expected assertion not generated"); \
         }
 #else

-    // there are no assertions in non-debug build so just check that it fails
+    // there are no assertions in this build so just check that it fails

     #define WX_ASSERT_FAILS_WITH_ASSERT(cond) CPPUNIT_ASSERT(!(cond))
 #endif
 
 // these functions can be used to hook into wxApp event processing and are
 // currently used by the events propagation test
     #define WX_ASSERT_FAILS_WITH_ASSERT(cond) CPPUNIT_ASSERT(!(cond))
 #endif
 
 // these functions can be used to hook into wxApp event processing and are
 // currently used by the events propagation test

+class WXDLLIMPEXP_FWD_BASE wxEvent;
+

 typedef int (*FilterEventFunc)(wxEvent&);
 typedef bool (*ProcessEventFunc)(wxEvent&);
 
 extern void SetFilterEventFunc(FilterEventFunc func);
 extern void SetProcessEventFunc(ProcessEventFunc func);
 typedef int (*FilterEventFunc)(wxEvent&);
 typedef bool (*ProcessEventFunc)(wxEvent&);
 
 extern void SetFilterEventFunc(FilterEventFunc func);
 extern void SetProcessEventFunc(ProcessEventFunc func);

+
+extern bool IsNetworkAvailable();