Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

This commit was manufactured by cvs2svn to create tag 'WX_2_2_9'.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/WX_2_2_9@13364 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2002-01-04 16:15:08 +00:00
parent dc3d889d0b
commit f7f6abe24d
2324 changed files with 375095 additions and 121526 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
docs/msw/bc_ide.txt
View File

@@ -1,80 +0,0 @@
Readme for wxWindows 2.0 Ide-files
First release Feb. 1999, detlev@reymann-online.de
1. What you can do with this IDE files
2. Where to install the files
3. How to modify them for your own needs
4. How to create IDE files for your own wxWindows-programs
1. What you can do with this IDE files
======================================
There are two IDE files. src\bc32.ide should help you to
create the wxWindows libraries from within the Ide of Borlands
C++, v. 5.x. Note that this doesn't include debugging code: you
need to change the settings if you wish to include debug
information. Previously, bc32d.ide was supplied with debug
settings, but this proved to time-consuming to maintain.
2. Where to install the files
=============================
You should copy the files for the libraries into the
src-directory of your wxWindows-Installation (e.g. C:\wxwin\src).
And the other file for the samples should be copied into the
samples-directory (e.g. C:\wxwin\samples).
(If installing from setup.exe or wx2..._bc.zip the files
will be installed into the appropriate directories
automatically).
3. How to modify them for your own needs
========================================
If your wxWindows-Installation resides on the same drive as your
Borland-Compiler and additionally the Borland-Installation is
the default (e.g. C:\BC5) then there should be no need to change
anything. Otherwise please change the path from within the ide
(Options->project->directories). Because we use the
$inherit-macro (Julian found the trick), this should work.
To add a new sample to samples\bc32.ide, follow these steps:
a. Choose Project->New target... and type in e.g.
samples\newsample. Press OK.
b. Static, no OWL, MFC or class libraries. Check Multithread
on. Press OK.
c. Right-click on the new node, choose Add node... and add
..\lib\wx32.lib and ..\lib\xpm.lib. Add any other source
files you require.
d. Right-click on the new node, choose Edit Local Options.. and
add in Directories, specify the following:
Include: $inherit;.\newsample
Library: $inherit;
Source: .\newsample
Intermediate: .\newsample
Final: .\newsample
4. How to create IDE files for your own wxWindows-programs
==========================================================
I think you are familiar with the necessary options for your own
program. So I will only describe what is neccessary to link
yout program with the wxWindows library. If you want to create
an IDE file for your own wxWindows program, create a new project
from the menu file->new->project. Deactivate all the
standard-options, the only three thing that should be activated is
"static" for the libraries, if you want to use the library
produced with the library-ide, the checkbox OLE (you can
leave this checkbox unchecked, but then you have to add the
library \bc5\lib\ole2w32.lib to your project), and the
Multithread checkbox. You have to add
the include-path of wxWindows to the include-path in the
options-dialog (options->project->directories->include). The
result should be something like:
path_of_my_program;\bc5\include;\wxwin2\include; Then you have
to add the libraries to the project. Open the project-view and
activate your program. Then right-click and choose "add" and
select the wxWindows library (e.g. \wxwin\lib\wx32.lib). Also
add the xpm library.

219
docs/msw/install.txt
View File

