From f0ee18f1aa2bc0aa27cee62884cd9379f2978711 Mon Sep 17 00:00:00 2001 From: PB Date: Tue, 13 Oct 2020 18:49:53 +0200 Subject: [PATCH] Remove BCC mentions from documentation --- docs/contributing/about-version-numbers.md | 1 - docs/doxygen/mainpages/const_cpp.h | 2 +- docs/doxygen/mainpages/devtips.h | 15 ++--- docs/doxygen/mainpages/introduction.h | 6 +- docs/doxygen/mainpages/platdetails.h | 4 +- docs/msw/install.md | 71 +--------------------- docs/univ/readme.txt | 8 --- 7 files changed, 12 insertions(+), 95 deletions(-) diff --git a/docs/contributing/about-version-numbers.md b/docs/contributing/about-version-numbers.md index 372eb50b65..c19cc1da6a 100644 --- a/docs/contributing/about-version-numbers.md +++ b/docs/contributing/about-version-numbers.md @@ -27,7 +27,6 @@ Here is the list of files that need to be updated: include/wx/osx/config_xcode.h samples/docview/Info.plist samples/minimal/Info_cocoa.plist - samples/minimal/borland_ide.cpp [not-micro] Do not forget to rebake everything after updating version.bkl! diff --git a/docs/doxygen/mainpages/const_cpp.h b/docs/doxygen/mainpages/const_cpp.h index 435a7f9894..dfe228d67f 100644 --- a/docs/doxygen/mainpages/const_cpp.h +++ b/docs/doxygen/mainpages/const_cpp.h @@ -120,7 +120,7 @@ compiler used. @beginDefList @itemdef{__BORLANDC__, Borland C++. The value of the macro corresponds - to the compiler version: 500 is 5.0.} + to the compiler version: 500 is 5.0 (not used any more).} @itemdef{__DIGITALMARS__, Digital Mars (not used any more).} @itemdef{__GNUG__, Gnu C++ on any platform, see also wxCHECK_GCC_VERSION} @itemdef{__GNUWIN32__, Gnu-Win32 compiler, see also wxCHECK_W32API_VERSION} diff --git a/docs/doxygen/mainpages/devtips.h b/docs/doxygen/mainpages/devtips.h index 13a63ff7ba..041dbec3ac 100644 --- a/docs/doxygen/mainpages/devtips.h +++ b/docs/doxygen/mainpages/devtips.h @@ -28,10 +28,6 @@ following section before any other includes: // For compilers that support precompilation, includes "wx.h". #include -#ifdef __BORLANDC__ -# pragma hdrstop -#endif - #ifndef WX_PRECOMP // Include your minimal set of headers here, or wx.h # include @@ -44,8 +40,8 @@ The file @c "wx/wxprec.h" includes @c "wx/wx.h". Although this incantation may seem quirky, it is in fact the end result of a lot of experimentation, and several Windows compilers to use precompilation which is largely automatic for compilers with necessary support. Currently it is used for Visual C++ -(including embedded Visual C++), Borland C++ and newer versions of GCC. Some -compilers might need extra work from the application developer to set the build +(including embedded Visual C++) and newer versions of GCC. Some compilers +might need extra work from the application developer to set the build environment up as necessary for the support. @@ -110,9 +106,8 @@ and this must not be changed. On Microsoft Windows, wxWidgets has a different set of makefiles for each compiler, because each compiler's @c 'make' tool is slightly different. Popular Windows compilers that we cater for, and the corresponding makefile extensions, -include: Microsoft Visual C++ (.vc), Borland C++ (.bcc) and MinGW/Cygwin -(.gcc). Makefiles are provided for the wxWidgets library itself, samples, -demos, and utilities. +include: Microsoft Visual C++ (.vc) and MinGW/Cygwin (.gcc). Makefiles are +provided for the wxWidgets library itself, samples, demos, and utilities. On Linux and macOS, you use the @c 'configure' command to generate the necessary makefiles. You should also use this method when building with @@ -259,7 +254,7 @@ its own run-time type information system, implemented using macros. @subsection page_multiplatform_cpp_precompiledheaders Precompiled Headers -Some compilers, such as Borland C++ and Microsoft C++, support precompiled +Some compilers, such as Microsoft C++, support precompiled headers. This can save a great deal of compiling time. The recommended approach is to precompile @c "wx.h", using this precompiled header for compiling both wxWidgets itself and any wxWidgets applications. For Windows compilers, two diff --git a/docs/doxygen/mainpages/introduction.h b/docs/doxygen/mainpages/introduction.h index 3c6f866937..f38fb56504 100644 --- a/docs/doxygen/mainpages/introduction.h +++ b/docs/doxygen/mainpages/introduction.h @@ -94,9 +94,9 @@ primary supported compiler is GNU g++. supports 32 or 64 bit Intel Macs running macOS 10.10 or later. The port can be built either with g++ or clang. -Other platforms (e.g. iOS - with a minimum requirement of iOS 13), compilers (Borland C++ -under Windows, Sun CC, HP-UX aCC, IBM xlC or SGI mipsPro under Unix) and ports ( -wxQT, wxGTK1, wxX11, wxDFB...) are also supported but to a lesser extent. +Other platforms (e.g. iOS - with a minimum requirement of iOS 13), compilers +(Sun CC, HP-UX aCC, IBM xlC or SGI mipsPro under Unix) and ports (wxQT, wxGTK1, +wxX11, wxDFB...) are also supported but to a lesser extent. Please see the @subpage page_port "platform details page" for more information. There are no CPU speed requirements but the faster (and more) CPU(s) you have, diff --git a/docs/doxygen/mainpages/platdetails.h b/docs/doxygen/mainpages/platdetails.h index c7ff959ce9..1d7542317b 100644 --- a/docs/doxygen/mainpages/platdetails.h +++ b/docs/doxygen/mainpages/platdetails.h @@ -96,8 +96,8 @@ and candy of newer interfaces like GTK. wxMSW is a port of wxWidgets for the Windows platforms (Windows XP and later are supported). wxMSW provides native look and feel for each Windows version. This port can be compiled with several compilers including Microsoft Studio -VC++ 2003 or later, Borland 5.5, MinGW32, Cygwin as well as cross-compilation -with a Linux-hosted MinGW32 tool chain. +VC++ 2003 or later, MinGW32, Cygwin as well as cross-compilation with a +Linux-hosted MinGW32 tool chain. @subpage plat_msw_install "Build and Install Instructions" diff --git a/docs/msw/install.md b/docs/msw/install.md index 31e94bd69e..8f10fe6db4 100644 --- a/docs/msw/install.md +++ b/docs/msw/install.md @@ -262,75 +262,6 @@ NOTE: The makefile.gcc makefiles are for compilation under MinGW using -Borland C++ Compilation {#msw_build_borland} ----------------------------------------------------------------- - -WARNING: Borland instructions are out of date, please send us your - corrections if you are using it with wxWidgets 3.0. - -The minimum version required is 5.5 (last version supported by BC++ 5.0 was -2.4.2), which can be downloaded for free from: -http://www.borland.com/products/downloads/download_cbuilder.html - -We have found that the free Turbo Explorer and commercial BDS work fine; the -debugger is very good. To avoid linker errors you will need to add --DSHARED=1 to the makefile line for the library - -The version 5.6 included in Borland C++ Builder 2006 works as well after the -following small change: please remove the test for `__WINDOWS__` from line 88 -of the file `BCCDIR\include\stl\_threads.h`. - -Compiling using the makefiles: - -1. Change directory to build\msw. Type 'make -f makefile.bcc' to - make the wxWidgets core library. Ignore the compiler warnings. - This produces a couple of libraries in the `lib\bcc_lib` directory. - -2. Change directory to a sample or demo such as samples\minimal, and type - `make -f makefile.bcc`. This produces a windows exe file - by default - in the `bcc_mswd` subdirectory. - -Note (1): the wxWidgets makefiles assume dword structure alignment. Please -make sure that your own project or makefile settings use the -same alignment, or you could experience mysterious crashes. To -change the alignment, change CPPFLAGS in build\msw\config.bcc. - -Note (2): If you wish debug messages to be sent to the console in -debug mode, edit makefile.bcc and change /aa to /Tpe in link commands. - -Using the Debugger and IDE in BDS or Turbo Explorer ---------------------------------------------------- - -Double-click / open \%WXWIN\%\samples\minimal\borland.bdsproj. The current version -is to be used with a dynamic build of wxWidgets-made by running -make -f Makefile.bcc -DBUILD=debug -DSHARED=1 -in wxWidgets\build\msw. You also need the `wxWidgets\lib\bcc_dll` -directory in your PATH. The debugger tracks your source and also -traces into the wxWidgets sources. - -To use this to debug other samples, copy the `borland_ide.cpp` -and borland.bdsproj files, then replace all occurrences of -"minimal" with the name of the new project files - -Compilation succeeds with CBuilderX personal edition and CBuilder6, but -you may have to copy make.exe from the 5.5 download to the new bin directory. - -Compiling using the IDE files for Borland C++ 5.0 and using CBuilder IDE -(v1-v6): not supported - - -** REMEMBER ** -In all of your wxWidgets applications, your source code should include -the following preprocessor directive: - - #ifdef __BORLANDC__ - #pragma hdrstop - #endif - -(check the samples -- e.g., \wx2\samples\minimal\minimal.cpp -- for -more details) - - Installing and building wxWidgets using vcpkg {#msw_install_and_build} ============================================= @@ -448,7 +379,7 @@ The full list of the build settings follows: Links static version of C and C++ runtime libraries into the executable, so that the program does not depend on DLLs provided with the compiler (e.g. - Visual C++'s msvcrt.dll or Borland's cc3250mt.dll). + Visual C++'s msvcrt.dll). Caution: Do not use static runtime libraries when building DLL (SHARED=1)! * `DEBUG_FLAG=0` diff --git a/docs/univ/readme.txt b/docs/univ/readme.txt index 067329d1f2..1cfff06d2e 100644 --- a/docs/univ/readme.txt +++ b/docs/univ/readme.txt @@ -59,14 +59,6 @@ b) Cygwin ** the instructions may be out of date as for wxWidgets 2.5.2+ ** -c) Other compilers - Borland: - in the wxwindows\src\msw directory run - 'make -f makefile.b32 WXUSINGUNIV=1' to build the library and then run - 'make -f makefile.b32 WXUSINGUNIV=1' in the sample directory which you wish - to build using the wxUniversal widgets. Use 'SET WXTHEME=GTK' [or WIN32 or METAL] - to test the existing themes - Unfortunately we don't have makefiles for any other compilers yet. Please contact us if you would like to help us with creating one for the compiler you use.