From: Václav Slavík Date: Thu, 1 Apr 2004 07:17:50 +0000 (+0000) Subject: BCC fixes X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/20f46e8dc8ba9246f7174e9d9153f61282f53a07 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 5eafa69e0f..daca99cb6a 100644 --- 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 #include @@ -30,6 +34,10 @@ #include #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 64b12d8b0f..05c9458b70 100644 --- 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 d17d97756a..5eb0ecf30f 100644 --- 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