@@ -1,11 +1,9 @@
Installing wxWindows 2.1
Installing wxWindows 2.2
------------------------
This is a beta release of wxWindows 2.1 for Microsoft
Windows 95, 98 and NT. This is not a production release,
although a huge number of bugs found in earlier versions
of wxWindows have been fixed.
This is wxWindows 2.2 for Microsoft Windows 3.1, 95, 98 and
Windows NT/Windows 2000. This is an official, stable release.
IMPORTANT NOTE: If you experience problems installing, please
re-read this instructions and other related files (changes.txt,
@@ -34,20 +32,8 @@ program contains the following:
- Tex2RTF source;
- Dialog Editor binary.
Alternatively, you may unarchive the set of .zip files by hand,
where x is the minor version number and y is the release number:
wx2_x_y_gen.zip Generic source code and samples (required)
wx2_x_y_msw.zip Windows-specific source code and samples (required)
wx2_x_y_doc.zip Documentation source code (not required)
wx2_x_y_hlp.zip WinHelp documentation
wx2_x_y_pdf.zip Acrobat PDF documentation
wx2_x_y_htm.zip HTML documentation
wx2_x_y_vc.zip MS VC++ 5.0 project files
wx2_x_y_cw.zip Metrowerks CodeWarrior project files
wx2_x_y_bc.zip BC++ 5 project files
jpeg.zip Use this to allow wxImage to read and write JPEG files
tiff.zip Use this to allow wxImage to read and write TIFF files
Alternatively, you may unarchive the .zip form by hand:
wxMSW-x.y.z.zip where x.y.z is the version number.
Unarchive the required files plus any optional documentation
files into a suitable directory such as c:\wx.
@@ -59,6 +45,9 @@ Other add-on packages are available from the wxWindows Web site, such as:
- tex2rtf3.zip. Tex2RTF: create Windows Help, HTML, and Word RTF files from
the same document source.
For instructions on compiling wxBase (wxWindows-without-GUI),
please see docs/base/install.txt.
General installation notes
--------------------------
@@ -81,7 +70,8 @@ Visual C++ 4.0/5.0/6.0 compilation
Using project files (VC++ 5 and 6 only):
1. Unarchive wx2_x_y_vc.zip, the VC++ 5/6 project makefiles.
1. Unarchive wxWindows-x.y.z-vc.zip, the VC++ 5/6 project
makefiles (already included in wxMSW-x.y.z.zip and the setup version).
2. Open src/wxvc.dsp, set Debug or Release configuration for
the wxvc project, and compile. Alternatively, use Batch Build
to build both Debug and Release configurations.
@@ -148,7 +138,7 @@ To build the DLL version using makefiles:
suitable precompiled header file for compiling applications.
The resulting libraries are called:
wx\lib\wx[version].lib(dll) (debug version)
wx\lib\wx[version]d.lib(dll) (debug version)
wx\lib\wx[version].lib(dll) (release version, using FINAL=1)
2. Invoke a sample makefile with 'nmake -f makefile.vc WXUSINGDLL=1'
@@ -199,12 +189,13 @@ the project. After this, delete everything (including PCH) and recompile.
Note (5): for some further notes about upgrading your project
files to be compatible with wxWindows 2.1.14, please see
"Highlights of wxWindows 2.1.14" from the Download page of the
"Highlights of wxWindows" from the Download page of the
web site or CD-ROM.
Note (6): to create your own IDE files, see the technical note on the
wxWindows web site or CD-ROM, entitled "Compiling wxWindows
applications in the VC++ IDE". You can also copy .dsp and .dsw
applications in the VC++ IDE" (technical note docs/tech/tn0010.htm in the
wxWindows distribution). You can also copy .dsp and .dsw
files from an existing wxWindows sample and adapt them.
Visual C++ 1.5 compilation (16-bit)
@@ -239,6 +230,13 @@ Compiling using the makefiles:
'make -f makefile.b32 clean'
'make -f makefile.b32 FINAL=1'
for the library and samples.
5. To make and use wxWindows as a DLL, type
'make -f makefile.b32 clean'
'make -f makefile.b32 DLL=1'
and then for each sample,
'make -f makefile.b32 WXUSINGDLL=1'
Please note that the samples have not been exhaustively tested
with this configuration.
Note (1): the wxWindows library and (some) samples compile in 16-bit mode
using makefile.bcc, but at present the wxWindows resource system is switched
@@ -299,39 +297,127 @@ some samples) you need to compile them with bc32.ide.
Note (3): the debug version of the wxWindows library is about 40 MB, and the
release version is around 5 MB.
See also the file bc_ide.txt for further instructions and details
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/patches/#freecompiler55
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=<Borland C++ 5.5 path>
(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
------------------------------
C++Builder compilation is the same as for Borland C++ above.
1. Build the wxWindows libraries using the Borland make utility as
specified in the section called "Borland C++ 4.5/5.0 compilation"
above. (C++ Builder includes a stand-alone C++ compiler. For example,
C++ Builder 4.0 comes with C++ 5.4.)
Tested with C++Builder 1.0 and 3.0. Only makefiles are currently
supplied.
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 or http://biolpc22.york.ac.uk/wx/bc/ide.html.
Watcom C++ 10.6/11 compilation
---------------------------
1. Make sure your WXWIN variable is set, and uses the DOS short
name form.
2. Change directory to wx\src\msw. Type 'wmake -f makefile.wat' to
2. Change directory to wx\src\msw. Type
'wmake -f makefile.wat all' to
make the wxWindows core library.
3. Change directory to wx\samples\minimal and type 'wmake -f makefile.wat'
3. Change directory to wx\samples\minimal and type
'wmake -f makefile.wat all'
to make this sample. Repeat for other samples of interest.
Note (1): setup.h overrides wxUSE_LIBJPEG and sets it to 0, since
imagjpeg.cpp doesn't compile.
Note (2): makewat.env uses the odbc32.lib supplied in wxWindows' lib\watcom
Note (1): makewat.env uses the odbc32.lib supplied in wxWindows' lib\watcom
directory. See the notes in that directory.
Note (3): if variant.cpp is compiled with date/time class
Note (2): if variant.cpp is compiled with date/time class
options, the linker gives up. So the date/time option is switched
off for Watcom C++. Also, wxAutomationObject is not compiled with
Watcom C++.
Note (4): if Watcom can't read the precompiled header when
building a sample, try deleting src\msw\watcom.pch and
compiling the sample again.
Note (5): if you get _popen_ and _pclose_ link errors, try
Note (3): if Watcom can't read the precompiled header when
building a sample or library, try deleting src\msw\watcom.pch and
compiling again.
Note (4): if you get _popen_ and _pclose_ link errors, try
recompiling wxWindows with XPM support disabled in setup.h.
Alternatively, make sure these lines exist at the top of
src\xpm\xpmi.h:
@@ -344,7 +430,7 @@ src\xpm\xpmi.h:
Metrowerks CodeWarrior compilation
----------------------------------
1. Downloaded and unzip wx2_x_y_cw.zip.
1. Downloaded and unzip wxWindows-x.y.z-cw.zip.
2. Load the make_cw.mcp project in wx\src, and compile.
3. Load the make_cw.mcp project in wx\samples\minimal, and compile.
Further project files for samples will be available in due
@@ -393,37 +479,33 @@ the debugging version of the library is 90MB, with samples coming in
at 40MB :-) However, wxWindows at least makes a good test suite for
improving the compiler.
Cygwin b19/b20/Mingw32 compilation
Cygwin/Mingw32 compilation
----------------------------------
wxWindows 2 supports Cygwin (formerly GnuWin32) b19, b20, Mingw32,
and Mingw32/EGCS.
wxWindows 2 supports Cygwin (formerly GnuWin32) betas and
releases, and Mingw32.
Thanks are due to Keith Garry Boyce (garp@opustel.com) and Cygnus for making
it all possible.
Thanks are due to Keith Garry Boyce (garp@opustel.com), Cygnus
and others for making it all possible.
From wxWindows 2.0 beta 9, both Cygwin and Mingw32 (the minimal
distribution of Cygwin) can be used with the same makefiles.
Both Cygwin and Mingw32 (the minimal distribution of Cygwin) can be used
with the same makefiles.
Here are the steps required:
- Retrieve and install the latest beta of Cygwin, or Mingw32, as per the
instructions with either of these packages.
- If using Mingw32 (including the EGCS variant), you need some
extra files to use the wxWindows makefiles. You can find these
files in ports/mingw32 on the ftp site or CD-ROM, as extra.zip.
These should be extracted to the Mingw32 directory.
If you have already have downloaded bison, flex, make, rm, cp, mv
- If using Mingw32, you need some extra files to use the wxWindows
makefiles. You can find these files in ports/mingw32 on the ftp
site or CD-ROM, as extra.zip. These should be extracted to the Mingw32
directory. If you have alread downloaded bison, flex, make, rm, cp, mv
from elsewhere, you won't need this.
If using Mingw32 2.8.1, see also see mingw32.txt in this directory
(docs/msw) about a fix that has to be applied to a Mingw32 header file.
If using Mingw32 2.95 and below with wxWindows 2.1 or above, you
must hand-patch in Mingw32-gcc295.patches (located in the top-level of the
wxWindows 2 installation). Mingw32 2.95.2 and above contain the
fixes already.
must hand-patch with Mingw32-gcc295.patches (located in the
top-level of the wxWindows 2 installation). Mingw32 2.95.2
and above contain the fixes already.
- Modify the file wx/src/cygnus.bat (or mingw32.bat or mingegcs.bat)
to set up appropriate variables, if necessary mounting drives.
@@ -435,12 +517,9 @@ Here are the steps required:
supplied).
- Edit wx/src/makeg95.env and set the MINGW32 variable at the top of
the file to either 1 (you have Mingw32) or 0 (you have Cygwin32).
If using MINGW32, also set the MINGW32VERSION variable
appropriately.
- Mingw32 may not support winsock.h, so if you have a problem
here, comment out socket-related files in src/msw/makefile.g95.
the file to either 1 (you have Mingw32 or Cygwin 1.x releases) or 0
(if you have Cygwin betas). If using Mingw32, also set the
MINGW32VERSION variable appropriately.
- Set your WXWIN variable to where wxWindows is installed.
*** IMPORTANT: For Cygwin/Mingw32, use forward slashes in the path, not
@@ -457,7 +536,7 @@ Here are the steps required:
- Use the 'strip' command to reduce executable size.
- With Cygnus Cygwin, you can invoke gdb --nw myfile.exe to
- With Cygwin, you can invoke gdb --nw myfile.exe to
debug an executable. If there are memory leaks, they will be
flagged when the program quits.
@@ -487,9 +566,9 @@ Notes:
(a missing bracket).
4. If there's a problem with the copy command in
4. If there's a problem with the copy or remove commands in
src/msw/makefile.g95, you may need to change the COPY and
COPYSEP variables in makeg95.env.
RM variables in makeg95.env.
5. If there's a problem executing the windres program, try
commenting out RCPREPROCESSOR in makeg95.env.
@@ -509,11 +588,10 @@ Notes:
References:
- The GNU-WIN32 site is at
http://www.cygnus.com/gnu-win32/
- The Cygwin site is at
http://sourceware.cygnus.com
- Mingw32 is available at:
ftp://ftp.xraylith.wisc.edu/pub/khan/gnu-win32/mingw32/gcc-2.95/
- See also http://web.ukonline.co.uk/julian.smart/wxwin/gnuwin32.htm
ftp://www.mingw.org
TWIN32 and gcc on Linux
-----------------------
@@ -542,5 +620,6 @@ General Notes
- If you are installing wxWindows 2 from CVS, you may find that
include/wx/msw/setup.h is missing. This is deliberate, to avoid
developers' different setup.h configurations getting confused.
Please copy setup0.h to setup.h before compiling.
Please copy setup0.h to setup.h before compiling. Also, read
the BuildCVS.txt for other hints.

