]> git.saurik.com Git - wxWidgets.git/commitdiff
Fix tests compilation without wxUSE_REGEX.
authorVadim Zeitlin <vadim@wxwidgets.org>
Sun, 3 Oct 2010 17:14:57 +0000 (17:14 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Sun, 3 Oct 2010 17:14:57 +0000 (17:14 +0000)
Don't build wxRegEx unit tests when wxUSE_REGEX == 0.

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

tests/interactive/input.cpp
tests/regex/regextest.cpp

index 8344ef5c6aee21c566e10280ab496ae0a46fd066..1e45d503094bd64d5f15c601ed33b11e2a485e8a 100644 (file)
@@ -32,7 +32,9 @@
 #define TEST_SNGLINST
 #define TEST_FTP
 #define TEST_INFO_FUNCTIONS
 #define TEST_SNGLINST
 #define TEST_FTP
 #define TEST_INFO_FUNCTIONS
-#define TEST_REGEX
+#if wxUSE_REGEX
+    #define TEST_REGEX
+#endif
 #define TEST_DATETIME
 
 // ----------------------------------------------------------------------------
 #define TEST_DATETIME
 
 // ----------------------------------------------------------------------------
index bfe200932a213590f3124232bf423d520f7a8dcc..c31b63983475f06acc2e7d44468f7bf504e6d3a7 100644 (file)
@@ -36,6 +36,8 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 
+#if wxUSE_REGEX
+
 // for all others, include the necessary headers
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 // for all others, include the necessary headers
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
@@ -393,3 +395,5 @@ void RegExTestSuite::add(
 
 
 #endif // wxHAS_REGEX_ADVANCED
 
 
 #endif // wxHAS_REGEX_ADVANCED
+
+#endif // wxUSE_REGEX