This commit was manufactured by cvs2svn to create tag

'BC5_SNAPSHOT_LATEST'.

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

.cvsignore

@@ -9,3 +9,15 @@ linux.system.cache
 wx-config
 config.log
 linux-gnu.system.cache
+*.dsp
+*.dsw
+*.plg
+*.opt
+*.aps
+*.ncb
+*.pro
+*.opt
+Release
+Debug
+ReleaseDLL
+DebugDLL

distrib/gtk/README.txt

@@ -0,0 +1,310 @@
+wxPython README
+---------------
+
+Introduction
+------------
+The code in this subtree is a Python Extension Module that enables the
+use of wxWindows from the Python language.  So what is Python?  Go to
+http://www.python.org to learn more but in a nutshell, it's an
+extremly cool object oriented language.  It's easier than Perl and
+nearly as powerful.  It runs on more platforms than Java, and by some
+reports, is even faster than Java with a JIT compiler!
+
+So why would you want to use wxPython over just C++ and wxWindows?
+Personally I prefer using Python for everything.  I only use C++ when
+I absolutly have to eek more performance out of an algorithm, and even
+then I ususally code it as an extension module and leave the majority
+of the program in Python.  Another good thing to use wxPython for is
+quick prototyping of your wxWindows apps.  With C++ you have to
+continuously go though the edit-compile-link-run cycle, which can be
+quite time comsuming.  With Python it is only an edit-run cycle.  You
+can easily build an application in a few hours with Python that would
+normally take a few days with C++.  Converting a wxPython app to a
+C++/wxWindows app should be a straight forward task.
+
+This extension module attempts to mirror the class heiarchy of
+wxWindows as closely as possble.  This means that there is a wxFrame
+class in wxPython that looks, smells, tastes and acts almost the same
+as the wxFrame class in the C++ version.  Unfortunatly, I wasn't able
+to match things exactly because of differences in the languages, but
+the differences should be easy to absorb because they are natural to
+Python.  For example, some methods that return mutliple values via
+argument pointers in C++ will return a tuple of values in Python.
+These differences have not been documented yet so if something isn't
+working the same as described in the wxWindows documents the best
+thing to do is to scan through the wxPython sources, especially the .i
+files, as that is where the interfaces for wxPython are defined.
+
+I have reports of successfully embedding wxPython within a wxWindows
+C++ app on GTK.  It hasn't yet been attempted on MSW (to my knowledge)
+so I don't know how successful such an attempt would be.  However it
+is certainly possible.
+
+
+
+Getting Help
+------------
+
+Since wxPython is a blending of multiple technologies, help comes from
+multiple sources.  See the http://alldunn.com/wxPython for details on
+various sources of help, but probably the best source is the
+wxPython-users mail list.  You can view the archive or subscribe by
+going to
+
+       http://starship.python.net/mailman/listinfo/wxpython-users
+
+Or you can send mail directly to the list using this address:
+
+       wxpython-users@starship.python.net
+
+
+
+What's new in 2.0b9
+-------------------
+Bug fix for ListCtrl in test4.py (Was a missing file...  DSM!)
+
+Bug fix for occassional GPF on Win32 systems upon termination of a
+wxPython application.
+
+Added wxListBox.GetSelections returning selections as a Tuple.
+
+Added a wxTreeItemData that is able to hold any Python object and be
+associated with items in a wxTreeCtrl.  Added test pytree.py to show
+this feature off.
+
+Added wxSafeYield function.
+
+OpenGL Canvas can be optionally compiled in to wxPython.
+
+Awesome new Demo Framework for showing off wxPython and for learning
+how it all works.
+
+The pre-built Win32 version is no longer distributing the wxWindows
+DLL.  It is statically linked with the wxWindows library instead.
+
+Added a couple missing items from the docs.
+
+Added wxImage, wxImageHandler, wxPNGHandler, wxJPEGHandler,
+wxGIFHandler and wxBMPHandler.
+
+Added new methods to wxTextCtrl.
+
+
+
+What's new in 2.0b8
+-------------------
+Support for using Python threads in wxPython apps.
+
+Several missing methods from various classes.
+
+Various bug fixes.
+
+
+
+What's new in 2.0b7
+-------------------
+Added DLG_PNT and DLG_SZE convienience methods to wxWindow class.
+
+Added missing constructor and other methods for wxMenuItem.
+
+
+
+What's new in 2.0b6
+-------------------
+Just a quickie update to fix the self-installer to be compatible with
+Python 1.5.2b2's Registry settings.
+
+
+What's new in 2.0b5
+-------------------
+Well obviously the numbering scheme has changed.  I did this to
+reflect the fact that this truly is the second major revision of
+wxPython, (well the third actually if you count the one I did for
+wxWindows 1.68 and then threw away...) and also that it is associated
+with the 2.0 version of wxWindows.
+
+I have finally started documenting wxPython.  There are several pages
+in the wxWindows documentation tree specifically about wxPython, and I
+have added notes within the class references about where wxPython
+diverges from wxWindows.
+
+Added wxWindow_FromHWND(hWnd) for wxMSW to construct a wxWindow from a
+window handle.  If you can get the window handle into the python code,
+it should just work...  More news on this later.
+
+Added wxImageList, wxToolTip.
+
+Re-enabled wxConfig.DeleteAll() since it is reportedly fixed for the
+wxRegConfig class.
+
+As usual, some bug fixes, tweaks, etc.
+
+
+
+What's new in 0.5.3
+-------------------
+Added wxSashWindow, wxSashEvent, wxLayoutAlgorithm, etc.
+
+Various cleanup, tweaks, minor additions, etc. to maintain
+compatibility with the current wxWindows.
+
+
+
+What's new in 0.5.0
+-------------------
+Changed the import semantics from "from wxPython import *" to "from
+wxPython.wx import *"  This is for people who are worried about
+namespace pollution, they can use "from wxPython import wx" and then
+prefix all the wxPython identifiers with "wx."
+
+Added wxTaskbarIcon for wxMSW.
+
+Made the events work for wxGrid.
+
+Added wxConfig.
+
+Added wxMiniFrame for wxGTK.
+
+Changed many of the args and return values that were pointers to gdi
+objects to references to reflect changes in the wxWindows API.
+
+Other assorted fixes and additions.
+
+
+
+
+What's new in 0.4.2
+-------------------
+
+wxPython on wxGTK works!!!  Both dynamic and static on Linux and
+static on Solaris have been tested.  Many thanks go to Harm
+<H.v.d.Heijden@phys.tue.nl> for his astute detective work on tracking
+down a nasty DECREF bug.  Okay so I have to confess that it was just a
+DSM (Dumb Stupid Mistake) on my part but it was nasty none the less
+because the behavior was so different on different platforms.
+
+
+The dynamicly loaded module on Solaris is still segfaulting, so it
+must have been a different issue all along...
+
+
+
+What's New in 0.4
+-----------------
+
+1. Worked on wxGTK compatibility.  It is partially working.  On a
+Solaris/Sparc box wxPython is working but only when it is statically
+linked with the Python interpreter.  When built as a dyamically loaded
+extension module, things start acting weirdly and it soon seg-faults.
+And on Linux both the statically linked and the dynamically linked
+version segfault shortly after starting up.
+
+2. Added Toolbar, StatusBar and SplitterWindow classes.
+
+3. Varioius bug fixes, enhancements, etc.
+
+
+
+Build Instructions
+------------------
+I used SWIG (http://www.swig.org) to create the source code for the
+extension module.  This enabled me to only have to deal with a small
+amount of code and only have to bother with the exceptional issues.
+SWIG takes care of the rest and generates all the repetative code for
+me.  You don't need SWIG to build the extension module as all the
+generated C++ code is included under the src directory.
+
+I added a few minor features to SWIG to control some of the code
+generation.  If you want to playaround with this the patches are in
+wxPython/SWIG.patches and they should be applied to the 1.1p5 version
+of SWIG.  These new patches are documented at
+http://starship.skyport.net/crew/robind/python/#swig, and they should
+also end up in the 1.2 version of SWIG.
+
+wxPython is organized as a Python package.  This means that the
+directory containing the results of the build process should be a
+subdirectory of a directory on the PYTHONPATH.  (And preferably should
+be named wxPython.)  You can control where the build process will dump
+wxPython by setting the TARGETDIR makefile variable.  The default is
+$(WXWIN)/utils/wxPython, where this README.txt is located.  If you
+leave it here then you should add $(WXWIN)/utils to your PYTHONPATH.
+However, you may prefer to use something that is already on your
+PYTHONPATH, such as the site-packages directory on Unix systems.
+
+
+Win32
+-----
+
+1. Build wxWindows with wxUSE_RESOURCE_LOADING_IN_MSW set to 1 in
+include/wx/msw/setup.h so icons can be loaded dynamically.  While
+there, make sure wxUSE_OWNER_DRAWN is also set to 1.
+
+2. Change into the $(WXWIN)/utils/wxPython/src directory.
+
+3. Edit makefile.vc and specify where your python installation is at.
+You may also want to fiddle with the TARGETDIR variable as described
+above.
+
+4. Run nmake -f makefile.vc
+
+5. If it builds successfully, congratulations!  Move on to the next
+step.  If not then you can try mailing me for help.  Also, I will
+always have a pre-built win32 version of this extension module at
+http://starship.skyport.net/crew/robind/python.
+
+6. Change to the $(WXWIN)/utils/wxPython/tests directory.
+
+7. Try executing the test programs.  Note that some of these print
+diagnositc or test info to standard output, so they will require the
+console version of python.  For example:
+
+    python test1.py
+
+To run them without requiring a console, you can use the pythonw.exe
+version of Python either from the command line or from a shortcut.
+
+
+
+Unix
+----
+
+1. Change into the $(WXWIN)/utils/wxPython/src directory.
+
+2. Edit Setup.in and ensure that the flags, directories, and toolkit
+options are correct.  See the above commentary about TARGETDIR.  There
+are a few sample Setup.in.[platform] files provided.
+
+[I've written a Setup which should work in almost all Unix systems,
+ so that the steps 1 and 2 don't have to be done. Robert Roebling. ]
+
+3. Run this command to generate a makefile:
+
+    make -f Makefile.pre.in boot
+
+4. Run these commands to build and then install the wxPython extension
+module:
+
+    make
+    
+4b. Log in as root. [Robert Roebling]    
+
+    make install
+    
+4c. Log out from root. [Robert Roebling]    
+
+
+5. Change to the $(WXWIN)/utils/wxPython/tests directory.
+
+6. Try executing the test programs.  For example:
+
+    python test1.py
+
+    
+------------------------
+10/20/1998
+
+Robin Dunn
+robin@alldunn.com
+
+
+

distrib/gtk/Setup

@@ -0,0 +1,47 @@
+# This file gives the details of what is needed to build this extension
+# module so the Makefile can be created.
+
+###
+### This file should be created by configure.  Currently it is tweaked by hand.
+###
+
+*shared*
+
+CCC=g++
+WXWIN=~/wxWindows
+GENCODEDIR=gtk
+srcdir=$(GENCODEDIR)
+WX_CONFIG_CFLAGS=`wx-config --cflags` `gtk-config --cflags`
+WX_CONFIG_LIBS=`wx-config --libs`
+
+# Depending on how your Python was built, you may have to set this
+# value to use the C++ driver to link with instead of the default
+# C driver.  For example:
+MY_LDSHARED=$(CCC) -shared $(WX_CONFIG_LIBS)
+
+# Same as above, but for statically linking Python and wxPython together,
+# in other words, if you comment out the *shared* above.  If this is the
+# case then you should ensure that the main() function is Python's, not
+# wxWindows'.  You can rebuild $(WXWIN)/src/gtk/app.cpp with NOMAIN defined
+# to force this...
+MY_LINKCC=$(CCC)
+
+
+## Pick one of these, or set your own.  This is where the
+## wxPython module should be installed.  It should be a
+## subdirectory named wxPython.
+#TARGETDIR=..
+#TARGETDIR=$(BINLIBDEST)/site-packages/wxPython
+TARGETDIR=$(BINLIBDEST)/wxPython
+
+wxc	wx.cpp helpers.cpp windows.cpp events.cpp misc.cpp gdi.cpp \
+	mdi.cpp controls.cpp controls2.cpp windows2.cpp cmndlgs.cpp \
+	frames.cpp stattool.cpp windows3.cpp image.cpp \
+	utils.cpp \
+	## comment out the next line to disable wxGLCanvas
+	##_glcanvas.cpp glcanvas.cpp -DWITH_GLCANVAS -lGL -lGLU \
+	-I. $(WX_CONFIG_CFLAGS) -I/usr/local/lib/glib/include \
+	-DSWIG_GLOBAL -DWXP_WITH_THREAD $(SEPARATE) -Xlinker $(WX_CONFIG_LIBS)
+
+
+

distrib/gtk/copy_src

@@ -3,7 +3,10 @@
 # This script is creates a dir tree in ~/wxgtk_dist which
 # can then be packed into an archive
 
-echo This script will copy the wxGTK release files into ~/wxgtk_dist
+echo                               --------
+echo    This script will copy the wxGTK release files into ~/wxgtk_dist
+echo                               --------
+echo
 
 mkdir ~/wxgtk_dist
 mkdir ~/wxgtk_dist/wxGTK
@@ -51,6 +54,11 @@ cd generic
 cp *.h ~/wxgtk_dist/wxGTK/include/wx/generic
 cd ..
 
+mkdir ~/wxgtk_dist/wxGTK/include/wx/unix
+cd unix
+cp *.h ~/wxgtk_dist/wxGTK/include/wx/unix
+cd ..
+
 mkdir ~/wxgtk_dist/wxGTK/include/wx/gtk
 cd gtk
 cp *.h ~/wxgtk_dist/wxGTK/include/wx/gtk
@@ -149,6 +157,11 @@ cp *.inc ~/wxgtk_dist/wxGTK/src/gtk
 cp *.cpp ~/wxgtk_dist/wxGTK/src/gtk
 cd ..
 
+cd unix
+mkdir ~/wxgtk_dist/wxGTK/src/unix
+cp *.cpp ~/wxgtk_dist/wxGTK/src/unix
+cd ..
+
 cd generic
 mkdir ~/wxgtk_dist/wxGTK/src/generic
 cp *.cpp ~/wxgtk_dist/wxGTK/src/generic
@@ -169,6 +182,11 @@ mkdir ~/wxgtk_dist/wxGTK/src/png
 cp * ~/wxgtk_dist/wxGTK/src/png
 cd ..
 
+cd jpeg
+mkdir ~/wxgtk_dist/wxGTK/src/jpeg
+cp * ~/wxgtk_dist/wxGTK/src/jpeg
+cd ..
+
 cd ..
 
 echo Utils dir..
@@ -177,6 +195,8 @@ cd utils
 mkdir ~/wxgtk_dist/wxGTK/utils
 cp Makefile ~/wxgtk_dist/wxGTK/utils
 
+echo wxGLCanvas..
+
 cd glcanvas
 mkdir ~/wxgtk_dist/wxGTK/utils/glcanvas
 cp ./docs/notes.txt ~/wxgtk_dist/wxGTK/utils/glcanvas/NOTES.txt
@@ -187,6 +207,7 @@ cp ./gtk/glcanvas.h ~/wxgtk_dist/wxGTK/utils/glcanvas/gtk
 
 mkdir ~/wxgtk_dist/wxGTK/utils/glcanvas/samples
 mkdir ~/wxgtk_dist/wxGTK/utils/glcanvas/samples/cube
+mkdir ~/wxgtk_dist/wxGTK/utils/glcanvas/samples/isosurf
 mkdir ~/wxgtk_dist/wxGTK/utils/glcanvas/samples/penguin
 
 cd samples/cube
@@ -195,6 +216,13 @@ cp cube.h ~/wxgtk_dist/wxGTK/utils/glcanvas/samples/cube
 cp cube.cpp ~/wxgtk_dist/wxGTK/utils/glcanvas/samples/cube
 cd ..
 
+cd isosurf
+cp Makefile ~/wxgtk_dist/wxGTK/utils/glcanvas/samples/isosurf
+cp isosurf.h ~/wxgtk_dist/wxGTK/utils/glcanvas/samples/isosurf
+cp isosurf.cpp ~/wxgtk_dist/wxGTK/utils/glcanvas/samples/isosurf
+cp isosurf.dat.gz ~/wxgtk_dist/wxGTK/utils/glcanvas/samples/isosurf
+cd ..
+
 cd penguin
 cp Makefile ~/wxgtk_dist/wxGTK/utils/glcanvas/samples/penguin
 cp penguin.h ~/wxgtk_dist/wxGTK/utils/glcanvas/samples/penguin
@@ -206,6 +234,8 @@ cp lw.cpp ~/wxgtk_dist/wxGTK/utils/glcanvas/samples/penguin
 cp penguin.lwo ~/wxgtk_dist/wxGTK/utils/glcanvas/samples/penguin
 cd ../../..
 
+echo DialogEd..
+
 cd dialoged/src
 mkdir ~/wxgtk_dist/wxGTK/utils/dialoged
 cp Makefile ~/wxgtk_dist/wxGTK/utils/dialoged
@@ -230,7 +260,53 @@ cp winstyle.h ~/wxgtk_dist/wxGTK/utils/dialoged
 cd bitmaps
 mkdir ~/wxgtk_dist/wxGTK/utils/dialoged/bitmaps
 cp *.xpm ~/wxgtk_dist/wxGTK/utils/dialoged/bitmaps
-cd ../../../..
+cd ../../..
+
+echo wxPython..
+
+cd wxPython
+mkdir ~/wxgtk_dist/wxGTK/utils/wxPython
+cp README.txt ~/wxgtk_dist/wxGTK/utils/wxPython
+
+mkdir ~/wxgtk_dist/wxGTK/utils/wxPython/src
+cp ./src/* ~/wxgtk_dist/wxGTK/utils/wxPython/src
+
+mkdir ~/wxgtk_dist/wxGTK/utils/wxPython/src/gtk
+cp ./src/gtk/* ~/wxgtk_dist/wxGTK/utils/wxPython/src/gtk
+
+mkdir ~/wxgtk_dist/wxGTK/utils/wxPython/lib
+cp ./lib/*.py ~/wxgtk_dist/wxGTK/utils/wxPython/lib
+
+mkdir ~/wxgtk_dist/wxGTK/utils/wxPython/tests
+cp ./tests/README.txt ~/wxgtk_dist/wxGTK/utils/wxPython/tests
+cp ./tests/*.py ~/wxgtk_dist/wxGTK/utils/wxPython/tests
+
+mkdir ~/wxgtk_dist/wxGTK/utils/wxPython/demo
+cp ./demo/README.txt ~/wxgtk_dist/wxGTK/utils/wxPython/demo
+cp ./demo/*.py ~/wxgtk_dist/wxGTK/utils/wxPython/demo
+cp ./demo/*.pyc ~/wxgtk_dist/wxGTK/utils/wxPython/demo
+mkdir ~/wxgtk_dist/wxGTK/utils/wxPython/demo/bitmaps
+cp ./demo/bitmaps/* ~/wxgtk_dist/wxGTK/utils/wxPython/demo/bitmaps
+
+mkdir ~/wxgtk_dist/wxGTK/utils/wxPython/tests/bitmaps
+cp ./tests/bitmaps/* ~/wxgtk_dist/wxGTK/utils/wxPython/tests/bitmaps
+cd ..
+
+echo wxOLE..
+
+cd wxOLE
+mkdir ~/wxgtk_dist/wxGTK/utils/wxOLE
+mkdir ~/wxgtk_dist/wxGTK/utils/wxOLE/gtk
+cp ./gtk/wxole.* ~/wxgtk_dist/wxGTK/utils/wxOLE/gtk
+mkdir ~/wxgtk_dist/wxGTK/utils/wxOLE/samples
+mkdir ~/wxgtk_dist/wxGTK/utils/wxOLE/samples/servlet
+cp ./samples/servlet/Makefile ~/wxgtk_dist/wxGTK/utils/wxOLE/samples/servlet
+cp ./samples/servlet/*.xpm ~/wxgtk_dist/wxGTK/utils/wxOLE/samples/servlet
+cp ./samples/servlet/*.cpp ~/wxgtk_dist/wxGTK/utils/wxOLE/samples/servlet
+cp ./samples/servlet/*.gnorba ~/wxgtk_dist/wxGTK/utils/wxOLE/samples/servlet
+
+cd ../..
+
 
 echo Samples dir..
 
@@ -364,6 +440,16 @@ cp *.cpp ~/wxgtk_dist/wxGTK/samples/dynamic
 cp *.xpm ~/wxgtk_dist/wxGTK/samples/dynamic
 cd ..
 
+echo Drawing sample..
+
+cd drawing
+mkdir ~/wxgtk_dist/wxGTK/samples/drawing
+cp Makefile ~/wxgtk_dist/wxGTK/samples/drawing
+cp Makefile.in ~/wxgtk_dist/wxGTK/samples/drawing
+cp *.cpp ~/wxgtk_dist/wxGTK/samples/drawing
+cp *.xpm ~/wxgtk_dist/wxGTK/samples/drawing
+cd ..
+
 echo Forty sample..
 
 cd forty
@@ -415,6 +501,8 @@ cp Makefile ~/wxgtk_dist/wxGTK/samples/image
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/image
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/image
 cp horse.png ~/wxgtk_dist/wxGTK/samples/image
+cp horse.gif ~/wxgtk_dist/wxGTK/samples/image
+cp horse.jpg ~/wxgtk_dist/wxGTK/samples/image
 cd ..
 
 echo Internat sample..
@@ -557,6 +645,16 @@ cp *.cpp ~/wxgtk_dist/wxGTK/samples/sashtest
 cp *.h ~/wxgtk_dist/wxGTK/samples/sashtest
 cd ..
 
+echo Scroll sample..
+
+cd sashtest
+mkdir ~/wxgtk_dist/wxGTK/samples/scroll
+cp Makefile ~/wxgtk_dist/wxGTK/samples/scroll
+cp Makefile.in ~/wxgtk_dist/wxGTK/samples/scroll
+cp *.cpp ~/wxgtk_dist/wxGTK/samples/scroll
+cp *.h ~/wxgtk_dist/wxGTK/samples/scroll
+cd ..
+
 echo Splitter sample..
 
 cd splitter
@@ -654,9 +752,13 @@ cp Makefile ~/wxgtk_dist/wxGTK/samples/wxsocket
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/wxsocket
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/wxsocket
 cp *.xpm ~/wxgtk_dist/wxGTK/samples/wxsocket
-cd ..
-
-
+cd ../..
+
+echo LOCAL CORRECTCIONS
+
+cd distrib/gtk
+cp README.txt ~/wxgtk_dist/wxGTK/utils/wxPython
+cp Setup ~/wxgtk_dist/wxGTK/utils/wxPython/src
 
 
 

distrib/msw/bc.rsp

@@ -0,0 +1,3 @@
+src/bc32.ide
+src/bc32d.ide
+samples/bc32.ide

distrib/msw/generic.rsp

@@ -1,5 +1,10 @@
 distrib/msw/*.rsp
 distrib/msw/*.bat
+distrib/msw/tardist
+distrib/gtk/*
+
+locale/*.po
+locale/*.mo
 
 docs/readme.txt
 docs/install.txt
@@ -31,6 +36,8 @@ src/generic/*.cpp
 src/generic/*.c
 src/generic/*.inc
 
+src/unix/*.cpp
+
 src/png/*.c
 src/png/*.h
 src/png/makefile*
@@ -61,6 +68,7 @@ include/wx/protocol/*.h
 include/wx/wx_setup.vms
 include/wx/common/*.h
 include/wx/generic/*.h
+include/wx/unix/*.h
 lib/dummy
 
 bin/*.*
@@ -203,6 +211,12 @@ samples/wxsocket/client.wat
 samples/wxsocket/server.wat
 samples/wxsocket/client.vc
 samples/wxsocket/server.vc
+samples/wxsocket/client.dos
+samples/wxsocket/server.dos
+samples/wxsocket/client.b32
+samples/wxsocket/server.b32
+samples/wxsocket/client.bcc
+samples/wxsocket/server.bcc
 samples/wxsocket/*.xbm
 samples/wxsocket/*.xpm
 samples/wxsocket/*.ico
@@ -335,6 +349,7 @@ samples/proplist/makefile*
 samples/proplist/*.xbm
 samples/proplist/*.xpm
 samples/proplist/*.ico
+samples/proplist/*.bmp
 samples/proplist/*.rc
 
 samples/layout/*.cpp
@@ -640,6 +655,18 @@ samples/thread/*.png
 samples/thread/*.ico
 samples/thread/*.txt
 
+samples/forty/*.cpp
+samples/forty/*.h
+samples/forty/makefile*
+samples/forty/*.rc
+samples/forty/*.def
+samples/forty/*.bmp
+samples/forty/*.xpm
+samples/forty/*.xbm
+samples/forty/*.png
+samples/forty/*.ico
+samples/forty/*.txt
+
 samples/dde/*.cpp
 samples/dde/*.h
 samples/dde/makefile*
@@ -647,6 +674,12 @@ samples/dde/client.vc
 samples/dde/server.vc
 samples/dde/client.wat
 samples/dde/server.wat
+samples/dde/client.b32
+samples/dde/server.b32
+samples/dde/client.bcc
+samples/dde/server.bcc
+samples/dde/client.dos
+samples/dde/server.dos
 samples/dde/*.rc
 samples/dde/*.def
 samples/dde/*.bmp
@@ -656,3 +689,39 @@ samples/dde/*.png
 samples/dde/*.ico
 samples/dde/*.txt
 
+samples/scroll/*.cpp
+samples/scroll/*.h
+samples/scroll/makefile*
+samples/scroll/*.rc
+samples/scroll/*.def
+samples/scroll/*.bmp
+samples/scroll/*.xpm
+samples/scroll/*.xbm
+samples/scroll/*.png
+samples/scroll/*.ico
+samples/scroll/*.txt
+
+samples/caret/*.cpp
+samples/caret/*.h
+samples/caret/makefile*
+samples/caret/*.rc
+samples/caret/*.def
+samples/caret/*.bmp
+samples/caret/*.xpm
+samples/caret/*.xbm
+samples/caret/*.png
+samples/caret/*.ico
+samples/caret/*.txt
+
+samples/drawing/*.cpp
+samples/drawing/*.h
+samples/drawing/makefile*
+samples/drawing/*.rc
+samples/drawing/*.def
+samples/drawing/*.bmp
+samples/drawing/*.xpm
+samples/drawing/*.xbm
+samples/drawing/*.png
+samples/drawing/*.ico
+samples/drawing/*.txt
+

distrib/msw/glcanvas.rsp

@@ -2,19 +2,22 @@ utils/glcanvas/docs/*.*
 utils/glcanvas/win/*.cpp
 utils/glcanvas/win/*.h
 utils/glcanvas/win/make*.*
-utils/glcanvas/src/*.cpp
-utils/glcanvas/src/*.h
-utils/glcanvas/src/make*.*
+utils/glcanvas/gtk/*.cpp
+utils/glcanvas/gtk/*.h
+utils/glcanvas/gtk/make*.*
+utils/glcanvas/gtk/Makefile
 utils/glcanvas/motif/*.cpp
 utils/glcanvas/motif/*.h
 utils/glcanvas/motif/make*.*
 utils/glcanvas/motif/*.txt
+utils/glcanvas/motif/Makefile
 utils/glcanvas/samples/cube/*.cpp
 utils/glcanvas/samples/cube/*.h
 utils/glcanvas/samples/cube/*.rc
 utils/glcanvas/samples/cube/*.ico
 utils/glcanvas/samples/cube/*.xbm
 utils/glcanvas/samples/cube/make*.*
+utils/glcanvas/samples/cube/Makefile
 
 utils/glcanvas/samples/isosurf/*.cpp
 utils/glcanvas/samples/isosurf/*.h
@@ -23,6 +26,7 @@ utils/glcanvas/samples/isosurf/*.ico
 utils/glcanvas/samples/isosurf/*.xbm
 utils/glcanvas/samples/isosurf/*.dat.gz
 utils/glcanvas/samples/isosurf/make*.*
+utils/glcanvas/samples/isosurf/Makefile
 
 utils/glcanvas/samples/penguin/*.cpp
 utils/glcanvas/samples/penguin/*.c
@@ -32,6 +36,7 @@ utils/glcanvas/samples/penguin/*.ico
 utils/glcanvas/samples/penguin/*.xbm
 utils/glcanvas/samples/penguin/*.xpm
 utils/glcanvas/samples/penguin/make*.*
+utils/glcanvas/samples/penguin/Makefile
 utils/glcanvas/samples/penguin/penguin.lwo
 
 

distrib/msw/gtk.rsp

@@ -7,16 +7,23 @@ config.guess
 config.sub
 wx-config.in
 mkinstalldirs
+wxGTK.spec
+
+distrib/gtk/copy_src
+distrib/gtk/README.txt
+distrib/gtk/Setup
 
 docs/gtk/*.html
 docs/gtk/*.txt
+docs/gtk/makewxgtk
 
 include/wx/gtk/*.h
 include/install-sh
+include/wx/install-sh
 
 src/Makefile
 src/Makefile.in
-src/*.inc
+src/gtk.inc
 src/make.env
 src/makelib.env
 src/makeprog.env

distrib/msw/makefile.rsp

@@ -0,0 +1,91 @@
+samples/bombs/Makefile.in
+samples/bombs/Makefile
+samples/checklst/Makefile.in
+samples/checklst/Makefile
+samples/config/Makefile.in
+samples/config/Makefile
+samples/controls/Makefile.in
+samples/controls/Makefile
+samples/db/Makefile.in
+samples/db/Makefile
+samples/dde/Makefile.in
+samples/dde/Makefile
+samples/dialogs/Makefile.in
+samples/dialogs/Makefile
+samples/dnd/Makefile.in
+samples/dnd/Makefile
+samples/docview/Makefile.in
+samples/docview/Makefile
+samples/docvwmdi/Makefile.in
+samples/docvwmdi/Makefile
+samples/dynamic/Makefile.in
+samples/dynamic/Makefile
+samples/forty/Makefile.in
+samples/forty/Makefile
+samples/fractal/Makefile.in
+samples/fractal/Makefile
+samples/grid/Makefile.in
+samples/grid/Makefile
+samples/help/Makefile.in
+samples/help/Makefile
+samples/image/Makefile.in
+samples/image/Makefile
+samples/internat/Makefile.in
+samples/internat/Makefile
+samples/layout/Makefile.in
+samples/layout/Makefile
+samples/listctrl/Makefile.in
+samples/listctrl/Makefile
+samples/mdi/Makefile.in
+samples/mdi/Makefile
+samples/memcheck/Makefile.in
+samples/memcheck/Makefile
+samples/minifram/Makefile.in
+samples/minifram/Makefile
+samples/minimal/Makefile.in
+samples/minimal/Makefile
+samples/notebook/Makefile.in
+samples/notebook/Makefile
+samples/png/Makefile.in
+samples/png/Makefile
+samples/printing/Makefile.in
+samples/printing/Makefile
+samples/proplist/Makefile.in
+samples/proplist/Makefile
+samples/resource/Makefile.in
+samples/resource/Makefile
+samples/sashtest/Makefile.in
+samples/sashtest/Makefile
+samples/splitter/Makefile.in
+samples/splitter/Makefile
+samples/tab/Makefile.in
+samples/tab/Makefile
+samples/thread/Makefile.in
+samples/thread/Makefile
+samples/toolbar/Makefile.in
+samples/toolbar/Makefile
+samples/treectrl/Makefile.in
+samples/treectrl/Makefile
+samples/typetest/Makefile.in
+samples/typetest/Makefile
+samples/validate/Makefile.in
+samples/validate/Makefile
+samples/wxpoem/Makefile.in
+samples/wxpoem/Makefile
+samples/wxsocket/Makefile.in
+samples/wxsocket/Makefile
+samples/scroll/Makefile.in
+samples/scroll/Makefile
+samples/caret/Makefile.in
+samples/caret/Makefile
+samples/drawing/Makefile.in
+samples/drawing/Makefile
+src/Makefile.in
+src/Makefile
+utils/ogl/samples/ogledit/Makefile.in
+utils/ogl/samples/ogledit/Makefile
+utils/ogl/samples/studio/Makefile.in
+utils/ogl/samples/studio/Makefile
+utils/ogl/src/Makefile.in
+utils/ogl/src/Makefile
+

distrib/msw/motif.rsp

@@ -16,7 +16,7 @@ src/makelib.env
 
 src/Makefile
 src/Makefile.in
-src/*.inc
+src/motif.inc
 
 src/motif/*.cpp
 src/motif/*.c
@@ -44,9 +44,10 @@ src/iodbc/postgres/*.h
 
 include/wx/motif/*.h
 include/install-sh
+include/wx/install-sh
 
 docs/motif/*.txt
-docs/motif/makewx
+docs/motif/makewxmotif
 
 lib/dummy
 

distrib/msw/msw.rsp

@@ -9,21 +9,31 @@ tools/gettext/msgfmt.exe
 tools/gettext/msgunfmt.exe
 
 src/makeb32.env
+src/makeprog.b32
+src/makelib.b32
 src/makebcc.env
+src/makeprog.bcc
+src/makelib.bcc
 src/makemsc.env
 src/makeprog.msc
+src/makelib.msc
 src/makewat.env
 src/makeprog.wat
+src/makelib.wat
 src/makesc.env
 src/makevc.env
+src/makeprog.vc
+src/makelib.vc
 src/makeg95.env
+src/makeprog.g95
+src/makelib.g95
 src/makesl.env
 src/makeprog.sl
+src/makelib.sl
 src/salford.lnk
 src/maketwin.env
 src/makeprog.twn
-src/makeprog.vc
-src/makelib.vc
+src/makelib.twn
 src/makefile.bcc
 src/makefile.dos
 src/makefile.vc

distrib/msw/ogl.rsp

@@ -1,10 +1,13 @@
+utils/ogl/Makefile
+
 utils/ogl/src/*.cpp
 utils/ogl/src/*.h
 utils/ogl/src/*.rc
 utils/ogl/src/*.def
 utils/ogl/src/*.xbm
 utils/ogl/src/*.xpm
-utils/ogl/src/makefile*
+utils/ogl/src/make*.*
+utils/ogl/src/Makefile
 utils/ogl/src/*.txt
 utils/ogl/src/*.ico
 utils/ogl/src/*.bmp
@@ -14,7 +17,8 @@ utils/ogl/samples/ogledit/*.h
 utils/ogl/samples/ogledit/*.rc
 utils/ogl/samples/ogledit/*.def
 utils/ogl/samples/ogledit/*.xbm
-utils/ogl/samples/ogledit/makefile*
+utils/ogl/samples/ogledit/make*.*
+utils/ogl/samples/ogledit/Makefile
 utils/ogl/samples/ogledit/*.txt
 utils/ogl/samples/ogledit/*.ico
 utils/ogl/samples/ogledit/*.bmp
@@ -24,6 +28,31 @@ utils/ogl/samples/ogledit/bitmaps/*.gif
 utils/ogl/samples/ogledit/bitmaps/*.xbm
 utils/ogl/samples/ogledit/bitmaps/*.xpm
 
+utils/ogl/samples/studio/*.cpp
+utils/ogl/samples/studio/*.h
+utils/ogl/samples/studio/*.rc
+utils/ogl/samples/studio/*.def
+utils/ogl/samples/studio/*.xbm
+utils/ogl/samples/studio/make*.*
+utils/ogl/samples/studio/Makefile
+utils/ogl/samples/studio/*.txt
+utils/ogl/samples/studio/*.ico
+utils/ogl/samples/studio/*.bmp
+utils/ogl/samples/studio/*.xpm
+utils/ogl/samples/studio/*.wxr
+utils/ogl/samples/studio/bitmaps/*.bmp
+utils/ogl/samples/studio/bitmaps/*.gif
+utils/ogl/samples/studio/bitmaps/*.xbm
+utils/ogl/samples/studio/bitmaps/*.xpm
+utils/ogl/samples/studio/manual/*.tex
+utils/ogl/samples/studio/manual/*.ini
+utils/ogl/samples/studio/manual/*.gif
+utils/ogl/samples/studio/manual/*.bmp
+utils/ogl/samples/studio/manual/*.htm
+utils/ogl/samples/studio/manual/*.hlp
+utils/ogl/samples/studio/manual/*.cnt
+utils/ogl/samples/studio/manual/Makefile
+
 utils/ogl/distrib/*.rsp
 utils/ogl/distrib/*.bat
 

distrib/msw/tardist

@@ -0,0 +1,108 @@
+#!/bin/sh
+# tardist: make up a tar.gz distribution of wxWindows 2
+# Supply a source (e.g. ~/wx2) and destination (e.g. ~/wx2/deliver)
+
+init=""
+if [ $1 = "" ]
+then
+  exit
+fi
+
+if [ $2 = "" ]
+then
+  exit
+fi
+
+echo About to archive wxWindows:
+echo   From   $1
+echo   To     $2
+echo CTRL-C if this is not correct.
+read dummy
+
+cd $1
+
+echo Removing backup files...
+rm *~ */*~ */*/*~ */*/*/*~ */*/*/*/*~
+
+rm -f $2/wx200*.tgz
+rm -f $2/tex2rtf2.tgz
+rm -f $2/ogl3.tgz
+rm -f $2/treedraw.tar.gz
+rm -f $2/glcanvas.tar.gz
+rm -f $2/jpeg.tgz
+
+echo Tarring...
+
+### Generic
+ls `cat $1/distrib/msw/generic.rsp $1/distrib/msw/makefile.rsp` > /tmp/wxgen.txt
+tar cvf $2/wx200gen.tar -T /tmp/wxgen.txt
+gzip $2/wx200gen.tar
+mv $2/wx200gen.tar.gz $2/wx200gen.tgz
+
+### wxGTK
+ls `cat $1/distrib/msw/generic.rsp $1/distrib/msw/gtk.rsp $1/distrib/msw/makefile.rsp` > /tmp/wxgtk.txt
+tar cvf $2/wx200gtk.tar -T /tmp/wxgtk.txt
+gzip $2/wx200gtk.tar
+mv $2/wx200gtk.tar.gz $2/wx200gtk.tgz
+
+### wxMotif
+ls `cat $1/distrib/msw/generic.rsp $1/distrib/msw/motif.rsp $1/distrib/msw/makefile.rsp` > /tmp/wxmotif.txt
+tar cvf $2/wx200mot.tar -T /tmp/wxmotif.txt
+gzip $2/wx200mot.tar
+mv $2/wx200mot.tar.gz $2/wx200mot.tgz
+
+### Doc sources
+ls `cat $1/distrib/msw/docsrc.rsp` > /tmp/docsrc.txt
+tar cvf $2/wx200doc.tar -T /tmp/docsrc.txt
+gzip $2/wx200doc.tar
+mv $2/wx200doc.tar.gz $2/wx200doc.tgz
+
+### HTML docs
+ls `cat $1/distrib/msw/wx_html.rsp` > /tmp/html.txt
+tar cvf $2/wx200htm.tar -T /tmp/html.txt
+gzip $2/wx200htm.tar
+mv $2/wx200htm.tar.gz $2/wx200htm.tgz
+
+### PDF docs
+ls `cat $1/distrib/msw/wx_pdf.rsp` > /tmp/pdf.txt
+tar cvf $2/wx200pdf.tar -T /tmp/pdf.txt
+gzip $2/wx200pdf.tar
+mv $2/wx200pdf.tar.gz $2/wx200pdf.tgz
+
+### Stubs files
+ls `cat $1/distrib/msw/stubs.rsp` > /tmp/stubs.txt
+tar cvf $2/wx200stubs.tar -T /tmp/stubs.txt
+gzip $2/wx200stubs.tar
+mv $2/wx200stubs.tar.gz $2/wx200stubs.tgz
+
+### Tex2RTF
+ls `cat $1/distrib/msw/tex2rtf.rsp` > /tmp/tex2rtf.txt
+tar cvf $2/tex2rtf2.tar -T /tmp/tex2rtf.txt
+gzip $2/tex2rtf2.tar
+mv $2/tex2rtf2.tar.gz $2/tex2rtf2.tgz
+
+### OGL
+ls `cat $1/distrib/msw/ogl.rsp` > /tmp/ogl.txt
+tar cvf $2/ogl3.tar -T /tmp/ogl.txt
+gzip $2/ogl3.tar
+mv $2/ogl3.tar.gz $2/ogl3.tgz
+
+### wxGLCanvas
+ls `cat $1/distrib/msw/glcanvas.rsp` > /tmp/glcanvas.txt
+tar cvf $2/glcanvas.tar -T /tmp/glcanvas.txt
+gzip $2/glcanvas.tar
+mv $2/glcanvas.tar.gz $2/glcanvas.tgz
+
+### wxTreeLayout
+ls `cat $1/distrib/msw/wxtree.rsp` > /tmp/wxtree.txt
+tar cvf $2/treedraw.tar -T /tmp/wxtree.txt
+gzip $2/treedraw.tar
+mv $2/treedraw.tar.gz $2/treedraw.tgz
+
+### JPEG
+ls `cat $1/distrib/msw/jpeg.rsp` > /tmp/jpeg.txt
+tar cvf $2/jpeg.tar -T /tmp/jpeg.txt
+gzip $2/jpeg.tar
+mv $2/jpeg.tar.gz $2/jpeg.tgz
+
+echo Done!

distrib/msw/tex2rtf.rsp

@@ -1,6 +1,7 @@
 utils/tex2rtf/src/*.cpp
 utils/tex2rtf/src/*.h
 utils/tex2rtf/src/make*.*
+utils/tex2rtf/src/Makefile
 utils/tex2rtf/src/*.xbm
 utils/tex2rtf/src/*.xpm
 utils/tex2rtf/src/*.sty

distrib/msw/user.rsp

@@ -0,0 +1,27 @@
+user/Makefile
+
+user/wxConvert/*.cpp
+user/wxConvert/*.h
+user/wxConvert/Makefile
+user/wxConvert/Makefile.in
+
+user/wxFile/*.cpp
+user/wxFile/*.h
+user/wxFile/Makefile
+user/wxFile/Makefile.in
+user/wxFile/*.xpm
+
+user/wxTest/*.cpp
+user/wxTest/*.h
+user/wxTest/Makefile
+user/wxTest/Makefile.in
+user/wxTest/*.xpm
+user/wxTest/*.png
+
+user/wxLayout/*.cpp
+user/wxLayout/*.h
+user/wxLayout/Makefile
+user/wxLayout/Makefile.in
+user/wxLayout/*.xpm
+user/wxLayout/*.png
+

distrib/msw/vc.rsp

@@ -1,5 +1,9 @@
-src/wxVC.dsp
-src/wxVC.dsw
+src/wxvc.dsp
+src/wxvc.dsw
+src/wxvc6.dsp
+src/wxvc6.dsw
+src/wxvc_dll.dsp
+src/wxvc_dll.dsw
 
 samples/checklst/ChecklstVC.dsp
 samples/checklst/ChecklstVC.dsw
@@ -145,6 +149,8 @@ utils/ogl/src/OglVC.dsp
 utils/ogl/src/OglVC.dsw
 utils/ogl/samples/ogledit/OgleditVC.dsp
 utils/ogl/samples/ogledit/OgleditVC.dsw
+utils/ogl/samples/studio/StudioVC.dsp
+utils/ogl/samples/studio/StudioVC.dsw
 
 utils/wxtree/src/TreeVC.dsp
 utils/wxtree/src/TreeVC.dsw

distrib/msw/wxtree.rsp

@@ -0,0 +1,10 @@
+utils/wxtree/src/*.cpp
+utils/wxtree/src/*.h
+utils/wxtree/src/makefile*
+utils/wxtree/src/*.xbm
+utils/wxtree/src/*.xpm
+utils/wxtree/lib/dummy
+utils/wxtree/src/*.ico
+utils/wxtree/src/*.def
+utils/wxtree/src/*.rc
+

distrib/msw/zipdist.bat

@@ -1,6 +1,6 @@
 @echo off
 rem Zip up an external, generic + Windows distribution of wxWindows 2.0
-set src=d:\wx2\wxWindows
+set src=%wxwin
 set dest=%src\deliver
 if "%src" == "" goto usage
 if "%dest" == "" goto usage
@@ -14,6 +14,7 @@ erase %dest\wx200*.zip
 erase %dest\glcanvas.zip
 erase %dest\ogl3.zip
 erase %dest\tex2rtf2.zip
+erase %dest\jpeg.zip
 
 cd %src
 echo Zipping...
@@ -34,6 +35,9 @@ zip32 -@ %dest\wx200wrd.zip < %src\distrib\msw\wx_word.rsp
 rem VC++ project files
 zip32 -@ %dest\wx200vc.zip < %src\distrib\msw\vc.rsp
 
+rem BC++ project files
+zip32 -@ %dest\wx200bc.zip < %src\distrib\msw\bc.rsp
+
 rem CodeWarrior project files
 zip32 -@ %dest\wx200cw.zip < %src\distrib\msw\cw.rsp
 
@@ -49,11 +53,16 @@ zip32 -@ %dest\tex2rtf2.zip < %src\distrib\msw\tex2rtf.rsp
 rem wxTreeLayout
 zip32 -@ %dest\treedraw.zip < %src\distrib\msw\wxtree.rsp
 
+rem JPEG source
+zip32 -@ %dest\jpeg.zip < %src\distrib\msw\jpeg.rsp
+
 copy %src\docs\changes.txt %dest
 copy %src\docs\msw\install.txt %dest\install_msw.txt
 copy %src\docs\motif\install.txt %dest\install_motif.txt
 copy %src\docs\gtk\install.txt %dest\install_gtk.txt
 copy %src\docs\readme.txt %dest
+copy %src\docs\motif\makewxmotif %dest
+copy %src\docs\gtk\makewxgtk %dest
 
 cd %dest
 

docs/bugs.txt

@@ -4,9 +4,16 @@ wxWindows Buglist
 wxGTK:
 ------
 
+- It is impossible to reposition a window before showing it
+  on screen. Suspected GTK bug.
+  
+- DnD does only moderately work.
+
 wxMSW:
 ------
 
+- TODO
+
 wxMotif:
 --------
 
@@ -25,8 +32,23 @@ wxMotif:
 
 - wxRadioBox sometimes doesn't show (e.g. in controls sample).
 
-- wxStaticText doesn't wrap.
+- Can't set the colours for the buttons in the file selector, for
+  some reason.
+
+- On SGI IRIX 6.4, XtDestroyWidget in ~wxWindow causes a crash in
+  some cicumstances. This is being looked into. Meanwhile, a
+  possible workaround is to remove the final XtDestroyWidget line in ~wxWindow
+  (window.cpp). This will mean that child windows will only get
+  destroyed when frames and dialogs are destroyed, so dynamic subwindow
+  deletion may not work properly.
+
+- There are reports that scrolling can cause crashes under Lesstif.
+  This is probably a Lesstif bug.
 
 General:
 --------
 
+- Dialog Editor could be more user-friendly. Controls are hard to
+  size and position accurately. No way of changing tab order
+  except by editing .wxr file.
+

docs/changes.txt

@@ -1,11 +1,131 @@
-wxWindows 2.0 Change Log
-------------------------
+wxWindows 2 Change Log
+----------------------
 
-Beta 3, January 1999
---------------------
+2.1.0, b4, May 9th 1999
+-----------------------
 
 wxGTK:
 
+- JPEG support added.
+- Many fixes and changes not thought worth mentioning in this file :-)
+
+wxMSW:
+
+- wxNotebook changes: can add image only; wxNB_FIXEDWIDTH added;
+  SetTabSize added.
+- JPEG support added.
+- Fixes for Cygwin compilation.
+- Added wxGA_SMOOTH and wxFRAME_FLOAT_ON_PARENT styles.
+- Many fixes people didn't tell this file about.
+
+wxMotif:
+
+
+General:
+
+- Some changes for Unicode support, including wxchar.h/cpp.
+
+
+2.0.1 (release), March 1st 1999
+-------------------------------
+
+wxGTK:
+
+- wxGLCanvas fixes.
+- Slider/spinbutton fixes.
+
+wxMSW:
+
+- Fixed problems with <return> in dialogs/panels.
+- Fixed window cursor setting.
+- Fixed toolbar sizing and edge-clipping problems.
+- Some makefile fixes.
+
+wxMotif:
+
+- None.
+
+General:
+
+- Added wxUSE_SOCKETS.
+- More topic overviews.
+- Put wxPrintPaperType, wxPrintPaperDatabase into
+  prntbase.h/cpp for use in non-PostScript situations
+  (e.g. Win16 wxPageSetupDialog).
+
+
+Beta 5, February 18th 1999
+--------------------------
+
+wxGTK:
+
+- wxExecute improved.
+
+wxMSW:
+
+- Fixed wxWindow::IsShown (::IsWindowVisible doesn't behave as
+  expected).
+- Changed VC++ makefiles (.vc) so that it's possible to have
+  debug/release/DLL versions of the library available simultaneously,
+  with names wx.lib, wx_d.lib, wx200.lib(dll), wx200_d.lib(dll).
+- Added BC++ 5 IDE files and instructions.
+- Fixed wxChoice, wxComboBox constructor bugs (m_noStrings initialisation).
+- Fixed focus-related crash.
+
+wxMotif:
+
+- Cured asynchronous wxExecute crash.
+- Added repaint event handlers to wxFrame, wxMDIChildFrame.
+
+General:
+
+- wxLocale documented.
+- Added include filenames to class reference.
+- wxHelpController API changed: SetBrowser becomes SetViewer,
+  DisplaySection works for WinHelp, help sample compiles under Windows
+  (though doesn't display help yet).
+
+Beta 4, February 12th 1999
+--------------------------
+
+wxGTK:
+
+- Miscellaneous fixes.
+
+wxMSW:
+
+- Makefiles for more compilers and samples; Cygwin makefiles
+  rationalised.
+- Added VC++ project file for compiling wxWindows as DLL.
+
+wxMotif:
+
+- Added OnEraseBackground invocation.
+- Added wxRETAINED implementation for wxScrolledWindow.
+- Cured scrolling display problem by adding XmUpdateDisplay.
+- Tried to make lex-ing in the makefile more generic (command line
+  syntax should apply to both lex and flex).
+- Changed file selector colours for consistency (except for buttons:
+  crashes for some reason).
+- Fixed wxMotif version of wxImage::ConvertToBitmap (used new instead
+  of malloc, which causes memory problems).
+
+General:
+
+- Further doc improvements.
+- wxGenericValidator added.
+- Added wxImageModule to image.cpp, so adds/cleans up standard handlers
+  automatically.
+
+Beta 3, January 31st 1999
+-------------------------
+
+wxGTK:
+
+- wxClipboard/DnD API changes (still in progress).
+- wxToolTip class added.
+- Miscellaneous fixes.
+
 wxMSW:
 
 - wxRegConfig DeleteAll bug fixed.
@@ -13,6 +133,7 @@ wxMSW:
 - TWIN32 support added.
 - Renamed VC++ makefiles from .nt to .vc, and
   factored out program/library settings.
+- Fixed wxIniConfig bug.
 
 wxMotif:
 

docs/gtk/install.txt

@@ -6,17 +6,27 @@ like to read install instructions just do (in the base dir):
 
 ./configure
 make
+su <type root password>
 make install
+ldconfig
+exit
+
 
 * The most simple errors
 ------------------------
 
-configure reports, that you don't have GTK 1.0.X installed
+configure reports, that you don't have GTK 1.X installed
 although you are certainly sure you have. Well, you have
 installed it, but you also have another version of the
 GTK installed, which you may need to removed including
 other versions of glib (and its headers).
 
+You get errors during compilation. The reason is that you
+probably have a broken compiler, which includes almost
+everything that is called gcc. If there is just any way
+for you to use egcs, use egcs. We are sorry, but we cannot
+fix gcc.
+
 * The most simple program
 -------------------------
 
@@ -47,18 +57,16 @@ this has no effect, but I tried...
 -----------------------
 
 wxWindows/GTK requires the GTK+ library to be installed on your system.
-It has to be a stable version, preferebly version 1.0.6. When using
-a version previous to 1.0.6 you'll get crashes here and there.
-
-wxWindows/GTK does NOT work with the 1.1.X versions of the GTK+ library
-and we will wait until the 1.2 version comes out and has stabilized
-until we'll work with that library.
+It has to be a stable version, preferebly version 1.2.3. You can use
+GTK 1.0.X in connection with wxWindows, but we don't support Drag'n'Drop
+for GTK 1.0.X so you have to "configure --without-dnd". wxWindows does 
+NOT work with the 1.1.X versions of the GTK+ library.
 
 You can get the newest version of the GTK+ from the GTK homepage
 at
   http://www.gtk.org
   
-We also mirror GTK+ 1.0.6 at my ftp site. You'll find information
+We also mirror GTK+ 1.2.1 at my ftp site soon. You'll find information
 about downloading at my homepage.
   
 * Additional libraries
@@ -77,21 +85,19 @@ distributions have correct glibc 2 support:
  - DLD 6.0
  - SuSE 6.0
  
-On IRIX you can also use SGI threads if Posix-Threads
-are not present. The SGI threads will be detected by
-configure automatically.
-
 You can enable thread support by running 
 
 ./configure "--with-threads"
 make clean
 make
+su <type root password>
 make install
+ldconfig
+exit
   
-NB: I included thread support in wxWindows/Gtk, as this 
-problem will disappear in the near future when all major 
-Linux Variants have moved to glibc 2. Also, the Linux
-Base Standard will include glibc 2 and Posix threads.
+NB: DO NOT COMPILE WXGTK WITH GCC AND THREADS, SINCE
+ALL PROGRAMS WILL CRASH UPON START-UP! Just always
+use egcs and be happy.
 
 * Create your configuration
 -----------------------------
@@ -154,11 +160,17 @@ toolkit. You must do this by running configure with either of:
 
 The following options handle the kind of library you want to build.
 
-	--with-threads          Compile without thread support.
+	--with-threads          Compile with thread support. Threads
+	                        support is also required for the
+				socket code to work.
 
 	--without-shared        Do not create shared libraries.
 
-	--without-optimise	Do not optimise the code.
+	--without-optimise	Do not optimise the code. Can
+	                        sometimes be useful for debugging
+				and is required on some architectures
+				such as Sun with gcc 2.8.X which
+				would otherwise produce segvs.
 
 	--with-profile          Add profiling info to the object 
 				files. Currently broken, I think.
@@ -169,19 +181,51 @@ The following options handle the kind of library you want to build.
 	                        Read more at www.letters.com/dmalloc/
 				
 	--with-debug_info	Add debug info to object files and
-	                        executables.
+	                        executables for use with debuggers
+				such as gdb (or its many frontends).
 
 	--with-debug_flag	Define __DEBUG__ and __WXDEBUG__ when
-	                        compiling.
+	                        compiling. This enable wxWindows' very
+				useful internal debugging tricks (such
+				as automatically reporting illegal calls)
+				to work. Note that program and library
+				must be compiled with the same debug 
+				options.
 
 * Feature Options
 -------------------
 
-As I don't yet care for binary size and target mainly at
-producing a shared library, wxWindows's configure system auto-
-matically enables all features, as long as they are already
-implemented. It is currently NOT possible to disable these
-options (in contrast to what configure tells you).
+When producing an executable that is linked statically with wxGTK
+you'll be surprised at its immense size. This can sometimes be
+drastically reduced by removing features from wxWindows that 
+are not used in your program. The most relevant such features
+are
+
+	--without-libpng	Disables PNG image format code.
+	
+	--without-libjpeg	Disables JPEG image format code.
+	
+	--without-odbc          Disables ODBC code.
+	
+        --without-wxresources   Disables the use of *.wxr type
+	                        resources.
+		
+	--without-threads       Disables threads. Will also
+	                        disable sockets.
+
+	--without-sockets       Disables sockets.
+
+	--without-dnd           Disables Drag'n'Drop.
+	
+	--without-clipboard     Disables Clipboard.
+	
+	--without-serial        Disables object instance serialiasation.
+	
+	--without-streams       Disables the wxStream classes.
+	
+Apart from disabling certain features you can very often "strip"
+the program of its debugging information resulting in a significant
+reduction in size.
 
 * Compiling
 -------------
@@ -196,13 +240,12 @@ the library by typing:
 
 make yourself some coffee, as it will take some time. On an old
 386SX possibly week. During compilation, you'll get a few 
-warning messages.
+warning messages depending in your compiler.
 
 if you want to be more selective:
 
-	make src	will build only the base libraries
+	make    	will build only the base libraries
 	make samples	will build the samples
-	make other	will build everything in other
 	make user	will build everything in user
 
 Then you may install the library and it's header files under
@@ -226,12 +269,12 @@ The "global" binaries and libraries will be placed in:
 This is also the place where all the object-files will go.
 (Currently there arent any global binaries).
 
-If you want to conserve disk space by removing unnecessary
+If you want to save disk space by removing unnecessary
 object-files:
 
-	 make clean_obj
+	 make clean
 
-will do the work for you.
+in the various directories will do the work for you.
 
 * Creating a new Project
 --------------------------

docs/gtk/makewxgtk

@@ -0,0 +1,11 @@
+# makewxgtk
+# Sets permissions (in case we extracted wxGTK from zip files)
+# and makes wxGTK.
+# Call from top-level wxWindows directory.
+# Note that this uses standard (but commonly-used) configure options;
+# if you're feeling brave, you may wish to compile with threads.
+# -- Julian Smart
+chmod a+x configure config.sub config.guess setup/general/* setup/shared/*
+./configure --with-shared --with-gtk --with-debug_flag --with-debug_info --without-threads
+make makefiles
+make

docs/gtk/readme.txt

@@ -1,8 +1,11 @@
 
-  Welcome to wxWindows/Gtk 2.01 (beta 3),
+  Welcome to wxWindows/Gtk 2.1 snapshot 5,
 
-you have downloaded version 2.01 of the GTK+ 1.0 port of 
-the wxWindows GUI library.
+you have downloaded version 2.1 of the GTK+ 1.2 port of 
+the wxWindows GUI library. This is a developers release
+and is it not suited for production development. Beware
+that major changes can happen before a final release -
+Particularly the makefile system will change entirly.
  
 More information is available from my homepage at:
 
@@ -16,11 +19,14 @@ at Julian Smart's homepage at:
   
 Information on how to install can be found in the file 
 INSTALL.txt, but if you cannot wait, this should work on
-all systems
+many systems (when using GTK 1.0 read the INSTALL.txt):
 
 ./configure
 make
+su <type root password>
 make install
+ldconfig
+exit
 
 Type the following to make the samples
 
@@ -42,9 +48,9 @@ DISTRIBUTION YOU USE AND WHAT ERROR WAS REPORTED. I know
 this has no effect, but I tried...
 
 The library produced by the install process will be called 
-libwx_gtk2.a (static) and libwx_gtk2.so.0.1 (shared) so that 
+libwx_gtk2.a (static) and libwx_gtk2.so.1.0 (shared) so that 
 once a binary incompatible version of wxWindows/Gtk comes out 
-we'll augment library version number to avoid linking problems.
+we'll augment the library version number to avoid linking problems.
 
 Please send problems concerning installation, feature requests, 
 bug reports or comments to the wxWindows users Information on 
@@ -52,7 +58,7 @@ how to subscribe is available from my homepage.
 
 wxWindows/Gtk doesn't come with any guarantee whatsoever. It might 
 crash your harddisk or destroy your monitor. It doesn't claim to be
-suitable for any special purpose.
+suitable for any special or general purpose.
 
   Regards,
 

docs/html/faqmot.htm

@@ -27,7 +27,7 @@ See also <a href="faq.htm">top-level FAQ page</a>.
 
 You will need version 1.2 or above. Version 2 should also be fine. Some people
 have had a positive experience with <a href="www.lesstif.org" target=_top>Lesstif</a>,
-a free Motif clone. (Note from Julian Smart - I use the Linux version of MetroLink Motif).
+a free Motif clone. (Note from Julian Smart - I use the Linux version of MetroLink Motif 1.2.4).
 
 <P>
 
@@ -39,22 +39,16 @@ wxGLCanvas.<P>
 The following classes are not likely to be implemented because there is no sensible
 equivalent on Motif: wxMiniFrame, wxTaskBar.<P>
 
-wxNotebook works for smaller dialogs (see notebook sample) but has some problems
-with a more complex situation (see the controls sample: initial resizing is very apparent).
-<P>
-
 These features are not yet implemented:<P>
 
 <ul>
-<li>Clipboard and drag and drop support are currently under development. Motif clipboard support
-should work, but currently for text only.
+<li>Clipboard and drag and drop support are currently under development.
 <li>Support for selection of specific visuals.
 <li>Wide character support (but when Unicode is supported under Windows, this support will
 be relatively easy to add).
 <li>Configurable colour/font settings (they are currently hard-wired in wxSystemSettings).
-<li>OnEraseBackground.
-<li>OnPaint optimization and backing pixmap.
-<li>A help system (please use wxHelpController and Netscape instead).
+<li>A help system (please use wxHelpController and Netscape instead). An HTML widget and help
+system is in preparation.
 </ul>
 
 <p>

docs/html/faqmsw.htm

@@ -25,13 +25,13 @@ See also <a href="faq.htm">top-level FAQ page</a>.
 
 <h3>Which Windows platforms are supported?</h3>
 
-wxWindows can be used to develop and deliver applications on Windows 3.1, Win32s,
+wxWindows 2 can be used to develop and deliver applications on Windows 3.1, Win32s,
 Windows 95, Windows 98, and Windows NT. A Windows CE version is being looked into (see below).<P>
 
 wxWindows 2 is designed to make use of WIN32 features and controls. However, unlike Microsoft,
 we have not forgotten users of 16-bit Windows. Most features
 work under Windows 3.1, including wxTreeCtrl and wxListCtrl using the generic implementation.
-However, don't expect very Windows-specific classes to work, such as wxTaskBarIcon. The wxRegConfig
+However, don't expect very Windows-95-specific classes to work, such as wxTaskBarIcon. The wxRegConfig
 class doesn't work either because the Windows 3.1 registry is very simplistic. Check out the 16-bit
 makefiles to see what other files have been left out.
 <P>
@@ -101,13 +101,13 @@ Watcom C++ is a little slow and the debugger is not really up to today's standar
 
 <h3>Is Unicode supported?</h3>
 
-No, although there are other internationalisation features.<P>
+Not yet, although there are other internationalisation features.<P>
 
 However, the issues surrounding Unicode support have been looked into so we know
 what we need to do, and have some header files ready to use containing appropriate
 type definitions. Just about every file in wxWindows will need changes, due to the
 pervasive nature of characters and character arrays. Unicode support is needed
-for the port to Windows CE (see above).<P>
+for the port to Windows CE (see above), and will probably be added in time for version 2.1.<P>
 
 <h3>Can you compile wxWindows 2 as a DLL?</h3>
 
@@ -125,7 +125,8 @@ wxWindows!
 <H3>How can I reduce executable size?</H3>
 
 You can compile wxWindows as a DLL (see above, VC++/BC++ only at present). You should also
-compile your programs for release using non-debugging and space-optimisation options.<P>
+compile your programs for release using non-debugging and space-optimisation options, but
+take with VC++ 5/6 space optimisation: it can sometimes cause problems.<P>
 
 Statically-linked wxWindows 2 programs are smaller than wxWindows 1.xx programs, because of the way
 wxWindows 2 has been designed to reduce dependencies between classes, and other
@@ -139,13 +140,32 @@ by Ian Luck. This nifty utility compresses Windows executables by around 50%, so
 will shrink to a mere 250KB. With this sort of size, there is reduced incentive to
 use DLLs.<P>
 
-
-<H3>Will wxWindows be compatible with MFC?</H3>
+<H3>Is wxWindows compatible with MFC?</H3>
 
 There is a sample which demonstrates MFC and wxWindows code co-existing in the same
 application. However, don't expect to be able to enable wxWindows windows with OLE-2
 functionality using MFC.<P>
 
+<H3>Why do I sometimes get bizarre crash problems using VC++ 5/6?</H3>
+
+Some crash problems can be due to inconsistent compiler
+options (and of course this isn't limited to wxWindows).
+If strange/weird/impossible things start to happen please
+check (dumping IDE project file as makefile and doing text comparison
+if necessary) that the project settings, especially the list of defined
+symbols, struct packing, etc. are exactly the same for all items in
+the project. After this, delete everything (including PCH) and recompile.<P>
+
+VC++ 5's optimization code seems to be broken and can
+cause problems: this can be seen when deleting an object Dialog
+Editor, in Release mode with optimizations on. If in doubt,
+switch off optimisations, although this will result in much
+larger executables. It seems possible that the library can be created with
+strong optimization, so long as the application is not strongly
+optimized. For example, in wxWindows project, set to 'Minimum
+Size'. In Dialog Editor project, set to 'Customize: Favor Small
+Code' (and no others). This will then work.<P>
+
 
 </font>
 

docs/html/index.htm

@@ -5,7 +5,8 @@
 
 </HEAD>
 
-<BODY BGCOLOR="#FFFFFF" TEXT=#000000 LINK=#FF0000 VLINK=#000000>
+<!BODY BGCOLOR="#FFFFFF" TEXT=#000000 LINK=#FF0000 VLINK=#000000>
+<BODY BGCOLOR="#CCDDDFF" TEXT=#000000 LINK=#FF0000 VLINK=#000000>
 
 <font face="Arial, Lucida Sans, Helvetica">
 
@@ -24,9 +25,9 @@
 
 <P>
 
-Welcome to wxWindows 2, the premiere cross-platform GUI C++ framework. This is an index of
-the plain text and HTML documentation. Documentation is also available in Acrobat (PDF) and Windows Help,
-from the <a href="http://www.wxwindows.org">wxWindows Web site</a>.<P>
+Welcome to wxWindows 2, the premi&egrave;re cross-platform GUI C++ framework. This is an index of
+the plain text, HTML, Windows Help and Acrobat documentation: availability depends on what you've
+downloaded from the <a href="http://www.wxwindows.org">wxWindows Web site</a>.<P>
 
 <CENTER>
 <FONT size=-1>
@@ -37,9 +38,7 @@ from the <a href="http://www.wxwindows.org">wxWindows Web site</a>.<P>
 </FONT>
 </CENTER>
 
-<hr>
-
-<h3><a name="install">Installation and release notes</a></h3>
+<h3 align=center><a name="install"><hr>Installation and release notes<hr></a></h3>
 
 <ul>
 <li>ReadMe: <a href="../readme.txt"><b>General ReadMe</b></a>,
@@ -71,33 +70,118 @@ from the <a href="http://www.wxwindows.org">wxWindows Web site</a>.<P>
 <li>List of <a href="../symbols.txt">preprocessor symbols</a> used in wxWindows
 </ul>
 
-<hr>
+<h3 align=center><a name="manuals"><hr>wxWindows manuals<hr></a></h3>
+
+<table border=1 align=center>
+
+<tr>
+<td align=center bgcolor="#FFFF00">
+<B>HTML</B>
+</td>
+<td align=center bgcolor="#FFFF00">
+<B>WinHelp</B>
+</td>
+<td align=center bgcolor="#FFFF00">
+<B>PDF</B>
+</td>
+</tr>
+
+<tr>
+<td align=center>
+<a href="wx/wx.htm">Reference Manual</a>
+</td>
+
+<td align=center>
+<a href="../winhelp/wx.hlp">Reference Manual</a>
+</td>
+
+<td align=center>
+<a href="../pdf/wx.pdf">Reference Manual</a>
+</td>
+</tr>
+
+<tr>
+<td align=center>
+<a href="porting/port.htm">Porting Guide</a>
+</td>
+
+<td align=center>
+<a href="../winhelp/porting.hlp">Porting Guide</a>
+</td>
+
+<td align=center>
+<a href="../pdf/porting.pdf">Porting Guide</a>
+</td>
+</tr>
+
+<tr>
+<td align=center>
+<a href="dialoged/dlged.htm">Dialog Editor Manual</a>
+</td>
+
+<td align=center>
+<a href="../winhelp/dialoged.hlp">Dialog Editor Manual</a>
+</td>
+
+<td align=center>
+<a href="../pdf/dialoged.pdf">Dialog Editor Manual</a>
+</td>
+</tr>
+
+<tr>
+<td align=center>
+<a href="proplist/prop.htm">Property List Classes</a>
+</td>
+
+<td align=center>
+<a href="../winhelp/proplist.hlp">Propert List Classes</a>
+</td>
+
+<td align=center>
+<a href="../pdf/proplist.pdf">Property List Classes</a>
+</td>
+</tr>
+
+<tr>
+<td align=center>
+<a href="wxtree/tree.htm">wxTreeLayout Class</a>
+</td>
+
+<td align=center>
+<a href="../winhelp/wxtree.hlp">wxTreeLayout Class</a>
+</td>
+
+<td align=center>
+<a href="../pdf/wxtree.pdf">wxTreeLayout Class</a>
+</td>
+</tr>
+
+<tr>
+<td align=center>
+<a href="odbc/odbc.htm">Remstar ODBC Classes</a>
+</td>
+
+<td align=center>
+<BR><BR>
+</td>
+
+<td align=center>
+<a href="../pdf/odbc.pdf">Remstar ODBC Classes</a>
+</td>
+</tr>
+
+</table>
 
 
-<h3><a name="manuals">wxWindows manuals</a></h3>
+<h3 align=center><a name="thirdparty"><hr>Third-party tools<hr></a></h3>
 
 <ul>
-<li><a href="wx/wx.htm">Reference Manual</a>
-<li><a href="porting/port.htm">Porting Guide</a> (wxWindows 1.xx to 2)
-<li><a href="dialoged/dlged.htm">Dialog Editor</a>
-<li><a href="proplist/prop.htm">Property List Classes</a>
-<li><a href="wxtree/tree.htm">wxTreeLayout</a>
-<li><a href="odbc/odbc.htm">Remstar ODBC Classes</a>
+<li><a href="gettext/gettext.htm">gettext Manual</a>
+<li><a href="gettext/xgettext.htm">xgettext Manual</a>
+<li><a href="gettext/msgfmt.htm">msgfmt Manual</a>
 </ul>
 
-<hr>
-
-<h3><a name="thirdparty">Third-party tools</a></h3>
-
-<ul>
-<li><a href="gettext/gettext.htm">gettext manual</a>
-<li><a href="gettext/xgettext.htm">xgettext manual</a>
-<li><a href="gettext/msgfmt.htm">msgfmt manual</a>
-</ul>
-
-<hr>
-
-<h3><a name="samples">Samples</a></h3>
+<h3 align=center><a name="samples"><hr>Samples<hr></a></h3>
 
 <ul>
 <li><a href="../../samples/bombs">bombs</a>: minesweeper-like game.
@@ -137,6 +221,7 @@ scheme is used whereby child windows have full sizing and moving rights within t
 window. On other platforms, tabbed windows are used, where the children are always maximized.
 <li><a href="../../samples/memcheck">memcheck</a>: demonstrates the memory checking/debugging facilities.
 <li><a href="../../samples/mfc">mfc</a>: shows how to use MFC and wxWindows code in the same application (Windows only).
+To compile this, you must edit include/wx/wxprec.h, comment out the windows.h inclusion, and recompile wxWindows.
 <li><a href="../../samples/minifram">minifram</a>: demonstrates a frame with a small title bar. On
 platforms that don't support it, a normal-sized title bar is displayed.
 <li><a href="../../samples/minimal">minimal</a>: just shows a frame, a menubar, and a statusbar. About as

docs/latex/porting/porting.tex

@@ -14,7 +14,7 @@
 \parindent=0pt
 \title{Guide to porting applications from wxWindows 1.xx to 2.0}
 \author{Julian Smart}
-\date{October 1997}
+\date{March 1999}
 \makeindex
 \begin{document}
 \maketitle
@@ -40,13 +40,10 @@ how you can modify your application to be 2.0-compliant.
 You may be worrying that porting to 2.0 will be a lot of work,
 particularly if you have only recently started using 1.xx. In fact,
 the wxWindows 2.0 API has far more in common with 1.xx than it has differences.
-With backward compatibility mode on, much of the conversion can be
-done gradually. The main challenges are doing without the default
+The main challenges are using the new event system, doing without the default
 panel item layout, and the lack of automatic labels in some controls.
-However, if you already use resource files (.wxr), or application-specific positioning,
-or constraints, then even this will be quite painless.
 
-So please don't be freaked out by the jump to 2.0! For one thing, 1.xx is still available
+Please don't be freaked out by the jump to 2.0! For one thing, 1.xx is still available
 and will be supported by the user community for some time. And when you have
 changed to 2.0, we hope that you will appreciate the benefits in terms
 of greater flexibility, better user interface aesthetics, improved C++ conformance,
@@ -100,7 +97,7 @@ void MyFrame::OnOK(wxCommandEvent& event)
 
 You may find that writing the extra code to call a member function isn't worth it at this stage,
 but the option is there.
-\item {\bf Use wxString wherever possible.} 2.0 will replace char * with wxString
+\item {\bf Use wxString wherever possible.} 2.0 replaces char * with wxString
 in most cases, and if you use wxString to receive strings returned from
 wxWindows functions (except when you need to save the pointer if deallocation is required), there should
 be no conversion problems later on.
@@ -112,7 +109,7 @@ Windows and X under wxWindows 1.66. Yes, this is not easy... but I think it's be
 standards of each platform, and currently the size difference makes it difficult to
 conform to Windows UI standards. You may eventually wish to build in a global 'fudge-factor' to compensate
 for size differences. The old font sizing will still be available via wx\_setup.h, so do not panic...
-\item {\bf Consider dropping wxForm usage}: an alternative is to be found in utils/wxprop.
+\item {\bf Consider dropping wxForm usage}:
 wxPropertyFormView can be used in a wxForm-like way, except that you specify a pre-constructed panel
 or dialog; or you can use a wxPropertyListView to show attributes in a scrolling list - you don't even need
 to lay panel items out.
@@ -180,7 +177,8 @@ See \helpref{Device contexts and painting}{dc}.
 These objects - instances of classes such as wxPen, wxBrush, wxBitmap (but not wxColour) -
 are now implemented with reference-counting. This makes assignment a very cheap operation,
 and also means that management of the resource is largely automatic. You now pass {\it references} to
-objects to functions such as wxDC::SetPen. The device context does not store a copy of the pen
+objects to functions such as wxDC::SetPen, not pointers, so you will need to derefence your pointers.
+The device context does not store a copy of the pen
 itself, but takes a copy of it (via reference counting), and the object's data gets freed up
 when the reference count goes to zero. The application does not have to worry so much about
 who the object belongs to: it can pass the reference, then destroy the object without
@@ -191,11 +189,8 @@ pointers to GDI objects, and using the FindOrCreate... functions. However, it is
 keep this explicit management to a minimum, instead creating objects on the fly as needed, on the stack,
 unless this causes too much of an overhead in your application.
 
-At a minimum, you will have to make sure that calls to SetPen, SetBrush etc. work. Some compilers
-will do the conversion from pointer to reference automatically (via a constructor in the GDI
-class) but you cannot rely on this being true for all compilers. Also, where you pass NULL to these
-functions, you will need to either cast to the appropriate reference type, or instead
-use an identifier such as wxNullPen or wxNullBrush.
+At a minimum, you will have to make sure that calls to SetPen, SetBrush etc. work. Also, where you pass NULL to these
+functions, you will need to use an identifier such as wxNullPen or wxNullBrush.
 
 \chapter{Dialogs and controls}\label{dialogscontrols}
 
@@ -213,8 +208,7 @@ properties.
 
 All window constructors have two main changes, apart from the label issue mentioned above.
 Windows now have integer identifiers; and position and size are now passed as wxPoint and
-wxSize objects. In addition, some windows have a wxValidator argument. wxWindows 2.0 may provide
-old-style constructors in WXWIN\_COMPATIBILITY mode for limited backward compatibility.
+wxSize objects. In addition, some windows have a wxValidator argument.
 
 \wxheading{Show versus ShowModal}
 
@@ -253,7 +247,7 @@ wxGroupBox is renamed wxStaticBox.
 
 \wxheading{wxForm}
 
-Note that wxForm is no longer supported in wxWindows 2.0. Consider using the wxPropertyForm class
+Note that wxForm is no longer supported in wxWindows 2.0. Consider using the wxPropertyFormView class
 instead, which takes standard dialogs and panels and associates controls with property objects.
 You may also find that the new validation method, combined with dialog resources, is easier
 and more flexible than using wxForm.
@@ -327,7 +321,7 @@ Try to use the {\bf const} keyword in your own code where possible.
 \chapter{Backward compatibility}\label{compat}
 
 Some wxWindows 1.xx functionality has been left to ease the transition to 2.0. This functionality
-(usually) only works if you compile with WXWIN\_COMPATIBILITY set to 1.
+(usually) only works if you compile with WXWIN\_COMPATIBILITY set to 1 in setup.h.
 
 Mostly this defines old names to be the new names (e.g. wxRectangle is defined to be wxRect).
 
@@ -336,50 +330,169 @@ Mostly this defines old names to be the new names (e.g. wxRectangle is defined t
 This section allows you to quickly find features that
 need to be converted.
 
-TODO
+\section{Include files}
+
+Use the form:
+
+\begin{verbatim}
+#include <wx/wx.h>
+#include <wx/button.h>
+\end{verbatim}
+
+For precompiled header support, use this form:
+
+\begin{verbatim}
+// For compilers that support precompilation, includes "wx.h".
+#include <wx/wxprec.h>
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+// Any files you want to include if not precompiling by including
+// the whole of <wx/wx.h>
+#ifndef WX_PRECOMP
+    #include <stdio.h>
+    #include <wx/setup.h>
+    #include <wx/bitmap.h>
+    #include <wx/brush.h>
+#endif
+
+// Any files you want to include regardless of precompiled headers
+#include <wx/toolbar.h>
+\end{verbatim}
+
+\section{IPC classes}
+
+These are now separated out into wxDDEServer/Client/Connection (Windows only) and wxTCPServer/Client/Connection
+(Windows and Unix). Take care to use wxString for your overridden function arguments, instead of char*, as per
+the documentation.
+
+\section{MDI style frames}
+
+MDI is now implemented as a family of separate classes, so you can't switch to MDI just by
+using a different frame style. Please see the documentation for the MDI frame classes, and the MDI
+sample may be helpful too.
 
 \section{OnActivate}
 
-Rename to OldOnActivate, or replace arguments with one wxActivateEvent\& argument.
+Replace the arguments with one wxActivateEvent\& argument, make sure the function isn't virtual,
+and add an EVT\_ACTIVATE event table entry.
 
-\wxheading{See also}
+\section{OnChar}
 
-\helpref{Backward compatibility}{compat}
+This is now a non-virtual function, with the same wxKeyEvent\& argument as before.
+Add an EVT\_CHAR macro to the event table
+for your window, and the implementation of your function will need very few changes.
 
 \section{OnClose}
 
-This can either remain the same as before, or you can add an OnCloseWindow event
-handler using an EVT\_CLOSE event table entry.
+The old virtual function OnClose is now obsolete.
+Add an OnCloseWindow event handler using an EVT\_CLOSE event table entry. For details
+about window destruction, see the Windows Deletion Overview in the manual. This is a subtle
+topic so please read it very carefully. Basically, OnCloseWindow is now responsible for
+destroying a window with Destroy(), but the default implementation (for example for wxDialog) may not
+destroy the window, so to be sure, always provide this event handler so it's obvious what's going on.
 
-\wxheading{See also}
+\section{OnEvent}
 
-\helpref{Backward compatibility}{compat}
+This is now a non-virtual function, with the same wxMouseEvent\& argument as before. However
+you may wish to rename it OnMouseEvent. Add an EVT\_MOUSE\_EVENTS macro to the event table
+for your window, and the implementation of your function will need very few changes.
+However, if you wish to intercept different events using different functions, you can
+specify specific events in your event table, such as EVT\_LEFT\_DOWN.
+
+Your OnEvent function is likely to have references to GetDC(), so make sure you create
+a wxClientDC instead. See \helpref{Device contexts}{dc}.
+
+If you are using a wxScrolledWindow (formerly wxCanvas), you should call
+PrepareDC(dc) to set the correct translation for the current scroll position.
 
 \section{OnMenuCommand}
 
-Rename to OldOnMenuCommand, or replace with a series of functions, one for
-each case of your old switch statement. Create an event table for your frame
-containing EVT\_MENU macros, and insert DECLARE\_EVENT\_TABLE() in your frame class.
+You need to replace this virtual function with a series of non-virtual functions, one for
+each case of your old switch statement. Each function takes a wxCommandEvent\& argument.
+Create an event table for your frame
+containing EVT\_MENU macros, and insert DECLARE\_EVENT\_TABLE() in your frame class, as
+per the samples.
 
-\wxheading{See also}
+\section{OnPaint}
 
-\helpref{Backward compatibility}{compat}
+This is now a non-virtual function, with a wxPaintEvent\& argument.
+Add an EVT\_PAINT macro to the event table
+for your window.
+
+Your function {\it must} create a wxPaintDC object, instead of using GetDC to
+obtain the device context.
+
+If you are using a wxScrolledWindow (formerly wxCanvas), you should call
+PrepareDC(dc) to set the correct translation for the current scroll position.
 
 \section{OnSize}
 
-Rename to OldOnSize, or replace arguments with one wxSizeEvent\& argument.
+Replace the arguments with one wxSizeEvent\& argument, make it non-virtual, and add to your
+event table using EVT\_SIZE.
 
-\wxheading{See also}
+\section{wxApp definition}
 
-\helpref{Backward compatibility}{compat}
+The definition of OnInit has changed. Return a bool value, not a wxFrame.
+
+Also, do {\it not} declare a global application object. Instead, use the macros
+DECLARE\_APP and IMPLEMENT\_APP as per the samples. Remove any occurrences of IMPLEMENT\_WXWIN\_MAIN:
+this is subsumed in IMPLEMENT\_APP.
+
+\section{wxButton}
+
+For bitmap buttons, use wxBitmapButton.
+
+\section{wxCanvas}
+
+Change the name to wxScrolledWindow.
+
+\section{wxDialogBox}
+
+Change the name to wxDialog, and for modal dialogs, use ShowModal instead of Show.
 
 \section{wxDialog::Show}
 
-If you used {\bf Show} to show a modal dialog, or to override the standard
+If you used {\bf Show} to show a modal dialog or to override the standard
 modal dialog {\bf Show}, use {\bf ShowModal} instead.
 
 \wxheading{See also}
 
 \helpref{Dialogs and controls}{dialogscontrols}
 
+\section{wxForm}
+
+Sorry, this class is no longer available. Try using the wxPropertyListView or wxPropertyFormView class
+instead, or use .wxr files and validators.
+
+\section{wxPoint}
+
+The old wxPoint is called wxRealPoint, and wxPoint now uses integers.
+
+\section{wxRectangle}
+
+This is now called wxRect.
+
+\section{wxScrollBar}
+
+The function names have changed for this class: please refer to the documentation for wxScrollBar. Instead
+of setting properties individually, you will call SetScrollbar with several parameters.
+
+\section{wxText, wxMultiText, wxTextWindow}
+
+Change all these to wxTextCtrl. Add the window style wxTE\_MULTILINE if you
+wish to have a multi-line text control.
+
+\section{wxToolBar}
+
+This name is an alias for the most popular form of toolbar for your platform. There is now a family
+of toolbar classes, with for example wxToolBar95, wxToolBarMSW and wxToolBarSimple classes existing
+under Windows 95.
+
+Toolbar management is supported by frames, so calling wxFrame::CreateToolBar and adding tools is usually
+enough, and the SDI or MDI frame will manage the positioning for you. The client area of the frame is the space
+left over when the menu bar, toolbar and status bar have been taken into account.
+
 \end{document}

docs/latex/proplist/classes.tex

@@ -4,7 +4,6 @@
 
 \overview{Property classes overview}{propertyoverview}
 
-
 \section{\class{wxBoolFormValidator}: wxPropertyFormValidator}\label{wxboolformvalidator}
 
 \overview{Validator classes}{validatorclasses}

docs/latex/proplist/tex2rtf.ini

@@ -9,7 +9,7 @@ footerRule = yes
 useHeadingStyles = yes
 contentsDepth = 2
 listItemIndent=40
-generateHPJ = no
+generateHPJ = yes
 htmlBrowseButtons = bitmap
 winHelpVersion = 3
 winHelpContents = yes

docs/latex/wx/.cvsignore

@@ -0,0 +1,13 @@
+WX.GID
+WX.HLP
+wx.ref
+wx.cnt
+Wx.rtf
+Wx.con
+minimald.hpj
+minimald.ref
+minimald.con
+MINIMALD.HLP
+minimald.GID
+minimald.cnt
+minimald.rtf

docs/latex/wx/accel.tex

@@ -6,6 +6,10 @@ An object used by an application wishing to create an \helpref{accelerator table
 
 None
 
+\wxheading{Include files}
+
+<wx/accel.h>
+
 \wxheading{See also}
 
 \helpref{wxAcceleratorTable}{wxacceleratortable}, \helpref{wxWindow::SetAcceleratorTable}{wxwindowsetacceleratortable}
@@ -77,6 +81,10 @@ initial accelerator table for a window.
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/accel.h>
+
 \wxheading{Example}
 
 {\small%

docs/latex/wx/activevt.tex

@@ -8,6 +8,10 @@ or deactivated.
 \helpref{wxEvent}{wxevent}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/event.h>
+
 \wxheading{Event table macros}
 
 To process an activate event, use these event handler macros to direct input to a member

docs/latex/wx/app.tex

@@ -22,6 +22,10 @@ a reference to your application object) to be visible to other files.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/app.h>
+
 \wxheading{See also}
 
 \helpref{wxApp overview}{wxappoverview}
@@ -127,18 +131,17 @@ otherwise.
 
 \helpref{wxApp::SetExitOnDelete}{wxappsetexitondelete}
 
-\membersection{wxApp::GetPrintMode}\label{wxappgetprintmode}
-
-\constfunc{bool}{GetPrintMode}{\void}
-
-Returns the print mode: see \helpref{wxApp::SetPrintMode}{wxappsetprintmode}.
-
 \membersection{wxApp::GetTopWindow}\label{wxappgettopwindow}
 
 \constfunc{wxWindow *}{GetTopWindow}{\void}
 
 Returns a pointer to the top window.
 
+\wxheading{Remarks}
+
+If the top window hasn't been set using \helpref{wxApp::SetTopWindow}{wxappsettopwindow}, this
+function will find the first top-level window (frame or dialog) and return that.
+
 \wxheading{See also}
 
 \helpref{wxApp::SetTopWindow}{wxappsettopwindow}
@@ -267,7 +270,7 @@ Under Windows, OnEndSession is called in response to the WM\_ENDSESSION message.
 \func{bool}{OnInit}{\void}
 
 This must be provided by the application, and will usually create the
-application's main window, calling \helpref{wxApp::SetTopWindow}{wxappsettopwindow}.
+application's main window, optionally calling \helpref{wxApp::SetTopWindow}{wxappsettopwindow}.
 
 Return TRUE to continue processing, FALSE to exit the application.
 
@@ -419,31 +422,16 @@ deleted. If FALSE, the application will continue to run.}
 
 Currently, setting this to FALSE only has an effect under Windows.
 
-\membersection{wxApp::SetPrintMode}\label{wxappsetprintmode}
-
-\func{void}{SetPrintMode}{\param{int}{ mode}}
-
-Sets the print mode determining what printing facilities will be
-used by the printing framework.
-
-\wxheading{Parameters}
-
-\docparam{mode}{This can be one of:
-
-\begin{twocollist}\itemsep=0pt
-\twocolitem{{\bf wxPRINT\_WINDOWS}}{Under Windows, use Windows printing (wxPrinterDC). This is the
-default under Windows.}
-\twocolitem{{\bf wxPRINT\_POSTSCRIPT}}{Use PostScript printing (wxPostScriptDC). This is the
-default for non-Windows platforms.}
-\end{twocollist}
-}%
-
 \membersection{wxApp::SetTopWindow}\label{wxappsettopwindow}
 
 \func{void}{SetTopWindow}{\param{wxWindow* }{window}}
 
-Sets the `top' window. You should normally call this from within \helpref{wxApp::OnInit}{wxapponinit} to
-let wxWindows know which is the main window.
+Sets the `top' window. You can call this from within \helpref{wxApp::OnInit}{wxapponinit} to
+let wxWindows know which is the main window. You don't have to set the top window;
+it's only a convenience so that (for example) certain dialogs without parents can use a
+specific window as the top window. If no top window is specified by the application,
+wxWindows just uses the first frame or dialog in its top-level window list, when it
+needs to use the top window.
 
 \wxheading{Parameters}
 

docs/latex/wx/array.tex

@@ -39,7 +39,14 @@ deleted when the element is removed from the array. It should be noted that
 all of wxArray's functions are inline, so it costs strictly nothing to define as
 many array types as you want (either in terms of the executable size or the
 speed) as long as at least one of them is defined and this is always the case
-because wxArrays are used by wxWindows internally.
+because wxArrays are used by wxWindows internally. This class has one serious
+limitation: it can only be used for storing integral types (bool, char, short,
+int, long and their unsigned variants) or pointers (of any kind). An attempt
+to use with objects of sizeof() greater than sizeof(long) will provoke a
+runtime assertion failure, however declaring a wxArray of floats will not (on
+the machines where sizeof(float) <= sizeof(long)), yet it will {\bf not} work,
+please use wxObjArray for storing floats and doubles (NB: a more efficient
+wxArrayDouble class is scheduled for the next release of wxWindows).
 
 wxSortedArray is a wxArray variant which should be used when searching in the
 array is a frequently used operation. It requires you to define an additional
@@ -51,9 +58,8 @@ slower: it is $O(log(N))$ instead of constant time (neglecting time spent in
 memory allocation routine). However, in a usual situation elements are added to
 an array much less often than searched inside it, so wxSortedArray may lead to
 huge performance improvements compared to wxArray. Finally, it should be
-noticed that, as wxArray, wxSortedArray can not be used to store anything of
-sizeof() larger than max(sizeof(long), sizeof(void *)) - an assertion failure
-will be raised from the constructor otherwise.
+noticed that, as wxArray, wxSortedArray can be only used for storing integral
+types or pointers.
 
 wxObjArray class treats its elements like "objects". It may delete them when
 they are removed from the array (invoking the correct destructor) and copies

docs/latex/wx/arrstrng.tex

@@ -0,0 +1,249 @@
+\section{\class{wxArrayString}}\label{wxarraystring}
+
+wxArrayString is an efficient container for storing 
+\helpref{wxString}{wxstring} objects. It has the same features as all 
+\helpref{wxArray}{wxarray} classes, i.e. it dynamically expands when new items
+are added to it (so it is as easy to use as a linked list), but the access
+time to the elements is constant, instead of being linear in number of
+elements as in the case of linked lists. It is also very size efficient and
+doesn't take more space than a C array {\it wxString[]} type. wxArrayString
+uses its knowledge of internals of wxString class to achieve this.
+
+This class is used in the same way as other dynamic \helpref{arrays}{wxarray},
+except that no {\it WX\_DEFINE\_ARRAY} declaration is needed for it. When a
+string is added or inserted in the array, a copy of the string is created, so
+the original string may be safely deleted (e.g. if it was a {\it char *} 
+pointer the memory it was using can be freed immediately after this). In
+general, there is no need to worry about string memory deallocation when using
+this class - it will always free the memory it uses itself.
+
+The references returned by \helpref{Item}{wxarraystringitem}, 
+\helpref{Last}{wxarraystringlast} or 
+\helpref{operator[]}{wxarraystringoperatorindex} are not constant, so the
+array elements may be modified in place like this
+
+\begin{verbatim}
+    array.Last().MakeUpper();
+\end{verbatim}
+
+Finally, none of the methods of this class is virtual including its
+destructor, so this class should not be derived from.
+
+\wxheading{Derived from}
+
+Although this is not true strictly speaking, this class may be considered as a
+specialization of \helpref{wxArray}{wxarray} class for the wxString member
+data: it is not implemented like this, but it does have all of the wxArray
+functions.
+
+\wxheading{Include files}
+
+<wx/string.h>
+
+\wxheading{See also}
+
+\helpref{wxArray}{wxarray}, \helpref{wxString}{wxstring}, \helpref{wxString overview}{wxstringoverview}
+
+\latexignore{\rtfignore{\wxheading{Members}}}
+
+\membersection{wxArrayString::wxArrayString}\label{wxarraystringctor}
+
+\func{}{wxArrayString}{\void}
+
+\func{}{wxArrayString}{\param{const wxArrayString\&}{ array}}
+
+Default and copy constructors.
+
+\membersection{wxArrayString::\destruct{wxArrayString}}\label{wxarraystringdtor}
+
+\func{}{\destruct{wxArrayString}}{}
+
+Destructor frees memory occupied by the array strings. For the performance
+reasons it is not virtual, so this class should not be derived from.
+
+\membersection{wxArrayString::operator=}\label{wxarraystringoperatorassign}
+
+\func{wxArrayString \&}{operator $=$}{\param{const wxArrayString\&}{ array}}
+
+Assignment operator.
+
+\membersection{wxArrayString::operator[]}\label{wxarraystringoperatorindex}
+
+\func{wxString\&}{operatorp[]}{\param{size\_t }{nIndex}}
+
+Return the array element at position {\it nIndex}. An assert failure will
+result from an attempt to access an element beyond the end of array in debug
+mode, but no check is done in release mode.
+
+This is the operator version of \helpref{Item}{wxarraystringitem} method.
+
+\membersection{wxArrayString::Add}\label{wxarraystringadd}
+
+\func{void}{Add}{\param{const wxString\& }{str}}
+
+Appends a new item to the array.
+
+See also: \helpref{Insert}{wxarraystringinsert}
+
+\membersection{wxArrayString::Alloc}\label{wxarraystringalloc}
+
+\func{void}{Alloc}{\param{size\_t }{nCount}}
+
+Preallocates enough memory to store {\it nCount} items. This function may be
+used to improve array class performance before adding a known number of items
+consecutively.
+
+See also: \helpref{Dynamic array memory management}{wxarraymemorymanagement}
+
+\membersection{wxArrayString::Clear}\label{wxarraystringclear}
+
+\func{void}{Clear}{\void}
+
+Clears the array contents and frees memory.
+
+See also: \helpref{Empty}{wxarraystringempty}
+
+\membersection{wxArrayString::Count}\label{wxarraystringcount}
+
+\constfunc{size\_t}{Count}{\void}
+
+Returns the number of items in the array. This function is deprecated and is
+for backwards compatibility only, please use 
+\helpref{GetCount}{wxarraystringgetcount} instead.
+
+\membersection{wxArrayString::Empty}\label{wxarraystringempty}
+
+\func{void}{Empty}{\void}
+
+Empties the array: after a call to this function 
+\helpref{GetCount}{wxarraystringgetcount} will return $0$. However, this
+function does not free the memory used by the array and so should be used when
+the array is going to be reused for storing other strings. Otherwise, you
+should use \helpref{Clear}{wxarraystringclear} to empty the array and free
+memory.
+
+\membersection{wxArrayString::GetCount}\label{wxarraystringgetcount}
+
+\constfunc{size\_t}{GetCount}{\void}
+
+Returns the number of items in the array.
+
+\membersection{wxArrayString::Index}\label{wxarraystringindex}
+
+\func{int}{Index}{\param{const char *}{ sz}, \param{bool}{ bCase = TRUE}, \param{bool}{ bFromEnd = FALSE}}
+
+Search the element in the array, starting from the beginning if
+{\it bFromEnd} is FALSE or from end otherwise. If {\it bCase}, comparison is
+case sensitive (default), otherwise the case is ignored.
+
+Returns index of the first item matched or wxNOT\_FOUND if there is no match.
+
+\membersection{wxArrayString::Insert}\label{wxarraystringinsert}
+
+\func{void}{Insert}{\param{const wxString\& }{str}, \param{size\_t}{ nIndex}}
+
+Insert a new element in the array before the position {\it nIndex}. Thus, for
+example, to insert the string in the beginning of the array you would write
+
+\begin{verbatim}
+Insert("foo", 0);
+\end{verbatim}
+
+If {\it nIndex} is equal to {\it GetCount() + 1} this function behaves as 
+\helpref{Add}{wxarraystringadd}.
+
+\membersection{wxArrayString::IsEmpty}\label{wxarraystringisempty}
+
+\func{}{IsEmpty}{}
+
+Returns TRUE if the array is empty, FALSE otherwise. This function returns the
+same result as {\it GetCount() == 0} but is probably easier to read.
+
+\membersection{wxArrayString::Item}\label{wxarraystringitem}
+
+\constfunc{wxString\&}{Item}{\param{size\_t }{nIndex}}
+
+Return the array element at position {\it nIndex}. An assert failure will
+result from an attempt to access an element beyond the end of array in debug
+mode, but no check is done in release mode.
+
+See also \helpref{operator[]}{wxarraystringoperatorindex} for the operator
+version.
+
+\membersection{wxArrayString::Last}\label{wxarraystringlast}
+
+\func{}{Last}{}
+
+Returns the last element of the array. Attempt to access the last element of
+an empty array will result in assert failure in debug build, however no checks
+are done in release mode.
+
+\membersection{wxArrayString::Remove (by value)}\label{wxarraystringremoveval}
+
+\func{void}{Remove}{\param{const char *}{ sz}}
+
+Removes the first item matching this value. An assert failure is provoked by
+an attempt to remove an element which does not exist in debug build.
+
+See also: \helpref{Index}{wxarraystringindex}, \helpref{Remove}{wxarraystringremove}
+
+\membersection{wxArrayString::Remove (by index)}\label{wxarraystringremove}
+
+\func{void}{Remove}{\param{size\_t }{nIndex}}
+
+Removes the item at given position.
+
+See also: \helpref{Remove}{wxarraystringremoveval}
+
+\membersection{wxArrayString::Shrink}\label{wxarraystringshrink}
+
+\func{void}{Shrink}{\void}
+
+Releases the extra memory allocated by the array. This function is useful to
+minimize the array memory consumption.
+
+See also: \helpref{Alloc}{wxarraystringalloc}, \helpref{Dynamic array memory management}{wxarraymemorymanagement}
+
+\membersection{wxArrayString::Sort (alphabetically)}\label{wxarraystringsort}
+
+\func{void}{Sort}{\param{bool}{ reverseOrder = FALSE}}
+
+Sorts the array in alphabetical order or in reverse alphabetical order if
+{\it reverseOrder} is TRUE.
+
+See also: \helpref{Sort}{wxarraystringsortcallback}
+
+\membersection{wxArrayString::Sort (user defined)}\label{wxarraystringsortcallback}
+
+\func{void}{Sort}{\param{CompareFunction }{compareFunction}}
+
+Sorts the array using the specified {\it compareFunction} for item comparison.
+{\it CompareFunction} is defined as a function taking two {\it const
+wxString\&} parameters and returning {\it int} value less than, equal to or
+greater than 0 if the first string is less than, equal to or greater than the
+second one.
+
+\wxheading{Example}
+
+The following example sorts strings by their length.
+
+\begin{verbatim}
+static int CompareStringLen(const wxString& first, const wxString& second)
+{
+    return first.length() - second.length();
+}
+
+...
+
+wxArrayString array;
+
+array.Add("one");
+array.Add("two");
+array.Add("three");
+array.Add("four");
+
+array.Sort(CompareStringLen);
+\end{verbatim}
+
+See also: \helpref{Sort}{wxarraystringsort}
+

docs/latex/wx/autoobj.tex

@@ -22,6 +22,10 @@ Note that this class works under Windows only, and currently only for Visual C++
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/msw/ole/automtn.h>
+
 \wxheading{See also}
 
 \helpref{wxVariant}{wxvariant}
@@ -70,19 +74,6 @@ needing to call GetProperty several times using several temporary objects. For e
 \end{verbatim}
 }
 
-\membersection{wxAutomationObject::ConvertOleToVariant}\label{wxautomationobjectconvertoletovariant}
-
-\constfunc{bool}{ConvertOleToVariant}{\param{const VARIANTARG\&}{ oleVariant}, \param{const wxVariant\&}{ variant}}
-
-Converts the given VARIANTARG object to a wxVariant. IDispatch pointers are converted to the ``void*" type.
-
-\membersection{wxAutomationObject::ConvertVariantToOle}\label{wxautomationobjectconvertvarianttoole}
-
-\constfunc{bool}{ConvertVariantToOle}{\param{const wxVariant\&}{ variant}, \param{VARIANTARG\&}{ oleVariant}}
-
-Converts the given wxVariant object to a VARIANTARG. The ``void*" type is assumed to be an
-IDispatch pointer.
-
 \membersection{wxAutomationObject::CreateInstance}\label{wxautomationobjectcreateinstance}
 
 \constfunc{bool}{CreateInstance}{\param{const wxString\&}{ classId}}

docs/latex/wx/bbutton.tex

@@ -12,6 +12,10 @@ almost any other window.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/bmpbuttn.h>
+
 \wxheading{Remarks}
 
 A bitmap button can be supplied with a single bitmap, and wxWindows will draw

docs/latex/wx/bitmap.tex

@@ -10,12 +10,22 @@ either monochrome or colour.
 \helpref{wxGDIObject}{wxgdiobject}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/bitmap.h>
+
+\wxheading{Predefined objects}
+
+Objects:
+
+{\bf wxNullBitmap}
+
 \wxheading{See also}
 
-\helpref{wxBitmap overview}{wxbitmapoverview}, 
-\helpref{supported bitmap file formats}{supportedbitmapformats}, 
-\helpref{wxDC::Blit}{wxdcblit}, 
-\helpref{wxIcon}{wxicon}, \helpref{wxCursor}{wxcursor}, \helpref{wxBitmap}{wxbitmap}, 
+\helpref{wxBitmap overview}{wxbitmapoverview},
+\helpref{supported bitmap file formats}{supportedbitmapformats},
+\helpref{wxDC::Blit}{wxdcblit},
+\helpref{wxIcon}{wxicon}, \helpref{wxCursor}{wxcursor}, \helpref{wxBitmap}{wxbitmap},
 \helpref{wxMemoryDC}{wxmemorydc}
 
 \latexignore{\rtfignore{\wxheading{Members}}}
@@ -124,6 +134,17 @@ Under X, {\it type} defaults to wxBITMAP\_TYPE\_XPM.
 
 \helpref{wxBitmap::LoadFile}{wxbitmaploadfile}
 
+\pythonnote{Constructors supported by wxPython are:\par
+\indented{2cm}{\begin{twocollist}
+\twocolitem{\bf{wxBitmap(name, flag)}}{Loads a bitmap from a file}
+\twocolitem{\bf{wxNoRefBitmap(name, flag)}}{This one won't own the
+reference, so Python won't call the destructor, this is good for toolbars
+and such where the parent will manage the bitmap.}
+\twocolitem{\bf{wxEmptyBitmap(width, height, depth = -1)}}{Creates an
+empty bitmap with the given specifications}
+\end{twocollist}}
+}
+
 \membersection{wxBitmap::\destruct{wxBitmap}}
 
 \func{}{\destruct{wxBitmap}}{\void}
@@ -388,8 +409,9 @@ Saves a bitmap in the named file.
 
 The validity of these flags depends on the platform and wxWindows configuration.}
 
-\docparam{palette}{An optional palette used for saving the bitmap. TODO: this parameter should
-probably be eliminated; instead the app should set the palette before saving.}
+\docparam{palette}{An optional palette used for saving the bitmap.}
+% TODO: this parameter should
+%probably be eliminated; instead the app should set the palette before saving.
 
 \wxheading{Return value}
 
@@ -538,6 +560,10 @@ application initialisation.
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/bitmap.h>
+
 \wxheading{See also}
 
 \helpref{wxBitmap}{wxbitmap}, \helpref{wxIcon}{wxicon}, \helpref{wxCursor}{wxcursor}
@@ -640,8 +666,7 @@ Saves a bitmap in the named file.
 
 \docparam{type}{See \helpref{wxBitmap::wxBitmap}{wxbitmapconstr} for values this can take.}
 
-\docparam{palette}{An optional palette used for saving the bitmap. TODO: this parameter should
-probably be eliminated; instead the app should set the palette before saving.}
+\docparam{palette}{An optional palette used for saving the bitmap.}
 
 \wxheading{Return value}
 

docs/latex/wx/bmpdatob.tex

@@ -1,14 +1,25 @@
 \section{\class{wxBitmapDataObject}}\label{wxbitmapdataobject}
 
- wxBitmapDataObject is a specialization of wxDataObject for bitmaps.
+wxBitmapDataObject is a specialization of wxDataObject for bitmap data. It can be
+used without change to paste data into the \helpref{wxClipboard}{wxclipboard}
+or a \helpref{wxDropSource}{wxdropsource}. A user may wish to derive a new class
+from this class for providing a bitmap on-demand in order to minimize memory consumption
+when offering data in several formats, such as a bitmap and GIF.
+
+In order to offer bitmap data on-demand \helpref{GetSize}{wxbitmapdataobjectgetsize} 
+and \helpref{WriteData}{wxbitmapdataobjectwritedata} will have to be overridden.
 
 \wxheading{Derived from}
 
 \helpref{wxDataObject}{wxdataobject}
 
+\wxheading{Include files}
+
+<wx/dataobj.h>
+
 \wxheading{See also}
 
-\helpref{wxDataObject}{wxdataobject}, \helpref{wxBitmap}{wxbitmap}
+\helpref{wxDataObject}{wxdataobject}
 
 \latexignore{\rtfignore{\wxheading{Members}}}
 
@@ -16,23 +27,90 @@
 
 \func{}{wxBitmapDataObject}{\void}
 
-Constructor. TODO: shouldn't there be a constructor taking a wxBitmap?
+Default constructor. Call \helpref{SetBitmap}{wxbitmapdataobjectsetbitmap} later
+or override \helpref{WriteData}{wxbitmapdataobjectwritedata} and 
+\helpref{GetSize}{wxbitmapdataobjectgetsize} for providing data on-demand.
 
-\membersection{wxBitmapDataObject::GetFormat}\label{wxbitmapdataobjectgetformat}
+\func{}{wxBitmapDataObject}{\param{const wxBitmap\& }{bitmap}}
 
-\func{virtual wxDataFormat}{GetFormat}{\void}
+Constructor, passing a bitmap.
 
-Returns wxDF\_BITMAP.
+\membersection{wxBitmapDataObject::GetSize}\label{wxbitmapdataobjectgetsize}
+
+\constfunc{virtual size\_t}{GetSize}{\void}
+
+Returns the data size. By default, returns the size of the bitmap data
+set in the constructor or using \helpref{SetBitmap}{wxbitmapdataobjectsetbitmap}.
+This can be overridden to provide size data on-demand. Note that you'd
+have to call the inherited GetSize method as this is the only way
+to get to know the transfer size of the bitmap in a platform dependent
+way - a bitmap has different size under GTK and Windows. In practice, 
+this would look like this:
+
+\begin{verbatim}
+size_t MyBitmapDataObject::GetSize()
+{
+  // Get bitmap from global container. This container
+  // should be able to "produce" data in all formats
+  // offered by the application but store it only in
+  // one format to reduce memory consumption.
+
+  wxBitmap my_bitmap = my_global_container->GetBitmap();
+  
+  // temporarily set bitmap
+  
+  SetBitmap( my_bitmap );
+
+  size_t ret = wxBitmapDataObject::GetSize();
+  
+  // unset bitmap again
+  
+  SetBitmap( wxNullBitmap );
+
+  retrun ret;
+}
+\end{verbatim}
+
+TODO: Offer a nicer way to do this. Maybe by providing a platform
+dependent function in this class like 
+
+\begin{verbatim}
+size_t GetBitmapSize( const wxBitmap &bitmap )
+\end{verbatim}
+
+\membersection{wxBitmapDataObject::GetBitmap}\label{wxbitmapdataobjectgettext}
+
+\constfunc{virtual wxBitmap}{GetBitmap}{\void}
+
+Returns the bitmap associated with the data object. You may wish to override
+this method when offering data on-demand, but this is not required by
+wxWindows' internals. Use this method to get data in bitmap form from
+the \helpref{wxClipboard}{wxclipboard}.
 
 \membersection{wxBitmapDataObject::SetBitmap}\label{wxbitmapdataobjectsetbitmap}
 
 \func{virtual void}{SetBitmap}{\param{const wxBitmap\& }{bitmap}}
 
-Sets the bitmap for the data object.
+Sets the bitmap associated with the data object. This method is called
+internally when retrieving data from the \helpref{wxClipboard}{wxclipboard}
+and may be used to paste data to the clipboard directly (instead of
+on-demand).
 
-\membersection{wxBitmapDataObject::GetBitmap}\label{wxbitmapdataobjectgetbitmap}
+\membersection{wxBitmapDataObject::WriteData}\label{wxbitmapdataobjectwritedata}
 
-\constfunc{virtual wxBitmap}{GetBitmap}{\void}
+\constfunc{virtual void}{WriteData}{\param{void}{*dest} }
 
-Returns the bitmap associated with the data object.
+Write the data owned by this class to {\it dest}. By default, this
+calls \helpref{WriteBitmap}{wxbitmapdataobjectwritebitmap} with the bitmap
+set in the constructor or using \helpref{SetBitmap}{wxbitmapdataobjectsetbitmap}.
+This can be overridden to provide bitmap data on-demand; in this case
+\helpref{WriteBitmap}{wxbitmapdataobjectwritebitmap} must be called from
+within th overriding WriteData() method.
+
+\membersection{wxBitmapDataObject::WriteBitmap}\label{wxbitmapdataobjectwritebitmap}
+
+\constfunc{void}{WriteBitmap}{\param{const wxBitmap\& }{bitmap}\param{void}{*dest} }
+
+Writes the the bitmap {\it bitmap} to {\it dest}. This method must be called
+from \helpref{WriteData}{wxbitmapdataobjectwritedata}.
 

docs/latex/wx/body.tex

@@ -7,8 +7,8 @@
 
 wxWindows is a C++ framework providing GUI (Graphical User
 Interface) and other facilities on more than one platform.  Version 2.0 currently
-supports MS Windows (16-bit, Windows 95 and Windows NT) and GTK+, with Motif
-and Mac ports in an advanced state.
+supports MS Windows (16-bit, Windows 95 and Windows NT), Unix with GTK+, and Unix with Motif.
+A Mac port is in an advanced state.
 
 wxWindows was originally developed at the Artificial Intelligence
 Applications Institute, University of Edinburgh, for internal use.
@@ -80,7 +80,7 @@ here are some of the benefits:
 \item Available on a variety of popular platforms.
 \item Works with almost all popular C++ compilers.
 \item Several example programs.
-\item Over 700 pages of printable and on-line documentation.
+\item Over 900 pages of printable and on-line documentation.
 \item Includes Tex2RTF, to allow you to produce your own documentation
 in Windows Help, HTML and Word RTF formats.
 \item Simple-to-use, object-oriented API.
@@ -148,7 +148,7 @@ same API;
 temporarily with the window as an argument;
 \item events from sliders and scrollbars can be handled more flexibly;
 \item the handling of window close events has been changed in line with the new
-event system, but backward {\bf OnClose} compatibility has been retained;
+event system;
 \item the concept of {\it validator} has been added to allow much easier coding of
 the relationship between controls and application data;
 \item the documentation has been revised, with more cross-referencing.
@@ -194,7 +194,7 @@ Applications Institute by anonymous FTP and World Wide Web:
 
 \begin{verbatim}
   ftp://www.remstar.com/pub/wxwin
-  http://web.ukonline.co.uk/julian.smart/wxwin
+  http://www.wxwindows.org
 \end{verbatim}
 
 \section{Acknowledgments}

docs/latex/wx/brush.tex

@@ -9,6 +9,29 @@ style.
 \helpref{wxGDIObject}{wxgdiobject}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/brush.h>
+
+\wxheading{Predefined objects}
+
+Objects:
+
+{\bf wxNullBrush}
+
+Pointers:
+
+{\bf wxBLUE\_BRUSH\\
+wxGREEN\_BRUSH\\
+wxWHITE\_BRUSH\\
+wxBLACK\_BRUSH\\
+wxGREY\_BRUSH\\
+wxMEDIUM\_GREY\_BRUSH\\
+wxLIGHT\_GREY\_BRUSH\\
+wxTRANSPARENT\_BRUSH\\
+wxCYAN\_BRUSH\\
+wxRED\_BRUSH}
+
 \wxheading{Remarks}
 
 On a monochrome display, wxWindows shows
@@ -32,8 +55,7 @@ efficiency problems. Once one wxBrush object changes its data it will create its
 own brush data internally so that other brushes, which previously shared the
 data using the reference counting, are not affected.
 
-TODO: an overview for wxBrush.
-
+%TODO: an overview for wxBrush.
 \wxheading{See also}
 
 \helpref{wxBrushList}{wxbrushlist}, \helpref{wxDC}{wxdc}, \helpref{wxDC::SetBrush}{wxdcsetbrush}
@@ -260,6 +282,10 @@ A brush list is a list containing all brushes which have been created.
 \helpref{wxList}{wxlist}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/gdicmn.h>
+
 \wxheading{Remarks}
 
 There is only one instance of this class: {\bf wxTheBrushList}.  Use

docs/latex/wx/busycurs.tex

@@ -20,6 +20,10 @@ and \helpref{wxEndBusyCursor}{wxendbusycursor} in the destructor.
 
 None
 
+\wxheading{Include files}
+
+<wx/utils.h>
+
 \wxheading{See also}
 
 \helpref{wxBeginBusyCursor}{wxbeginbusycursor}, \helpref{wxEndBusyCursor}{wxendbusycursor}

docs/latex/wx/button.tex

@@ -12,6 +12,10 @@ almost any other window.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/button.h>
+
 \wxheading{Window styles}
 
 There are no special styles for wxButton.

docs/latex/wx/calclevt.tex

@@ -9,6 +9,10 @@ occupy.
 \helpref{wxEvent}{wxevent}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/laywin.h>
+
 \wxheading{Event table macros}
 
 \twocolwidtha{7cm}%

docs/latex/wx/category.tex

@@ -57,6 +57,7 @@ in an application.
 \twocolitem{\helpref{wxFontDialog}{wxfontdialog}}{Font chooser dialog}
 \twocolitem{\helpref{wxPageSetupDialog}{wxpagesetupdialog}}{Standard page setup dialog}
 \twocolitem{\helpref{wxPrintDialog}{wxprintdialog}}{Standard print dialog}
+\twocolitem{\helpref{wxPageSetupDialog}{wxpagesetupdialog}}{Standard page setup dialog}
 \twocolitem{\helpref{wxMessageDialog}{wxmessagedialog}}{Simple message box dialog}
 \end{twocollist}
 
@@ -143,7 +144,7 @@ These classes are related to drawing on device contexts and windows.
 \twocolitem{\helpref{wxFont}{wxfont}}{Represents fonts}
 \twocolitem{\helpref{wxFontList}{wxfontlist}}{The list of previously-created fonts}
 \twocolitem{\helpref{wxIcon}{wxicon}}{A small, transparent bitmap for assigning to frames and drawing on device contexts}
-\twocolitem{\helpref{wxImage}{wximage}}{A platform-independent image class.}
+\twocolitem{\helpref{wxImage}{wximage}}{A platform-independent image class}
 \twocolitem{\helpref{wxImageList}{wximagelist}}{A list of images, used with some controls}
 \twocolitem{\helpref{wxMask}{wxmask}}{Represents a mask to be used with a bitmap for transparent drawing}
 \twocolitem{\helpref{wxPen}{wxpen}}{Used for drawing lines on a device context}
@@ -196,8 +197,9 @@ These are the window validators, used for filtering and validating
 user input.
 
 \begin{twocollist}\itemsep=0pt
-\twocolitem{\helpref{wxValidator}{wxvalidator}}{Base validator class.}
-\twocolitem{\helpref{wxTextValidator}{wxtextvalidator}}{Text control validator class.}
+\twocolitem{\helpref{wxValidator}{wxvalidator}}{Base validator class}
+\twocolitem{\helpref{wxTextValidator}{wxtextvalidator}}{Text control validator class}
+\twocolitem{\helpref{wxGenericValidator}{wxgenericvalidator}}{Generic control validator class}
 \end{twocollist}
 
 {\large {\bf Data structures}}
@@ -222,7 +224,7 @@ These are the data structure classes supported by wxWindows.
 \twocolitem{\helpref{wxSize}{wxsize}}{Representation of a size}
 \twocolitem{\helpref{wxTime}{wxtime}}{A class for time manipulation}
 \twocolitem{\helpref{wxVariant}{wxvariant}}{A class for storing arbitrary types
-that may change at run-time.}
+that may change at run-time}
 \end{twocollist}
 
 {\large {\bf Run-time class information system}}
@@ -307,12 +309,15 @@ facilities.
 \twocolitem{\helpref{wxPreviewFrame}{wxpreviewframe}}{Frame for displaying a print preview}
 \twocolitem{\helpref{wxPreviewCanvas}{wxpreviewcanvas}}{Canvas for displaying a print preview}
 \twocolitem{\helpref{wxPreviewControlBar}{wxpreviewcontrolbar}}{Standard control bar for a print preview}
-\twocolitem{\helpref{wxPrintData}{wxprintdata}}{Represents information about the document being printed}
 \twocolitem{\helpref{wxPrintDialog}{wxprintdialog}}{Standard print dialog}
+\twocolitem{\helpref{wxPageSetupDialog}{wxpagesetupdialog}}{Standard page setup dialog}
 \twocolitem{\helpref{wxPrinter}{wxprinter}}{Class representing the printer}
 \twocolitem{\helpref{wxPrinterDC}{wxprinterdc}}{Printer device context}
 \twocolitem{\helpref{wxPrintout}{wxprintout}}{Class representing a particular printout}
 \twocolitem{\helpref{wxPrintPreview}{wxprintpreview}}{Class representing a print preview}
+\twocolitem{\helpref{wxPrintData}{wxprintdata}}{Represents information about the document being printed}
+\twocolitem{\helpref{wxPrintDialogData}{wxprintdialogdata}}{Represents information about the print dialog}
+\twocolitem{\helpref{wxPageSetupDialogData}{wxpagesetupdialogdata}}{Represents information about the page setup dialog}
 \end{twocollist}
 
 {\large {\bf Database classes}}
@@ -335,15 +340,16 @@ The older classes are as follows:
 \overview{Drag and drop and clipboard overview}{wxdndoverview}
 
 \begin{twocollist}\itemsep=0pt
-\twocolitem{\helpref{wxDropTarget}{wxdroptarget}}{Drop target class}
-\twocolitem{\helpref{wxFileDropTarget}{wxfiledroptarget}}{File drop target class}
-\twocolitem{\helpref{wxTextDropTarget}{wxtextdroptarget}}{Text drop target class}
-\twocolitem{\helpref{wxDropSource}{wxdropsource}}{Drop source class}
 \twocolitem{\helpref{wxDataObject}{wxdataobject}}{Data object class}
 \twocolitem{\helpref{wxTextDataObject}{wxtextdataobject}}{Text data object class}
 \twocolitem{\helpref{wxFileDataObject}{wxtextdataobject}}{File data object class}
 \twocolitem{\helpref{wxBitmapDataObject}{wxbitmapdataobject}}{Bitmap data object class}
+\twocolitem{\helpref{wxPrivateDataObject}{wxprivatedataobject}}{Private data object class}
 \twocolitem{\helpref{wxClipboard}{wxclipboard}}{Clipboard class}
+\twocolitem{\helpref{wxDropTarget}{wxdroptarget}}{Drop target class}
+\twocolitem{\helpref{wxFileDropTarget}{wxfiledroptarget}}{File drop target class}
+\twocolitem{\helpref{wxTextDropTarget}{wxtextdroptarget}}{Text drop target class}
+\twocolitem{\helpref{wxDropSource}{wxdropsource}}{Drop source class}
 \end{twocollist}
 
 {\large {\bf File related classes}}
@@ -357,6 +363,28 @@ overview}{wxfileoverview} for more details.
 \twocolitem{\helpref{wxTextFile}{wxtextfile}}{Class for working with text files as with arrays of lines}
 \end{twocollist}
 
+{\large {\bf Stream classes}}
+
+wxWindows has its own set of stream classes, as an alternative to often buggy standard stream
+libraries, and to provide enhanced functionality.
+
+\begin{twocollist}\itemsep=0pt
+\twocolitem{\helpref{wxStreamBase}{wxstreambase}}{Stream base class}
+\twocolitem{\helpref{wxStreamBuffer}{wxstreambuffer}}{Stream buffer class}
+\twocolitem{\helpref{wxInputStream}{wxinputstream}}{Input stream class}
+\twocolitem{\helpref{wxOutputStream}{wxoutputstream}}{Output stream class}
+\twocolitem{\helpref{wxFilterInputStream}{wxfilterinputstream}}{Filtered input stream class}
+\twocolitem{\helpref{wxFilterOutputStream}{wxfilteroutputstream}}{Filtered output stream class}
+\twocolitem{\helpref{wxDataInputStream}{wxdatainputstream}}{Platform-independent data input stream class}
+\twocolitem{\helpref{wxDataOutputStream}{wxdataoutputstream}}{Platform-independent data output stream class}
+\twocolitem{\helpref{wxFileInputStream}{wxfileinputstream}}{File input stream class}
+\twocolitem{\helpref{wxFileOutputStream}{wxfileoutputstream}}{File output stream class}
+\twocolitem{\helpref{wxZlibInputStream}{wxzlibinputstream}}{Zlib (compression) input stream class}
+\twocolitem{\helpref{wxZlibOutputStream}{wxzliboutputstream}}{Zlib (compression) output stream class}
+\twocolitem{\helpref{wxSocketInputStream}{wxsocketinputstream}}{Socket input stream class}
+\twocolitem{\helpref{wxSocketOutputStream}{wxsocketoutputstream}}{Socket output stream class}
+\end{twocollist}
+
 {\large {\bf Miscellaneous}}
 
 \begin{twocollist}\itemsep=0pt

docs/latex/wx/checkbox.tex

@@ -10,6 +10,10 @@ or off (no checkmark).
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/checkbox.h>
+
 \wxheading{Window styles}
 
 There are no special styles for wxCheckBox.

docs/latex/wx/checklst.tex

@@ -15,13 +15,21 @@ Only the new functions for this class are documented; see also \helpref{wxListBo
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/checklst.h>
+
 \wxheading{Window styles}
 
 See \helpref{wxListBox}{wxlistbox}.
 
 \wxheading{Event handling}
 
-See \helpref{wxListBox}{wxlistbox}.
+\twocolwidtha{7cm}
+\begin{twocollist}\itemsep=0pt
+\twocolitem{{\bf EVT\_CHECKLISTBOX(id, func)}}{Process a wxEVT\_COMMAND\_CHECKLISTBOX\_TOGGLE event,
+when an item in the check list box is checked or unchecked.}
+\end{twocollist}
 
 \wxheading{See also}
 
@@ -64,6 +72,10 @@ appropriately.}
 
 \docparam{name}{Window name.}
 
+\pythonnote{The wxCheckListBox constructor in wxPython reduces the \tt{n}
+and \tt{choices} arguments are to a single argument, which is
+a list of strings.}
+
 \membersection{wxCheckListBox::\destruct{wxCheckListBox}}
 
 \func{void}{\destruct{wxCheckListBox}}{\void}

docs/latex/wx/choice.tex

@@ -11,6 +11,10 @@ menu of choices.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/choice.h>
+
 \wxheading{Window styles}
 
 There are no special styles for wxChoice.
@@ -70,6 +74,10 @@ appropriately.}
 
 \helpref{wxChoice::Create}{wxchoicecreate}, \helpref{wxValidator}{wxvalidator}
 
+\pythonnote{The wxChoice constructor in wxPython reduces the \tt{n}
+and \tt{choices} arguments are to a single argument, which is
+a list of strings.}
+
 \membersection{wxChoice::\destruct{wxChoice}}
 
 \func{}{\destruct{wxChoice}}{\void}

docs/latex/wx/clasinfo.tex

@@ -8,6 +8,10 @@ of macros such as {\bf DECLARE\_DYNAMIC\_CLASS} and {\bf IMPLEMENT\_DYNAMIC\_CLA
 
 No parent class.
 
+\wxheading{Include files}
+
+<wx/object.h>
+
 \wxheading{See also}
 
 \helpref{Overview}{wxclassinfooverview}, \helpref{wxObject}{wxobject}

docs/latex/wx/classes.tex

@@ -2,35 +2,12 @@
 \setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
 \setfooter{\thepage}{}{}{}{}{\thepage}%
 \pagenumbering{arabic}%
-%
-\begin{comment}
-\helpignore{\section{Class hierarchy}%
-
-The GUI-specific wxWindows class hierarchy is shown in Figure 5.1.
-Many other, non-GUI classes have been omitted.
-
-\vskip 1cm
-$$\image{14cm;0cm}{wxclass.ps}$$
-\vskip 1cm
-\centerline{Figure 5.1: wxWindows class hierarchy}
-
-\newpage}%
-
-\overview{Writing a wxWindows application: a rough guide}{roughguide}
-
-\helponly{
-\sethotspotcolour{off}%
-\large{
-\helpref{Notes on using the reference}{referencenotes}\\
-\helpref{Guide to functions}{functions}
-\sethotspotcolour{on}%
-}}
-\end{comment}
 
 \input accel.tex
 \input activevt.tex
 \input app.tex
 \input array.tex
+\input arrstrng.tex
 \input autoobj.tex
 \input busycurs.tex
 \input button.tex
@@ -60,8 +37,8 @@ $$\image{14cm;0cm}{wxclass.ps}$$
 \input cursor.tex
 \input database.tex
 \input dataobj.tex
-\input date.tex
 \input datstrm.tex
+\input date.tex
 \input dc.tex
 \input ddeclint.tex
 \input ddeconn.tex
@@ -69,13 +46,13 @@ $$\image{14cm;0cm}{wxclass.ps}$$
 \input debugcxt.tex
 \input dialog.tex
 \input dirdlg.tex
-\input document.tex
 \input docchfrm.tex
 \input docmanag.tex
 \input docmdich.tex
 \input docmdipr.tex
 \input docprfrm.tex
 \input doctempl.tex
+\input document.tex
 \input dropevt.tex
 \input dropsrc.tex
 \input droptrgt.tex
@@ -88,6 +65,7 @@ $$\image{14cm;0cm}{wxclass.ps}$$
 \input filedlg.tex
 \input fildrptg.tex
 \input filehist.tex
+\input strmfile.tex
 \input filetype.tex
 \input fltinstr.tex
 \input fltoutst.tex
@@ -99,9 +77,11 @@ $$\image{14cm;0cm}{wxclass.ps}$$
 \input ftp.tex
 \input gauge.tex
 \input gdiobj.tex
+\input valgen.tex
 \input grid.tex
 \input hash.tex
 \input helpinst.tex
+\input http.tex
 \input idleevt.tex
 \input icon.tex
 \input image.tex
@@ -109,6 +89,7 @@ $$\image{14cm;0cm}{wxclass.ps}$$
 \input ilayout.tex
 \input indlgevt.tex
 \input inputstr.tex
+\input ipvaddr.tex
 \input joystick.tex
 \input joyevent.tex
 \input keyevent.tex
@@ -118,13 +99,17 @@ $$\image{14cm;0cm}{wxclass.ps}$$
 \input listbox.tex
 \input listctrl.tex
 \input listevt.tex
+\input locale.tex
 \input log.tex
+\input longlong.tex
 \input mask.tex
 \input mdi.tex
+\input memorydc.tex
+\input strmmem.tex
 \input menu.tex
 \input menuitem.tex
 \input menuevt.tex
-\input memorydc.tex
+\input msgdlg.tex
 \input metafile.tex
 \input mimetype.tex
 \input minifram.tex
@@ -132,12 +117,12 @@ $$\image{14cm;0cm}{wxclass.ps}$$
 \input mouseevt.tex
 \input moveevt.tex
 \input mltchdlg.tex
-\input msgdlg.tex
 \input mutex.tex
 \input mutexlck.tex
 \input node.tex
 \input notebook.tex
 \input noteevt.tex
+\input notifevt.tex
 \input object.tex
 \input outptstr.tex
 \input pagedlg.tex
@@ -155,6 +140,7 @@ $$\image{14cm;0cm}{wxclass.ps}$$
 \input prvdatob.tex
 \input prvtdrpt.tex
 \input process.tex
+\input progdlg.tex
 \input procevt.tex
 \input protocol.tex
 \input query.tex
@@ -178,36 +164,38 @@ $$\image{14cm;0cm}{wxclass.ps}$$
 \input slider.tex
 \input sckaddr.tex
 \input socket.tex
+\input splitevt.tex
+\input strmsock.tex
 \input spinbutt.tex
 \input splitter.tex
 \input statbmp.tex
 \input statbox.tex
 \input stattext.tex
 \input statusbr.tex
+\input strmbase.tex
+\input stream.tex
 \input wxstring.tex
 \input strlist.tex
-\input stream.tex
-\input strmbase.tex
+\input tokenizr.tex
 \input sysclevt.tex
 \input settings.tex
 \input tab.tex
 \input tabctrl.tex
 \input tabevent.tex
 \input taskbar.tex
-\input text.tex
-\input textdlg.tex
-\input txtdrptg.tex
-\input valtext.tex
-\input tempfile.tex
 \input tcpclint.tex
 \input tcpconn.tex
 \input tcpservr.tex
+\input tempfile.tex
+\input text.tex
 \input txtdatob.tex
+\input textdlg.tex
+\input txtdrptg.tex
+\input valtext.tex
 \input textfile.tex
 \input thread.tex
 \input time.tex
 \input timer.tex
-\input tokenizr.tex
 \input toolbar.tex
 \input treectrl.tex
 \input treeevt.tex
@@ -219,7 +207,7 @@ $$\image{14cm;0cm}{wxclass.ps}$$
 \input wave.tex
 \input window.tex
 \input windowdc.tex
-
+\input strmzlib.tex
 \input function.tex
 \input keycode.tex
 

docs/latex/wx/clientdc.tex

@@ -14,6 +14,10 @@ To draw on the whole window including decorations, construct a \helpref{wxWindow
 
 \helpref{wxDC}{wxdc}
 
+\wxheading{Include files}
+
+<wx/dcclient.h>
+
 \wxheading{See also}
 
 \helpref{wxDC}{wxdc}, \helpref{wxMemoryDC}{wxmemorydc}, \helpref{wxPaintDC}{wxpaintdc},\rtfsp

docs/latex/wx/clipbrd.tex

@@ -40,6 +40,10 @@ For example:
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/clipbrd.h>
+
 \wxheading{See also}
 
 \helpref{Drag and drop overview}{wxdndoverview}, \helpref{wxDataObject}{wxdataobject}
@@ -79,14 +83,14 @@ Call this function to close the clipboard, having opened it with \helpref{wxClip
 
 \membersection{wxClipboard::GetData}\label{wxclipboardgetdata}
 
-\func{bool}{GetData}{\param{wxDataObject&}{ data}}
+\func{bool}{GetData}{\param{wxDataObject\&}{ data}}
 
 Call this function to fill {\it data} with data on the clipboard, if available in the required
 format. Returns TRUE on success.
 
 \membersection{wxClipboard::IsSupported}\label{wxclipboardissupported}
 
-\func{bool}{IsSupported}{\param{wxDataObject&}{ data}}
+\func{bool}{IsSupported}{\param{wxDataObject\&}{ data}}
 
 Returns TRUE if the format of the given data object is available on the clipboard.
 
@@ -102,7 +106,7 @@ should keep the clipboard open for only a very short time.
 
 Returns TRUE on success. This should be tested (as in the sample shown above).
 
-\membersection{wxClipboard::SetData}\label{wxclipboardadddata}
+\membersection{wxClipboard::SetData}\label{wxclipboardsetdata}
 
 \func{bool}{SetData}{\param{wxDataObject*}{ data}}
 

docs/latex/wx/closeevt.tex

@@ -6,6 +6,10 @@ This event class contains information about window and session close events.
 
 \helpref{wxEvent}{wxevent}
 
+\wxheading{Include files}
+
+<wx/event.h>
+
 \wxheading{Event table macros}
 
 To process a close event, use these event handler macros to direct input to member

docs/latex/wx/cmdevent.tex

@@ -7,6 +7,10 @@ simple controls. More complex controls, such as \helpref{wxTreeCtrl}{wxtreectrl}
 
 \helpref{wxEvent}{wxevent}
 
+\wxheading{Include files}
+
+<wx/event.h>
+
 \wxheading{Event table macros}
 
 To process a menu command event, use these event handler macros to direct input to member
@@ -14,9 +18,9 @@ functions that take a wxCommandEvent argument.
 
 \twocolwidtha{7cm}
 \begin{twocollist}\itemsep=0pt
-\twocolitem{{\bf EVT\_COMMAND(id, cmd, func)}}{Process a command, supplying the window identifier,
+\twocolitem{{\bf EVT\_COMMAND(id, event, func)}}{Process a command, supplying the window identifier,
 command event identifier, and member function.}
-\twocolitem{{\bf EVT\_COMMAND\_RANGE(id1, id2, cmd, func)}}{Process a command for a range
+\twocolitem{{\bf EVT\_COMMAND\_RANGE(id1, id2, event, func)}}{Process a command for a range
 of window identifiers, supplying the minimum and maximum window identifiers,
 command event identifier, and member function.}
 \twocolitem{{\bf EVT\_BUTTON(id, func)}}{Process a wxEVT\_COMMAND\_BUTTON\_CLICKED command,
@@ -181,8 +185,3 @@ Sets the {\bf m\_commandInt} member.
 
 Sets the {\bf m\_commandString} member.
 
-
-%%% Local Variables: 
-%%% mode: latex
-%%% TeX-master: "referenc"
-%%% End: 

docs/latex/wx/cmdproc.tex

@@ -8,6 +8,10 @@ if you want different behaviour.
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/docview.h>
+
 \wxheading{See also}
 
 \helpref{wxCommandProcessor overview}{wxcommandprocessoroverview}, \helpref{wxCommand}{wxcommand}

docs/latex/wx/colordlg.tex

@@ -9,6 +9,10 @@ This class represents the colour chooser dialog.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/colordlg.h>
+
 \wxheading{See also}
 
 \helpref{wxColourDialog Overview}{wxcolourdialogoverview}, \helpref{wxColour}{wxcolour}, \helpref{wxColourData}{wxcolourdata}

docs/latex/wx/colour.tex

@@ -11,6 +11,26 @@ Valid RGB values are in the range 0 to 255.
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/colour.h>
+
+\wxheading{Predefined objects}
+
+Objects:
+
+{\bf wxNullColour}
+
+Pointers:
+
+{\bf wxBLACK\\
+wxWHITE\\
+wxRED\\
+wxBLUE\\
+wxGREEN\\
+wxCYAN\\
+wxLIGHT\_GREY}
+
 \wxheading{See also}
 
 \helpref{wxColourDatabase}{wxcolourdatabase}, \helpref{wxPen}{wxpen}, \helpref{wxBrush}{wxbrush},\rtfsp
@@ -53,6 +73,14 @@ Copy constructor.
 
 \helpref{wxColourDatabase}{wxcolourdatabase}
 
+\pythonnote{Constructors supported by wxPython are:\par
+\indented{2cm}{\begin{twocollist}
+\twocolitem{\bf{wxColour(red=0, green=0, blue=0)}}{}
+\twocolitem{\bf{wxNamedColour(name)}}{}
+\end{twocollist}}
+}
+
+
 \membersection{wxColour::Blue}\label{wxcolourblue}
 
 \constfunc{unsigned char}{Blue}{\void}
@@ -112,18 +140,12 @@ Assignment operator, using a colour name to be found in the colour database.
 
 Tests the equality of two colours by comparing individual red, green blue colours.
 
-TODO: this may be different on platforms other than Windows - no reference counting
-is done on Windows.
-
 \membersection{wxColour::operator $!=$}\label{wxcolourinequality}
 
 \func{bool}{operator $!=$}{\param{const wxColour\&}{ colour}}
 
 Tests the inequality of two colours by comparing individual red, green blue colours.
 
-TODO: this may be different on platforms other than Windows - no reference counting
-is done on Windows.
-
 \section{\class{wxColourData}}\label{wxcolourdata}
 
 This class holds a variety of information related to colour dialogs.
@@ -132,6 +154,10 @@ This class holds a variety of information related to colour dialogs.
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/cmndata.h>
+
 \wxheading{See also}
 
 \helpref{wxColour}{wxcolour}, \helpref{wxColourDialog}{wxcolourdialog}, \helpref{wxColourDialog overview}{wxcolourdialogoverview}
@@ -221,6 +247,10 @@ is only one instance of this class: {\bf wxTheColourDatabase}.
 \helpref{wxList}{wxlist}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/gdicmn.h>
+
 \wxheading{Remarks}
 
 The colours in the standard database are as follows:

docs/latex/wx/combobox.tex

@@ -14,6 +14,10 @@ A combobox permits a single selection only. Combobox items are numbered from zer
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/combo.h>
+
 \wxheading{Window styles}
 
 \begin{twocollist}\itemsep=0pt
@@ -81,6 +85,11 @@ appropriately.}
 
 \helpref{wxComboBox::Create}{wxcomboboxcreate}, \helpref{wxValidator}{wxvalidator}
 
+\pythonnote{The wxComboBox constructor in wxPython reduces the \tt{n}
+and \tt{choices} arguments are to a single argument, which is
+a list of strings.}
+
+
 \membersection{wxComboBox::\destruct{wxComboBox}}
 
 \func{}{\destruct{wxComboBox}}{\void}
@@ -220,8 +229,7 @@ Returns the current value in the combobox text field.
 \constfunc{int}{Number}{\void}
 
 Returns the number of items in the combobox list.
-
-TODO: make this GetNumber or GetCount?
+%TODO: make this GetNumber or GetCount?
 
 \membersection{wxComboBox::Paste}\label{wxcomboboxpaste}
 

docs/latex/wx/command.tex

@@ -9,6 +9,10 @@ change the data or view.
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/docview.h>
+
 \wxheading{See also}
 
 \overview{Overview}{wxcommandoverview}

docs/latex/wx/conditn.tex

@@ -6,6 +6,10 @@ TODO
 
 None.
 
+\wxheading{Include files}
+
+<wx/thread.h>
+
 \wxheading{See also}
 
 \helpref{wxThread}{wxthread}, \helpref{wxMutex}{wxmutex}

docs/latex/wx/config.tex

@@ -21,6 +21,14 @@ features of this class.
 
 No base class
 
+\wxheading{Include files}
+
+<wx/config.h> (to let wxWindows choose a wxConfig class for your platform)\\
+<wx/confbase.h> (base config class)\\
+<wx/fileconf.h> (wxFileconfig class)\\
+<wx/msw/regconf.h> (wxRegConfig class)\\
+<wx/msw/iniconf.h> (wxIniConfig class)
+
 \wxheading{Example}
 
 Here is how you would typically use this class:
@@ -116,7 +124,7 @@ sensible!):
 
   // create an entry in subgroup
   conf->Write("SubgroupEntry", 3);
-  
+
   // '..' is understood
   conf->Write("../GroupEntry", 2);
   conf->SetPath("..");
@@ -150,7 +158,7 @@ doesn't save and restore the path):
   void bar(wxConfigBase *config)
   {
     config->Write("Test", 17);
-    
+
     foo(config);
 
     // we're reading "/Foo/Data/Test" here! -1 will probably be returned...
@@ -222,13 +230,12 @@ actually enumerating them, but you will probably never need them.
 
 \helpref{HasGroup}{wxconfigbasehasgroup}\\
 \helpref{HasEntry}{wxconfigbasehasentry}\\
-\helpref{Exists}{wxconfigbaseexists}
+\helpref{Exists}{wxconfigbaseexists}\\
+\helpref{GetEntryType}{wxconfigbasegetentrytype}
 
 \membersection{Miscellaneous accessors}
 
-\helpref{SetAppName}{wxconfigbasesetappname}\\
 \helpref{GetAppName}{wxconfigbasegetappname}\\
-\helpref{SetVendorName}{wxconfigbasesetvendorname}\\
 \helpref{GetVendorName}{wxconfigbasegetvendorname}
 
 \membersection{Key access}
@@ -351,7 +358,9 @@ class and is ignored by some. For wxFileConfig, these styles determine whether
 a local or global config file is created or used. If the flag is present but
 the parameter is empty, the parameter will be set to a default. If the
 parameter is present but the style flag not, the relevant flag will be added
-to the style.}
+to the style. For wxFileConfig you can also add wxCONFIG\_USE\_RELATIVE\_PATH 
+by logicaly or'ing it to either of the _FILE options to tell wxFileConfig to 
+use relative instead of absolute paths.  }
 
 \wxheading{Remarks}
 
@@ -428,6 +437,29 @@ Get the current config object. If there is no current object, creates one
 
 Returns the application name.
 
+\membersection{wxConfigBase::GetEntryType}\label{wxconfigbasegetentrytype}
+
+\constfunc{enum wxConfigBase::EntryType}{GetEntryType}{\param{const wxString\& }{name}}
+
+Returns the type of the given entry or {\it Unknown} if the entry doesn't
+exist. This function should be used to decide which version of Read() should
+be used because some of wxConfig implementations will complain about type
+mismatch otherwise: e.g., an attempt to read a string value from an integer
+key with wxRegConfig will fail.
+
+The result is an element of enum EntryType:
+
+\begin{verbatim}
+  enum EntryType
+  {
+    Unknown,
+    String,
+    Boolean,
+    Integer,
+    Float
+  };
+\end{verbatim}
+
 \membersection{wxConfigBase::GetFirstGroup}\label{wxconfigbasegetfirstgroup}
 
 \constfunc{bool}{GetFirstGroup}{\param{wxString\& }{str}, \param{long\&}{
@@ -435,6 +467,10 @@ index}}
 
 Gets the first group.
 
+\pythonnote{The wxPython version of this method returns a 3-tuple
+consisting of the continue flag, the value string, and the index for
+the next call.}
+
 \membersection{wxConfigBase::GetFirstEntry}\label{wxconfigbasegetfirstentry}
 
 \constfunc{bool}{GetFirstEntry}{\param{wxString\& }{str}, \param{long\&}{
@@ -442,6 +478,10 @@ index}}
 
 Gets the first entry.
 
+\pythonnote{The wxPython version of this method returns a 3-tuple
+consisting of the continue flag, the value string, and the index for
+the next call.}
+
 \membersection{wxConfigBase::GetNextGroup}\label{wxconfigbasegetnextgroup}
 
 \constfunc{bool}{GetNextGroup}{\param{wxString\& }{str}, \param{long\&}{
@@ -449,6 +489,10 @@ index}}
 
 Gets the next group.
 
+\pythonnote{The wxPython version of this method returns a 3-tuple
+consisting of the continue flag, the value string, and the index for
+the next call.}
+
 \membersection{wxConfigBase::GetNextEntry}\label{wxconfigbasegetnextentry}
 
 \constfunc{bool}{GetNextEntry}{\param{wxString\& }{str}, \param{long\&}{
@@ -456,6 +500,10 @@ index}}
 
 Gets the next entry.
 
+\pythonnote{The wxPython version of this method returns a 3-tuple
+consisting of the continue flag, the value string, and the index for
+the next call.}
+
 \membersection{wxConfigBase::GetNumberOfEntries}\label{wxconfigbasegetnumberofentries}
 
 \constfunc{uint }{GetNumberOfEntries}{\param{bool }{bRecursive = FALSE}}
@@ -572,6 +620,15 @@ not found, {\it b} is not changed.
 Reads a bool value, returning TRUE if the value was found. If the value was
 not found, {\it defaultVal} is used instead.
 
+\pythonnote{In place of a single overloaded method name, wxPython
+implements the following methods:\par
+\indented{2cm}{\begin{twocollist}
+\twocolitem{\bf{Read(key, default="")}}{Returns a string.}
+\twocolitem{\bf{ReadInt(key, default=0)}}{Returns an int.}
+\twocolitem{\bf{ReadFloat(key, default=0.0)}}{Returns a floating point number.}
+\end{twocollist}}
+}
+
 \membersection{wxConfigBase::RenameEntry}\label{wxconfigbaserenameentry}
 
 \func{bool}{RenameEntry}{\param{const wxString\& }{ oldName}, \param{const wxString\& }{ newName}}
@@ -601,12 +658,6 @@ exists.
 Sets the config object as the current one, returns the pointer to the previous
 current object (both the parameter and returned value may be NULL)
 
-\membersection{wxConfigBase::SetAppName}\label{wxconfigbasesetappname}
-
-\func{void }{SetAppName}{\param{const wxString\&}{ appName}}
-
-Sets the application name.
-
 \membersection{wxConfigBase::SetExpandingEnvVars}\label{wxconfigbasesetexpandingenvvars}
 
 \func{void}{SetExpandEnvVars }{\param{bool }{bDoIt = TRUE}}
@@ -631,12 +682,6 @@ If on (default is off) all default values are written back to the config file.
 This allows the user to see what config options may be changed and is probably
 useful only for wxFileConfig.
 
-\membersection{wxConfigBase::SetVendorName}\label{wxconfigbasesetvendorname}
-
-\func{void}{SetVendorName}{\param{const wxString\&}{ vendorName}}
-
-Sets the vendor name.
-
 \membersection{wxConfigBase::Write}\label{wxconfigbasewrite}
 
 \func{bool}{Write}{\param{const wxString\& }{ key}, \param{const wxString\& }{
@@ -651,4 +696,16 @@ value}}
 These functions write the specified value to the config file and return TRUE
 on success.
 
+\pythonnote{In place of a single overloaded method name, wxPython
+implements the following methods:\par
+\indented{2cm}{\begin{twocollist}
+\twocolitem{\bf{Write(key, value)}}{Writes a string.}
+\twocolitem{\bf{WriteInt(key, value)}}{Writes an int.}
+\twocolitem{\bf{WriteFloat(key, value)}}{Writes a floating point number.}
+\end{twocollist}}
+}
+
+
+
+
 

docs/latex/wx/control.tex

@@ -11,6 +11,10 @@ of data.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/control.h>
+
 \wxheading{See also}
 
 \helpref{wxValidator}{wxvalidator}

docs/latex/wx/critsect.tex

@@ -18,6 +18,10 @@ possible instead of directly using wxCriticalSection for the same reasons
 
 None.
 
+\wxheading{Include files}
+
+<wx/thread.h>
+
 \wxheading{See also}
 
 \helpref{wxThread}{wxthread}, \helpref{wxCondition}{wxcondition}, 

docs/latex/wx/crtslock.tex

@@ -10,6 +10,10 @@ and difficult to debug problems).
 
 None.
 
+\wxheading{Include files}
+
+<wx/thread.h>
+
 \wxheading{See also}
 
 \helpref{wxCriticalSection}{wxcriticalsection}, 

docs/latex/wx/cursor.tex

@@ -20,6 +20,22 @@ global \helpref{::wxSetCursor}{wxsetcursor} is also available for MS Windows use
 \helpref{wxGDIObject}{wxgdiobject}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/cursor.h>
+
+\wxheading{Predefined objects}
+
+Objects:
+
+{\bf wxNullCursor}
+
+Pointers:
+
+{\bf wxSTANDARD\_CURSOR\\
+wxHOURGLASS\_CURSOR\\
+wxCROSS\_CURSOR}
+
 \wxheading{See also}
 
 \helpref{wxBitmap}{wxbitmap}, \helpref{wxIcon}{wxicon}, \helpref{wxWindow::SetCursor}{wxwindowsetcursor},\rtfsp
@@ -84,10 +100,10 @@ Under Windows, the permitted types are:
 \twocolwidtha{6cm}
 \begin{twocollist}\itemsep=0pt
 \twocolitem{\windowstyle{wxBITMAP\_TYPE\_CUR}}{Load a cursor from a .cur cursor file (only if USE\_RESOURCE\_LOADING\_IN\_MSW
-is enabled in wx\_setup.h).}
+is enabled in setup.h).}
 \twocolitem{\windowstyle{wxBITMAP\_TYPE\_CUR\_RESOURCE}}{Load a Windows resource (as specified in the .rc file).}
 \twocolitem{\windowstyle{wxBITMAP\_TYPE\_ICO}}{Load a cursor from a .ico icon file (only if USE\_RESOURCE\_LOADING\_IN\_MSW
-is enabled in wx\_setup.h). Specify {\it hotSpotX} and {\it hotSpotY}.}
+is enabled in setup.h). Specify {\it hotSpotX} and {\it hotSpotY}.}
 \end{twocollist}}
 
 \docparam{cursorId}{A stock cursor identifier. May be one of:
@@ -124,6 +140,14 @@ Note that not all cursors are available on all platforms.}
 
 \docparam{cursor}{Pointer or reference to a cursor to copy.}
 
+\pythonnote{Constructors supported by wxPython are:\par
+\indented{2cm}{\begin{twocollist}
+\twocolitem{\bf{wxCursor(name, flags, hotSpotX=0,
+hotSpotY=0)}}{Constructs a cursor from a filename}
+\twocolitem{\bf{wxStockCursor(id)}}{Constructs a stock cursor }
+\end{twocollist}}
+}
+
 \membersection{wxCursor::\destruct{wxCursor}}
 
 \func{}{\destruct{wxCursor}}{\void}

docs/latex/wx/database.tex

@@ -1,11 +1,16 @@
 \section{\class{wxDatabase}}\label{wxdatabase}
 
-Every database object represents an ODBC connection. The connection may be closed and reopened.
+Every database object represents an ODBC connection.
+The connection may be closed and reopened.
 
-\wxheading{Derivation}
+\wxheading{Derived from}
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/odbc.h>
+
 \wxheading{See also}
 
 \overview{wxDatabase overview}{wxdatabaseoverview}, \helpref{wxRecordSet}{wxrecordset}

docs/latex/wx/dataobj.tex

@@ -43,6 +43,10 @@ available data and the WriteData() methods in both classes.
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/dataobj.h>
+
 \wxheading{See also}
 
 \helpref{wxFileDataObject}{wxfiledataobject}, 

docs/latex/wx/date.tex

@@ -2,10 +2,18 @@
 
 A class for manipulating dates.
 
+{\bf NOTE:} this class should be
+used with caution, since it is not fully tested. It will be replaced
+with a new wxDateTime class in the near future.
+
 \wxheading{Derived from}
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/date.h>
+
 \wxheading{See also}
 
 \helpref{wxTime}{wxtime}

docs/latex/wx/datstrm.tex

@@ -1,114 +1,136 @@
-\section{\class{wxDataStream}}\label{wxdatastream}
+\section{\class{wxDataInputStream}}\label{wxdatainputstream}
 
-This class provides functions that read and write integers or double in a
+This class provides functions that read data types in a
 portable way. So, a file written by an Intel processor can be read by a
 Sparc or anything else.
 
+\wxheading{Derived from}
+
+\helpref{wxFilterInputStream}{wxfilterinputstream}\\
+\helpref{wxInputStream}{wxinputstream}\\
+\helpref{wxStreamBase}{wxstreambase}
+
+\wxheading{Include files}
+
+<wx/datstrm.h>
+
 \latexignore{\rtfignore{\wxheading{Members}}}
 
-\membersection{wxDataStream::wxDataStream}\label{wxdatastreamconstr}
+\membersection{wxDataInputStream::wxDataInputStream}\label{wxdatainputstreamconstr}
 
-\func{}{wxDataStream}{\param{istream\&}{ stream}}
+\func{}{wxDataInputStream}{\param{wxInputStream\&}{ stream}}
 
-Constructs a datastream object from a C++ input stream. Only read methods will
+Constructs a datastream object from an input stream. Only read methods will
 be available.
 
 \wxheading{Parameters}
 
-\docparam{stream}{The C++ input stream.}
+\docparam{stream}{The input stream.}
 
-\func{}{wxDataStream}{\param{istream\&}{ stream}}
+\membersection{wxDataInputStream::\destruct{wxDataInputStream}}
 
-Constructs a datastream object from a C++ input stream. Only read methods will
-be available.
+\func{}{\destruct{wxDataInputStream}}{\void}
 
-\wxheading{Parameters}
+Destroys the wxDataInputStream object.
 
-\docparam{stream}{The C++ input stream.}
-
-\membersection{wxDataStream::\destruct{wxDataStream}}
-
-\func{}{\destruct{wxDataStream}}{\void}
-
-Destroys the wxDataStream object.
-
-\membersection{wxDataStream::Read8}
+\membersection{wxDataInputStream::Read8}
 
 \func{unsigned char}{Read8}{\void}
 
 Reads a single byte from the stream.
 
-\membersection{wxDataStream::Read16}
+\membersection{wxDataInputStream::Read16}
 
 \func{unsigned short}{Read16}{\void}
 
 Reads a 16 bit integer from the stream.
 
-\membersection{wxDataStream::Read32}
+\membersection{wxDataInputStream::Read32}
 
 \func{unsigned long}{Read32}{\void}
 
 Reads a 32 bit integer from the stream.
 
-\membersection{wxDataStream::ReadDouble}
+\membersection{wxDataInputStream::ReadDouble}
 
 \func{double}{ReadDouble}{\void}
 
 Reads a double (IEEE encoded) from the stream.
 
-\membersection{wxDataStream::ReadString}
+\membersection{wxDataInputStream::ReadLine}
 
-\func{wxString}{wxDataStream::ReadString}{\void}
-
-Reads a string from a stream. Actually, this function first reads a byte
-specifying the length of the string (without the last null character) and then
-reads the string.
-
-\membersection{wxDataStream::ReadLine}
-
-\func{wxString}{wxDataStream::ReadLine}{\void}
+\func{wxString}{wxDataInputStream::ReadLine}{\void}
 
 Reads a line from the stream. A line is a string which ends with \\n or \\r\\n.
 
-\membersection{wxDataStream::Write8}
+\membersection{wxDataInputStream::ReadString}
 
-\func{void}{wxDataStream::Write8}{{\param unsigned char }{i8}}
+\func{wxString}{wxDataInputStream::ReadString}{\void}
+
+Reads a string from a stream. Actually, this function first reads a long integer
+specifying the length of the string (without the last null character) and then
+reads the string.
+
+\section{\class{wxDataOutputStream}}\label{wxdataoutputstream}
+
+This class provides functions that write data types in a
+portable way. So, a file written by an Intel processor can be read by a
+Sparc or anything else.
+
+\latexignore{\rtfignore{\wxheading{Members}}}
+
+\membersection{wxDataOutputStream::wxDataOutputStream}\label{wxdataoutputstreamconstr}
+
+\func{}{wxDataInputStream}{\param{wxOutputStream\&}{ stream}}
+
+Constructs a datastream object from an output stream. Only read methods will
+be available.
+
+\wxheading{Parameters}
+
+\docparam{stream}{The output stream.}
+
+\membersection{wxDataOutputStream::\destruct{wxDataOutputStream}}
+
+\func{}{\destruct{wxDataOutputStream}}{\void}
+
+Destroys the wxDataOutputStream object.
+
+\membersection{wxDataOutputStream::Write8}
+
+\func{void}{wxDataOutputStream::Write8}{{\param unsigned char }{i8}}
 
 Writes the single byte {\it i8} to the stream.
 
-\membersection{wxDataStream::Write16}
+\membersection{wxDataOutputStream::Write16}
 
-\func{void}{wxDataStream::Write16}{{\param unsigned short }{i16}}
+\func{void}{wxDataOutputStream::Write16}{{\param unsigned short }{i16}}
 
 Writes the 16 bit integer {\it i16} to the stream.
 
-\membersection{wxDataStream::Write32}
+\membersection{wxDataOutputStream::Write32}
 
-\func{void}{wxDataStream::Write32}{{\param unsigned long }{i32}}
+\func{void}{wxDataOutputStream::Write32}{{\param unsigned long }{i32}}
 
 Writes the 32 bit integer {\it i32} to the stream.
 
-\membersection{wxDataStream::WriteDouble}
+\membersection{wxDataOutputStream::WriteDouble}
 
-\func{void}{wxDataStream::WriteDouble}{{\param double }{f}}
+\func{void}{wxDataOutputStream::WriteDouble}{{\param double }{f}}
 
 Writes the double {\it f} to the stream using the IEEE format.
 
-\membersection{wxDataStream::WriteString}
+\membersection{wxDataOutputStream::WriteLine}
 
-\func{void}{wxDataStream::WriteString}{{\param const wxString\& }{string}}
+\func{void}{wxDataOutputStream::WriteLine}{{\param const wxString\& }{string}}
+
+Writes {\it string} as a line. Depending on the operating system, it adds
+$\backslash$n or $\backslash$r$\backslash$n.
+
+\membersection{wxDataOutputStream::WriteString}
+
+\func{void}{wxDataOutputStream::WriteString}{{\param const wxString\& }{string}}
 
 Writes {\it string} to the stream. Actually, this method writes the size of
 the string before writing {\it string} itself.
 
-\membersection{wxDataStream::WriteLine}
-
-\func{void}{wxDataStream::WriteLine}{{\param const wxString\& }{string}}
-
-Writes {\it string} as a line. Depending on the operating system, it adds
-\\n or \\r\\n.
-
-%%% Local Variables: 
-%%% mode: latex
-%%% TeX-master: "referenc"
-%%% End: 

docs/latex/wx/dc.tex

@@ -13,6 +13,10 @@ only, so refer to this section for most device context information.
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/dc.h>
+
 \wxheading{See also}
 
 \helpref{Overview}{dcoverview}
@@ -183,14 +187,14 @@ filling the shape.
 \func{void}{DrawEllipticArc}{\param{long}{ x}, \param{long}{ y}, \param{long}{ width}, \param{long}{ height},
  \param{double}{ start}, \param{double}{ end}}
 
-Draws an arc of an ellipse. The current pen is used for drawing the arc and 
+Draws an arc of an ellipse. The current pen is used for drawing the arc and
 the current brush is used for drawing the pie. This function is currently only available for
 X window and PostScript device contexts.
 
 {\it x} and {\it y} specify the x and y coordinates of the upper-left corner of the rectangle that contains
 the ellipse.
 
-{\it width} and {\it height} specify the width and height of the rectangle that contains 
+{\it width} and {\it height} specify the width and height of the rectangle that contains
 the ellipse.
 
 {\it start} and {\it end} specify the start and end of the arc relative to the three-o'clock
@@ -224,6 +228,9 @@ pointers to points, adding the optional offset coordinate. The current
 pen is used for drawing the lines.  The programmer is responsible for
 deleting the list of points.
 
+\pythonnote{The wxPython version of this method accepts a Python list
+of wxPoint objects.}
+
 \membersection{wxDC::DrawPolygon}\label{wxdcdrawpolygon}
 
 \func{void}{DrawPolygon}{\param{int}{ n}, \param{wxPoint}{ points[]}, \param{long}{ xoffset = 0}, \param{long}{ yoffset = 0},\\
@@ -244,6 +251,9 @@ The programmer is responsible for deleting the list of points.
 
 Note that wxWindows automatically closes the first and last points.
 
+\pythonnote{The wxPython version of this method accepts a Python list
+of wxPoint objects.}
+
 \membersection{wxDC::DrawPoint}\label{wxdcdrawpoint}
 
 \func{void}{DrawPoint}{\param{long}{ x}, \param{long}{ y}}
@@ -288,6 +298,9 @@ program `XFIG'.
 
 Draws a three-point spline using the current pen.
 
+\pythonnote{The wxPython version of this method accepts a Python list
+of wxPoint objects.}
+
 \membersection{wxDC::DrawText}\label{wxdcdrawtext}
 
 \func{void}{DrawText}{\param{const wxString\& }{text}, \param{long}{ x}, \param{long}{ y}}
@@ -364,6 +377,9 @@ Gets the average character width of the currently set font.
 
 Gets the rectangle surrounding the current clipping region.
 
+\pythonnote{No arguments are required and the four values defining the
+rectangle are returned as a tuple.}
+
 \membersection{wxDC::GetFont}\label{wxdcgetfont}
 
 \func{wxFont\&}{GetFont}{\void}
@@ -424,6 +440,9 @@ printer page:
   dc.SetUserScale(min(scaleX,scaleY),min(scaleX,scaleY));
 \end{verbatim}
 
+\pythonnote{No arguments are required and the two values defining the
+size are returned as a tuple.}
+
 \membersection{wxDC::GetTextBackground}\label{wxdcgettextbackground}
 
 \func{wxColour\&}{GetTextBackground}{\void}
@@ -449,6 +468,14 @@ the device context first.
 
 See also \helpref{wxFont}{wxfont}, \helpref{wxDC::SetFont}{wxdcsetfont}.
 
+\pythonnote{The following methods are implemented in wxPython:\par
+\indented{2cm}{\begin{twocollist}
+\twocolitem{\bf{GetTextExtent(string)}}{Returns a 2-tuple, (width, height)}
+\twocolitem{\bf{GetFullTextExtent(string, font=NULL)}}{Returns a
+4-tuple, (width, height, descent, externalLeading) }
+\end{twocollist}}
+}
+
 \membersection{wxDC::GetTextForeground}\label{wxdcgettextforeground}
 
 \func{wxColour\&}{GetTextForeground}{\void}
@@ -619,7 +646,7 @@ wxXOR                 src XOR dst
 
 The default is wxCOPY, which simply draws with the current colour.
 The others combine the current colour and the background using a
-logical operation.  wxXOR is commonly used for drawing rubber bands or
+logical operation.  wxINVERT is commonly used for drawing rubber bands or
 moving outlines, since drawing twice reverts to the original colour.
 
 \membersection{wxDC::SetMapMode}\label{wxdcsetmapmode}
@@ -644,12 +671,12 @@ PostScript output.
 The mapping mode can be one of the following:
 
 \begin{twocollist}\itemsep=0pt
-\twocolitem{MM\_TWIPS}{Each logical unit is 1/20 of a point, or 1/1440 of
+\twocolitem{wxMM\_TWIPS}{Each logical unit is 1/20 of a point, or 1/1440 of
   an inch.}
-\twocolitem{MM\_POINTS}{Each logical unit is a point, or 1/72 of an inch.}
-\twocolitem{MM\_METRIC}{Each logical unit is 1 mm.}
-\twocolitem{MM\_LOMETRIC}{Each logical unit is 1/10 of a mm.}
-\twocolitem{MM\_TEXT}{Each logical unit is 1 pixel.}
+\twocolitem{wxMM\_POINTS}{Each logical unit is a point, or 1/72 of an inch.}
+\twocolitem{wxMM\_METRIC}{Each logical unit is 1 mm.}
+\twocolitem{wxMM\_LOMETRIC}{Each logical unit is 1/10 of a mm.}
+\twocolitem{wxMM\_TEXT}{Each logical unit is 1 pixel.}
 \end{twocollist}
 
 \membersection{wxDC::SetOptimization}\label{wxsetoptimization}

docs/latex/wx/ddeclint.tex

@@ -19,6 +19,10 @@ of this API is available using \helpref{wxTCPClient}{wxtcpclient}.
 wxClientBase\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/dde.h>
+
 \wxheading{See also}
 
 \helpref{wxDDEServer}{wxddeserver}, \helpref{wxDDEConnection}{wxddeconnection}, 

docs/latex/wx/ddeconn.tex

@@ -21,6 +21,10 @@ of this API is available using \helpref{wxTCPConnection}{wxtcpconnection}.
 wxConnectionBase\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/dde.h>
+
 \wxheading{Types}
 
 \index{wxIPCFormat}wxIPCFormat is defined as follows:

docs/latex/wx/ddeservr.tex

@@ -11,6 +11,10 @@ of this API is available using \helpref{wxTCPServer}{wxtcpserver}.
 
 wxServerBase
 
+\wxheading{Include files}
+
+<wx/dde.h>
+
 \wxheading{See also}
 
 \helpref{wxDDEClient}{wxddeclient}, \helpref{wxDDEConnection}{wxddeconnection}, \helpref{IPC overview}{ipcoverview}

docs/latex/wx/debugcxt.tex

@@ -5,12 +5,16 @@ operations. Full functionality (such as printing out objects
 currently allocated) is only present in a debugging build of wxWindows,
 i.e. if the DEBUG symbol is defined and non-zero. wxDebugContext
 and related functions and macros can be compiled out by setting
-USE\_DEBUG\_CONTEXT to 0 is wx\_setup.h
+wxUSE\_DEBUG\_CONTEXT to 0 is setup.h
 
 \wxheading{Derived from}
 
 No parent class.
 
+\wxheading{Include files}
+
+<wx/memory.h>
+
 \wxheading{See also}
 
 \overview{Overview}{wxdebugcontextoverview}
@@ -251,6 +255,10 @@ This is soon to be obsolete, replaced by \helpref{wxLog}{wxlog} functionality.
 
 streambuf
 
+\wxheading{Include files}
+
+<wx/memory.h>
+
 \wxheading{Example}
 
 \begin{verbatim}

docs/latex/wx/dialog.tex

@@ -10,6 +10,10 @@ the screen. It can contain controls and other windows.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/dialog.h>
+
 \wxheading{Remarks}
 
 There are two kinds of dialog - {\it modal} and {\it modeless}. A modal dialog
@@ -29,7 +33,7 @@ dialog to respond to system close events.
 \begin{twocollist}\itemsep=0pt
 \twocolitem{\windowstyle{wxCAPTION}}{Puts a caption on the dialog box (Motif only).}
 \twocolitem{\windowstyle{wxDEFAULT\_DIALOG\_STYLE}}{Equivalent to a combination of wxCAPTION, wxSYSTEM\_MENU and wxTHICK\_FRAME}
-\twocolitem{\windowstyle{wxRESIZE\_BORDER}}{Display a resizeable frame around the window (Motif only).}
+\twocolitem{\windowstyle{wxRESIZE\_BORDER}}{Display a resizeable frame around the window (Unix only).}
 \twocolitem{\windowstyle{wxSYSTEM\_MENU}}{Display a system menu.}
 \twocolitem{\windowstyle{wxTHICK\_FRAME}}{Display a thick frame around the window.}
 \twocolitem{\windowstyle{wxSTAY\_ON\_TOP}}{The dialog stays on top of all other windows (Windows only).}
@@ -37,7 +41,8 @@ dialog to respond to system close events.
 should not have 3D borders unless specified in the control.}
 \end{twocollist}
 
-Under Motif, MWM (the Motif Window Manager) should be running for any of these styles to have an effect.
+Under Unix or Linux, MWM (the Motif Window Manager) or other window managers reckognizing
+the MHM hints should be running for any of these styles to have an effect.
 
 See also \helpref{Generic window styles}{windowstyles}.
 
@@ -129,8 +134,24 @@ invocation.
 \wxheading{See also}
 
 \helpref{wxDialog::ShowModal}{wxdialogshowmodal},\rtfsp
-\helpref{wxWindow::GetReturnCode}{wxwindowgetreturncode},\rtfsp
-\helpref{wxWindow::SetReturnCode}{wxwindowsetreturncode}
+\helpref{wxDialog::GetReturnCode}{wxdialoggetreturncode},\rtfsp
+\helpref{wxDialog::SetReturnCode}{wxdialogsetreturncode}
+
+\membersection{wxDialog::GetReturnCode}\label{wxdialoggetreturncode}
+
+\func{int}{GetReturnCode}{\void}
+
+Gets the return code for this window.
+
+\wxheading{Remarks}
+
+A return code is normally associated with a modal dialog, where \helpref{wxDialog::ShowModal}{wxdialogshowmodal} returns
+a code to the application.
+
+\wxheading{See also}
+
+\helpref{wxDialog::SetReturnCode}{wxdialogsetreturncode}, \helpref{wxDialog::ShowModal}{wxdialogshowmodal},\rtfsp
+\helpref{wxDialog::EndModal}{wxdialogendmodal}
 
 \membersection{wxDialog::GetTitle}\label{wxdialoggettitle}
 
@@ -142,7 +163,7 @@ Returns the title of the dialog box.
 
 \func{void}{Iconize}{\param{const bool}{ iconize}}
 
-Iconizes or restores the dialog.
+Iconizes or restores the dialog. Windows only.
 
 \wxheading{Parameters}
 
@@ -160,7 +181,7 @@ calling {\tt Iconize(FALSE)} will bring the window to the front, as does
 
 \constfunc{bool}{IsIconized}{\void}
 
-Returns TRUE if the dialog box is iconized.
+Returns TRUE if the dialog box is iconized. Windows only.
 
 \wxheading{Remarks}
 
@@ -265,6 +286,26 @@ until the dialog is hidden) or modeless (control returns immediately).
 
 \docparam{flag}{If TRUE, the dialog will be modal, otherwise it will be modeless.}
 
+\membersection{wxDialog::SetReturnCode}\label{wxdialogsetreturncode}
+
+\func{void}{SetReturnCode}{\param{int }{retCode}}
+
+Sets the return code for this window.
+
+\wxheading{Parameters}
+
+\docparam{retCode}{The integer return code, usually a control identifier.}
+
+\wxheading{Remarks}
+
+A return code is normally associated with a modal dialog, where \helpref{wxDialog::ShowModal}{wxdialogshowmodal} returns
+a code to the application. The function \helpref{wxDialog::EndModal}{wxdialogendmodal} calls {\bf SetReturnCode}.
+
+\wxheading{See also}
+
+\helpref{wxWindow::GetReturnCode}{wxwindowgetreturncode}, \helpref{wxDialog::ShowModal}{wxdialogshowmodal},\rtfsp
+\helpref{wxDialog::EndModal}{wxdialogendmodal}
+
 \membersection{wxDialog::SetTitle}\label{wxdialogsettitle}
 
 \func{void}{SetTitle}{\param{const wxString\& }{ title}}

docs/latex/wx/dirdlg.tex

@@ -9,6 +9,10 @@ This class represents the directory chooser dialog.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/dirdlg.h>
+
 \wxheading{See also}
 
 \helpref{wxDirDialog overview}{wxdirdialogoverview}, \helpref{wxFileDialog}{wxfiledialog}

docs/latex/wx/docchfrm.tex

@@ -16,6 +16,10 @@ See the example application in {\tt samples/docview}.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/docview.h>
+
 \wxheading{See also}
 
 \helpref{Document/view overview}{docviewoverview}, \helpref{wxFrame}{wxframe}

docs/latex/wx/docmanag.tex

@@ -9,6 +9,10 @@ and \helpref{wxDocTemplate}{wxdoctemplate} classes.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/docview.h>
+
 \wxheading{See also}
 
 \helpref{wxDocManager overview}{wxdocmanageroverview}, \helpref{wxDocument}{wxdocument},\rtfsp

docs/latex/wx/docmdich.tex

@@ -17,6 +17,10 @@ See the example application in {\tt samples/docview}.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/docmdi.h>
+
 \wxheading{See also}
 
 \helpref{Document/view overview}{docviewoverview}, \helpref{wxMDIChildFrame}{wxmdichildframe}

docs/latex/wx/docmdipr.tex

@@ -16,6 +16,10 @@ See the example application in {\tt samples/docview}.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/docmdi.h>
+
 \wxheading{See also}
 
 \helpref{Document/view overview}{docviewoverview}, \helpref{wxMDIParentFrame}{wxmdiparentframe}

docs/latex/wx/docprfrm.tex

@@ -15,6 +15,10 @@ See the example application in {\tt samples/docview}.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/docview.h>
+
 \wxheading{See also}
 
 \helpref{Document/view overview}{docviewoverview}, \helpref{wxFrame}{wxframe}

docs/latex/wx/doctempl.tex

@@ -7,6 +7,10 @@ document class and a view class.
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/docview.h>
+
 \wxheading{See also}
 
 \helpref{wxDocTemplate overview}{wxdoctemplateoverview}, \helpref{wxDocument}{wxdocument}, \helpref{wxView}{wxview}

docs/latex/wx/document.tex

@@ -10,6 +10,10 @@ and \helpref{wxDocManager}{wxdocmanager} classes.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/docview.h>
+
 \wxheading{See also}
 
 \helpref{wxDocument overview}{wxdocumentoverview}, \helpref{wxView}{wxview},\rtfsp
@@ -137,16 +141,18 @@ dialog boxes. By default, uses the frame associated with the first view.
 
 \constfunc{wxString}{GetFilename}{\void}
 
-Gets the filename associated with this document, or NULL if none is
+Gets the filename associated with this document, or "" if none is
 associated.
 
-\membersection{wxDocument::GetFirstView}
+\membersection{wxDocument::GetFirstView}\label{wxdocumentgetfirstview}
 
-\constfunc{wxView*}{GetFirstView}{\void}
+\constfunc{wxView *}{GetFirstView}{\void}
 
 A convenience function to get the first view for a document, because
 in many cases a document will only have a single view.
 
+See also: \helpref{GetViews}{wxdocumentgetviews}
+
 \membersection{wxDocument::GetPrintableName}
 
 \constfunc{virtual void}{GetPrintableName}{\param{wxString\& }{name}}
@@ -163,6 +169,14 @@ Gets the title for this document. The document title is used for an associated
 frame (if any), and is usually constructed by the framework from
 the filename.
 
+\membersection{wxDocument::GetViews}\label{wxdocumentgetviews}
+
+\constfunc{wxList \&}{GetViews}{\void}
+
+Returns the list whose elements are the views on the document.
+
+See also: \helpref{GetFirstView}{wxdocumentgetfirstview}
+
 \membersection{wxDocument::IsModified}\label{wxdocumentismodified}
 
 \constfunc{virtual bool}{IsModified}{\void}
@@ -237,7 +251,7 @@ document, and notifies the views that the filename (in fact, the title) has chan
 
 \func{virtual bool}{OnOpenDocument}{\param{const wxString\& }{filename}}
 
-Constructs an input file stream for the given filename (which must not be NULL),
+Constructs an input file stream for the given filename (which must not be empty),
 and calls LoadObject. If LoadObject returns TRUE, the document is set to
 unmodified; otherwise, an error message box is displayed. The document's
 views are notified that the filename has changed, to give windows an opportunity
@@ -247,7 +261,7 @@ to update their titles. All of the document's views are then updated.
 
 \func{virtual bool}{OnSaveDocument}{\param{const wxString\& }{filename}}
 
-Constructs an output file stream for the given filename (which must not be NULL),
+Constructs an output file stream for the given filename (which must not be empty),
 and calls SaveObject. If SaveObject returns TRUE, the document is set to
 unmodified; otherwise, an error message box is displayed.
 

docs/latex/wx/dropevt.tex

@@ -12,6 +12,10 @@ older, Windows message-based approach of dropping files.
 \helpref{wxEvent}{wxevent}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/event.h>
+
 \wxheading{Event table macros}
 
 To process a drop files event, use these event handler macros to direct input to a member

docs/latex/wx/dropsrc.tex

@@ -8,6 +8,10 @@ This class represents a source for a drag and drop operation.
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/dnd.h>
+
 \wxheading{Types}
 
 \index{wxDragResult}wxDragResult is defined as follows:

docs/latex/wx/droptrgt.tex

@@ -8,6 +8,10 @@ This class represents a target for a drag and drop operation.
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/dnd.h>
+
 \wxheading{See also}
 
 \helpref{Drag and drop overview}{wxdndoverview}, \helpref{wxDropSource}{wxdropsource}, 

docs/latex/wx/eraseevt.tex

@@ -7,6 +7,10 @@ An erase event is sent when a window's background needs to be repainted.
 \helpref{wxEvent}{wxevent}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/event.h>
+
 \wxheading{Event table macros}
 
 To process an erase event, use this event handler macro to direct input to a member

docs/latex/wx/event.tex

@@ -8,6 +8,10 @@ event object, and is an abstract base class for other event classes (see below).
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/event.h>
+
 \wxheading{See also}
 
 \helpref{wxCommandEvent}{wxcommandevent},\rtfsp

docs/latex/wx/evthand.tex

@@ -8,6 +8,10 @@ this class.
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/event.h>
+
 \wxheading{See also}
 
 \overview{Event handling overview}{eventhandlingoverview}
@@ -237,8 +241,7 @@ Sets user-supplied client data.
 Normally, any extra data the programmer wishes
 to associate with the object should be made available by deriving a new class
 with new data members.
-
-TODO: make this void*, char* only in compatibility mode.
+%TODO: make this void*, char* only in compatibility mode.
 
 \wxheading{See also}
 

docs/latex/wx/expr.tex

@@ -8,6 +8,10 @@ or list, and lists can be nested.
 
 None
 
+\wxheading{Include files}
+
+<wx/wxexpr.h>
+
 \wxheading{See also}
 
 \helpref{wxExpr overview}{exproverview}, \helpref{wxExprDatabase}{wxexprdatabase}

docs/latex/wx/fildatob.tex

@@ -6,6 +6,10 @@ wxFileDataObject is a specialization of wxDataObject for file names.
 
 \helpref{wxDataObject}{wxdataobject}
 
+\wxheading{Include files}
+
+<wx/dataobj.h>
+
 \wxheading{See also}
 
 \helpref{wxDataObject}{wxdataobject}

docs/latex/wx/fildrptg.tex

@@ -6,6 +6,10 @@
 
 \helpref{wxDropTarget}{wxdroptarget}
 
+\wxheading{Include files}
+
+<wx/dnd.h>
+
 \wxheading{See also}
 
 \helpref{Drag and drop overview}{wxdndoverview}, \helpref{wxDropSource}{wxdropsource}, 

docs/latex/wx/file.tex

@@ -9,6 +9,10 @@ between platforms and compilers.
 
 None.
 
+\wxheading{Include files}
+
+<wx/file.h>
+
 \wxheading{Constants}
 
 wx/file.h defines the following constants:
@@ -257,7 +261,7 @@ TRUE if the operation was successful.
 
 \membersection{wxFile::Write}\label{wxfilewrites}
 
-\func{bool}{Write}{\param{const wxString& }{s}}
+\func{bool}{Write}{\param{const wxString\& }{s}}
 
 Writes the contents of the string to the file, returns TRUE on success.
 

docs/latex/wx/filedlg.tex

@@ -9,12 +9,13 @@ This class represents the file chooser dialog.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/filedlg.h>
+
 \wxheading{See also}
 
 \helpref{wxFileDialog overview}{wxfiledialogoverview}, \helpref{wxFileSelector}{wxfileselector}
-%\rtfsp\helpref{wxFileSelectorEx}{wxfileselectorex}
-%\helpref{wxLoadFileSelector}{wxloadfileselector},\rtfsp
-%\helpref{wxSaveFileSelector}{wxsavefileselector}
 
 \wxheading{Remarks}
 
@@ -39,7 +40,7 @@ Under Windows (only), the wildcard may be a specification for multiple
 types of file with a description for each, such as:
 
 \begin{verbatim}
- "BMP files (*.bmp) | *.bmp | GIF files (*.gif) | *.gif"
+ "BMP files (*.bmp)|*.bmp|GIF files (*.gif)|*.gif"
 \end{verbatim}
 
 \latexignore{\rtfignore{\wxheading{Members}}}

docs/latex/wx/filehist.tex

@@ -11,6 +11,10 @@ as well as the MDI parent frame.
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/docview.h>
+
 \wxheading{See also}
 
 \helpref{wxFileHistory overview}{wxfilehistoryoverview}, \helpref{wxDocManager}{wxdocmanager}

docs/latex/wx/filetype.tex

@@ -29,14 +29,14 @@ A MIME type may have one or more associated extensions: "text/plain" will
 typically correspond to the extension ".txt", but may as well be associated with
 ".ini" or ".conf".
 
-\wxheading{Required headers}
-
-<wx/mimetype.h>
-
 \wxheading{Derived from}
 
 No base class.
 
+\wxheading{Include files}
+
+<wx/mimetype.h>
+
 \wxheading{See also}
 
 \helpref{wxMimeTypesManager}{wxmimetypesmanager}