From 8a6be78d08e855c045cff015011ce4e0013546ab Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Sat, 3 Jun 2000 10:22:27 +0000 Subject: [PATCH] Docs mods git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7525 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/latex/wx/tresourc.tex | 2 +- docs/latex/wx/wx.hpj | 2 +- docs/latex/wx/wxstring.tex | 6 +-- docs/msw/install.txt | 86 +++++++++++++++++++++++++++++++++++++- 4 files changed, 90 insertions(+), 6 deletions(-) diff --git a/docs/latex/wx/tresourc.tex b/docs/latex/wx/tresourc.tex index e78e3b8488..35aaea2b28 100644 --- a/docs/latex/wx/tresourc.tex +++ b/docs/latex/wx/tresourc.tex @@ -19,7 +19,7 @@ Dialog Editor nor the .WXR format currently cover all wxWindows controls; some are missing, such as wxSpinCtrl, wxSpinButton, wxListCtrl, wxTreeCtrl and others. Note that in later versions of wxWindows, this resource format will be replaced -by XML specifications that also can include sizers. +by XML specifications that can also include sizers. \subsection{The format of a .WXR file} diff --git a/docs/latex/wx/wx.hpj b/docs/latex/wx/wx.hpj index 43d8c37176..5bf567ae88 100644 --- a/docs/latex/wx/wx.hpj +++ b/docs/latex/wx/wx.hpj @@ -1,5 +1,5 @@ [OPTIONS] -BMROOT=d:\wx2\wxWindows\docs\latex\wx ; Assume that bitmaps are where the source is +BMROOT=d:\wx2\wxWind~1\docs/latex/wx ; Assume that bitmaps are where the source is TITLE=wxWindows Manual CONTENTS=Contents COMPRESS=HIGH diff --git a/docs/latex/wx/wxstring.tex b/docs/latex/wx/wxstring.tex index 61a1f102a1..e313744c46 100644 --- a/docs/latex/wx/wxstring.tex +++ b/docs/latex/wx/wxstring.tex @@ -523,7 +523,7 @@ See also: \helpref{Empty}{wxstringempty} Case-sensitive comparison. Returns a positive value if the string is greater than the argument, zero if -it si equal to it or negative value if it is less than argument (same semantics +it is equal to it or a negative value if it is less than the argument (same semantics as the standard {\it strcmp()} function). See also \helpref{CmpNoCase}{wxstringcmpnocase}, \helpref{IsSameAs}{wxstringissameas}. @@ -535,7 +535,7 @@ See also \helpref{CmpNoCase}{wxstringcmpnocase}, \helpref{IsSameAs}{wxstringissa Case-insensitive comparison. Returns a positive value if the string is greater than the argument, zero if -it si equal to it or negative value if it is less than argument (same semantics +it is equal to it or a negative value if it is less than the argument (same semantics as the standard {\it strcmp()} function). See also \helpref{Cmp}{wxstringcmp}, \helpref{IsSameAs}{wxstringissameas}. @@ -613,7 +613,7 @@ This static function returns the string containing the result of calling \constfunc{int}{Frec}{\param{char }{ch}} -Returns the number of occurences of {it ch} in the string. +Returns the number of occurences of {\it ch} in the string. \membersection{wxString::GetChar}\label{wxstringgetchar} diff --git a/docs/msw/install.txt b/docs/msw/install.txt index 55c11518f4..a35d7dd5c2 100644 --- a/docs/msw/install.txt +++ b/docs/msw/install.txt @@ -302,6 +302,90 @@ release version is around 5 MB. See also the file docs/tech/tn0007.txt for further instructions and details of how to create your own project files. +Borland C++ 5.5 compilation +--------------------------- + +Before compiling wxWindows with Borland C++ 5.5, there are a few +issues concerning the compiler installation: + +1. The compiler must be installed to a path that does not contain + spaces, such as c:\Borland\Bcc55 (in particular, do not install + it below "C:\Program Files"). + +2. Make sure that you downloaded and installed the service pack 1 + for Borland C++ 5.5. This SP1 can be downloaded from: + http://www.borland.com/devsupport/bcppbuilder/file_supplements.html + + IMPORTANT: + When installing SP1, make sure that you extract (UnZip) the files + to the directory where you installed Borland C++ 5.5 (e.g., + c:\Borland\Bcc55) with the option "use folder names" selected. + This is necessary, to ensure that the files (mostly include files) + are extracted to the right directory. + +3. Create the following two files in the same directory where you + installed Borland C++ 5.5 (e.g., c:\Borland\Bcc55): + + a. bcc32.cfg + text file containing the following two lines: + -I"c:\Borland\Bcc55\include" + -L"c:\Borland\Bcc55\lib" + + b. ilink32.cfg + text file containing the following line: + -L"c:\Borland\Bcc55\lib" + + (replace c:\Borland\Bcc55 with the actual path where you installed + Borland C++ 5.5) + +4. Add the borland BIN directory to your path (e.g., c:\Borland\Bcc55\bin), + and define the environment variable BCCDIR= + (e.g., set BCCDIR=c:\Borland\Bcc55) + +Compiling wxWindows: + +Once the compiler and its service pack are properly installed, you build +wxWindows using the provided makefile.b32 in the src/msw directory: + +a. To build wxWindows in DEBUG mode: + + cd c:\wx2\src\msw + make -f makefile.b32 + + (replace c:\wx2 with the actual path where you installed wxWindows) + +b. To build wxWindows in RELEASE mode: + + cd c:\wx2\src\msw + make -f makefile.b32 FINAL=1 + + (if you had previously built wxWindows, you need to clean all of + the object and intermediate files. Before the above make command, + run: 'make -f makefile.b32 CLEANALL') + +IMPORTANT: +The Service Pack 1 for Borland C++ 5.5 must be installed before wxWindows +is compiled. If you compiled wxWindows before, it is advised that you +re-compile it following the next steps: + + cd c:\wx2\src\msw + make -f makefile.b32 CLEANALL + make -f makefile.b32 (or make -f makefile.b32 FINAL=1) + + (replace c:\wx2 with the actual path where you installed wxWindows) + +** REMEMBER ** + +In all of your wxWindows 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) + Borland C++Builder compilation ------------------------------ @@ -312,7 +396,7 @@ Borland C++Builder compilation 2. You can build samples using the makefiles as per the instructions for BC++ above, or you can follow the instructions - in docs/tech/tn0004.htm to use the IDE. + in docs/tech/tn0004.htm or http://biolpc22.york.ac.uk/wx/bc/. Watcom C++ 10.6/11 compilation ---------------------------