more dmc fixes (patch 941830)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27026 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-04-30 20:55:57 +00:00
parent 387f829ed1
commit 0d95d20c5b
3 changed files with 32 additions and 57 deletions

View File

@@ -45,10 +45,6 @@
#include "wx/cppunit.h"
#include <stdexcept>
#ifdef __DMC__
#include <locale.h>
#endif
using namespace std;
using namespace CppUnit;
@@ -323,36 +319,15 @@ wxString RegExTestCase::quote(const wxString& arg)
///////////////////////////////////////////////////////////////////////////////
// Test suite
//
// In a non-unicode build the regex is affected by the current locale, so
// this derived TestSuite is used. It sets the locale in it's run() method
// for the duration of the regex tests.
class RegExTestSuite : public TestSuite
{
public:
RegExTestSuite(string name);
void run(TestResult *result);
RegExTestSuite(string name) : TestSuite(name) { }
void add(const char *mode, const char *id, const char *flags,
const char *pattern, const char *data, const char *expected, ...);
};
// constructor, sets the locale so that it is set when the tests are added
//
RegExTestSuite::RegExTestSuite(string name) : TestSuite(name)
{
setlocale(LC_ALL, "");
}
// run the test suite, sets the locale again since it may have been changed
// by another test since this suite was crated
//
void RegExTestSuite::run(TestResult *result)
{
setlocale(LC_ALL, "");
TestSuite::run(result);
}
// Add a testcase to the suite
//
void RegExTestSuite::add(