BCC fixes

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

diff --git a/include/wx/cppunit.h b/include/wx/cppunit.h
index 5eafa69e0fe86104d509386fe1ab03312e1bfe37..daca99cb6a1d3a01274212424dbc34fab61460be 100644 (file)
--- a/include/wx/cppunit.h
+++ b/include/wx/cppunit.h
@@ -23,6 +23,10 @@
     #pragma warning(disable:4786)
 #endif // __VISUALC__
 
+#ifdef __BORLANDC__
+    #pragma warn -8022
+#endif
+
 #include "wx/beforestd.h"
 #include <cppunit/extensions/TestFactoryRegistry.h>
 #include <cppunit/ui/text/TestRunner.h>
@@ -30,6 +34,10 @@
 #include <cppunit/extensions/HelperMacros.h>
 #include "wx/afterstd.h"
 
+#ifdef __BORLANDC__
+    #pragma warn .8022
+#endif
+
 #ifdef _MSC_VER
   #pragma warning(default:4702)
 #endif // _MSC_VER

diff --git a/tests/filesys/filesys.cpp b/tests/filesys/filesys.cpp
index 64b12d8b0fd26ac9e25edbf284c5b306bdc448b5..05c9458b702806806164db9fb525ad032380ef1d 100644 (file)
--- a/tests/filesys/filesys.cpp
+++ b/tests/filesys/filesys.cpp
@@ -11,7 +11,16 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#include "wx/wx.h"
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+    #include "wx/wx.h"
+#endif // WX_PRECOMP
+
 #include "wx/filesys.h"
 
 #include "wx/cppunit.h"
@@ -57,7 +66,7 @@ private:
 
     void UrlParsing();
 
-    DECLARE_NO_COPY_CLASS(FileSystemTestCase);
+    DECLARE_NO_COPY_CLASS(FileSystemTestCase)
 };
 
 // register in the unnamed registry so that these tests are run by default
@@ -70,8 +79,8 @@ void FileSystemTestCase::UrlParsing()
 {
     static const struct Data
     {
-        const wchar_t *url;
-        const wchar_t *protocol, *left, *right, *anchor;
+        const wxChar *url;
+        const wxChar *protocol, *left, *right, *anchor;
     } data[] =
     {
         // simple case:

diff --git a/tests/mbconv/main.cpp b/tests/mbconv/main.cpp
index d17d97756aa5d6a3cb1abbc04f0da25ee2ebf07a..5eb0ecf30fd83b9dace89bebbb34a44b425619e8 100644 (file)
--- a/tests/mbconv/main.cpp
+++ b/tests/mbconv/main.cpp
@@ -11,7 +11,16 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#include "wx/wx.h"
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+    #include "wx/wx.h"
+#endif // WX_PRECOMP
+
 #include "wx/strconv.h"
 #include "wx/string.h"
 
@@ -33,7 +42,7 @@ private:
 
     void WC2CP1250();
 
-    DECLARE_NO_COPY_CLASS(MBConvTestCase);
+    DECLARE_NO_COPY_CLASS(MBConvTestCase)
 };
 
 // register in the unnamed registry so that these tests are run by default