32
docs/msw/mingw32.txt
View File

@@ -1,32 +0,0 @@
Return-Path: <drfish@uswest.net>
Delivered-To: julian.smart@ukonline.co.uk
Delivered-To: fixup-julian.smart@ukonline.co.uk@fixme
Date: Tue, 01 Dec 1998 23:27:18 -0700
From: "J.Russell Smyth" <drfish@uswest.net>
X-Accept-Language: en
To: Julian Smart <julian.smart@ukonline.co.uk>
Subject: fixes for mingw32
Julian,
After 3 hours I have found the problem causing
..\\..\\include\\wx/string.h:520: warning: ANSI C++ forbids implicit
conversion
from `void *' in assignment
-There is an error in
mingw\lib\gcc-lib\i386-mingw32\2.8.1\include\stdarg.h
(not a real diff.. dont have win95 diff avail right now)
67c67
<#if defined(__svr4__) || defined(_AIX) || defined(_M_UNIX) ||
defined(__NetBSD__)
---
>#if defined(__svr4__) || defined(_AIX) || defined(_M_UNIX) ||
defined(__NetBSD__)||defined(__WIN32__)
this fixes it!! I will send a message to the maintainer of mingw to let
him know of this problem.

9
docs/msw/readme.txt
View File

@@ -1,5 +1,8 @@
This is the wxWindows for Windows Preview.
This is wxWindows for Windows (wxMSW)
-------------------------------------
For more information, please see changes.txt, todo.txt, and the
manuals.
For information on installing wxWindows, please see install.txt.
For further information, please see docs/html/index.htm and the
wxWindows reference manual.

60
docs/msw/todo.txt
View File

@@ -1,6 +1,6 @@
Todo on wxWin 2.0, Windows platform
-----------------------------------
Todo on wxWin 2, Windows platform
---------------------------------
HIGH PRIORITY
-------------
@@ -12,8 +12,6 @@ Add centring, right justify styles to wxStaticText.
Extend wxSystemSettings to get symbols for current nationality,
e.g. ',' instead of '.' for decimal points.
Supply correct ctl3d/odbc lib files for BC++, Watcom (corrupt?)
wxToolTip::Enable should be static for wxGTK compatibility (VZ)
LOW PRIORITY (MEDIUM TERM)
@@ -21,53 +19,19 @@ LOW PRIORITY (MEDIUM TERM)
Supply VC++ project generator utility.
Convert remaining utilities e.g. wxGraphLayout.
More wxSystemSettings (see comment in settings.cpp).
Synchronize drawing functions on all platforms, using Chris's
code to test them.
Shell function to invoke a document with open, print, whatever...
Write tutorial.
Add wxDC::DeviceToLogical -> wxPoint etc (convenience accessors).
Generic makefiles? Rewrite makefiles to maintain simultaneous debug/release
objects.
Add a wxTabCtrl sample.
Improve printing. More API functions for printer DCs (to get
printer characteristics) and more reliable printing framework.
Add GetIcon, GetBitmap to wxImageList. Perhaps store bitmaps
in image list so we can get them later.
Merge dib.cpp, dibutils.cpp (see also some DIB code in bitmap.cpp).
Debug PNG support in wxBitmap (no 4-bit support), and possibly add a convertor from PNG
to HICON. We could perhaps also support inclusion of PNGs into
a .res file as a custom resource.
Fonts: ability to enumerate them.
Angled text.
Think about reimplementing wxBitmapButton, wxStaticBitmap using
BS_BITMAP, SS_BITMAP - but this may not allow wxBitmap
argument, so instead just allow controls loaded from native
resource to deal with this style and call default processing.
wxWizard class?
Doc/view - have some standard views/docs e.g. wxTextView.
Miscellaneous file/system function wrappers.
Bug database.
Menu bitmaps - document Vadim's enhancements.
wxCreateDynamicObject is apparently slow: ~ 2000 calls to strcmp. Need to
@@ -76,25 +40,11 @@ use some kind of hash table scheme.
Write wxDisplay class for querying settings and passing
to wxFrame to mirror the X situation (multiple displays).
Write translator between old and new .wxr formats (including
substituting static text for obsolete labels).
Write more validators. Also, how do they work if loading the
dialog from a .wxr? Could call SetValidator from within
InitDialog for all controls, then call TransferDataToWindow.
Classes for file/OS utility functions.
Add support for more static controls e.g. wxStaticLine.
Perhaps rewrite wxFile to use FILE* descriptors, so Eof and Flush
can work.
Find out how to set wxFileDialog position.
Maybe bundle Andrew Tucker's DBWIN32 with wxWindows (it's only
26KB), for viewing debug messages without a debugger.
Implement wxDC floating point transformations.
A wxDC function (or two) for drawing 3D edges?
@@ -102,15 +52,10 @@ A wxDC function (or two) for drawing 3D edges?
LOW PRIORITY (LONG TERM)
------------------------
Improve and expand wxSizer classes.
ActiveX support
Look at porting to WinCE
Enhance Tex2RTF to generate Microsoft HTML help, perhaps Netscape
HTML help also.
GDI objects could be optimised further in constructors by
searching for a matching, pre-existing object, and assigning from
that, thus sharing the internal handle. A problem with this
@@ -138,4 +83,3 @@ different platforms.
Rich text class.