From fe604ccddcf5696a751892ad70dbc822be239c95 Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Sun, 14 Jun 1998 20:48:39 +0000
Subject: [PATCH] Various documentation additions and changes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@95 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 docs/latex/wx/body.tex     |    2 +-
 docs/latex/wx/category.tex |    4 +-
 docs/latex/wx/classes.tex  |    3 +
 docs/latex/wx/dc.tex       |   16 +-
 docs/latex/wx/helpinst.tex |  144 ++--
 docs/latex/wx/joyevent.tex |  118 +++
 docs/latex/wx/joystick.tex |  294 ++++++++
 docs/latex/wx/memorydc.tex |    2 +-
 docs/latex/wx/mouseevt.tex |   21 +-
 docs/latex/wx/scrolwin.tex |    2 +-
 docs/latex/wx/t2rtf32.ini  |   21 -
 docs/latex/wx/tbitmap.tex  |    4 +-
 docs/latex/wx/tcommdlg.tex |   10 +-
 docs/latex/wx/tconstr.tex  |   22 +-
 docs/latex/wx/tdocview.tex |    2 +-
 docs/latex/wx/tex2rtf.ini  |    2 +-
 docs/latex/wx/tfont.tex    |    4 +-
 docs/latex/wx/tguide.tex   |    6 +-
 docs/latex/wx/toolbar.tex  |    6 +-
 docs/latex/wx/tsplittr.tex |   28 +-
 docs/latex/wx/ttab.tex     |    6 +-
 docs/latex/wx/ttoolbar.tex |    4 +-
 docs/latex/wx/tusage.tex   |    2 +-
 docs/latex/wx/upditer.tex  |    3 +-
 docs/latex/wx/view.tex     |    4 +-
 docs/latex/wx/window.tex   |   20 +-
 docs/latex/wx/winhelp.tex  |  107 +++
 docs/latex/wx/wx.cnt       | 1417 ++++++++++++++++++------------------
 docs/latex/wx/wx.hpj       |    2 +-
 29 files changed, 1389 insertions(+), 887 deletions(-)
 create mode 100644 docs/latex/wx/joyevent.tex
 create mode 100644 docs/latex/wx/joystick.tex
 delete mode 100644 docs/latex/wx/t2rtf32.ini
 create mode 100644 docs/latex/wx/winhelp.tex

diff --git a/docs/latex/wx/body.tex b/docs/latex/wx/body.tex
index 8079fbc639..c5787bffed 100644
--- a/docs/latex/wx/body.tex
+++ b/docs/latex/wx/body.tex
@@ -710,7 +710,7 @@ When an application invokes wxHelp, subsequent sections, blocks or
 files may be viewed using the same instance of wxHelp since the two
 programs are linked using wxWindows interprocess communication
 facilities. When the application exits, that application's instance of
-wxHelp may be made to exit also.  See the {\bf wxHelpInstance} entry in the
+wxHelp may be made to exit also.  See the {\bf wxHelpControllerBase} entry in the
 reference section for how an application controls wxHelp.
 
 \section{Tex2RTF}\label{textortf}
diff --git a/docs/latex/wx/category.tex b/docs/latex/wx/category.tex
index 246b9f7bb3..1072363653 100644
--- a/docs/latex/wx/category.tex
+++ b/docs/latex/wx/category.tex
@@ -188,6 +188,7 @@ An event object contains information about a specific event. Event handlers
 %\twocolitem{\helpref{wxSessionEvent}{wxsessionevent}}{A session ending event}
 \twocolitem{\helpref{wxSizeEvent}{wxsizeevent}}{A size event}
 \twocolitem{\helpref{wxSysColourChangedEvent}{wxsyscolourchangedevent}}{A system colour change event}
+\twocolitem{\helpref{wxTabEvent}{wxtabevent}}{A tab control event}
 \twocolitem{\helpref{wxTreeEvent}{wxtreeevent}}{A tree control event}
 \twocolitem{\helpref{wxUpdateUIEvent}{wxupdateuievent}}{A user interface update event}
 \end{twocollist}
@@ -267,7 +268,6 @@ based on DDE.
 \twocolitem{\helpref{wxDDEClient}{wxddeclient}}{Represents a client}
 \twocolitem{\helpref{wxDDEConnection}{wxddeconnection}}{Represents the connection between a client and a server}
 \twocolitem{\helpref{wxDDEServer}{wxddeserver}}{Represents a server}
-%TODO: put this somewhere \twocolitem{\helpref{wxHelpInstance}{wxhelpinstance}}{A specialised client}
 \end{twocollist}
 
 {\large {\bf Document/view framework}}
@@ -327,8 +327,10 @@ product.
 
 \begin{twocollist}\itemsep=0pt
 \twocolitem{\helpref{wxApp}{wxapp}}{Application class}
+\twocolitem{\helpref{wxHelpControllerBase}{wxhelpcontrollerbase}}{Base class for help controllers}
 \twocolitem{\helpref{wxTimer}{wxtimer}}{Timer class}
 \twocolitem{\helpref{wxSystemSettings}{wxsystemsettings}}{System settings class}
+\twocolitem{\helpref{wxWinHelpController}{wxwinhelpcontroller}}{Controls WinHelp instances}
 \end{twocollist}
 
 
diff --git a/docs/latex/wx/classes.tex b/docs/latex/wx/classes.tex
index 111109e100..c14c68c0ae 100644
--- a/docs/latex/wx/classes.tex
+++ b/docs/latex/wx/classes.tex
@@ -85,6 +85,8 @@ $$\image{14cm;0cm}{wxclass.ps}$$
 \input imaglist.tex
 \input ilayout.tex
 \input indlgevt.tex
+\input joystick.tex
+\input joyevent.tex
 \input keyevent.tex
 \input layout.tex
 \input list.tex
@@ -164,6 +166,7 @@ $$\image{14cm;0cm}{wxclass.ps}$$
 \input wave.tex
 \input window.tex
 \input windowdc.tex
+\input winhelp.tex
 
 \input function.tex
 
diff --git a/docs/latex/wx/dc.tex b/docs/latex/wx/dc.tex
index e84b28d054..a4d71bd80a 100644
--- a/docs/latex/wx/dc.tex
+++ b/docs/latex/wx/dc.tex
@@ -2,7 +2,7 @@
 
 A wxDC is a {\it device context} onto which graphics and text can be drawn.
 It is intended to represent a number of output devices in a generic way,
-so a canvas has a device context and a printer also has a device context.
+so a window can have a device context associated with it, and a printer also has a device context.
 In this way, the same piece of code may write to a number of different devices,
 if the device context is used as a parameter.
 
@@ -115,7 +115,7 @@ Clears the device context using the current background brush.
 \func{void}{CrossHair}{\param{long}{ x}, \param{long}{ y}}
 
 Displays a cross hair using the current pen. This is a vertical
-and horizontal line the height and width of the canvas, centred
+and horizontal line the height and width of the window, centred
 on the given point.
 
 \membersection{wxDC::DestroyClippingRegion}\label{wxdcdestroyclippingregion}
@@ -176,7 +176,7 @@ filling the shape.
 
 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 canvas and PostScript device contexts.
+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.
@@ -195,7 +195,7 @@ complete ellipse will be drawn.
 \func{void}{DrawIcon}{\param{const wxIcon\&}{ icon}, \param{long}{ x}, \param{long}{ y}}
 
 Draw an icon on the display (does nothing if the device context is PostScript).
-This can be the simplest way of drawing bitmaps on a canvas.
+This can be the simplest way of drawing bitmaps on a window.
 
 \membersection{wxDC::DrawLine}\label{wxdcdrawline}
 
@@ -349,7 +349,7 @@ Gets the character height of the currently set font.
 
 Gets the average character width of the currently set font.
 
-\membersection{wxCanvas::GetClippingBox}\label{wxdcgetclippingbox}
+\membersection{wxDC::GetClippingBox}\label{wxdcgetclippingbox}
 
 \func{void}{GetClippingBox}{\param{long}{ *x}, \param{long}{ *y}, \param{long}{ *width}, \param{long}{ *height}}
 
@@ -533,7 +533,7 @@ whether text will be drawn with a background colour or not.
 
 Sets the clipping region for the DC. The clipping region is a rectangular area
 to which drawing is restricted.  Possible uses for the clipping region are for clipping text
-or for speeding up canvas redraws when only a known area of the screen is damaged.
+or for speeding up window redraws when only a known area of the screen is damaged.
 
 See also \helpref{wxDC::DestroyClippingRegion}{wxdcdestroyclippingregion}.
 
@@ -541,7 +541,7 @@ See also \helpref{wxDC::DestroyClippingRegion}{wxdcdestroyclippingregion}.
 
 \func{void}{SetPalette}{\param{const wxPalette\& }{palette}}
 
-If this is a canvas DC or memory DC, assigns the given palette to the window
+If this is a window DC or memory DC, assigns the given palette to the window
 or bitmap associated with the DC. If the argument is wxNullPalette, the current
 palette is selected out of the device context, and the original palette
 restored.
@@ -576,7 +576,7 @@ See also \helpref{wxFont}{wxfont}.
 
 \func{void}{SetLogicalFunction}{\param{int}{ function}}
 
-Sets the current logical function for the canvas.  This determines how
+Sets the current logical function for the device context.  This determines how
 a source pixel (from a pen or brush colour, or source device context if
 using \helpref{wxDC::Blit}{wxdcblit}) combines with a destination pixel in the
 current device context.
diff --git a/docs/latex/wx/helpinst.tex b/docs/latex/wx/helpinst.tex
index 156b268a36..40d2fafefa 100644
--- a/docs/latex/wx/helpinst.tex
+++ b/docs/latex/wx/helpinst.tex
@@ -1,130 +1,122 @@
-\section{\class{wxHelpInstance}}\label{wxhelpinstance}
+\section{\class{wxHelpControllerBase}}\label{wxhelpcontrollerbase}
 
-NOTE: this documentation is out of date (see comments below).
+This class defines the interface by which
+applications may invoke a help viewer to provide on-line help.
 
-The {\bf wxHelpInstance} class implements the interface by which
-applications may invoke wxHelp to provide on-line help. Each instance
-of the class maintains one connection to an instance of wxHelp which
-belongs to the application, and which is shut down when the Quit
-member of {\bf wxHelpInstance} is called (for example in the {\bf
-OnClose} member of an application's main frame). Under MS Windows,
-there is currently only one instance of wxHelp which is used by all
-applications.
+Other classes derive from this class to provide actual implementations
+of help controllers.
 
-Since there is a DDE link between the two programs, each subsequent
-request to display a file or section uses the existing instance of
-wxHelp, rather than starting a new instance each time. wxHelp thus
-appears to the user to be an extension of the current application.
-wxHelp may also be invoked independently of a client application.
+A help controller allows an application to display help, at the contents
+or at a particular topic, and shut the help program down on termination.
+This avoids proliferation of many instances of the help viewer whenever the
+user requests a different topic via the application's menus or buttons.
 
-Normally an application will create an instance of {\bf
-wxHelpInstance} when it starts, and immediately call {\bf Initialize}\rtfsp
-to associate a filename with it. wxHelp will only get run, however,
-just before the first call to display something. See the test program
-supplied with the wxHelp source.
+Typically, an application will create a help controller instance
+when it starts, and immediately call {\bf Initialize}\rtfsp
+to associate a filename with it. The help viewer will only get run, however,
+just before the first call to display something.
 
-Include the file {\tt wx\_help.h} to use this API, even if you have
-included {\tt wx.h}.
+\wxheading{Derivation}
 
-If you give TRUE to the constructor, you can use the native help system
-where appropriate (currently under Windows only). Omit the file extension
-to allow wxWindows to choose the appropriate file for the platform.
+\helpref{wxObject}{wxobject}
 
-TODO: no longer derive this from a client class, but maybe have several implementations,
-e.g. wxHelpInstanceBase, wxHelpInstanceDDE, wxHelpInstanceWinHelp, wxHelpInstanceHTML, etc.
+\wxheading{See also}
 
-\wxheading{Derivation}
+\helpref{wxWinHelpController}{wxwinhelpcontroller}
 
-TODO
+\wxheading{Include file}
 
-\wxheading{See also}
+{\tt <wx/helpbase.h>} (for just wxHelpControllerBase)
+
+{\tt <wx/help.h>} (to include the platform-specific controller, e.g. wxWinHelpController)
 
-TODO
 
 \latexignore{\rtfignore{\wxheading{Members}}}
 
-\membersection{wxHelpInstance::wxHelpInstance}
+\membersection{wxHelpControllerBase::wxHelpControllerBase}
 
-\func{}{wxHelpInstance}{\param{bool}{ native}}
+\func{}{wxHelpControllerBase}{\void}
 
-Constructs a help instance object, but does not invoke wxHelp.
-If {\it native} is TRUE, tries to use the native help system where
-possible (Windows Help under MS Windows, wxHelp on other platforms).
+Constructs a help instance object, but does not invoke the help viewer.
 
-\membersection{wxHelpInstance::\destruct{wxHelpInstance}}
+\membersection{wxHelpControllerBase::\destruct{wxHelpControllerBase}}
 
-\func{}{\destruct{wxHelpInstance}}{\void}
+\func{}{\destruct{wxHelpControllerBase}}{\void}
 
-Destroys the help instance, closing down wxHelp for this application
-if it is running.
+Destroys the help instance, closing down the viewer if it is running.
 
-\membersection{wxHelpInstance::Initialize}
+\membersection{wxHelpControllerBase::Initialize}\label{wxhelpcontrollerbaseinitialize}
 
-\func{void}{Initialize}{\param{const wxString\& }{file}, \param{int}{ server = -1}}
+\func{virtual void}{Initialize}{\param{const wxString\& }{file}}
+
+\func{virtual void}{Initialize}{\param{const wxString\& }{file}, \param{int}{ server}}
 
 Initializes the help instance with a help filename, and optionally a server (socket)
-number (one is chosen at random if this parameter is omitted). Does not invoke wxHelp.
+number. Does not invoke the help viewer.
 This must be called directly after the help instance object is created and before
-any attempts to communicate with wxHelp.
+any attempts to communicate with the viewer.
+
+You may omit the file extension and a suitable one will be chosen.
 
-You may omit the file extension, and in fact this is recommended if you
-wish to support .xlp files under X and .hlp under Windows.
+\membersection{wxHelpControllerBase::DisplayBlock}\label{wxhelpcontrollerbasedisplayblock}
 
-\membersection{wxHelpInstance::DisplayBlock}
+\func{virtual bool}{DisplayBlock}{\param{long}{ blockNo}}
 
-\func{bool}{DisplayBlock}{\param{long}{ blockNo}}
+If the help viewer is not running, runs it and displays the file at the given block number.
+The interpretation of {\it blockNo} differs between help viewers. If using Windows Help, this
+refers to the context number. If wxHelp, this is the wxHelp block number.
 
-If wxHelp is not running, runs wxHelp and displays the file at the given block number.
-If using Windows Help, displays the file at the given context number.
+\membersection{wxHelpControllerBase::DisplayContents}\label{wxhelpcontrollerbasedisplaycontents}
 
-\membersection{wxHelpInstance::DisplayContents}
+\func{virtual bool}{DisplayContents}{\void}
 
-\func{bool}{DisplayContents}{\void}
+If the help viewer is not running, runs it and displays the
+contents.
 
-If wxHelp is not running, runs wxHelp (or Windows Help) and displays the
-contents (the first section of the file).
+\membersection{wxHelpControllerBase::DisplaySection}\label{wxhelpcontrollerbasedisplaysection}
 
-\membersection{wxHelpInstance::DisplaySection}
+\func{virtual bool}{DisplaySection}{\param{int}{ sectionNo}}
 
-\func{bool}{DisplaySection}{\param{int}{ sectionNo}}
+If the help viewer is not running, runs it and displays the given section.
+Sections are numbered starting from 1.
 
-If wxHelp is not running, runs wxHelp and displays the given section.
-Sections are numbered starting from 1, and section numbers may be viewed by running
-wxHelp in edit mode.
+For wxHelp, section numbers may be viewed by running wxHelp in edit mode.
 
-\membersection{wxHelpInstance::KeywordSearch}
+DisplaySection does not apply to WinHelp.
 
-\func{bool}{KeywordSearch}{\param{const wxString\& }{keyWord}}
+\membersection{wxHelpControllerBase::KeywordSearch}\label{wxhelpcontrollerbasekeywordsearch}
 
-If wxHelp (or Windows Help) is not running, runs wxHelp (or Windows
-Help), and searches for sections matching the given keyword. If one
+\func{virtual bool}{KeywordSearch}{\param{const wxString\& }{keyWord}}
+
+If the help viewer is not running, runs it, and searches for sections matching the given keyword. If one
 match is found, the file is displayed at this section. If more than one
 match is found, the Search dialog is displayed with the matches (wxHelp)
 or the first topic is displayed (Windows Help).
 
-\membersection{wxHelpInstance::LoadFile}
+\membersection{wxHelpControllerBase::LoadFile}\label{wxhelpcontrollerbaseloadfile}
 
-\func{bool}{LoadFile}{\param{const wxString\& }{file = NULL}}
+\func{virtual bool}{LoadFile}{\param{const wxString\& }{file = NULL}}
 
-If wxHelp (or Windows Help) is not running, runs wxHelp (or Windows
-Help), and loads the given file. If the filename is not supplied or is
-NULL, the file specified in {\bf Initialize} is used. If wxHelp is
+If the help viewer is not running, runs it and loads the given file.
+If the filename is not supplied or is
+NULL, the file specified in {\bf Initialize} is used. If the viewer is
 already displaying the specified file, it will not be reloaded. This
 member function may be used before each display call in case the user
 has opened another file.
 
-\membersection{wxHelpInstance::OnQuit}
+\membersection{wxHelpControllerBase::OnQuit}\label{wxhelpcontrollerbaseonquit}
+
+\func{virtual bool}{OnQuit}{\void}
 
-\func{bool}{OnQuit}{\void}
+Overridable member called when this application's viewer is quit by the user.
 
-Overridable member called when this application's wxHelp is quit
-(no effect if Windows Help is being used instead).
+This only works for wxXLPHelpController.
 
-\membersection{wxHelpInstance::Quit}
+\membersection{wxHelpControllerBase::Quit}\label{wxhelpcontrollerbasequit}
 
-\func{bool}{Quit}{\void}
+\func{virtual bool}{Quit}{\void}
 
-If wxHelp is running, quits wxHelp by disconnecting (no effect for Windows
-Help).
+If the viewer is running, quits it by disconnecting.
 
+For Windows Help, the viewer will only close if no other application is using it.
 
diff --git a/docs/latex/wx/joyevent.tex b/docs/latex/wx/joyevent.tex
new file mode 100644
index 0000000000..f8da76cf65
--- /dev/null
+++ b/docs/latex/wx/joyevent.tex
@@ -0,0 +1,118 @@
+\section{\class{wxJoystickEvent}}\label{wxjoystickevent}
+
+This event class contains information about mouse events, particularly
+events received by windows.
+
+\wxheading{Derived from}
+
+\helpref{wxEvent}{wxevent}
+
+\wxheading{Event table macros}
+
+To process a mouse event, use these event handler macros to direct input to member
+functions that take a wxJoystickEvent argument.
+
+\twocolwidtha{7cm}
+\begin{twocollist}\itemsep=0pt
+\twocolitem{{\bf EVT\_JOY\_BUTTON\_DOWN(func)}}{Process a wxEVT\_JOY\_BUTTON\_DOWN event.}
+\twocolitem{{\bf EVT\_JOY\_BUTTON\_UP(func)}}{Process a wxEVT\_JOY\_BUTTON\_UP event.}
+\twocolitem{{\bf EVT\_JOY\_MOVE(func)}}{Process a wxEVT\_JOY\_MOVE event.}
+\twocolitem{{\bf EVT\_JOY\_ZMOVE(func)}}{Process a wxEVT\_JOY\_ZMOVE event.}
+\end{twocollist}%
+
+\wxheading{See also}
+
+\helpref{wxJoystick}{wxjoystick}
+
+\latexignore{\rtfignore{\wxheading{Members}}}
+
+\membersection{wxJoystickEvent::wxJoystickEvent}
+
+\func{}{wxJoystickEvent}{\param{WXTYPE}{ eventType = 0}, \param{int}{ state = 0},
+ \param{int}{ joystick = wxJOYSTICK1}, \param{int }{change = 0}}
+
+Constructor.
+
+\membersection{wxJoystickEvent::ButtonDown}\label{wxjoystickeventbuttondown}
+
+\constfunc{bool}{ButtonDown}{\param{int}{ button = wxJOY\_BUTTON\_ANY}}
+
+Returns TRUE if the event was a down event from the specified button (or any button).
+
+\wxheading{Parameters}
+
+\docparam{button}{Can be wxJOY\_BUTTONn where n is 1, 2, 3 or 4; or wxJOY\_BUTTON\_ANY to
+indicate any button down event.}
+
+\membersection{wxJoystickEvent::ButtonIsDown}\label{wxjoystickeventbuttonisdown}
+
+\constfunc{bool}{ButtonIsDown}{\param{int}{ button = wxJOY\_BUTTON\_ANY}}
+
+Returns TRUE if the specified button (or any button) was in a down state.
+
+\wxheading{Parameters}
+
+\docparam{button}{Can be wxJOY\_BUTTONn where n is 1, 2, 3 or 4; or wxJOY\_BUTTON\_ANY to
+indicate any button down event.}
+
+\membersection{wxJoystickEvent::ButtonUp}\label{wxjoystickeventbuttonup}
+
+\constfunc{bool}{ButtonUp}{\param{int}{ button = wxJOY\_BUTTON\_ANY}}
+
+Returns TRUE if the event was an up event from the specified button (or any button).
+
+\wxheading{Parameters}
+
+\docparam{button}{Can be wxJOY\_BUTTONn where n is 1, 2, 3 or 4; or wxJOY\_BUTTON\_ANY to
+indicate any button down event.}
+
+\membersection{wxJoystickEvent::GetButtonChange}\label{wxjoystickeventgetbuttonchange}
+
+\constfunc{int}{GetButtonChange}{\void}
+
+Returns the identifier of the button changing state. This is a wxJOY\_BUTTONn identifier, where
+n is one of 1, 2, 3, 4.
+
+\membersection{wxJoystickEvent::GetButtonState}\label{wxjoystickeventgetbuttonstate}
+
+\constfunc{int}{GetButtonState}{\void}
+
+Returns the down state of the buttons. This is a bitlist of wxJOY\_BUTTONn identifiers, where
+n is one of 1, 2, 3, 4.
+
+\membersection{wxJoystickEvent::GetJoystick}\label{wxjoystickeventgetjoystick}
+
+\constfunc{int}{GetJoystick}{\void}
+
+Returns the identifier of the joystick generating the event - one of wxJOYSTICK1 and wxJOYSTICK2.
+
+\membersection{wxJoystickEvent::GetPosition}\label{wxjoystickeventgetposition}
+
+\constfunc{wxPoint}{GetPosition}{\void}
+
+Returns the x, y position of the joystick event.
+
+\membersection{wxJoystickEvent::GetZPosition}\label{wxjoystickeventgetzposition}
+
+\constfunc{int}{GetZPosition}{\void}
+
+Returns the z position of the joystick event.
+
+\membersection{wxJoystickEvent::IsButton}\label{wxjoystickeventisbutton}
+
+\constfunc{bool}{IsButton}{\void}
+
+Returns TRUE if this was a button up or down event ({\it not} 'is any button down?').
+
+\membersection{wxJoystickEvent::IsMove}\label{wxjoystickeventismove}
+
+\constfunc{bool}{IsMove}{\void}
+
+Returns TRUE if this was an x, y move event.
+
+\membersection{wxJoystickEvent::IsZMove}\label{wxjoystickeventiszmove}
+
+\constfunc{bool}{IsZMove}{\void}
+
+Returns TRUE if this was a z move event.
+
diff --git a/docs/latex/wx/joystick.tex b/docs/latex/wx/joystick.tex
new file mode 100644
index 0000000000..118a233360
--- /dev/null
+++ b/docs/latex/wx/joystick.tex
@@ -0,0 +1,294 @@
+\section{\class{wxJoystick}}\label{wxjoystick}
+
+wxJoystick allows an application to control one or more joysticks.
+
+\wxheading{Derived from}
+
+\helpref{wxObject}{wxobject}
+
+\wxheading{See also}
+
+\helpref{wxJoystickEvent}{wxjoystickevent}
+
+\latexignore{\rtfignore{\wxheading{Members}}}
+
+\membersection{wxJoystick::wxJoystick}\label{wxjoystickconstr}
+
+\func{}{wxJoystick}{\param{int}{ joystick = wxJOYSTICK1}}
+
+Constructor. {\it joystick} may be one of wxJOYSTICK1, wxJOYSTICK2, indicating the joystick
+controller of interest.
+
+\membersection{wxJoystick::\destruct{wxJoystick}}
+
+\func{}{\destruct{wxJoystick}}{\void}
+
+Destroys the wxJoystick object.
+
+\membersection{wxJoystick::GetButtonState}\label{wxjoystickgetbuttonstate}
+
+\constfunc{int}{GetButtonState}{\void}
+
+Returns the state of the joystick buttons. A bitlist of wxJOY\_BUTTONn identifiers,
+where n is 1, 2, 3 or 4.
+
+\membersection{wxJoystick::GetManufacturerId}\label{wxjoystickgetmanufacturerid}
+
+\constfunc{int}{GetManufacturerId}{\void}
+
+Returns the manufacturer id.
+
+\membersection{wxJoystick::GetMovementThreshold}\label{wxjoystickgetmovementthreshold}
+
+\constfunc{int}{GetMovementThreshold}{\void}
+
+Returns the movement threshold, the number of steps outside which the joystick is deemed to have
+moved.
+
+\membersection{wxJoystick::GetNumberAxes}\label{wxjoystickgetnumberaxes}
+
+\constfunc{int}{GetNumberAxes}{\void}
+
+Returns the number of axes for this joystick.
+
+\membersection{wxJoystick::GetNumberButtons}\label{wxjoystickgetnumberbuttons}
+
+\constfunc{int}{GetNumberButtons}{\void}
+
+Returns the number of buttons for this joystick.
+
+\membersection{wxJoystick::GetNumberJoysticks}\label{wxjoystickgetnumberjoysticks}
+
+\constfunc{int}{GetNumberJoysticks}{\void}
+
+Returns the number of joysticks currently attached to the computer.
+
+\membersection{wxJoystick::GetPollingMax}\label{wxjoystickgetpollingmax}
+
+\constfunc{int}{GetPollingMax}{\void}
+
+Returns the maximum polling frequency.
+
+\membersection{wxJoystick::GetPollingMin}\label{wxjoystickgetpollingmin}
+
+\constfunc{int}{GetPollingMin}{\void}
+
+Returns the minimum polling frequency.
+
+\membersection{wxJoystick::GetProductId}\label{wxjoystickgetproductid}
+
+\constfunc{int}{GetProductId}{\void}
+
+Returns the product id for the joystick.
+
+\membersection{wxJoystick::GetProductName}\label{wxjoystickgetproductname}
+
+\constfunc{wxString}{GetProductName}{\void}
+
+Returns the product name for the joystick.
+
+\membersection{wxJoystick::GetPosition}\label{wxjoystickgetposition}
+
+\constfunc{wxPoint}{GetPosition}{\void}
+
+Returns the x, y position of the joystick.
+
+\membersection{wxJoystick::GetPOVPosition}\label{wxjoystickgetpovposition}
+
+\constfunc{int}{GetPOVPosition}{\void}
+
+Returns the point-of-view position, expressed in discrete units.
+
+\membersection{wxJoystick::GetPOVCTSPosition}\label{wxjoystickgetpovctsposition}
+
+\constfunc{int}{GetPOVCTSPosition}{\void}
+
+Returns the point-of-view position, expressed in continuous, one-hundredth of a degree units.
+
+\membersection{wxJoystick::GetRudderMax}\label{wxjoystickgetruddermax}
+
+\constfunc{int}{GetRudderMax}{\void}
+
+Returns the maximum rudder position.
+
+\membersection{wxJoystick::GetRudderMin}\label{wxjoystickgetruddermin}
+
+\constfunc{int}{GetRudderMin}{\void}
+
+Returns the minimum rudder position.
+
+\membersection{wxJoystick::GetRudderPosition}\label{wxjoystickgetrudderposition}
+
+\constfunc{int}{GetRudderPosition}{\void}
+
+Returns the rudder position.
+
+\membersection{wxJoystick::GetUMax}\label{wxjoystickgetumax}
+
+\constfunc{int}{GetUMax}{\void}
+
+Returns the maximum U position.
+
+\membersection{wxJoystick::GetUMin}\label{wxjoystickgetumin}
+
+\constfunc{int}{GetUMin}{\void}
+
+Returns the minimum U position.
+
+\membersection{wxJoystick::GetUPosition}\label{wxjoystickgetuposition}
+
+\constfunc{int}{GetUPosition}{\void}
+
+Gets the position of the fifth axis of the joystick, if it exists.
+
+\membersection{wxJoystick::GetVMax}\label{wxjoystickgetvmax}
+
+\constfunc{int}{GetVMax}{\void}
+
+Returns the maximum V position.
+
+\membersection{wxJoystick::GetUMin}\label{wxjoystickgetumin}
+
+\constfunc{int}{GetUMin}{\void}
+
+Returns the minimum U position.
+
+\membersection{wxJoystick::GetVPosition}\label{wxjoystickgetvposition}
+
+\constfunc{int}{GetVPosition}{\void}
+
+Gets the position of the sixth axis of the joystick, if it exists.
+
+\membersection{wxJoystick::GetXMax}\label{wxjoystickgetxmax}
+
+\constfunc{int}{GetXMax}{\void}
+
+Returns the maximum x position.
+
+\membersection{wxJoystick::GetXMin}\label{wxjoystickgetxmin}
+
+\constfunc{int}{GetXMin}{\void}
+
+Returns the minimum x position.
+
+\membersection{wxJoystick::GetYMax}\label{wxjoystickgetymax}
+
+\constfunc{int}{GetYMax}{\void}
+
+Returns the maximum y position.
+
+\membersection{wxJoystick::GetYMin}\label{wxjoystickgetymin}
+
+\constfunc{int}{GetYMin}{\void}
+
+Returns the minimum y position.
+
+\membersection{wxJoystick::GetZMax}\label{wxjoystickgetzmax}
+
+\constfunc{int}{GetZMax}{\void}
+
+Returns the maximum z position.
+
+\membersection{wxJoystick::GetZMin}\label{wxjoystickgetzmin}
+
+\constfunc{int}{GetXMin}{\void}
+
+Returns the minimum z position.
+
+\membersection{wxJoystick::GetZPosition}\label{wxjoystickgetzposition}
+
+\constfunc{int}{GetZPosition}{\void}
+
+Returns the z position of the joystick.
+
+\membersection{wxJoystick::HasPOV}\label{wxjoystickhaspov}
+
+\constfunc{bool}{HasPOV}{\void}
+
+Returns TRUE if the joystick has a point of view control.
+
+\membersection{wxJoystick::HasPOV4Dir}\label{wxjoystickhaspovfdir}
+
+\constfunc{bool}{HasPOV4Dir}{\void}
+
+Returns TRUE if the joystick point-of-view supports discrete values (centered, forward, backward, left, and right).
+
+\membersection{wxJoystick::HasPOVCTS}\label{wxjoystickhaspovcts}
+
+\constfunc{bool}{HasPOVCTS}{\void}
+
+Returns TRUE if the joystick point-of-view supports continuous degree bearings.
+
+\membersection{wxJoystick::HasRudder}\label{wxjoystickhasrudder}
+
+\constfunc{bool}{HasRudder}{\void}
+
+Returns TRUE if there is a rudder attached to the computer.
+
+\membersection{wxJoystick::HasU}\label{wxjoystickhasu}
+
+\constfunc{bool}{HasU}{\void}
+
+Returns TRUE if the joystick has a U axis.
+
+\membersection{wxJoystick::HasV}\label{wxjoystickhasv}
+
+\constfunc{bool}{HasV}{\void}
+
+Returns TRUE if the joystick has a V axis.
+
+\membersection{wxJoystick::HasZ}\label{wxjoystickhasz}
+
+\constfunc{bool}{HasZ}{\void}
+
+Returns TRUE if the joystick has a Z axis.
+
+\membersection{wxJoystick::IsOk}\label{wxjoystickisok}
+
+\constfunc{bool}{IsOk}{\void}
+
+Returns TRUE if the joystick is functioning.
+
+\membersection{wxJoystick::ReleaseCapture}\label{wxjoystickreleasecapture}
+
+\func{bool}{ReleaseCapture}{\void}
+
+Releases the capture set by {\bf SetCapture}.
+
+\wxheading{Return value}
+
+TRUE if the capture release succeeded.
+
+\wxheading{See also}
+
+\helpref{wxJoystick::SetCapture}{wxjoysticksetcapture}, \helpref{wxJoystickEvent}{wxjoystickevent}
+
+\membersection{wxJoystick::SetCapture}\label{wxjoysticksetcapture}
+
+\func{bool}{SetCapture}{\param{wxWindow*}{ win}, \param{int}{ pollingFreq = 0}}
+
+Sets the capture to direct joystick events to {\it win}.
+
+\wxheading{Parameters}
+
+\docparam{win}{The window that will receive joystick events.}
+
+\docparam{pollingFreq}{If zero, movement events are sent when above the
+threshold. If greater than zero, events are received every {\it pollingFreq} milliseconds.}
+
+\wxheading{Return value}
+
+TRUE if the capture succeeded.
+
+\wxheading{See also}
+
+\helpref{wxJoystick::ReleaseCapture}{wxjoystickreleasecapture}, \helpref{wxJoystickEvent}{wxjoystickevent}
+
+\membersection{wxJoystick::SetMovementThreshold}\label{wxjoysticksetmovementthreshold}
+
+\func{void}{SetMovementThreshold}{\param{int}{ threshold}}
+
+Sets the movement threshold, the number of steps outside which the joystick is deemed to have
+moved.
+
+
diff --git a/docs/latex/wx/memorydc.tex b/docs/latex/wx/memorydc.tex
index 5237bb765a..ac29294fa4 100644
--- a/docs/latex/wx/memorydc.tex
+++ b/docs/latex/wx/memorydc.tex
@@ -48,7 +48,7 @@ into the DC before drawing on it.
 Selects the given bitmap into the device context, to use as the memory
 bitmap. Selecting the bitmap into a memory DC allows you to draw into
 the DC (and therefore the bitmap) and also to use {\bf Blit} to copy
-the bitmap to a canvas. For this purpose, you may find \helpref{wxDC::DrawIcon}{wxdcdrawicon}\rtfsp
+the bitmap to a window. For this purpose, you may find \helpref{wxDC::DrawIcon}{wxdcdrawicon}\rtfsp
 easier to use instead.
 
 If the argument is wxNullBitmap (or some other uninitialised wxBitmap) the current bitmap is selected out of the device
diff --git a/docs/latex/wx/mouseevt.tex b/docs/latex/wx/mouseevt.tex
index f8d03b988f..b1f73759cd 100644
--- a/docs/latex/wx/mouseevt.tex
+++ b/docs/latex/wx/mouseevt.tex
@@ -1,7 +1,7 @@
 \section{\class{wxMouseEvent}}\label{wxmouseevent}
 
-This event class contains information about mouse events, particularly
-events received by canvases. See \helpref{wxWindow::OnMouseEvent}{wxwindowonmouseevent}.
+This event class contains information about mouse events.
+See \helpref{wxWindow::OnMouseEvent}{wxwindowonmouseevent}.
 
 \wxheading{Derived from}
 
@@ -169,7 +169,7 @@ Returns TRUE if this was a dragging event (motion while a button is depressed).
 
 \func{bool}{Entering}{\void}
 
-Returns TRUE if the mouse was entering the canvas (MS Windows and Motif).
+Returns TRUE if the mouse was entering the window (MS Windows and Motif).
 
 See also \helpref{wxMouseEvent::Leaving}{wxmouseeventleaving}.
 
@@ -196,7 +196,7 @@ that may be tested using {\it ButtonDown}).
 
 \func{bool}{Leaving}{\void}
 
-Returns TRUE if the mouse was leaving the canvas (MS Windows and Motif).
+Returns TRUE if the mouse was leaving the window (MS Windows and Motif).
 
 See also \helpref{wxMouseEvent::Entering}{wxmouseevententering}.
 
@@ -267,14 +267,14 @@ Returns TRUE if this was a motion event (no buttons depressed).
 \func{void}{Position}{\param{float *}{x}, \param{float *}{y}}
 
 Sets *x and *y to the position at which the event occurred. If the
-window is a canvas, the position is converted to logical units
+window is a window, the position is converted to logical units
 (according to the current mapping mode) with scrolling taken into
 account. To get back to device units (for example to calculate where on the
-screen to place a dialog box associated with a canvas mouse event), use
+screen to place a dialog box associated with a window mouse event), use
 \rtfsp{\bf wxDC::LogicalToDeviceX} and {\bf wxDC::LogicalToDeviceY}.
 
 For example, the following code calculates screen pixel coordinates
-from the frame position, canvas view start (assuming the canvas is the only
+from the frame position, window view start (assuming the window is the only
 subwindow on the frame and therefore at the top left of it), and the
 logical event position. A menu is popped up at the position where the
 mouse click occurred. (Note that the application should also check that
@@ -285,9 +285,9 @@ occurred near the screen edge!)
   float event_x, event_y;
   event.Position(&event_x, &event_y);
   frame->GetPosition(&x, &y);
-  canvas->ViewStart(&x1, &y1);
-  int mouse_x = (int)(canvas->GetDC()->LogicalToDeviceX(event_x + x - x1);
-  int mouse_y = (int)(canvas->GetDC()->LogicalToDeviceY(event_y + y - y1);
+  window->ViewStart(&x1, &y1);
+  int mouse_x = (int)(window->GetDC()->LogicalToDeviceX(event_x + x - x1);
+  int mouse_y = (int)(window->GetDC()->LogicalToDeviceY(event_y + y - y1);
 
   char *choice = wxGetSingleChoice("Menu", "Pick a node action",
                                  no_choices, choices, frame, mouse_x, mouse_y);
@@ -318,7 +318,6 @@ of the current event type.
 
 Returns TRUE if the right mouse button changed to up.
 
-
 \membersection{wxMouseEvent::ShiftDown}
 
 \func{bool}{ShiftDown}{\void}
diff --git a/docs/latex/wx/scrolwin.tex b/docs/latex/wx/scrolwin.tex
index 2d186c8294..328daa8b21 100644
--- a/docs/latex/wx/scrolwin.tex
+++ b/docs/latex/wx/scrolwin.tex
@@ -178,7 +178,7 @@ outside of OnDraw (via OnPaint), or you wish to implement OnPaint yourself, you
 call this function yourself. For example:
 
 \begin{verbatim}
-void MyCanvas::OnEvent(wxMouseEvent& event)
+void MyWindow::OnEvent(wxMouseEvent& event)
 {
   wxClientDC dc(this);
   PrepareDC(dc);
diff --git a/docs/latex/wx/t2rtf32.ini b/docs/latex/wx/t2rtf32.ini
deleted file mode 100644
index 9169e3fc22..0000000000
--- a/docs/latex/wx/t2rtf32.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-;;; Tex2RTF initialisation file for 32-bit WinHelp
-runTwice = yes
-titleFontSize = 12
-authorFontSize = 10
-authorFontSize = 10
-chapterFontSize = 12
-sectionFontSize = 12
-subsectionFontSize = 12
-headerRule = yes
-footerRule = yes
-useHeadingStyles = yes
-listItemIndent=40
-generateHPJ = yes
-htmlBrowseButtons = bitmap
-winHelpContents = yes
-winHelpVersion = 4 ; 3 for Windows 3.x, 4 for Windows 95
-winHelpTitle = "wxWindows Manual"
-\overview [2] { \settransparency{on}\sethotspotcolour{off}\sethotspotunderline{on}\winhelponly{\image{}{books.bmp}\settransparency{off}}
-\htmlonly{\image{}{books.gif}}\helpref{#1}{#2}
-\sethotspotcolour{on}\sethotspotunderline{on}}
-
diff --git a/docs/latex/wx/tbitmap.tex b/docs/latex/wx/tbitmap.tex
index ce20413d8e..01cd32aae7 100644
--- a/docs/latex/wx/tbitmap.tex
+++ b/docs/latex/wx/tbitmap.tex
@@ -10,11 +10,11 @@ required.
 
 A bitmap created dynamically or loaded from a file can be selected
 into a memory device context (instance of \helpref{wxMemoryDC}{wxmemorydc}). This
-enables the bitmap to be copied to a canvas or memory device context
+enables the bitmap to be copied to a window or memory device context
 using \helpref{wxDC::Blit}{wxdcblit}, or to be used as a drawing surface.  The {\bf
 wxToolBarSimple} class is implemented using bitmaps, and the toolbar demo
 shows one of the toolbar bitmaps being used for drawing a miniature
-version of the graphic which appears on the main canvas.
+version of the graphic which appears on the main window.
 
 See \helpref{wxMemoryDC}{wxmemorydc} for an example of drawing onto a bitmap.
 
diff --git a/docs/latex/wx/tcommdlg.tex b/docs/latex/wx/tcommdlg.tex
index 6f6fc688da..d894847433 100644
--- a/docs/latex/wx/tcommdlg.tex
+++ b/docs/latex/wx/tcommdlg.tex
@@ -55,7 +55,7 @@ the wxColourDialog class. Here is an excerpt, which
 sets various parameters of a wxColourData object, including
 a grey scale for the custom colours. If the user did not cancel
 the dialog, the application retrieves the selected colour and
-uses it to set the background of a canvas.
+uses it to set the background of a window.
 
 \begin{verbatim}
   wxColourData data;
@@ -72,9 +72,9 @@ uses it to set the background of a canvas.
     wxColourData retData = dialog.GetColourData();
     wxColour col = retData.GetColour();
     wxBrush brush(col, wxSOLID);
-    myCanvas->SetBackground(brush);
-    myCanvas->Clear();
-    myCanvas->Refresh();
+    myWindow->SetBackground(brush);
+    myWindow->Clear();
+    myWindow->Refresh();
   }
 \end{verbatim}
 
@@ -128,7 +128,7 @@ and colour for drawing text on a canvas. Here is an excerpt:
     wxFontData retData = dialog.GetFontData();
     canvasFont = retData.GetChosenFont();
     canvasTextColour = retData.GetColour();
-    myCanvas->Refresh();
+    myWindow->Refresh();
   }
 \end{verbatim}
 
diff --git a/docs/latex/wx/tconstr.tex b/docs/latex/wx/tconstr.tex
index 3c659234db..14cbaae46d 100644
--- a/docs/latex/wx/tconstr.tex
+++ b/docs/latex/wx/tconstr.tex
@@ -80,13 +80,13 @@ irrelevant.
 
 \subsubsection{Example 1: subwindow layout}
 
-This example specifies a panel and a canvas side by side,
+This example specifies a panel and a window side by side,
 with a text subwindow below it. 
 
 \begin{verbatim}
-  frame->panel = new wxPanel(frame, 0, 0, 1000, 500, 0);
-  frame->canvas = new MyCanvas(frame, 0, 0, 400, 400, wxRETAINED);
-  frame->text_window = new MyTextWindow(frame, 0, 250, 400, 250, wxNATIVE_IMPL);
+  frame->panel = new wxPanel(frame, -1, wxPoint(0, 0), wxSize(1000, 500), 0);
+  frame->scrollWindow = new MyScrolledWindow(frame, -1, wxPoint(0, 0), wxSize(400, 400), wxRETAINED);
+  frame->text_window = new MyTextWindow(frame, -1, wxPoint(0, 250), wxSize(400, 250));
 
   // Set constraints for panel subwindow
   wxLayoutConstraints *c1 = new wxLayoutConstraints;
@@ -98,7 +98,7 @@ with a text subwindow below it.
 
   frame->panel->SetConstraints(c1);
 
-  // Set constraints for canvas subwindow
+  // Set constraints for scrollWindow subwindow
   wxLayoutConstraints *c2 = new wxLayoutConstraints;
 
   c2->left.SameAs       (frame->panel, wxRight);
@@ -106,7 +106,7 @@ with a text subwindow below it.
   c2->right.SameAs      (frame, wxRight);
   c2->height.PercentOf  (frame, wxHeight, 50);
 
-  frame->canvas->SetConstraints(c2);
+  frame->scrollWindow->SetConstraints(c2);
 
   // Set constraints for text subwindow
   wxLayoutConstraints *c3 = new wxLayoutConstraints;
@@ -127,7 +127,7 @@ the remainder of the width. Margins of 5 pixels are used.
 
 \begin{verbatim}
   // Create some panel items
-  wxButton *btn1 = new wxButton(frame->panel, (wxFunction)NULL, "A button") ;
+  wxButton *btn1 = new wxButton(frame->panel, -1, "A button") ;
 
   wxLayoutConstraints *b1 = new wxLayoutConstraints;
   b1->centreX.SameAs    (frame->panel, wxCentreX);
@@ -136,8 +136,8 @@ the remainder of the width. Margins of 5 pixels are used.
   b1->height.PercentOf  (frame->panel, wxHeight, 10);
   btn1->SetConstraints(b1);
 
-  wxListBox *list = new wxListBox(frame->panel, (wxFunction)NULL, "A list",
-                                  wxSINGLE, -1, -1, 200, 100);
+  wxListBox *list = new wxListBox(frame->panel, -1, "A list",
+                                  wxPoint(-1, -1), wxSize(200, 100));
 
   wxLayoutConstraints *b2 = new wxLayoutConstraints;
   b2->top.Below         (btn1, 5);
@@ -146,8 +146,8 @@ the remainder of the width. Margins of 5 pixels are used.
   b2->bottom.SameAs     (frame->panel, wxBottom, 5);
   list->SetConstraints(b2);
 
-  wxMultiText *mtext = new wxMultiText(frame->panel, (wxFunction)NULL, "Multiline text", "Some text",
-                        -1, -1, 150, 100);
+  wxTextCtrl *mtext = new wxTextCtrl(frame->panel, -1, "Multiline text", "Some text",
+                        wxPoint(-1, -1), wxSize(150, 100), wxTE_MULTILINE);
   
   wxLayoutConstraints *b3 = new wxLayoutConstraints;
   b3->top.Below         (btn1, 5);
diff --git a/docs/latex/wx/tdocview.tex b/docs/latex/wx/tdocview.tex
index 08d9cd7bf6..8b147fa176 100644
--- a/docs/latex/wx/tdocview.tex
+++ b/docs/latex/wx/tdocview.tex
@@ -27,7 +27,7 @@ These are the overall steps involved in creating an application based on the doc
 \item Define your own document and view classes, overriding a minimal set of
 member functions e.g. for input/output, drawing and initialization.
 \item Define any subwindows
-(such as a canvas) that are needed for the view(s). You may need to route some events
+(such as a scrolled window) that are needed for the view(s). You may need to route some events
 to views or documents, for example OnPaint needs to be routed to wxView::OnDraw.
 \item Decide what style of interface you will use: Microsoft's MDI (multiple
 document child frames surrounded by an overall frame), SDI (a separate, unconstrained frame
diff --git a/docs/latex/wx/tex2rtf.ini b/docs/latex/wx/tex2rtf.ini
index 3a79f73de0..a314d7ee23 100644
--- a/docs/latex/wx/tex2rtf.ini
+++ b/docs/latex/wx/tex2rtf.ini
@@ -11,7 +11,7 @@ headerRule = yes
 footerRule = yes
 useHeadingStyles = yes
 listItemIndent=40
-generateHPJ = yes
+generateHPJ = no
 htmlBrowseButtons = bitmap
 winHelpContents = yes
 winHelpVersion = 3 ; 3 for Windows 3.x, 4 for Windows 95
diff --git a/docs/latex/wx/tfont.tex b/docs/latex/wx/tfont.tex
index 9e6c6d83db..47fbfdef2b 100644
--- a/docs/latex/wx/tfont.tex
+++ b/docs/latex/wx/tfont.tex
@@ -3,7 +3,7 @@
 Class: \helpref{wxFont}{wxfont}
 
 A font is an object which determines the appearance of text, primarily
-when drawing text to a canvas or device context. A font is determined by
+when drawing text to a window or device context. A font is determined by
 up to six parameters:
 
 \begin{twocollist}\itemsep=0pt
@@ -30,7 +30,7 @@ might be transported to a different Windows machine or other platform.
 two platforms, if the mapping mode is anything other than MM\_TEXT.
 Under X, font size is always specified in points. Under MS Windows, the
 unit for text is points but the text is scaled according to the
-current mapping mode. However, user scaling on a device canvas will
+current mapping mode. However, user scaling on a device context will
 also scale fonts under both environments.}
 
 
diff --git a/docs/latex/wx/tguide.tex b/docs/latex/wx/tguide.tex
index a130495bd4..a4c4394351 100644
--- a/docs/latex/wx/tguide.tex
+++ b/docs/latex/wx/tguide.tex
@@ -22,13 +22,13 @@ Instead of creating a dialog box and populating it with items, it is possible to
 one of the convenient common dialog classes, such as \helpref{wxMessageDialog}{wxmessagedialog}\rtfsp
 and \helpref{wxFileDialog}{wxfiledialog}.
 
-You never draw directly onto a canvas --- you use a {\it device context} (DC). \helpref{wxDC}{wxdc} is
+You never draw directly onto a window --- you use a {\it device context} (DC). \helpref{wxDC}{wxdc} is
 the base for \helpref{wxClientDC}{wxclientdc}, \helpref{wxPaintDC}{wxpaintdc}, \helpref{wxMemoryDC}{wxmemorydc}, \helpref{wxPostScriptDC}{wxpostscriptdc},
 \rtfsp\helpref{wxMemoryDC}{wxmemorydc}, \helpref{wxMetaFileDC}{wxmetafiledc} and \helpref{wxPrinterDC}{wxprinterdc}.
 If your drawing functions have {\bf wxDC} as a parameter, you can pass any of these DCs
 to the function, and thus use the same code to draw to several different devices.
 You can draw using the member functions of {\bf wxDC}, such as \helpref{wxDC::DrawLine}{wxdcdrawline}\rtfsp
-and \helpref{wxDC::DrawText}{wxdcdrawtext}. Control colour on a canvas (\helpref{wxColour}{wxcolour}) with
+and \helpref{wxDC::DrawText}{wxdcdrawtext}. Control colour on a window (\helpref{wxColour}{wxcolour}) with
 brushes (\helpref{wxBrush}{wxbrush}) and pens (\helpref{wxPen}{wxpen}).
 
 To intercept events, you add a DECLARE\_EVENT\_TABLE macro to the window class declaration,
@@ -38,7 +38,7 @@ These might override predefined event handlers such as \helpref{wxWindow::OnChar
 \rtfsp\helpref{wxWindow::OnMouseEvent}{wxwindowonmouseevent}.
 
 Most modern applications will have an on-line, hypertext help system; for this, you
-need wxHelp and the \helpref{wxHelpInstance}{wxhelpinstance} class to control
+need wxHelp and the \helpref{wxHelpControllerBase}{wxhelpcontrollerbase} class to control
 wxHelp. To add sparkle, you might use the wxToolBar class (documented separately)
 which makes heavy use of the \helpref{wxBitmap}{wxbitmap}.
 
diff --git a/docs/latex/wx/toolbar.tex b/docs/latex/wx/toolbar.tex
index 8ea204d417..155756a81e 100644
--- a/docs/latex/wx/toolbar.tex
+++ b/docs/latex/wx/toolbar.tex
@@ -138,7 +138,7 @@ but for portability it should be called anyway.
 
 \func{void}{DrawTool}{\param{wxMemoryDC\& }{memDC}, \param{wxToolBarBaseTool* }{tool}}
 
-Draws the specified tool onto the canvas using the given memory device context.
+Draws the specified tool onto the window using the given memory device context.
 
 \wxheading{Parameters}
 
@@ -236,7 +236,7 @@ Returns the left/right and top/bottom margins, which are also used for inter-too
 \constfunc{void}{GetMaxSize}{\param{float*}{ w}, \param{float*}{ h}}
 
 Gets the maximum size taken up by the tools after layout, including margins.
-This can be used to size a frame around the toolbar canvas.
+This can be used to size a frame around the toolbar window.
 
 \wxheading{Parameters}
 
@@ -351,7 +351,7 @@ TRUE if the tool is toggled on, FALSE otherwise.
 \func{void}{Layout}{\void}
 
 Called by the application after the tools have been added to
-automatically lay the tools out on the canvas. If you have given
+automatically lay the tools out on the window. If you have given
 absolute positions when adding the tools, do not call this.
 
 \membersection{wxToolBarBase::OnLeftClick}\label{wxtoolbarbaseonleftclick}
diff --git a/docs/latex/wx/tsplittr.tex b/docs/latex/wx/tsplittr.tex
index ac4a35b945..2be27dee73 100644
--- a/docs/latex/wx/tsplittr.tex
+++ b/docs/latex/wx/tsplittr.tex
@@ -15,18 +15,16 @@ subwindows and hiding one of them.
 
 {\small
 \begin{verbatim}
-  splitter = new wxSplitterWindow(this, 0, 0, 400, 400, wxSP_3D);
+  splitter = new wxSplitterWindow(this, -1, wxPoint(0, 0), wxSize(400, 400), wxSP_3D);
 
-  leftCanvas = new MyCanvas(splitter);
-  leftCanvas->SetBackground(wxRED_BRUSH);
-  leftCanvas->SetScrollbars(20, 20, 50, 50, 4, 4);
+  leftWindow = new MyWindow(splitter);
+  leftWindow->SetScrollbars(20, 20, 50, 50);
 
-  rightCanvas = new MyCanvas(splitter);
-  rightCanvas->SetBackground(wxCYAN_BRUSH);
-  rightCanvas->SetScrollbars(20, 20, 50, 50, 4, 4);
-  rightCanvas->Show(FALSE);
+  rightWindow = new MyWindow(splitter);
+  rightWindow->SetScrollbars(20, 20, 50, 50);
+  rightWindow->Show(FALSE);
 
-  splitter->Initialize(leftCanvas);
+  splitter->Initialize(leftWindow);
 
   // Set this to prevent unsplitting
 //    splitter->SetMinimumPaneSize(20);
@@ -41,18 +39,18 @@ The next fragment shows how the splitter window can be manipulated after creatio
   {
         if ( splitter->IsSplit() )
             splitter->Unsplit();
-        leftCanvas->Show(TRUE);
-        rightCanvas->Show(TRUE);
-        splitter->SplitVertically( leftCanvas, rightCanvas );
+        leftWindow->Show(TRUE);
+        rightWindow->Show(TRUE);
+        splitter->SplitVertically( leftWindow, rightWindow );
   }
 
   void MyFrame::OnSplitHorizontal(wxCommandEvent& event)
   {
         if ( splitter->IsSplit() )
             splitter->Unsplit();
-        leftCanvas->Show(TRUE);
-        rightCanvas->Show(TRUE);
-        splitter->SplitHorizontally( leftCanvas, rightCanvas );
+        leftWindow->Show(TRUE);
+        rightWindow->Show(TRUE);
+        splitter->SplitHorizontally( leftWindow, rightWindow );
   }
 
   void MyFrame::OnUnsplit(wxCommandEvent& event)
diff --git a/docs/latex/wx/ttab.tex b/docs/latex/wx/ttab.tex
index 33eee2ab3e..d7654a09fa 100644
--- a/docs/latex/wx/ttab.tex
+++ b/docs/latex/wx/ttab.tex
@@ -1,7 +1,7 @@
 \section{Tab classes overview}\label{wxtaboverview}
 
 Classes: \helpref{wxTabView}{wxtabview}, \helpref{wxPanelTabView}{wxpaneltabview},
- \helpref{wxTabbedPanel}{wxtabbedpanel}, \helpref{wxTabbedDialogBox}{wxtabbeddialogbox},
+ \helpref{wxTabbedPanel}{wxtabbedpanel}, \helpref{wxTabbedDialog}{wxtabbeddialog},
  \helpref{wxTabControl}{wxtabcontrol}
 
 The tab classes provides a way to display rows of tabs (like file divider tabs), which can be
@@ -9,7 +9,7 @@ used to switch between panels or other information. Tabs are most
 commonly used in dialog boxes where the number of options is too great
 to fit on one dialog.
 
-\wxheading{The appearance and behaviour of a wxTabbedDialogBox}
+\wxheading{The appearance and behaviour of a wxTabbedDialog}
 
 The following screenshot shows the appearance of the sample tabbed dialog application.
 
@@ -209,7 +209,7 @@ wxPanelTabView class, but an application could derive other kinds of
 view from wxTabView. 
 
 For example, a help application might draw a representation of a book on
-a canvas, with a row of tabs along the top. The new tab view class might
+a window, with a row of tabs along the top. The new tab view class might
 be called wxCanvasTabView, for example, with the wxBookCanvas posting
 the OnEvent function to the wxCanvasTabView before processing further,
 application-specific event processing. 
diff --git a/docs/latex/wx/ttoolbar.tex b/docs/latex/wx/ttoolbar.tex
index d4178dd51c..10d3a6057d 100644
--- a/docs/latex/wx/ttoolbar.tex
+++ b/docs/latex/wx/ttoolbar.tex
@@ -87,7 +87,7 @@ Example of toolbar use are given in the sample programs tbarsmpl,
 tbarmsw and tbar95.
 
 Each sample creates a main window, and two toolbars: a floating toolbar
-with 24 tools, and a toolbar along the top of the main drawing canvas, divided into groups.
+with 24 tools, and a toolbar along the top of the main drawing window, divided into groups.
 
 The test program defines a general-purpose derived frame called
 \rtfsp{\bf wxFrameWithToolBar} which can manage a frame with one main subwindow
@@ -113,7 +113,7 @@ The following fragment illustrates the essence of creating a toolbar.
     wxDEFAULT_FRAME_STYLE | wxSTAY_ON_TOP);
 
   // 5 rows
-  toolBar = new TestToolBar(toolBarFrame, 10, 10, -1, -1, 0, wxVERTICAL, 5);
+  toolBar = new TestToolBar(toolBarFrame, -1, wxPoint(10, 10), wxSize(-1, -1), 0, wxVERTICAL, 5);
   toolBar->SetMargins(2, 2);
 
   for (int i = 10; i < 25; i++)
diff --git a/docs/latex/wx/tusage.tex b/docs/latex/wx/tusage.tex
index 51ee8552b9..ba9d767ada 100644
--- a/docs/latex/wx/tusage.tex
+++ b/docs/latex/wx/tusage.tex
@@ -3,7 +3,7 @@
 In the descriptions of the wxWindows classes and their member
 functions, note that descriptions of inherited member functions are not
 duplicated in derived classes unless their behaviour is different. So in
-using a class such as wxCanvas, be aware that wxWindow functions may be
+using a class such as wxScrolledWindow, be aware that wxWindow functions may be
 relevant.
 
 Note also that arguments with default values may be omitted from a
diff --git a/docs/latex/wx/upditer.tex b/docs/latex/wx/upditer.tex
index 90721d1734..148d4960da 100644
--- a/docs/latex/wx/upditer.tex
+++ b/docs/latex/wx/upditer.tex
@@ -1,7 +1,6 @@
 \section{\class{wxUpdateIterator}}\label{wxupdateiterator}
 
-This class is used to iterate through all damaged regions of a canvas, panel
-or dialog box, within an OnPaint call.
+This class is used to iterate through all damaged regions of a window, within an OnPaint call.
 
 To use it, construct an iterator object on the stack and loop through the
 regions, testing the object and incrementing the iterator at the end of the loop.
diff --git a/docs/latex/wx/view.tex b/docs/latex/wx/view.tex
index a38bbbb813..f8ec2b2ebc 100644
--- a/docs/latex/wx/view.tex
+++ b/docs/latex/wx/view.tex
@@ -118,8 +118,8 @@ Implements closing behaviour. The default implementation calls wxDocument::Close
 to close the associated document. Does not delete the view. The application
 may wish to do some cleaning up operations in this function, {\it if} a
 call to wxDocument::Close succeeded. For example, if your application's
-all share the same canvas, you need to disassociate the canvas from the view
-and perhaps clear the canvas. If {\it deleteWindow} is TRUE, delete the
+all share the same window, you need to disassociate the window from the view
+and perhaps clear the window. If {\it deleteWindow} is TRUE, delete the
 frame associated with the view.
 
 \membersection{wxView::OnCreate}
diff --git a/docs/latex/wx/window.tex b/docs/latex/wx/window.tex
index 03dc109ada..9b126650fb 100644
--- a/docs/latex/wx/window.tex
+++ b/docs/latex/wx/window.tex
@@ -1246,13 +1246,6 @@ the commandInt member of the event to check the selected menu identifier.
 
 \docparam{y}{Required y position for the menu to appear.}
 
-\wxheading{Remarks}
-
-Valid only for subwindows (panels, canvases and text windows).
-
-Sometimes this function does not function correctly under Motif, in which case
-please use \helpref{wxWindow::FakePopupMenu}{wxwindowfakepopupmenu} instead.
-
 \wxheading{See also}
 
 \helpref{wxMenu}{wxmenu}, \helpref{wxWindow::FakePopupMenu}{wxwindowfakepopupmenu}
@@ -1425,13 +1418,6 @@ You must call \helpref{wxWindow::SetAutoLayout}{wxwindowsetautolayout} to tell a
 the constraints automatically in OnSize; otherwise, you must
 override OnSize and call Layout explicitly.
 
-% TODO: double click should always be allowed.
-%\membersection{wxWindow::SetDoubleClick}\label{setdoubleclick}
-%
-%\func{void}{SetDoubleClick}{\param{bool}{ allowDoubleClick}}
-%
-%For canvases, allows double click if {\it allowDoubleClick} is TRUE. The default is FALSE.
-
 \membersection{wxWindow::SetFocus}\label{wxwindowsetfocus}
 
 \func{virtual void}{SetFocus}{\void}
@@ -1664,9 +1650,9 @@ Sets the range of one of the built-in scrollbars.
 \wxheading{Remarks}
 
 The range of a scrollbar is the number of steps that the thumb may travel, rather than the total
-object length of the scrollbar. If you are implementing a scrolling canvas, for example, you
-would adjust the scroll range when the canvas is resized, by subtracting the canvas view size from the
-total virtual canvas size. When the two sizes are the same (all the canvas is visible), the range goes to zero
+object length of the scrollbar. If you are implementing a scrolling window, for example, you
+would adjust the scroll range when the window is resized, by subtracting the window view size from the
+total virtual window size. When the two sizes are the same (all the window is visible), the range goes to zero
 and usually the scrollbar will be automatically hidden.
 
 \wxheading{See also}
diff --git a/docs/latex/wx/winhelp.tex b/docs/latex/wx/winhelp.tex
new file mode 100644
index 0000000000..f4af922bb1
--- /dev/null
+++ b/docs/latex/wx/winhelp.tex
@@ -0,0 +1,107 @@
+\section{\class{wxWinHelpController}}\label{wxwinhelpcontroller}
+
+This class provides the means to control a WinHelp instance.
+Under Windows, wxHelpController is defined to be a synonym for wxWinHelpController.
+
+A help controller allows an application to display help, at the contents
+or at a particular topic, and shut the help program down on termination.
+This avoids proliferation of many instances of the help viewer whenever the
+user requests a different topic via the application's menus or buttons.
+
+Typically, an application will create a help controller instance
+when it starts, and immediately call {\bf Initialize}\rtfsp
+to associate a filename with it. The help viewer will only get run, however,
+just before the first call to display something.
+
+\wxheading{Derivation}
+
+\helpref{wxObject}{wxobject}
+
+\wxheading{See also}
+
+\helpref{wxHelpControllerBase}{wxwinhelpcontrollerbase}
+
+\wxheading{Include file}
+
+{\tt <wx/help.h>}
+
+\latexignore{\rtfignore{\wxheading{Members}}}
+
+\membersection{wxWinHelpController::wxWinHelpController}
+
+\func{}{wxWinHelpController}{\void}
+
+Constructs a help instance object, but does not invoke the help viewer.
+
+\membersection{wxWinHelpController::\destruct{wxWinHelpController}}
+
+\func{}{\destruct{wxWinHelpController}}{\void}
+
+Destroys the help instance, closing down the viewer if it is running.
+
+\membersection{wxWinHelpController::Initialize}\label{wxwinhelpcontrollerinitialize}
+
+\func{void}{Initialize}{\param{const wxString\& }{file}}
+
+Initializes the help instance with a help filename. Does not invoke the help viewer.
+This must be called directly after the help instance object is created and before
+any attempts to communicate with the viewer.
+
+You may omit the file extension and a suitable one will be chosen.
+
+\membersection{wxWinHelpController::DisplayBlock}\label{wxwinhelpcontrollerdisplayblock}
+
+\func{bool}{DisplayBlock}{\param{long}{ blockNo}}
+
+If the help viewer is not running, runs it and displays the file at the given block number.
+The interpretation of {\it blockNo} differs between help viewers. If using Windows Help, this
+refers to the context number.
+
+\membersection{wxWinHelpController::DisplayContents}\label{wxwinhelpcontrollerdisplaycontents}
+
+\func{bool}{DisplayContents}{\void}
+
+If the help viewer is not running, runs it and displays the
+contents.
+
+\membersection{wxWinHelpController::DisplaySection}\label{wxwinhelpcontrollerdisplaysection}
+
+\func{bool}{DisplaySection}{\param{int}{ sectionNo}}
+
+DisplaySection does not apply to WinHelp.
+
+\membersection{wxWinHelpController::KeywordSearch}\label{wxwinhelpcontrollerkeywordsearch}
+
+\func{bool}{KeywordSearch}{\param{const wxString\& }{keyWord}}
+
+If the help viewer is not running, runs it, and searches for sections matching the given keyword. If one
+match is found, the file is displayed at this section. If more than one
+match is found, the first topic is displayed (Windows Help).
+
+\membersection{wxWinHelpController::LoadFile}\label{wxwinhelpcontrollerloadfile}
+
+\func{bool}{LoadFile}{\param{const wxString\& }{file = NULL}}
+
+If the help viewer is not running, runs it and loads the given file.
+If the filename is not supplied or is
+NULL, the file specified in {\bf Initialize} is used. If the viewer is
+already displaying the specified file, it will not be reloaded. This
+member function may be used before each display call in case the user
+has opened another file.
+
+\membersection{wxWinHelpController::OnQuit}\label{wxwinhelpcontrolleronquit}
+
+\func{bool}{OnQuit}{\void}
+
+Overridable member called when this application's viewer is quit by the user.
+
+Not implemented.
+
+\membersection{wxWinHelpController::Quit}\label{wxwinhelpcontrollerquit}
+
+\func{bool}{Quit}{\void}
+
+If the viewer is running, quits it by disconnecting.
+
+For Windows Help, the viewer will only close if no other application is using it.
+
diff --git a/docs/latex/wx/wx.cnt b/docs/latex/wx/wx.cnt
index 8975f5bd2b..071c8935c1 100644
--- a/docs/latex/wx/wx.cnt
+++ b/docs/latex/wx/wx.cnt
@@ -482,7 +482,7 @@
 3 wxDC::GetBrush=wxdcgetbrush
 3 wxDC::GetCharHeight=wxdcgetcharheight
 3 wxDC::GetCharWidth=wxdcgetcharwidth
-3 wxCanvas::GetClippingBox=wxdcgetclippingbox
+3 wxDC::GetClippingBox=wxdcgetclippingbox
 3 wxDC::GetFont=wxdcgetfont
 3 wxDC::GetLogicalFunction=wxdcgetlogicalfunction
 3 wxDC::GetMapMode=wxdcgetmapmode
@@ -1053,39 +1053,39 @@
 3 wxHashTable::MakeKey=topic375
 3 wxHashTable::Next=topic376
 3 wxHashTable::Put=topic377
-2 wxHelpInstance
-3 wxHelpInstance=wxhelpinstance
-3 wxHelpInstance::wxHelpInstance=topic378
-3 wxHelpInstance::~wxHelpInstance=topic379
-3 wxHelpInstance::Initialize=topic380
-3 wxHelpInstance::DisplayBlock=topic381
-3 wxHelpInstance::DisplayContents=topic382
-3 wxHelpInstance::DisplaySection=topic383
-3 wxHelpInstance::KeywordSearch=topic384
-3 wxHelpInstance::LoadFile=topic385
-3 wxHelpInstance::OnQuit=topic386
-3 wxHelpInstance::Quit=topic387
+2 wxHelpControllerBase
+3 wxHelpControllerBase=wxhelpcontrollerbase
+3 wxHelpControllerBase::wxHelpControllerBase=topic378
+3 wxHelpControllerBase::~wxHelpControllerBase=topic379
+3 wxHelpControllerBase::Initialize=wxhelpcontrollerbaseinitialize
+3 wxHelpControllerBase::DisplayBlock=wxhelpcontrollerbasedisplayblock
+3 wxHelpControllerBase::DisplayContents=wxhelpcontrollerbasedisplaycontents
+3 wxHelpControllerBase::DisplaySection=wxhelpcontrollerbasedisplaysection
+3 wxHelpControllerBase::KeywordSearch=wxhelpcontrollerbasekeywordsearch
+3 wxHelpControllerBase::LoadFile=wxhelpcontrollerbaseloadfile
+3 wxHelpControllerBase::OnQuit=wxhelpcontrollerbaseonquit
+3 wxHelpControllerBase::Quit=wxhelpcontrollerbasequit
 2 wxIdleEvent
 3 wxIdleEvent=wxidleevent
-3 wxIdleEvent::wxIdleEvent=topic388
+3 wxIdleEvent::wxIdleEvent=topic380
 3 wxIdleEvent::RequestMore=wxidleeventrequestmore
 3 wxIdleEvent::MoreRequested=wxidleeventmorerequested
 2 wxIcon
 3 wxIcon=wxicon
 3 wxIcon::wxIcon=wxiconconstr
-3 wxIcon::~wxIcon=topic389
-3 wxIcon::GetDepth=topic390
+3 wxIcon::~wxIcon=topic381
+3 wxIcon::GetDepth=topic382
 3 wxIcon::GetHeight=wxicongetheight
 3 wxIcon::GetWidth=wxicongetwidth
 3 wxIcon::LoadFile=wxiconloadfile
 3 wxIcon::Ok=wxiconok
 3 wxIcon::SetDepth=wxiconsetdepth
 3 wxIcon::SetHeight=wxiconsetheight
-3 wxIcon::SetOk=topic391
-3 wxIcon::SetWidth=topic392
-3 wxIcon::operator ==topic393
-3 wxIcon::operator ===topic394
-3 wxIcon::operator !==topic395
+3 wxIcon::SetOk=topic383
+3 wxIcon::SetWidth=topic384
+3 wxIcon::operator ==topic385
+3 wxIcon::operator ===topic386
+3 wxIcon::operator !==topic387
 2 wxImageList
 3 wxImageList=wximagelist
 3 wxImageList::wxImageList=wximagelistconstr
@@ -1098,71 +1098,129 @@
 3 wxImageList::Replace=wximagelistreplace
 2 wxIndividualLayoutConstraint
 3 wxIndividualLayoutConstraint=wxindividuallayoutconstraint
-3 Edges and relationships=topic396
-3 wxIndividualLayoutConstraint::wxIndividualLayoutConstraint=topic397
-3 wxIndividualLayoutConstraint::Above=topic398
-3 wxIndividualLayoutConstraint::Absolute=topic399
-3 wxIndividualLayoutConstraint::AsIs=topic400
-3 wxIndividualLayoutConstraint::Below=topic401
-3 wxIndividualLayoutConstraint::Unconstrained=topic402
-3 wxIndividualLayoutConstraint::LeftOf=topic403
-3 wxIndividualLayoutConstraint::PercentOf=topic404
-3 wxIndividualLayoutConstraint::RightOf=topic405
-3 wxIndividualLayoutConstraint::SameAs=topic406
-3 wxIndividualLayoutConstraint::Set=topic407
+3 Edges and relationships=topic388
+3 wxIndividualLayoutConstraint::wxIndividualLayoutConstraint=topic389
+3 wxIndividualLayoutConstraint::Above=topic390
+3 wxIndividualLayoutConstraint::Absolute=topic391
+3 wxIndividualLayoutConstraint::AsIs=topic392
+3 wxIndividualLayoutConstraint::Below=topic393
+3 wxIndividualLayoutConstraint::Unconstrained=topic394
+3 wxIndividualLayoutConstraint::LeftOf=topic395
+3 wxIndividualLayoutConstraint::PercentOf=topic396
+3 wxIndividualLayoutConstraint::RightOf=topic397
+3 wxIndividualLayoutConstraint::SameAs=topic398
+3 wxIndividualLayoutConstraint::Set=topic399
 2 wxInitDialogEvent
 3 wxInitDialogEvent=wxinitdialogevent
-3 wxInitDialogEvent::wxInitDialogEvent=topic408
+3 wxInitDialogEvent::wxInitDialogEvent=topic400
+2 wxJoystick
+3 wxJoystick=wxjoystick
+3 wxJoystick::wxJoystick=wxjoystickconstr
+3 wxJoystick::~wxJoystick=topic401
+3 wxJoystick::GetButtonState=wxjoystickgetbuttonstate
+3 wxJoystick::GetManufacturerId=wxjoystickgetmanufacturerid
+3 wxJoystick::GetMovementThreshold=wxjoystickgetmovementthreshold
+3 wxJoystick::GetNumberAxes=wxjoystickgetnumberaxes
+3 wxJoystick::GetNumberButtons=wxjoystickgetnumberbuttons
+3 wxJoystick::GetNumberJoysticks=wxjoystickgetnumberjoysticks
+3 wxJoystick::GetPollingMax=wxjoystickgetpollingmax
+3 wxJoystick::GetPollingMin=wxjoystickgetpollingmin
+3 wxJoystick::GetProductId=wxjoystickgetproductid
+3 wxJoystick::GetProductName=wxjoystickgetproductname
+3 wxJoystick::GetPosition=wxjoystickgetposition
+3 wxJoystick::GetPOVPosition=wxjoystickgetpovposition
+3 wxJoystick::GetPOVCTSPosition=wxjoystickgetpovctsposition
+3 wxJoystick::GetRudderMax=wxjoystickgetruddermax
+3 wxJoystick::GetRudderMin=wxjoystickgetruddermin
+3 wxJoystick::GetRudderPosition=wxjoystickgetrudderposition
+3 wxJoystick::GetUMax=wxjoystickgetumax
+3 wxJoystick::GetUMin=wxjoystickgetumin
+3 wxJoystick::GetUPosition=wxjoystickgetuposition
+3 wxJoystick::GetVMax=wxjoystickgetvmax
+3 wxJoystick::GetUMin=wxjoystickgetumin
+3 wxJoystick::GetVPosition=wxjoystickgetvposition
+3 wxJoystick::GetXMax=wxjoystickgetxmax
+3 wxJoystick::GetXMin=wxjoystickgetxmin
+3 wxJoystick::GetYMax=wxjoystickgetymax
+3 wxJoystick::GetYMin=wxjoystickgetymin
+3 wxJoystick::GetZMax=wxjoystickgetzmax
+3 wxJoystick::GetZMin=wxjoystickgetzmin
+3 wxJoystick::GetZPosition=wxjoystickgetzposition
+3 wxJoystick::HasPOV=wxjoystickhaspov
+3 wxJoystick::HasPOV4Dir=wxjoystickhaspovfdir
+3 wxJoystick::HasPOVCTS=wxjoystickhaspovcts
+3 wxJoystick::HasRudder=wxjoystickhasrudder
+3 wxJoystick::HasU=wxjoystickhasu
+3 wxJoystick::HasV=wxjoystickhasv
+3 wxJoystick::HasZ=wxjoystickhasz
+3 wxJoystick::IsOk=wxjoystickisok
+3 wxJoystick::ReleaseCapture=wxjoystickreleasecapture
+3 wxJoystick::SetCapture=wxjoysticksetcapture
+3 wxJoystick::SetMovementThreshold=wxjoysticksetmovementthreshold
+2 wxJoystickEvent
+3 wxJoystickEvent=wxjoystickevent
+3 wxJoystickEvent::wxJoystickEvent=topic402
+3 wxJoystickEvent::ButtonDown=wxjoystickeventbuttondown
+3 wxJoystickEvent::ButtonIsDown=wxjoystickeventbuttonisdown
+3 wxJoystickEvent::ButtonUp=wxjoystickeventbuttonup
+3 wxJoystickEvent::GetButtonChange=wxjoystickeventgetbuttonchange
+3 wxJoystickEvent::GetButtonState=wxjoystickeventgetbuttonstate
+3 wxJoystickEvent::GetJoystick=wxjoystickeventgetjoystick
+3 wxJoystickEvent::GetPosition=wxjoystickeventgetposition
+3 wxJoystickEvent::GetZPosition=wxjoystickeventgetzposition
+3 wxJoystickEvent::IsButton=wxjoystickeventisbutton
+3 wxJoystickEvent::IsMove=wxjoystickeventismove
+3 wxJoystickEvent::IsZMove=wxjoystickeventiszmove
 2 wxKeyEvent
 3 wxKeyEvent=wxkeyevent
-3 wxKeyEvent::m_altDown=topic409
-3 wxKeyEvent::m_controlDown=topic410
-3 wxKeyEvent::m_keyCode=topic411
-3 wxKeyEvent::m_metaDown=topic412
-3 wxKeyEvent::m_shiftDown=topic413
-3 wxKeyEvent::m_x=topic414
-3 wxKeyEvent::m_y=topic415
-3 wxKeyEvent::wxKeyEvent=topic416
-3 wxKeyEvent::AltDown=topic417
-3 wxKeyEvent::ControlDown=topic418
-3 wxKeyEvent::GetX=topic419
-3 wxKeyEvent::GetY=topic420
-3 wxKeyEvent::KeyCode=topic421
-3 wxKeyEvent::MetaDown=topic422
-3 wxKeyEvent::Position=topic423
-3 wxKeyEvent::ShiftDown=topic424
+3 wxKeyEvent::m_altDown=topic403
+3 wxKeyEvent::m_controlDown=topic404
+3 wxKeyEvent::m_keyCode=topic405
+3 wxKeyEvent::m_metaDown=topic406
+3 wxKeyEvent::m_shiftDown=topic407
+3 wxKeyEvent::m_x=topic408
+3 wxKeyEvent::m_y=topic409
+3 wxKeyEvent::wxKeyEvent=topic410
+3 wxKeyEvent::AltDown=topic411
+3 wxKeyEvent::ControlDown=topic412
+3 wxKeyEvent::GetX=topic413
+3 wxKeyEvent::GetY=topic414
+3 wxKeyEvent::KeyCode=topic415
+3 wxKeyEvent::MetaDown=topic416
+3 wxKeyEvent::Position=topic417
+3 wxKeyEvent::ShiftDown=topic418
 2 wxLayoutConstraints
 3 wxLayoutConstraints=wxlayoutconstraints
-3 wxLayoutConstraints::wxLayoutConstraints=topic425
-3 wxLayoutConstraints::bottom=topic426
-3 wxLayoutConstraints::centreX=topic427
-3 wxLayoutConstraints::centreY=topic428
-3 wxLayoutConstraints::height=topic429
-3 wxLayoutConstraints::left=topic430
-3 wxLayoutConstraints::right=topic431
-3 wxLayoutConstraints::top=topic432
-3 wxLayoutConstraints::width=topic433
+3 wxLayoutConstraints::wxLayoutConstraints=topic419
+3 wxLayoutConstraints::bottom=topic420
+3 wxLayoutConstraints::centreX=topic421
+3 wxLayoutConstraints::centreY=topic422
+3 wxLayoutConstraints::height=topic423
+3 wxLayoutConstraints::left=topic424
+3 wxLayoutConstraints::right=topic425
+3 wxLayoutConstraints::top=topic426
+3 wxLayoutConstraints::width=topic427
 2 wxList
 3 wxList=wxlist
-3 wxList::wxList=topic434
-3 wxList::~wxList=topic435
-3 wxList::Append=topic436
-3 wxList::Clear=topic437
-3 wxList::DeleteContents=topic438
-3 wxList::DeleteNode=topic439
-3 wxList::DeleteObject=topic440
-3 wxList::Find=topic441
-3 wxList::First=topic442
-3 wxList::Insert=topic443
-3 wxList::Last=topic444
-3 wxList::Member=topic445
-3 wxList::Nth=topic446
-3 wxList::Number=topic447
-3 wxList::Sort=topic448
+3 wxList::wxList=topic428
+3 wxList::~wxList=topic429
+3 wxList::Append=topic430
+3 wxList::Clear=topic431
+3 wxList::DeleteContents=topic432
+3 wxList::DeleteNode=topic433
+3 wxList::DeleteObject=topic434
+3 wxList::Find=topic435
+3 wxList::First=topic436
+3 wxList::Insert=topic437
+3 wxList::Last=topic438
+3 wxList::Member=topic439
+3 wxList::Nth=topic440
+3 wxList::Number=topic441
+3 wxList::Sort=topic442
 2 wxListBox
 3 wxListBox=wxlistbox
 3 wxListBox::wxListBox=wxlistboxconstr
-3 wxListBox::~wxListBox=topic449
+3 wxListBox::~wxListBox=topic443
 3 wxListBox::Append=wxlistboxappend
 3 wxListBox::Clear=wxlistboxclear
 3 wxListBox::Create=wxlistboxcreate
@@ -1185,7 +1243,7 @@
 2 wxListCtrl
 3 wxListCtrl=wxlistctrl
 3 wxListCtrl::wxListCtrl=wxlistctrlconstr
-3 wxListCtrl::~wxListCtrl=topic450
+3 wxListCtrl::~wxListCtrl=topic444
 3 wxListCtrl::Arrange=wxlistctrlarrange
 3 wxListCtrl::Create=wxlistctrlcreate
 3 wxListCtrl::DeleteItem=wxlistctrldeleteitem
@@ -1231,23 +1289,23 @@
 3 wxListCtrl::SortItems=wxlistctrlsortitems
 2 wxListEvent
 3 wxListEvent=wxlistevent
-3 wxListEvent::wxListEvent=topic451
-3 wxListEvent::m_code=topic452
-3 wxListEvent::m_itemIndex=topic453
-3 wxListEvent::m_oldItemIndex=topic454
-3 wxListEvent::m_col=topic455
-3 wxListEvent::m_cancelled=topic456
-3 wxListEvent::m_pointDrag=topic457
-3 wxListEvent::m_item=topic458
+3 wxListEvent::wxListEvent=topic445
+3 wxListEvent::m_code=topic446
+3 wxListEvent::m_itemIndex=topic447
+3 wxListEvent::m_oldItemIndex=topic448
+3 wxListEvent::m_col=topic449
+3 wxListEvent::m_cancelled=topic450
+3 wxListEvent::m_pointDrag=topic451
+3 wxListEvent::m_item=topic452
 2 wxMask
 3 wxMask=wxmask
 3 wxMask::wxMask=wxmaskconstr
-3 wxMask::~wxMask=topic459
+3 wxMask::~wxMask=topic453
 3 wxMask::Create=wxmaskcreate
 2 wxMDIChildFrame
 3 wxMDIChildFrame=wxmdichildframe
 3 wxMDIChildFrame::wxMDIChildFrame=wxmdichildframeconstr
-3 wxMDIChildFrame::~wxMDIChildFrame=topic460
+3 wxMDIChildFrame::~wxMDIChildFrame=topic454
 3 wxMDIChildFrame::Activate=wxmdichildframeactivate
 3 wxMDIChildFrame::Create=wxmdichildframecreate
 3 wxMDIChildFrame::Maximize=wxmdichildframemaximize
@@ -1255,12 +1313,12 @@
 2 wxMDIClientWindow
 3 wxMDIClientWindow=wxmdiclientwindow
 3 wxMDIClientWindow::wxMDIClientWindow=wxmdiclientwindowconstr
-3 wxMDIClientWindow::~wxMDIClientWindow=topic461
+3 wxMDIClientWindow::~wxMDIClientWindow=topic455
 3 wxMDIClientWindow::CreateClient=wxmdiclientwindowcreateclient
 2 wxMDIParentFrame
 3 wxMDIParentFrame=wxmdiparentframe
 3 wxMDIParentFrame::wxMDIParentFrame=wxmdiparentframeconstr
-3 wxMDIParentFrame::~wxMDIParentFrame=topic462
+3 wxMDIParentFrame::~wxMDIParentFrame=topic456
 3 wxMDIParentFrame::ActivateNext=wxmdiparentframeactivatenext
 3 wxMDIParentFrame::ActivatePrevious=wxmdiparentframeactivateprevious
 3 wxMDIParentFrame::ArrangeIcons=wxmdiparentframearrangeicons
@@ -1276,7 +1334,7 @@
 2 wxMenu
 3 wxMenu=wxmenu
 3 wxMenu::wxMenu=wxmenuconstr
-3 wxMenu::~wxMenu=topic463
+3 wxMenu::~wxMenu=topic457
 3 wxMenu::Append=wxmenuappend
 3 wxMenu::AppendSeparator=wxmenuappendseparator
 3 wxMenu::Break=wxmenubreak
@@ -1295,7 +1353,7 @@
 2 wxMenuBar
 3 wxMenuBar=wxmenubar
 3 wxMenuBar::wxMenuBar=wxmenubarconstr
-3 wxMenuBar::~wxMenuBar=topic464
+3 wxMenuBar::~wxMenuBar=topic458
 3 wxMenuBar::Append=wxmenubarappend
 3 wxMenuBar::Check=wxmenubarcheck
 3 wxMenuBar::Enable=wxmenubarenable
@@ -1313,7 +1371,7 @@
 2 wxMenuItem
 3 wxMenuItem=wxmenuitem
 3 wxMenuItem::wxMenuItem=wxmenuitemconstr
-3 wxMenuItem::~wxMenuItem=topic465
+3 wxMenuItem::~wxMenuItem=topic459
 3 wxMenuItem::Check=wxmenuitemcheck
 3 wxMenuItem::DeleteSubMenu=wxmenuitemdeletesubmenu
 3 wxMenuItem::Enable=wxmenuitemenable
@@ -1339,39 +1397,39 @@
 3 wxMenuItem::SetTextColour=wxmenuitemsettextcolour
 2 wxMenuEvent
 3 wxMenuEvent=wxmenuevent
-3 wxMenuEvent::wxMenuEvent=topic466
-3 wxMenuEvent::m_menuId=topic467
+3 wxMenuEvent::wxMenuEvent=topic460
+3 wxMenuEvent::m_menuId=topic461
 3 wxMenuEvent::GetMenuId=wxmenueventgetmenuid
 2 wxMemoryDC
 3 wxMemoryDC=wxmemorydc
-3 wxMemoryDC::wxMemoryDC=topic468
-3 wxMemoryDC::SelectObject=topic469
+3 wxMemoryDC::wxMemoryDC=topic462
+3 wxMemoryDC::SelectObject=topic463
 2 wxMessageDialog
 3 wxMessageDialog=wxmessagedialog
 3 wxMessageDialog::wxMessageDialog=wxmessagedialogconstr
-3 wxMessageDialog::~wxMessageDialog=topic470
+3 wxMessageDialog::~wxMessageDialog=topic464
 3 wxMessageDialog::ShowModal=wxmessagedialogshowmodal
 2 wxMetaFile
 3 wxMetaFile=wxmetafile
-3 wxMetaFile::wxMetaFile=topic471
-3 wxMetaFile::~wxMetaFile=topic472
+3 wxMetaFile::wxMetaFile=topic465
+3 wxMetaFile::~wxMetaFile=topic466
 3 wxMetaFile::Ok=wxmetafileok
 3 wxMetaFile::Play=wxmetafileplay
-3 wxMetaFile::SetClipboard=topic473
+3 wxMetaFile::SetClipboard=topic467
 2 wxMetaFileDC
 3 wxMetaFileDC=wxmetafiledc
-3 wxMetaFileDC::wxMetaFileDC=topic474
-3 wxMetaFileDC::~wxMetaFileDC=topic475
+3 wxMetaFileDC::wxMetaFileDC=topic468
+3 wxMetaFileDC::~wxMetaFileDC=topic469
 3 wxMetaFileDC::Close=wxmetafiledcclose
 2 wxMiniFrame
 3 wxMiniFrame=wxminiframe
 3 wxMiniFrame::wxMiniFrame=wxminiframeconstr
-3 wxMiniFrame::~wxMiniFrame=topic476
+3 wxMiniFrame::~wxMiniFrame=topic470
 3 wxMiniFrame::Create=wxminiframecreate
 2 wxModule
 3 wxModule=wxmodule
 3 wxModule::wxModule=wxmoduleconstr
-3 wxModule::~wxModule=topic477
+3 wxModule::~wxModule=topic471
 3 wxModule::CleanupModules=wxmodulecleanupmodules
 3 wxModule::Exit=wxmoduleexit
 3 wxModule::Init=wxmoduleinit
@@ -1382,69 +1440,69 @@
 3 wxModule::RegisterModules=wxmoduleregistermodules
 2 wxMouseEvent
 3 wxMouseEvent=wxmouseevent
-3 wxMouseEvent::m_altDown=topic478
-3 wxMouseEvent::m_controlDown=topic479
-3 wxMouseEvent::m_leftDown=topic480
-3 wxMouseEvent::m_middleDown=topic481
-3 wxMouseEvent::m_rightDown=topic482
-3 wxMouseEvent::m_leftDown=topic483
-3 wxMouseEvent::m_metaDown=topic484
-3 wxMouseEvent::m_shiftDown=topic485
-3 wxMouseEvent::m_x=topic486
-3 wxMouseEvent::m_y=topic487
-3 wxMouseEvent::wxMouseEvent=topic488
-3 wxMouseEvent::AltDown=topic489
-3 wxMouseEvent::Button=topic490
+3 wxMouseEvent::m_altDown=topic472
+3 wxMouseEvent::m_controlDown=topic473
+3 wxMouseEvent::m_leftDown=topic474
+3 wxMouseEvent::m_middleDown=topic475
+3 wxMouseEvent::m_rightDown=topic476
+3 wxMouseEvent::m_leftDown=topic477
+3 wxMouseEvent::m_metaDown=topic478
+3 wxMouseEvent::m_shiftDown=topic479
+3 wxMouseEvent::m_x=topic480
+3 wxMouseEvent::m_y=topic481
+3 wxMouseEvent::wxMouseEvent=topic482
+3 wxMouseEvent::AltDown=topic483
+3 wxMouseEvent::Button=topic484
 3 wxMouseEvent::ButtonDClick=buttondclick
-3 wxMouseEvent::ButtonDown=topic491
-3 wxMouseEvent::ButtonUp=topic492
-3 wxMouseEvent::ControlDown=topic493
-3 wxMouseEvent::Dragging=topic494
+3 wxMouseEvent::ButtonDown=topic485
+3 wxMouseEvent::ButtonUp=topic486
+3 wxMouseEvent::ControlDown=topic487
+3 wxMouseEvent::Dragging=topic488
 3 wxMouseEvent::Entering=wxmouseevententering
 3 wxMouseEvent::GetX=wxmouseeventgetx
 3 wxMouseEvent::GetY=wxmouseeventgety
-3 wxMouseEvent::IsButton=topic495
+3 wxMouseEvent::IsButton=topic489
 3 wxMouseEvent::Leaving=wxmouseeventleaving
-3 wxMouseEvent::LeftDClick=topic496
-3 wxMouseEvent::LeftDown=topic497
-3 wxMouseEvent::LeftIsDown=topic498
-3 wxMouseEvent::LeftUp=topic499
-3 wxMouseEvent::MetaDown=topic500
-3 wxMouseEvent::MiddleDClick=topic501
-3 wxMouseEvent::MiddleDown=topic502
-3 wxMouseEvent::MiddleIsDown=topic503
-3 wxMouseEvent::MiddleUp=topic504
-3 wxMouseEvent::Moving=topic505
-3 wxMouseEvent::Position=topic506
-3 wxMouseEvent::RightDClick=topic507
-3 wxMouseEvent::RightDown=topic508
-3 wxMouseEvent::RightIsDown=topic509
-3 wxMouseEvent::RightUp=topic510
-3 wxMouseEvent::ShiftDown=topic511
+3 wxMouseEvent::LeftDClick=topic490
+3 wxMouseEvent::LeftDown=topic491
+3 wxMouseEvent::LeftIsDown=topic492
+3 wxMouseEvent::LeftUp=topic493
+3 wxMouseEvent::MetaDown=topic494
+3 wxMouseEvent::MiddleDClick=topic495
+3 wxMouseEvent::MiddleDown=topic496
+3 wxMouseEvent::MiddleIsDown=topic497
+3 wxMouseEvent::MiddleUp=topic498
+3 wxMouseEvent::Moving=topic499
+3 wxMouseEvent::Position=topic500
+3 wxMouseEvent::RightDClick=topic501
+3 wxMouseEvent::RightDown=topic502
+3 wxMouseEvent::RightIsDown=topic503
+3 wxMouseEvent::RightUp=topic504
+3 wxMouseEvent::ShiftDown=topic505
 2 wxMoveEvent
 3 wxMoveEvent=wxmoveevent
-3 wxMoveEvent::wxMoveEvent=topic512
+3 wxMoveEvent::wxMoveEvent=topic506
 3 wxMoveEvent::GetPosition=wxmoveeventgetposition
 2 wxMultipleChoiceDialog
 3 wxMultipleChoiceDialog=wxmultiplechoicedialog
 2 wxMutex
 3 wxMutex=wxmutex
 3 wxMutex::wxMutex=wxmutexconstr
-3 wxMutex::~wxMutex=topic513
+3 wxMutex::~wxMutex=topic507
 3 wxMutex::IsLocked=wxmutexislocked
 3 wxMutex::Lock=wxmutexlock
 3 wxMutex::TryLock=wxmutextrylock
 3 wxMutex::Unlock=wxmutexunlock
 2 wxNode
 3 wxNode=wxnode
-3 wxNode::Data=topic514
-3 wxNode::Next=topic515
-3 wxNode::Previous=topic516
-3 wxNode::SetData=topic517
+3 wxNode::Data=topic508
+3 wxNode::Next=topic509
+3 wxNode::Previous=topic510
+3 wxNode::SetData=topic511
 2 wxObject
 3 wxObject=wxobject
 3 wxObject::wxObject=wxobjectconstr
-3 wxObject::~wxObject=topic518
+3 wxObject::~wxObject=topic512
 3 wxObject::m_refData=wxobjectmrefdata
 3 wxObject::Dump=wxobjectdump
 3 wxObject::GetClassInfo=wxobjectgetclassinfo
@@ -1457,13 +1515,13 @@
 3 wxObject::operator delete=wxobjectdelete
 2 wxObjectRefData
 3 wxObjectRefData=wxobjectrefdata
-3 wxObjectRefData::m_count=topic519
+3 wxObjectRefData::m_count=topic513
 3 wxObjectRefData::wxObjectRefData=wxobjectrefdataconstr
-3 wxObjectRefData::~wxObjectRefData=topic520
+3 wxObjectRefData::~wxObjectRefData=topic514
 2 wxPageSetupData
 3 wxPageSetupData=wxpagesetupdata
-3 wxPageSetupData::wxPageSetupData=topic521
-3 wxPageSetupData::~wxPageSetupData=topic522
+3 wxPageSetupData::wxPageSetupData=topic515
+3 wxPageSetupData::~wxPageSetupData=topic516
 3 wxPageSetupData::EnableHelp=wxpagesetupdataenablehelp
 3 wxPageSetupData::EnableMargins=wxpagesetupdataenablemargins
 3 wxPageSetupData::EnableOrientation=wxpagesetupdataenableorientation
@@ -1492,20 +1550,20 @@
 3 wxPageSetupData::SetDefaultInfo=wxpagesetupdatasetdefaultinfo
 2 wxPageSetupDialog
 3 wxPageSetupDialog=wxpagesetupdialog
-3 wxPageSetupDialog::wxPageSetupDialog=topic523
-3 wxPageSetupDialog::~wxPageSetupDialog=topic524
+3 wxPageSetupDialog::wxPageSetupDialog=topic517
+3 wxPageSetupDialog::~wxPageSetupDialog=topic518
 3 wxPageSetupDialog::GetPageSetupData=wxpagesetupdialoggetpagesetupdata
 3 wxPageSetupDialog::ShowModal=wxpagesetupdialogshowmodal
 2 wxPaintDC
 3 wxPaintDC=wxpaintdc
-3 wxPaintDC::wxPaintDC=topic525
+3 wxPaintDC::wxPaintDC=topic519
 2 wxPaintEvent
 3 wxPaintEvent=wxpaintevent
-3 wxPaintEvent::wxPaintEvent=topic526
+3 wxPaintEvent::wxPaintEvent=topic520
 2 wxPalette
 3 wxPalette=wxpalette
 3 wxPalette::wxPalette=wxpaletteconstr
-3 wxPalette::~wxPalette=topic527
+3 wxPalette::~wxPalette=topic521
 3 wxPalette::Create=wxpalettecreate
 3 wxPalette::GetPixel=wxpalettegetpixel
 3 wxPalette::GetRGB=wxpalettegetrgb
@@ -1516,32 +1574,32 @@
 2 wxPanel
 3 wxPanel=wxpanel
 3 wxPanel::wxPanel=wxpanelconstr
-3 wxPanel::~wxPanel=topic528
+3 wxPanel::~wxPanel=topic522
 3 wxPanel::Create=wxpanelcreate
 3 wxPanel::InitDialog=wxpanelinitdialog
 3 wxPanel::OnSysColourChanged=wxpanelonsyscolourchanged
 2 wxPanelTabView
 3 wxPanelTabView=wxpaneltabview
 3 wxPanelTabView::wxPanelTabView=wxpaneltabviewconstr
-3 wxPanelTabView::~wxPanelTabView=topic529
+3 wxPanelTabView::~wxPanelTabView=topic523
 3 wxPanelTabView::AddTabWindow=wxpaneltabviewaddtabwindow
-3 wxPanelTabView::ClearWindows=topic530
-3 wxPanelTabView::GetCurrentWindow=topic531
-3 wxPanelTabView::GetTabWindow=topic532
-3 wxPanelTabView::ShowWindowForTab=topic533
+3 wxPanelTabView::ClearWindows=topic524
+3 wxPanelTabView::GetCurrentWindow=topic525
+3 wxPanelTabView::GetTabWindow=topic526
+3 wxPanelTabView::ShowWindowForTab=topic527
 2 wxPathList
 3 wxPathList=wxpathlist
-3 wxPathList::wxPathList=topic534
-3 wxPathList::AddEnvList=topic535
-3 wxPathList::Add=topic536
-3 wxPathList::EnsureFileAccessible=topic537
-3 wxPathList::FindAbsoluteValidPath=topic538
-3 wxPathList::FindValidPath=topic539
-3 wxPathList::Member=topic540
+3 wxPathList::wxPathList=topic528
+3 wxPathList::AddEnvList=topic529
+3 wxPathList::Add=topic530
+3 wxPathList::EnsureFileAccessible=topic531
+3 wxPathList::FindAbsoluteValidPath=topic532
+3 wxPathList::FindValidPath=topic533
+3 wxPathList::Member=topic534
 2 wxPen
 3 wxPen=wxpen
 3 wxPen::wxPen=wxpenconstr
-3 wxPen::~wxPen=topic541
+3 wxPen::~wxPen=topic535
 3 wxPen::GetCap=wxpengetcap
 3 wxPen::GetColour=wxpengetcolour
 3 wxPen::GetDashes=wxpengetdashes
@@ -1562,40 +1620,40 @@
 3 wxPen::operator !==wxpennotequals
 2 wxPenList
 3 wxPenList=wxpenlist
-3 wxPenList::wxPenList=topic542
+3 wxPenList::wxPenList=topic536
 3 wxPenList::AddPen=wxpenlistaddpen
 3 wxPenList::FindOrCreatePen=wxpenlistfindorcreatepen
 3 wxPenList::RemovePen=wxpenlistremovepen
 2 wxPoint
 3 wxPoint=wxpoint
-3 wxPoint::wxPoint=topic543
-3 wxPoint::x=topic544
-3 wxPoint::y=topic545
+3 wxPoint::wxPoint=topic537
+3 wxPoint::x=topic538
+3 wxPoint::y=topic539
 2 wxPreviewCanvas
 3 wxPreviewCanvas=wxpreviewcanvas
-3 wxPreviewCanvas::wxPreviewCanvas=topic546
-3 wxPreviewCanvas::~wxPreviewCanvas=topic547
+3 wxPreviewCanvas::wxPreviewCanvas=topic540
+3 wxPreviewCanvas::~wxPreviewCanvas=topic541
 3 wxPreviewCanvas::OnPaint=wxpreviewcanvasonpaint
 2 wxPreviewControlBar
 3 wxPreviewControlBar=wxpreviewcontrolbar
-3 wxPreviewControlBar::wxPreviewControlbar=topic548
-3 wxPreviewControlBar::~wxPreviewControlBar=topic549
-3 wxPreviewControlBar::CreateButtons=topic550
-3 wxPreviewControlBar::GetPrintPreview=topic551
-3 wxPreviewControlBar::GetZoomControl=topic552
-3 wxPreviewControlBar::SetZoomControl=topic553
+3 wxPreviewControlBar::wxPreviewControlbar=topic542
+3 wxPreviewControlBar::~wxPreviewControlBar=topic543
+3 wxPreviewControlBar::CreateButtons=topic544
+3 wxPreviewControlBar::GetPrintPreview=topic545
+3 wxPreviewControlBar::GetZoomControl=topic546
+3 wxPreviewControlBar::SetZoomControl=topic547
 2 wxPreviewFrame
 3 wxPreviewFrame=wxpreviewframe
-3 wxPreviewFrame::wxPreviewFrame=topic554
-3 wxPreviewFrame::~wxPreviewFrame=topic555
-3 wxPreviewFrame::CreateControlBar=topic556
-3 wxPreviewFrame::CreateCanvas=topic557
-3 wxPreviewFrame::Initialize=topic558
-3 wxPreviewFrame::OnClose=topic559
+3 wxPreviewFrame::wxPreviewFrame=topic548
+3 wxPreviewFrame::~wxPreviewFrame=topic549
+3 wxPreviewFrame::CreateControlBar=topic550
+3 wxPreviewFrame::CreateCanvas=topic551
+3 wxPreviewFrame::Initialize=topic552
+3 wxPreviewFrame::OnClose=topic553
 2 wxPrintData
 3 wxPrintData=wxprintdata
-3 wxPrintData::wxPrintData=topic560
-3 wxPrintData::~wxPrintData=topic561
+3 wxPrintData::wxPrintData=topic554
+3 wxPrintData::~wxPrintData=topic555
 3 wxPrintData::EnableHelp=wxprintdataenablehelp
 3 wxPrintData::EnablePageNumbers=wxprintdataenablepagenumbers
 3 wxPrintData::EnablePrintToFile=wxprintdataenableprinttofile
@@ -1619,15 +1677,15 @@
 3 wxPrintData::SetToPage=wxprintdatasettopage
 2 wxPrintDialog
 3 wxPrintDialog=wxprintdialog
-3 wxPrintDialog::wxPrintDialog=topic562
-3 wxPrintDialog::~wxPrintDialog=topic563
+3 wxPrintDialog::wxPrintDialog=topic556
+3 wxPrintDialog::~wxPrintDialog=topic557
 3 wxPrintDialog::GetPrintData=wxprintdialoggetprintdata
 3 wxPrintDialog::GetPrintDC=wxprintdialoggetprintdc
 3 wxPrintDialog::ShowModal=wxprintdialogshowmodal
 2 wxPrinter
 3 wxPrinter=wxprinter
-3 wxPrinter::wxPrinter=topic564
-3 wxPrinter::~wxPrinter=topic565
+3 wxPrinter::wxPrinter=topic558
+3 wxPrinter::~wxPrinter=topic559
 3 wxPrinter::Abort=wxprinterabort
 3 wxPrinter::CreateAbortWindow=wxprintercreateabortwindow
 3 wxPrinter::GetPrintData=wxprintergetprintdata
@@ -1637,11 +1695,11 @@
 3 wxPrinter::Setup=wxprintersetup
 2 wxPrinterDC
 3 wxPrinterDC=wxprinterdc
-3 wxPrinterDC::wxPrinterDC=topic566
+3 wxPrinterDC::wxPrinterDC=topic560
 2 wxPrintout
 3 wxPrintout=wxprintout
-3 wxPrintout::wxPrintout=topic567
-3 wxPrintout::~wxPrintout=topic568
+3 wxPrintout::wxPrintout=topic561
+3 wxPrintout::~wxPrintout=topic562
 3 wxPrintout::GetDC=wxprintoutgetdc
 3 wxPrintout::GetPageInfo=wxprintoutgetpageinfo
 3 wxPrintout::GetPageSizeMM=wxprintoutgetpagesizemm
@@ -1658,8 +1716,8 @@
 3 wxPrintout::OnPrintPage=wxprintoutonprintpage
 2 wxPrintPreview
 3 wxPrintPreview=wxprintpreview
-3 wxPrintPreview::wxPrintPreview=topic569
-3 wxPrintPreview::~wxPrintPreview=topic570
+3 wxPrintPreview::wxPrintPreview=topic563
+3 wxPrintPreview::~wxPrintPreview=topic564
 3 wxPrintPreview::DrawBlankPage=wxprintpreviewdrawblankpage
 3 wxPrintPreview::GetCanvas=wxprintpreviewgetcanvas
 3 wxPrintPreview::GetCurrentPage=wxprintpreviewgetcurrentpage
@@ -1680,44 +1738,44 @@
 3 wxPrintPreview::SetZoom=wxprintpreviewsetzoom
 2 wxPostScriptDC
 3 wxPostScriptDC=wxpostscriptdc
-3 wxPostScriptDC::wxPostScriptDC=topic571
-3 wxPostScriptDC::GetStream=topic572
+3 wxPostScriptDC::wxPostScriptDC=topic565
+3 wxPostScriptDC::GetStream=topic566
 2 wxQueryCol
 3 wxQueryCol=wxquerycol
-3 wxQueryCol::wxQueryCol=topic573
-3 wxQueryCol::~wxQueryCol=topic574
-3 wxQueryCol::BindVar=topic575
-3 wxQueryCol::FillVar=topic576
-3 wxQueryCol::GetData=topic577
-3 wxQueryCol::GetName=topic578
-3 wxQueryCol::GetType=topic579
-3 wxQueryCol::GetSize=topic580
-3 wxQueryCol::IsRowDirty=topic581
-3 wxQueryCol::IsNullable=topic582
-3 wxQueryCol::AppendField=topic583
-3 wxQueryCol::SetData=topic584
-3 wxQueryCol::SetName=topic585
-3 wxQueryCol::SetNullable=topic586
-3 wxQueryCol::SetFieldDirty=topic587
-3 wxQueryCol::SetType=topic588
+3 wxQueryCol::wxQueryCol=topic567
+3 wxQueryCol::~wxQueryCol=topic568
+3 wxQueryCol::BindVar=topic569
+3 wxQueryCol::FillVar=topic570
+3 wxQueryCol::GetData=topic571
+3 wxQueryCol::GetName=topic572
+3 wxQueryCol::GetType=topic573
+3 wxQueryCol::GetSize=topic574
+3 wxQueryCol::IsRowDirty=topic575
+3 wxQueryCol::IsNullable=topic576
+3 wxQueryCol::AppendField=topic577
+3 wxQueryCol::SetData=topic578
+3 wxQueryCol::SetName=topic579
+3 wxQueryCol::SetNullable=topic580
+3 wxQueryCol::SetFieldDirty=topic581
+3 wxQueryCol::SetType=topic582
 2 wxQueryField
 3 wxQueryField=wxqueryfield
-3 wxQueryField::wxQueryField=topic589
-3 wxQueryField::~wxQueryField=topic590
-3 wxQueryField::AllocData=topic591
-3 wxQueryField::ClearData=topic592
-3 wxQueryField::GetData=topic593
-3 wxQueryField::GetSize=topic594
-3 wxQueryField::GetType=topic595
-3 wxQueryField::IsDirty=topic596
-3 wxQueryField::SetData=topic597
-3 wxQueryField::SetDirty=topic598
-3 wxQueryField::SetSize=topic599
-3 wxQueryField::SetType=topic600
+3 wxQueryField::wxQueryField=topic583
+3 wxQueryField::~wxQueryField=topic584
+3 wxQueryField::AllocData=topic585
+3 wxQueryField::ClearData=topic586
+3 wxQueryField::GetData=topic587
+3 wxQueryField::GetSize=topic588
+3 wxQueryField::GetType=topic589
+3 wxQueryField::IsDirty=topic590
+3 wxQueryField::SetData=topic591
+3 wxQueryField::SetDirty=topic592
+3 wxQueryField::SetSize=topic593
+3 wxQueryField::SetType=topic594
 2 wxRadioBox
 3 wxRadioBox=wxradiobox
 3 wxRadioBox::wxRadioBox=wxradioboxconstr
-3 wxRadioBox::~wxRadioBox=topic601
+3 wxRadioBox::~wxRadioBox=topic595
 3 wxRadioBox::Create=wxradioboxcreate
 3 wxRadioBox::Enable=wxradioboxenable
 3 wxRadioBox::FindString=wxradioboxfindstring
@@ -1733,20 +1791,20 @@
 2 wxRadioButton
 3 wxRadioButton=wxradiobutton
 3 wxRadioButton::wxRadioButton=wxradiobuttonconstr
-3 wxRadioButton::~wxRadioButton=topic602
+3 wxRadioButton::~wxRadioButton=topic596
 3 wxRadioButton::Create=wxradiobuttoncreate
 3 wxRadioButton::GetValue=wxradiobuttongetvalue
 3 wxRadioButton::SetValue=wxradiobuttonsetvalue
 2 wxRealPoint
 3 wxRealPoint=wxrealpoint
-3 wxRealPoint::wxRealPoint=topic603
+3 wxRealPoint::wxRealPoint=topic597
 2 wxRect
 3 wxRect=wxrect
-3 wxRect::wxRect=topic604
-3 wxRect::x=topic605
-3 wxRect::y=topic606
-3 wxRect::width=topic607
-3 wxRect::height=topic608
+3 wxRect::wxRect=topic598
+3 wxRect::x=topic599
+3 wxRect::y=topic600
+3 wxRect::width=topic601
+3 wxRect::height=topic602
 3 wxRect::GetBottom=wxrectgetbottom
 3 wxRect::GetHeight=wxrectgetheight
 3 wxRect::GetLeft=wxrectgetleft
@@ -1761,80 +1819,80 @@
 3 wxRect::SetWidth=wxrectsetwidth
 3 wxRect::SetX=wxrectsetx
 3 wxRect::SetY=wxrectsety
-3 wxRect::operator ==topic609
-3 wxRect::operator ===topic610
-3 wxRect::operator !==topic611
+3 wxRect::operator ==topic603
+3 wxRect::operator ===topic604
+3 wxRect::operator !==topic605
 2 wxRecordSet
 3 wxRecordSet=wxrecordset
-3 wxRecordSet::wxRecordSet=topic612
-3 wxRecordSet::~wxRecordSet=topic613
-3 wxRecordSet::AddNew=topic614
-3 wxRecordSet::BeginQuery=topic615
-3 wxRecordSet::BindVar=topic616
-3 wxRecordSet::CanAppend=topic617
-3 wxRecordSet::Cancel=topic618
-3 wxRecordSet::CanRestart=topic619
-3 wxRecordSet::CanScroll=topic620
-3 wxRecordSet::CanTransact=topic621
-3 wxRecordSet::CanUpdate=topic622
-3 wxRecordSet::ConstructDefaultSQL=topic623
-3 wxRecordSet::Delete=topic624
-3 wxRecordSet::Edit=topic625
-3 wxRecordSet::EndQuery=topic626
+3 wxRecordSet::wxRecordSet=topic606
+3 wxRecordSet::~wxRecordSet=topic607
+3 wxRecordSet::AddNew=topic608
+3 wxRecordSet::BeginQuery=topic609
+3 wxRecordSet::BindVar=topic610
+3 wxRecordSet::CanAppend=topic611
+3 wxRecordSet::Cancel=topic612
+3 wxRecordSet::CanRestart=topic613
+3 wxRecordSet::CanScroll=topic614
+3 wxRecordSet::CanTransact=topic615
+3 wxRecordSet::CanUpdate=topic616
+3 wxRecordSet::ConstructDefaultSQL=topic617
+3 wxRecordSet::Delete=topic618
+3 wxRecordSet::Edit=topic619
+3 wxRecordSet::EndQuery=topic620
 3 wxRecordSet::ExecuteSQL=wxrecordsetexecutesql
-3 wxRecordSet::FillVars=topic627
-3 wxRecordSet::GetColName=topic628
-3 wxRecordSet::GetColType=topic629
-3 wxRecordSet::GetColumns=topic630
-3 wxRecordSet::GetCurrentRecord=topic631
-3 wxRecordSet::GetDatabase=topic632
+3 wxRecordSet::FillVars=topic621
+3 wxRecordSet::GetColName=topic622
+3 wxRecordSet::GetColType=topic623
+3 wxRecordSet::GetColumns=topic624
+3 wxRecordSet::GetCurrentRecord=topic625
+3 wxRecordSet::GetDatabase=topic626
 3 wxRecordSet::GetDataSources=wxrecordsetgetdatasources
-3 wxRecordSet::GetDefaultConnect=topic633
-3 wxRecordSet::GetDefaultSQL=topic634
-3 wxRecordSet::GetErrorCode=topic635
+3 wxRecordSet::GetDefaultConnect=topic627
+3 wxRecordSet::GetDefaultSQL=topic628
+3 wxRecordSet::GetErrorCode=topic629
 3 wxRecordSet::GetFieldData=wxrecordsetgetfielddata
 3 wxRecordSet::GetFieldDataPtr=wxrecordsetgetfielddataptr
-3 wxRecordSet::GetFilter=topic636
-3 wxRecordSet::GetForeignKeys=topic637
-3 wxRecordSet::GetNumberCols=topic638
-3 wxRecordSet::GetNumberFields=topic639
-3 wxRecordSet::GetNumberParams=topic640
-3 wxRecordSet::GetNumberRecords=topic641
-3 wxRecordSet::GetPrimaryKeys=topic642
-3 wxRecordSet::GetOptions=topic643
-3 wxRecordSet::GetResultSet=topic644
-3 wxRecordSet::GetSortString=topic645
-3 wxRecordSet::GetSQL=topic646
-3 wxRecordSet::GetTableName=topic647
-3 wxRecordSet::GetTables=topic648
-3 wxRecordSet::GetType=topic649
-3 wxRecordSet::GoTo=topic650
-3 wxRecordSet::IsBOF=topic651
-3 wxRecordSet::IsFieldDirty=topic652
-3 wxRecordSet::IsFieldNull=topic653
-3 wxRecordSet::IsColNullable=topic654
-3 wxRecordSet::IsEOF=topic655
-3 wxRecordSet::IsDeleted=topic656
-3 wxRecordSet::IsOpen=topic657
-3 wxRecordSet::Move=topic658
-3 wxRecordSet::MoveFirst=topic659
-3 wxRecordSet::MoveLast=topic660
+3 wxRecordSet::GetFilter=topic630
+3 wxRecordSet::GetForeignKeys=topic631
+3 wxRecordSet::GetNumberCols=topic632
+3 wxRecordSet::GetNumberFields=topic633
+3 wxRecordSet::GetNumberParams=topic634
+3 wxRecordSet::GetNumberRecords=topic635
+3 wxRecordSet::GetPrimaryKeys=topic636
+3 wxRecordSet::GetOptions=topic637
+3 wxRecordSet::GetResultSet=topic638
+3 wxRecordSet::GetSortString=topic639
+3 wxRecordSet::GetSQL=topic640
+3 wxRecordSet::GetTableName=topic641
+3 wxRecordSet::GetTables=topic642
+3 wxRecordSet::GetType=topic643
+3 wxRecordSet::GoTo=topic644
+3 wxRecordSet::IsBOF=topic645
+3 wxRecordSet::IsFieldDirty=topic646
+3 wxRecordSet::IsFieldNull=topic647
+3 wxRecordSet::IsColNullable=topic648
+3 wxRecordSet::IsEOF=topic649
+3 wxRecordSet::IsDeleted=topic650
+3 wxRecordSet::IsOpen=topic651
+3 wxRecordSet::Move=topic652
+3 wxRecordSet::MoveFirst=topic653
+3 wxRecordSet::MoveLast=topic654
 3 wxRecordSet::MoveNext=wxrecordsetmovenext
 3 wxRecordSet::MovePrev=wxrecordsetmoveprev
-3 wxRecordSet::Query=topic661
-3 wxRecordSet::RecordCountFinal=topic662
-3 wxRecordSet::Requery=topic663
-3 wxRecordSet::SetFieldDirty=topic664
-3 wxRecordSet::SetDefaultSQL=topic665
-3 wxRecordSet::SetFieldNull=topic666
-3 wxRecordSet::SetOptions=topic667
-3 wxRecordSet::SetTableName=topic668
-3 wxRecordSet::SetType=topic669
-3 wxRecordSet::Update=topic670
+3 wxRecordSet::Query=topic655
+3 wxRecordSet::RecordCountFinal=topic656
+3 wxRecordSet::Requery=topic657
+3 wxRecordSet::SetFieldDirty=topic658
+3 wxRecordSet::SetDefaultSQL=topic659
+3 wxRecordSet::SetFieldNull=topic660
+3 wxRecordSet::SetOptions=topic661
+3 wxRecordSet::SetTableName=topic662
+3 wxRecordSet::SetType=topic663
+3 wxRecordSet::Update=topic664
 2 wxRegion
 3 wxRegion=wxregion
 3 wxRegion::wxRegion=wxregionconstr
-3 wxRegion::~wxRegion=topic671
+3 wxRegion::~wxRegion=topic665
 3 wxRegion::Clear=wxregionclear
 3 wxRegion::Contains=wxregioncontains
 3 wxRegion::GetBox=wxregiongetbox
@@ -1845,13 +1903,13 @@
 3 wxRegion::operator ==wxregionassign
 2 wxScreenDC
 3 wxScreenDC=wxscreendc
-3 wxScreenDC::wxScreenDC=topic672
+3 wxScreenDC::wxScreenDC=topic666
 3 wxScreenDC::StartDrawingOnTop=wxscreendcstartdrawingontop
 3 wxScreenDC::EndDrawingOnTop=wxscreendcenddrawingontop
 2 wxScrollBar
 3 wxScrollBar=wxscrollbar
 3 wxScrollBar::wxScrollBar=wxscrollbarconstr
-3 wxScrollBar::~wxScrollBar=topic673
+3 wxScrollBar::~wxScrollBar=topic667
 3 wxScrollBar::Create=wxscrollbarcreate
 3 wxScrollBar::GetRange=wxscrollbargetrange
 3 wxScrollBar::GetPageSize=wxscrollbargetpagesize
@@ -1861,13 +1919,13 @@
 3 wxScrollBar::SetScrollbar=wxscrollbarsetscrollbar
 2 wxScrollEvent
 3 wxScrollEvent=wxscrollevent
-3 wxScrollEvent::wxScrollEvent=topic674
+3 wxScrollEvent::wxScrollEvent=topic668
 3 wxScrollEvent::GetOrientation=wxscrolleventgetorientation
 3 wxScrollEvent::GetPosition=wxscrolleventgetposition
 2 wxScrolledWindow
 3 wxScrolledWindow=wxscrolledwindow
 3 wxScrolledWindow::wxScrolledWindow=wxscrolledwindowconstr
-3 wxScrolledWindow::~wxScrolledWindow=topic675
+3 wxScrolledWindow::~wxScrolledWindow=topic669
 3 wxScrolledWindow::Create=wxscrolledwindowcreate
 3 wxScrolledWindow::EnableScrolling=wxscrolledwindowenablescrolling
 3 wxScrolledWindow::GetScrollPixelsPerUnit=wxscrolledwindowgetscrollpixelsperunit
@@ -1883,28 +1941,28 @@
 2 wxSingleChoiceDialog
 3 wxSingleChoiceDialog=wxsinglechoicedialog
 3 wxSingleChoiceDialog::wxSingleChoiceDialog=wxsinglechoicedialogconstr
-3 wxSingleChoiceDialog::~wxSingleChoiceDialog=topic676
-3 wxSingleChoiceDialog::GetSelection=topic677
-3 wxSingleChoiceDialog::GetSelectionClientData=topic678
-3 wxSingleChoiceDialog::GetStringSelection=topic679
+3 wxSingleChoiceDialog::~wxSingleChoiceDialog=topic670
+3 wxSingleChoiceDialog::GetSelection=topic671
+3 wxSingleChoiceDialog::GetSelectionClientData=topic672
+3 wxSingleChoiceDialog::GetStringSelection=topic673
 3 wxSingleChoiceDialog::ShowModal=wxsinglechoicedialogshowmodal
 2 wxSize
 3 wxSize=wxsize
-3 wxSize::wxSize=topic680
-3 wxSize::x=topic681
-3 wxSize::y=topic682
+3 wxSize::wxSize=topic674
+3 wxSize::x=topic675
+3 wxSize::y=topic676
 3 wxSize::GetX=wxsizegetx
 3 wxSize::GetY=wxsizegety
 3 wxSize::Set=wxsizeset
-3 wxSize::operator ==topic683
+3 wxSize::operator ==topic677
 2 wxSizeEvent
 3 wxSizeEvent=wxsizeevent
-3 wxSizeEvent::wxSizeEvent=topic684
+3 wxSizeEvent::wxSizeEvent=topic678
 3 wxSizeEvent::GetSize=wxsizeeventgetsize
 2 wxSlider
 3 wxSlider=wxslider
 3 wxSlider::wxSlider=wxsliderconstr
-3 wxSlider::~wxSlider=topic685
+3 wxSlider::~wxSlider=topic679
 3 wxSlider::ClearSel=wxsliderclearsel
 3 wxSlider::ClearTicks=wxsliderclearticks
 3 wxSlider::Create=wxslidercreate
@@ -1928,7 +1986,7 @@
 2 wxSpinButton
 3 wxSpinButton=wxspinbutton
 3 wxSpinButton::wxSpinButton=wxspinbuttonconstr
-3 wxSpinButton::~wxSpinButton=topic686
+3 wxSpinButton::~wxSpinButton=topic680
 3 wxSpinButton::Create=wxspinbuttoncreate
 3 wxSpinButton::GetMax=wxspinbuttongetmax
 3 wxSpinButton::GetMin=wxspinbuttongetmin
@@ -1938,7 +1996,7 @@
 2 wxSplitterWindow
 3 wxSplitterWindow=wxsplitterwindow
 3 wxSplitterWindow::wxSplitterWindow=wxsplitterwindowconstr
-3 wxSplitterWindow::~wxSplitterWindow=topic687
+3 wxSplitterWindow::~wxSplitterWindow=topic681
 3 wxSplitterWindow::Create=wxsplitterwindowcreate
 3 wxSplitterWindow::GetMinimumPaneSize=wxsplitterwindowgetminimumpanesize
 3 wxSplitterWindow::GetSashPosition=wxsplitterwindowgetsashposition
@@ -1964,7 +2022,7 @@
 2 wxStaticBox
 3 wxStaticBox=wxstaticbox
 3 wxStaticBox::wxStaticBox=wxstaticboxconstr
-3 wxStaticBox::~wxStaticBox=topic688
+3 wxStaticBox::~wxStaticBox=topic682
 3 wxStaticBox::Create=wxstaticboxcreate
 2 wxStaticText
 3 wxStaticText=wxstatictext
@@ -1975,7 +2033,7 @@
 2 wxStatusBar
 3 wxStatusBar=wxstatusbar
 3 wxStatusBar::wxStatusBar=wxstatusbarconstr
-3 wxStatusBar::~wxStatusBar=topic689
+3 wxStatusBar::~wxStatusBar=topic683
 3 wxStatusBar::Create=wxstatusbarcreate
 3 wxStatusBar::GetFieldRect=wxstatusbargetfieldrect
 3 wxStatusBar::GetFieldsCount=wxstatusbargetfieldscount
@@ -2057,109 +2115,109 @@
 3 Split=wxstringSplit
 2 wxStringList
 3 wxStringList=wxstringlist
-3 wxStringList::wxStringList=topic690
-3 wxStringList::~wxStringList=topic691
-3 wxStringList::Add=topic692
-3 wxStringList::Delete=topic693
-3 wxStringList::ListToArray=topic694
-3 wxStringList::Member=topic695
-3 wxStringList::Sort=topic696
+3 wxStringList::wxStringList=topic684
+3 wxStringList::~wxStringList=topic685
+3 wxStringList::Add=topic686
+3 wxStringList::Delete=topic687
+3 wxStringList::ListToArray=topic688
+3 wxStringList::Member=topic689
+3 wxStringList::Sort=topic690
 2 wxSysColourChangedEvent
 3 wxSysColourChangedEvent=wxsyscolourchangedevent
-3 wxSysColourChangedEvent::wxSysColourChanged=topic697
+3 wxSysColourChangedEvent::wxSysColourChanged=topic691
 2 wxSystemSettings
 3 wxSystemSettings=wxsystemsettings
-3 wxSystemSettings::wxSystemSettings=topic698
+3 wxSystemSettings::wxSystemSettings=topic692
 3 wxSystemSettings::GetSystemColour=wxsystemsettingsgetsystemcolour
 3 wxSystemSettings::GetSystemFont=wxsystemsettingsgetsystemfont
 3 wxSystemSettings::GetSystemMetric=wxsystemsettingsgetsystemmetric
 2 wxTabbedDialog
 3 wxTabbedDialog=wxtabbeddialog
-3 wxTabbedDialog::wxTabbedDialog=topic699
-3 wxTabbedDialog::~wxTabbedDialog=topic700
-3 wxTabbedDialog::SetTabView=topic701
-3 wxTabbedDialog::GetTabView=topic702
+3 wxTabbedDialog::wxTabbedDialog=topic693
+3 wxTabbedDialog::~wxTabbedDialog=topic694
+3 wxTabbedDialog::SetTabView=topic695
+3 wxTabbedDialog::GetTabView=topic696
 2 wxTabbedPanel
 3 wxTabbedPanel=wxtabbedpanel
-3 wxTabbedPanel::wxTabbedPanel=topic703
-3 wxTabbedPanel::SetTabView=topic704
-3 wxTabbedPanel::GetTabView=topic705
+3 wxTabbedPanel::wxTabbedPanel=topic697
+3 wxTabbedPanel::SetTabView=topic698
+3 wxTabbedPanel::GetTabView=topic699
 2 wxTabControl
 3 wxTabControl=wxtabcontrol
-3 wxTabControl::wxTabControl=topic706
-3 wxTabControl::GetColPosition=topic707
-3 wxTabControl::GetFont=topic708
-3 wxTabControl::GetHeight=topic709
-3 wxTabControl::GetId=topic710
-3 wxTabControl::GetLabel=topic711
-3 wxTabControl::GetRowPosition=topic712
-3 wxTabControl::GetSelected=topic713
-3 wxTabControl::GetWidth=topic714
-3 wxTabControl::GetX=topic715
-3 wxTabControl::GetY=topic716
-3 wxTabControl::HitTest=topic717
-3 wxTabControl::OnDraw=topic718
-3 wxTabControl::SetColPosition=topic719
-3 wxTabControl::SetFont=topic720
-3 wxTabControl::SetId=topic721
-3 wxTabControl::SetLabel=topic722
-3 wxTabControl::SetPosition=topic723
-3 wxTabControl::SetRowPosition=topic724
-3 wxTabControl::SetSelected=topic725
-3 wxTabControl::SetSize=topic726
+3 wxTabControl::wxTabControl=topic700
+3 wxTabControl::GetColPosition=topic701
+3 wxTabControl::GetFont=topic702
+3 wxTabControl::GetHeight=topic703
+3 wxTabControl::GetId=topic704
+3 wxTabControl::GetLabel=topic705
+3 wxTabControl::GetRowPosition=topic706
+3 wxTabControl::GetSelected=topic707
+3 wxTabControl::GetWidth=topic708
+3 wxTabControl::GetX=topic709
+3 wxTabControl::GetY=topic710
+3 wxTabControl::HitTest=topic711
+3 wxTabControl::OnDraw=topic712
+3 wxTabControl::SetColPosition=topic713
+3 wxTabControl::SetFont=topic714
+3 wxTabControl::SetId=topic715
+3 wxTabControl::SetLabel=topic716
+3 wxTabControl::SetPosition=topic717
+3 wxTabControl::SetRowPosition=topic718
+3 wxTabControl::SetSelected=topic719
+3 wxTabControl::SetSize=topic720
 2 wxTabView
 3 wxTabView=wxtabview
-3 wxTabView::wxTabView=topic727
+3 wxTabView::wxTabView=topic721
 3 wxTabView::AddTab=wxtabviewaddtab
 3 wxTabView::CalculateTabWidth=wxtabviewcalculatetabwidth
-3 wxTabView::ClearTabs=topic728
-3 wxTabView::Draw=topic729
-3 wxTabView::FindTabControlForId=topic730
-3 wxTabView::FindTabControlForPosition=topic731
-3 wxTabView::GetBackgroundBrush=topic732
-3 wxTabView::GetBackgroundColour=topic733
-3 wxTabView::GetBackgroundPen=topic734
-3 wxTabView::GetHighlightColour=topic735
-3 wxTabView::GetHighlightPen=topic736
-3 wxTabView::GetHorizontalTabOffset=topic737
-3 wxTabView::GetNumberOfLayers=topic738
-3 wxTabView::GetSelectedTabFont=topic739
-3 wxTabView::GetShadowColour=topic740
-3 wxTabView::GetTabHeight=topic741
-3 wxTabView::GetTabFont=topic742
-3 wxTabView::GetTabSelectionHeight=topic743
-3 wxTabView::GetTabStyle=topic744
-3 wxTabView::GetTabWidth=topic745
-3 wxTabView::GetTextColour=topic746
-3 wxTabView::GetTopMargin=topic747
-3 wxTabView::GetShadowPen=topic748
-3 wxTabView::GetViewRect=topic749
-3 wxTabView::GetVerticalTabTextSpacing=topic750
-3 wxTabView::GetWindow=topic751
-3 wxTabView::OnCreateTabControl=topic752
-3 wxTabView::Layout=topic753
-3 wxTabView::OnEvent=topic754
-3 wxTabView::OnTabActivate=topic755
-3 wxTabView::OnTabPreActivate=topic756
-3 wxTabView::SetBackgroundColour=topic757
-3 wxTabView::SetHighlightColour=topic758
-3 wxTabView::SetHorizontalTabOffset=topic759
-3 wxTabView::SetSelectedTabFont=topic760
-3 wxTabView::SetShadowColour=topic761
-3 wxTabView::SetTabFont=topic762
-3 wxTabView::SetTabStyle=topic763
-3 wxTabView::SetTabSize=topic764
-3 wxTabView::SetTabSelectionHeight=topic765
-3 wxTabView::SetTabSelection=topic766
-3 wxTabView::SetTextColour=topic767
-3 wxTabView::SetTopMargin=topic768
-3 wxTabView::SetVerticalTabTextSpacing=topic769
+3 wxTabView::ClearTabs=topic722
+3 wxTabView::Draw=topic723
+3 wxTabView::FindTabControlForId=topic724
+3 wxTabView::FindTabControlForPosition=topic725
+3 wxTabView::GetBackgroundBrush=topic726
+3 wxTabView::GetBackgroundColour=topic727
+3 wxTabView::GetBackgroundPen=topic728
+3 wxTabView::GetHighlightColour=topic729
+3 wxTabView::GetHighlightPen=topic730
+3 wxTabView::GetHorizontalTabOffset=topic731
+3 wxTabView::GetNumberOfLayers=topic732
+3 wxTabView::GetSelectedTabFont=topic733
+3 wxTabView::GetShadowColour=topic734
+3 wxTabView::GetTabHeight=topic735
+3 wxTabView::GetTabFont=topic736
+3 wxTabView::GetTabSelectionHeight=topic737
+3 wxTabView::GetTabStyle=topic738
+3 wxTabView::GetTabWidth=topic739
+3 wxTabView::GetTextColour=topic740
+3 wxTabView::GetTopMargin=topic741
+3 wxTabView::GetShadowPen=topic742
+3 wxTabView::GetViewRect=topic743
+3 wxTabView::GetVerticalTabTextSpacing=topic744
+3 wxTabView::GetWindow=topic745
+3 wxTabView::OnCreateTabControl=topic746
+3 wxTabView::Layout=topic747
+3 wxTabView::OnEvent=topic748
+3 wxTabView::OnTabActivate=topic749
+3 wxTabView::OnTabPreActivate=topic750
+3 wxTabView::SetBackgroundColour=topic751
+3 wxTabView::SetHighlightColour=topic752
+3 wxTabView::SetHorizontalTabOffset=topic753
+3 wxTabView::SetSelectedTabFont=topic754
+3 wxTabView::SetShadowColour=topic755
+3 wxTabView::SetTabFont=topic756
+3 wxTabView::SetTabStyle=topic757
+3 wxTabView::SetTabSize=topic758
+3 wxTabView::SetTabSelectionHeight=topic759
+3 wxTabView::SetTabSelection=topic760
+3 wxTabView::SetTextColour=topic761
+3 wxTabView::SetTopMargin=topic762
+3 wxTabView::SetVerticalTabTextSpacing=topic763
 3 wxTabView::SetViewRect=wxtabviewsetviewrect
-3 wxTabView::SetWindow=topic770
+3 wxTabView::SetWindow=topic764
 2 wxTabCtrl
 3 wxTabCtrl=wxtabctrl
 3 wxTabCtrl::wxTabCtrl=wxtabctrlconstr
-3 wxTabCtrl::~wxTabCtrl=topic771
+3 wxTabCtrl::~wxTabCtrl=topic765
 3 wxTabCtrl::Create=wxtabctrlcreate
 3 wxTabCtrl::DeleteAllItems=wxtabctrldeleteallitems
 3 wxTabCtrl::DeleteItem=wxtabctrldeleteitem
@@ -2186,7 +2244,7 @@
 2 wxTaskBarIcon
 3 wxTaskBarIcon=wxtaskbaricon
 3 wxTaskBarIcon::wxTaskBarIcon=wxtaskbariconconstr
-3 wxTaskBarIcon::~wxTaskBarIcon=topic772
+3 wxTaskBarIcon::~wxTaskBarIcon=topic766
 3 wxTaskBarIcon::IsIconInstalled=wxtaskbariconisiconinstalled
 3 wxTaskBarIcon::IsOK=wxtaskbariconisok
 3 wxTaskBarIcon::OnLButtonDown=wxtaskbaricononlbuttondown
@@ -2201,12 +2259,12 @@
 2 wxTextCtrl
 3 wxTextCtrl=wxtextctrl
 3 wxTextCtrl::wxTextCtrl=wxtextctrlconstr
-3 wxTextCtrl::~wxTextCtrl=topic773
+3 wxTextCtrl::~wxTextCtrl=topic767
 3 wxTextCtrl::Clear=wxtextctrlclear
 3 wxTextCtrl::Copy=wxtextctrlcopy
 3 wxTextCtrl::Create=wxtextctrlcreate
 3 wxTextCtrl::Cut=wxtextctrlcut
-3 wxTextCtrl::DiscardEdits=topic774
+3 wxTextCtrl::DiscardEdits=topic768
 3 wxTextCtrl::GetInsertionPoint=wxtextctrlgetinsertionpoint
 3 wxTextCtrl::GetLastPosition=wxtextctrlgetlastposition
 3 wxTextCtrl::GetLineLength=wxtextctrlgetlinelength
@@ -2234,14 +2292,14 @@
 2 wxTextEntryDialog
 3 wxTextEntryDialog=wxtextentrydialog
 3 wxTextEntryDialog::wxTextEntryDialog=wxtextentrydialogconstr
-3 wxTextEntryDialog::~wxTextEntryDialog=topic775
+3 wxTextEntryDialog::~wxTextEntryDialog=topic769
 3 wxTextEntryDialog::GetValue=wxtextentrydialoggetvalue
 3 wxTextEntryDialog::SetValue=wxtextentrydialogsetvalue
 3 wxTextEntryDialog::ShowModal=wxtextentrydialogshowmodal
 2 wxTextValidator
 3 wxTextValidator=wxtextvalidator
 3 wxTextValidator::wxTextValidator=wxtextvalidatorconstr
-3 wxTextValidator::~wxTextValidator=topic776
+3 wxTextValidator::~wxTextValidator=topic770
 3 wxTextValidator::Clone=wxtextvalidatorclone
 3 wxTextValidator::GetExcludeList=wxtextvalidatorgetexcludelist
 3 wxTextValidator::GetIncludeList=wxtextvalidatorgetincludelist
@@ -2256,7 +2314,7 @@
 2 wxThread
 3 wxThread=wxthread
 3 wxThread::wxThread=wxthreadconstr
-3 wxThread::~wxThread=topic777
+3 wxThread::~wxThread=topic771
 3 wxThread::Create=wxthreadcreate
 3 wxThread::DeferDestroy=wxthreaddeferdestroy
 3 wxThread::Destroy=wxthreaddestroy
@@ -2271,16 +2329,16 @@
 3 wxTime=wxtime
 2 wxTimer
 3 wxTimer=wxtimer
-3 wxTimer::wxTimer=topic778
-3 wxTimer::~wxTimer=topic779
-3 wxTimer::Interval=topic780
-3 wxTimer::Notify=topic781
-3 wxTimer::Start=topic782
-3 wxTimer::Stop=topic783
+3 wxTimer::wxTimer=topic772
+3 wxTimer::~wxTimer=topic773
+3 wxTimer::Interval=topic774
+3 wxTimer::Notify=topic775
+3 wxTimer::Start=topic776
+3 wxTimer::Stop=topic777
 2 wxToolBarBase
 3 wxToolBarBase=wxtoolbarbase
 3 wxToolBarBase::wxToolBarBase=wxtoolbarbaseconstr
-3 wxToolBarBase::~wxToolBarBase=topic784
+3 wxToolBarBase::~wxToolBarBase=topic778
 3 wxToolBarBase::AddSeparator=wxtoolbarbaseaddseparator
 3 wxToolBarBase::AddTool=wxtoolbarbaseaddtool
 3 wxToolBarBase::CreateTools=wxtoolbarbasecreatetools
@@ -2321,7 +2379,7 @@
 2 wxTreeCtrl
 3 wxTreeCtrl=wxtreectrl
 3 wxTreeCtrl::wxTreeCtrl=wxtreectrlconstr
-3 wxTreeCtrl::~wxTreeCtrl=topic785
+3 wxTreeCtrl::~wxTreeCtrl=topic779
 3 wxTreeCtrl::Create=wxtreectrlcreate
 3 wxTreeCtrl::DeleteAllItems=wxtreectrldeleteallitems
 3 wxTreeCtrl::DeleteItem=wxtreectrldeleteitem
@@ -2359,28 +2417,28 @@
 3 wxTreeCtrl::SortChildren=wxtreectrlsortchildren
 2 wxTreeEvent
 3 wxTreeEvent=wxtreeevent
-3 wxTreeEvent::wxTreeEvent=topic786
-3 wxTreeEvent::m_code=topic787
-3 wxTreeEvent::m_itemIndex=topic788
-3 wxTreeEvent::m_oldItem=topic789
-3 wxTreeEvent::m_pointDrag=topic790
+3 wxTreeEvent::wxTreeEvent=topic780
+3 wxTreeEvent::m_code=topic781
+3 wxTreeEvent::m_itemIndex=topic782
+3 wxTreeEvent::m_oldItem=topic783
+3 wxTreeEvent::m_pointDrag=topic784
 2 wxUpdateIterator
 3 wxUpdateIterator=wxupdateiterator
-3 wxUpdateIterator::wxUpdateIterator=topic791
-3 wxUpdateIterator::GetX=topic792
-3 wxUpdateIterator::GetY=topic793
-3 wxUpdateIterator::GetWidth=topic794
-3 wxUpdateIterator::GetHeight=topic795
-3 wxUpdateIterator::operator ++=topic796
+3 wxUpdateIterator::wxUpdateIterator=topic785
+3 wxUpdateIterator::GetX=topic786
+3 wxUpdateIterator::GetY=topic787
+3 wxUpdateIterator::GetWidth=topic788
+3 wxUpdateIterator::GetHeight=topic789
+3 wxUpdateIterator::operator ++=topic790
 2 wxUpdateUIEvent
 3 wxUpdateUIEvent=wxupdateuievent
-3 wxUpdateUIEvent::wxUpdateUIEvent=topic797
-3 wxUpdateUIEvent::m_checked=topic798
-3 wxUpdateUIEvent::m_enabled=topic799
-3 wxUpdateUIEvent::m_setChecked=topic800
-3 wxUpdateUIEvent::m_setEnabled=topic801
-3 wxUpdateUIEvent::m_setText=topic802
-3 wxUpdateUIEvent::m_text=topic803
+3 wxUpdateUIEvent::wxUpdateUIEvent=topic791
+3 wxUpdateUIEvent::m_checked=topic792
+3 wxUpdateUIEvent::m_enabled=topic793
+3 wxUpdateUIEvent::m_setChecked=topic794
+3 wxUpdateUIEvent::m_setEnabled=topic795
+3 wxUpdateUIEvent::m_setText=topic796
+3 wxUpdateUIEvent::m_text=topic797
 3 wxUpdateUIEvent::Check=wxupdateuieventcheck
 3 wxUpdateUIEvent::Enable=wxupdateuieventenable
 3 wxUpdateUIEvent::GetChecked=wxupdateuieventgetchecked
@@ -2393,7 +2451,7 @@
 2 wxValidator
 3 wxValidator=wxvalidator
 3 wxValidator::wxValidator=wxvalidatorconstr
-3 wxValidator::~wxValidator=topic804
+3 wxValidator::~wxValidator=topic798
 3 wxValidator::Clone=wxvalidatorclone
 3 wxValidator::GetWindow=wxvalidatorgetwindow
 3 wxValidator::SetWindow=wxvalidatorsetwindow
@@ -2402,76 +2460,76 @@
 3 wxValidator::Validate=wxvalidatorvalidate
 2 wxView
 3 wxView=wxview
-3 wxView::m_viewDocument=topic805
-3 wxView::m_viewFrame=topic806
-3 wxView::m_viewTypeName=topic807
-3 wxView::wxView=topic808
-3 wxView::~wxView=topic809
-3 wxView::Activate=topic810
-3 wxView::Close=topic811
-3 wxView::GetDocument=topic812
-3 wxView::GetDocumentManager=topic813
-3 wxView::GetFrame=topic814
-3 wxView::GetViewName=topic815
-3 wxView::OnActivateView=topic816
-3 wxView::OnChangeFilename=topic817
-3 wxView::OnClose=topic818
-3 wxView::OnCreate=topic819
-3 wxView::OnCreatePrintout=topic820
-3 wxView::OnUpdate=topic821
-3 wxView::SetDocument=topic822
-3 wxView::SetFrame=topic823
-3 wxView::SetViewName=topic824
+3 wxView::m_viewDocument=topic799
+3 wxView::m_viewFrame=topic800
+3 wxView::m_viewTypeName=topic801
+3 wxView::wxView=topic802
+3 wxView::~wxView=topic803
+3 wxView::Activate=topic804
+3 wxView::Close=topic805
+3 wxView::GetDocument=topic806
+3 wxView::GetDocumentManager=topic807
+3 wxView::GetFrame=topic808
+3 wxView::GetViewName=topic809
+3 wxView::OnActivateView=topic810
+3 wxView::OnChangeFilename=topic811
+3 wxView::OnClose=topic812
+3 wxView::OnCreate=topic813
+3 wxView::OnCreatePrintout=topic814
+3 wxView::OnUpdate=topic815
+3 wxView::SetDocument=topic816
+3 wxView::SetFrame=topic817
+3 wxView::SetViewName=topic818
 2 wxWave
 3 wxWave=wxwave
 3 wxWave::wxWave=wxwaveconstr
-3 wxWave::~wxWave=topic825
+3 wxWave::~wxWave=topic819
 3 wxWave::Create=wxwavecreate
 3 wxWave::IsOk=wxwaveisok
 3 wxWave::Play=wxwaveplay
 2 wxWindow
 3 wxWindow=wxwindow
-3 wxWindow::wxWindow=topic826
-3 wxWindow::~wxWindow=topic827
-3 wxWindow::AddChild=topic828
+3 wxWindow::wxWindow=topic820
+3 wxWindow::~wxWindow=topic821
+3 wxWindow::AddChild=topic822
 3 wxWindow::CaptureMouse=wxwindowcapturemouse
 3 wxWindow::Center=wxwindowcenter
 3 wxWindow::Centre=wxwindowcentre
 3 wxWindow::Clear=wxwindowclear
-3 wxWindow::ClientToScreen=topic829
+3 wxWindow::ClientToScreen=topic823
 3 wxWindow::Close=wxwindowclose
 3 wxWindow::Destroy=wxwindowdestroy
-3 wxWindow::DestroyChildren=topic830
+3 wxWindow::DestroyChildren=topic824
 3 wxWindow::DragAcceptFiles=wxwindowdragacceptfiles
 3 wxWindow::Enable=wxwindowenable
 3 wxWindow::FakePopupMenu=wxwindowfakepopupmenu
 3 wxWindow::FindFocus=wxwindowfindfocus
 3 wxWindow::Fit=wxwindowfit
 3 wxWindow::GetBackgroundColour=wxwindowgetbackgroundcolour
-3 wxWindow::GetCharHeight=topic831
-3 wxWindow::GetCharWidth=topic832
-3 wxWindow::GetChildren=topic833
+3 wxWindow::GetCharHeight=topic825
+3 wxWindow::GetCharWidth=topic826
+3 wxWindow::GetChildren=topic827
 3 wxWindow::GetClientSize=wxwindowgetclientsize
 3 wxWindow::GetConstraints=wxwindowgetconstraints
 3 wxWindow::GetDefaultItem=wxwindowgetdefaultitem
 3 wxWindow::GetEventHandler=wxwindowgeteventhandler
 3 wxWindow::GetFont=wxwindowgetfont
 3 wxWindow::GetForegroundColour=wxwindowgetforegroundcolour
-3 wxWindow::GetGrandParent=topic834
-3 wxWindow::GetHandle=topic835
+3 wxWindow::GetGrandParent=topic828
+3 wxWindow::GetHandle=topic829
 3 wxWindow::GetId=wxwindowgetid
-3 wxWindow::GetPosition=topic836
-3 wxWindow::GetLabel=topic837
+3 wxWindow::GetPosition=topic830
+3 wxWindow::GetLabel=topic831
 3 wxWindow::GetName=wxwindowgetname
-3 wxWindow::GetParent=topic838
+3 wxWindow::GetParent=topic832
 3 wxWindow::GetReturnCode=wxwindowgetreturncode
 3 wxWindow::GetScrollThumb=wxwindowgetscrollthumb
 3 wxWindow::GetScrollPos=wxwindowgetscrollpos
 3 wxWindow::GetScrollRange=wxwindowgetscrollrange
-3 wxWindow::GetSize=topic839
-3 wxWindow::GetTextExtent=topic840
+3 wxWindow::GetSize=topic833
+3 wxWindow::GetTextExtent=topic834
 3 wxWindow::GetTitle=wxwindowgettitle
-3 wxWindow::GetWindowStyleFlag=topic841
+3 wxWindow::GetWindowStyleFlag=topic835
 3 wxWindow::InitDialog=wxwindowinitdialog
 3 wxWindow::IsEnabled=wxwindowisenabled
 3 wxWindow::IsRetained=wxwindowisretained
@@ -2509,7 +2567,7 @@
 3 wxWindow::Refresh=wxwindowrefresh
 3 wxWindow::ReleaseMouse=wxwindowreleasemouse
 3 wxWindow::RemoveChild=wxwindowremovechild
-3 wxWindow::ScreenToClient=topic842
+3 wxWindow::ScreenToClient=topic836
 3 wxWindow::ScrollWindow=wxwindowscrollwindow
 3 wxWindow::SetAutoLayout=wxwindowsetautolayout
 3 wxWindow::SetBackgroundColour=wxwindowsetbackgroundcolour
@@ -2524,56 +2582,65 @@
 3 wxWindow::SetScrollPos=wxwindowsetscrollpos
 3 wxWindow::SetSize=wxwindowsetsize
 3 wxWindow::SetSizeHints=wxwindowsetsizehints
-3 wxWindow::SetClientSize=topic843
-3 wxWindow::SetPalette=topic844
+3 wxWindow::SetClientSize=topic837
+3 wxWindow::SetPalette=topic838
 3 wxWindow::SetCursor=wxwindowsetcursor
 3 wxWindow::SetEventHandler=wxwindowseteventhandler
 3 wxWindow::SetTitle=wxwindowsettitle
-3 wxWindow::Show=topic845
+3 wxWindow::Show=topic839
 3 wxWindow::TransferDataFromWindow=wxwindowtransferdatafromwindow
 3 wxWindow::TransferDataToWindow=wxwindowtransferdatatowindow
 3 wxWindow::Validate=wxwindowvalidate
 3 wxWindow::WarpPointer=wxwindowwarppointer
 2 wxWindowDC
 3 wxWindowDC=wxwindowdc
-3 wxWindowDC::wxWindowDC=topic846
+3 wxWindowDC::wxWindowDC=topic840
+2 wxWinHelpController
+3 wxWinHelpController=wxwinhelpcontroller
+3 wxWinHelpController::wxWinHelpController=topic841
+3 wxWinHelpController::~wxWinHelpController=topic842
+3 wxWinHelpController::Initialize=wxwinhelpcontrollerinitialize
+3 wxWinHelpController::DisplayBlock=wxwinhelpcontrollerdisplayblock
+3 wxWinHelpController::DisplayContents=wxwinhelpcontrollerdisplaycontents
+3 wxWinHelpController::DisplaySection=wxwinhelpcontrollerdisplaysection
+3 wxWinHelpController::KeywordSearch=wxwinhelpcontrollerkeywordsearch
+3 wxWinHelpController::LoadFile=wxwinhelpcontrollerloadfile
+3 wxWinHelpController::OnQuit=wxwinhelpcontrolleronquit
+3 wxWinHelpController::Quit=wxwinhelpcontrollerquit
 1 Functions
 2 Functions=functions
-2 File functions
-3 File functions=filefunctions
-3 ::wxDirExists=topic847
-3 ::wxDos2UnixFilename=topic848
-3 ::wxFileExists=topic849
-3 ::wxFileNameFromPath=topic850
+2 File functions=filefunctions
+3 ::wxDirExists=topic843
+3 ::wxDos2UnixFilename=topic844
+3 ::wxFileExists=topic845
+3 ::wxFileNameFromPath=topic846
 3 ::wxFindFirstFile=wxfindfirstfile
 3 ::wxFindNextFile=wxfindnextfile
-3 ::wxIsAbsolutePath=topic851
-3 ::wxPathOnly=topic852
-3 ::wxUnix2DosFilename=topic853
-3 ::wxConcatFiles=topic854
-3 ::wxCopyFile=topic855
+3 ::wxIsAbsolutePath=topic847
+3 ::wxPathOnly=topic848
+3 ::wxUnix2DosFilename=topic849
+3 ::wxConcatFiles=topic850
+3 ::wxCopyFile=topic851
 3 ::wxGetHostName=wxgethostname
 3 ::wxGetEmailAddress=wxgetemailaddress
 3 ::wxGetUserId=wxgetuserid
 3 ::wxGetUserName=wxgetusername
-3 ::wxGetWorkingDirectory=topic856
-3 ::wxGetTempFileName=topic857
+3 ::wxGetWorkingDirectory=topic852
+3 ::wxGetTempFileName=topic853
 3 ::wxIsWild=wxiswild
 3 ::wxMatchWild=wxmatchwild
-3 ::wxMkdir=topic858
-3 ::wxRemoveFile=topic859
-3 ::wxRenameFile=topic860
-3 ::wxRmdir=topic861
-3 ::wxSetWorkingDirectory=topic862
-2 String functions
-3 String functions=topic863
-3 ::copystring=topic864
-3 ::wxStringMatch=topic865
+3 ::wxMkdir=topic854
+3 ::wxRemoveFile=topic855
+3 ::wxRenameFile=topic856
+3 ::wxRmdir=topic857
+3 ::wxSetWorkingDirectory=topic858
+2 String functions=topic859
+3 ::copystring=topic860
+3 ::wxStringMatch=topic861
 3 ::wxStringEq=wxstringeq
 3 ::wxTransferFileToStream=wxtransferfiletostream
 3 ::wxTransferStreamToFile=wxtransferstreamtofile
-2 Dialog functions
-3 Dialog functions=dialogfunctions
+2 Dialog functions=dialogfunctions
 3 ::wxFileSelector=wxfileselector
 3 ::wxGetTextFromUser=wxgettextfromuser
 3 ::wxGetMultipleChoice=wxgetmultiplechoice
@@ -2581,82 +2648,77 @@
 3 ::wxGetSingleChoiceIndex=wxgetsinglechoiceindex
 3 ::wxGetSingleChoiceData=wxgetsinglechoicedata
 3 ::wxMessageBox=wxmessagebox
-2 GDI functions
-3 GDI functions=gdifunctions
-3 ::wxColourDisplay=topic866
-3 ::wxDisplayDepth=topic867
+2 GDI functions=gdifunctions
+3 ::wxColourDisplay=topic862
+3 ::wxDisplayDepth=topic863
 3 ::wxMakeMetaFilePlaceable=wxmakemetafileplaceable
 3 ::wxSetCursor=wxsetcursor
-2 System event functions
-3 System event functions=topic868
-3 ::wxAddPrimaryEventHandler=topic869
-3 ::wxAddSecondaryEventHandler=topic870
-3 ::wxNotifyEvent=topic871
-3 ::wxRegisterEventClass=topic872
-3 ::wxRegisterEventName=topic873
-3 ::wxRegisterExternalEventHandlers=topic874
-3 ::wxRemoveSecondaryEventHandler=topic875
+2 System event functions=topic864
+3 ::wxAddPrimaryEventHandler=topic865
+3 ::wxAddSecondaryEventHandler=topic866
+3 ::wxNotifyEvent=topic867
+3 ::wxRegisterEventClass=topic868
+3 ::wxRegisterEventName=topic869
+3 ::wxRegisterExternalEventHandlers=topic870
+3 ::wxRemoveSecondaryEventHandler=topic871
 3 ::wxSendEvent=wxsendevent
-2 Printer settings
-3 Printer settings=printersettings
-3 ::wxGetPrinterCommand=topic876
-3 ::wxGetPrinterFile=topic877
-3 ::wxGetPrinterMode=topic878
-3 ::wxGetPrinterOptions=topic879
-3 ::wxGetPrinterOrientation=topic880
-3 ::wxGetPrinterPreviewCommand=topic881
-3 ::wxGetPrinterScaling=topic882
-3 ::wxGetPrinterTranslation=topic883
-3 ::wxSetPrinterCommand=topic884
-3 ::wxSetPrinterFile=topic885
-3 ::wxSetPrinterMode=topic886
-3 ::wxSetPrinterOptions=topic887
-3 ::wxSetPrinterOrientation=topic888
-3 ::wxSetPrinterPreviewCommand=topic889
-3 ::wxSetPrinterScaling=topic890
-3 ::wxSetPrinterTranslation=topic891
-2 Clipboard functions
-3 Clipboard functions=clipsboard
-3 ::wxClipboardOpen=topic892
-3 ::wxCloseClipboard=topic893
-3 ::wxEmptyClipboard=topic894
-3 ::wxEnumClipboardFormats=topic895
-3 ::wxGetClipboardData=topic896
-3 ::wxGetClipboardFormatName=topic897
-3 ::wxIsClipboardFormatAvailable=topic898
-3 ::wxOpenClipboard=topic899
-3 ::wxRegisterClipboardFormat=topic900
-3 ::wxSetClipboardData=topic901
-2 Miscellaneous functions
-3 Miscellaneous functions=miscellany
-3 ::NewId=topic902
-3 ::RegisterId=topic903
+2 Printer settings=printersettings
+3 ::wxGetPrinterCommand=topic872
+3 ::wxGetPrinterFile=topic873
+3 ::wxGetPrinterMode=topic874
+3 ::wxGetPrinterOptions=topic875
+3 ::wxGetPrinterOrientation=topic876
+3 ::wxGetPrinterPreviewCommand=topic877
+3 ::wxGetPrinterScaling=topic878
+3 ::wxGetPrinterTranslation=topic879
+3 ::wxSetPrinterCommand=topic880
+3 ::wxSetPrinterFile=topic881
+3 ::wxSetPrinterMode=topic882
+3 ::wxSetPrinterOptions=topic883
+3 ::wxSetPrinterOrientation=topic884
+3 ::wxSetPrinterPreviewCommand=topic885
+3 ::wxSetPrinterScaling=topic886
+3 ::wxSetPrinterTranslation=topic887
+2 Clipboard functions=clipsboard
+3 ::wxClipboardOpen=topic888
+3 ::wxCloseClipboard=topic889
+3 ::wxEmptyClipboard=topic890
+3 ::wxEnumClipboardFormats=topic891
+3 ::wxGetClipboardData=topic892
+3 ::wxGetClipboardFormatName=topic893
+3 ::wxIsClipboardFormatAvailable=topic894
+3 ::wxOpenClipboard=topic895
+3 ::wxRegisterClipboardFormat=topic896
+3 ::wxSetClipboardData=topic897
+2 Miscellaneous functions=miscellany
+3 ::NewId=topic898
+3 ::RegisterId=topic899
 3 ::wxBeginBusyCursor=wxbeginbusycursor
-3 ::wxBell=topic904
+3 ::wxBell=topic900
 3 ::wxCleanUp=wxcleanup
 3 ::wxCreateDynamicObject=wxcreatedynamicobject
-3 ::wxDebugMsg=topic905
-3 ::wxDisplaySize=topic906
+3 ::wxDebugMsg=topic901
+3 ::wxDisplaySize=topic902
 3 ::wxEntry=wxentry
 3 ::wxError=wxerror
 3 ::wxEndBusyCursor=wxendbusycursor
 3 ::wxExecute=wxexecute
 3 ::wxExit=wxexit
 3 ::wxFatalError=wxfatalerror
-3 ::wxFindMenuItemId=topic907
-3 ::wxFindWindowByLabel=topic908
+3 ::wxFindMenuItemId=topic903
+3 ::wxFindWindowByLabel=topic904
 3 ::wxFindWindowByName=wxfindwindowbyname
 3 ::wxGetActiveWindow=wxgetactivewindow
 3 ::wxGetDisplayName=wxgetdisplayname
-3 ::wxGetHomeDir=topic909
-3 ::wxGetHostName=topic910
+3 ::wxGetHomeDir=topic905
+3 ::wxGetHostName=topic906
 3 ::wxGetElapsedTime=wxgetelapsedtime
-3 ::wxGetFreeMemory=topic911
-3 ::wxGetMousePosition=topic912
-3 ::wxGetOsVersion=topic913
+3 ::wxGetFreeMemory=topic907
+3 ::wxGetMousePosition=topic908
+3 ::wxGetOsVersion=topic909
 3 ::wxGetResource=wxgetresource
-3 ::wxGetUserId=topic914
-3 ::wxGetUserName=topic915
+3 ::wxGetUserId=topic910
+3 ::wxGetUserName=topic911
 3 ::wxKill=wxkill
 3 ::wxInitClipboard=wxinitclipboard
 3 ::wxIPCCleanUp=wxipccleanup
@@ -2667,94 +2729,80 @@
 3 ::wxPostDelete=wxpostdelete
 3 ::wxSetDisplayName=wxsetdisplayname
 3 ::wxShell=wxshell
-3 ::wxSleep=topic916
-3 ::wxStripMenuCodes=topic917
+3 ::wxSleep=topic912
+3 ::wxStripMenuCodes=topic913
 3 ::wxStartTimer=wxstarttimer
 3 ::wxToLower=wxtolower
 3 ::wxToUpper=wxtoupper
 3 ::wxTrace=wxtrace
 3 ::wxTraceLevel=wxtracelevel
 3 ::wxWriteResource=wxwriteresource
-3 ::wxYield=topic918
-2 Macros
-3 Macros=macros
+3 ::wxYield=topic914
+2 Macros=macros
 3 CLASSINFO=classinfo
 3 WXDEBUG_NEW=debugnew
-3 DECLARE_ABSTRACT_CLASS=topic919
+3 DECLARE_ABSTRACT_CLASS=topic915
 3 DECLARE_APP=declareapp
-3 DECLARE_CLASS=topic920
-3 DECLARE_DYNAMIC_CLASS=topic921
-3 IMPLEMENT_ABSTRACT_CLASS=topic922
-3 IMPLEMENT_ABSTRACT_CLASS2=topic923
+3 DECLARE_CLASS=topic916
+3 DECLARE_DYNAMIC_CLASS=topic917
+3 IMPLEMENT_ABSTRACT_CLASS=topic918
+3 IMPLEMENT_ABSTRACT_CLASS2=topic919
 3 IMPLEMENT_APP=implementapp
-3 IMPLEMENT_CLASS=topic924
-3 IMPLEMENT_CLASS2=topic925
-3 IMPLEMENT_DYNAMIC_CLASS=topic926
-3 IMPLEMENT_DYNAMIC_CLASS2=topic927
+3 IMPLEMENT_CLASS=topic920
+3 IMPLEMENT_CLASS2=topic921
+3 IMPLEMENT_DYNAMIC_CLASS=topic922
+3 IMPLEMENT_DYNAMIC_CLASS2=topic923
 3 WXTRACE=trace
 3 WXTRACELEVEL=tracelevel
-2 wxWindows resource functions
-3 wxWindows resource functions=resourcefuncs
+2 wxWindows resource functions=resourcefuncs
 3 ::wxResourceAddIdentifier=wxresourceaddidentifier
-3 ::wxResourceClear=topic928
-3 ::wxResourceCreateBitmap=topic929
-3 ::wxResourceCreateIcon=topic930
-3 ::wxResourceCreateMenuBar=topic931
-3 ::wxResourceGetIdentifier=topic932
+3 ::wxResourceClear=topic924
+3 ::wxResourceCreateBitmap=topic925
+3 ::wxResourceCreateIcon=topic926
+3 ::wxResourceCreateMenuBar=topic927
+3 ::wxResourceGetIdentifier=topic928
 3 ::wxResourceParseData=wxresourcedata
-3 ::wxResourceParseFile=topic933
+3 ::wxResourceParseFile=topic929
 3 ::wxResourceParseString=wxresourceparsestring
 3 ::wxResourceRegisterBitmapData=registerbitmapdata
-3 ::wxResourceRegisterIconData=topic934
+3 ::wxResourceRegisterIconData=topic930
 1 Classes by category
 2 Classes by category=classesbycat
 1 Topic overviews
 2 Topic overviews=overviews
 2 wxApp overview=wxappoverview
-2 Bitmaps overview
-3 Bitmaps overview=wxbitmapoverview
-3 Loading bitmaps: further information=topic935
-3 Bitmap format handlers=topic936
+2 Bitmaps overview=wxbitmapoverview
+3 Loading bitmaps: further information=topic931
+3 Bitmap format handlers=topic932
 3 wxIcon overview=wxiconoverview
-2 wxDialog overview
-3 wxDialog overview=wxdialogoverview
-2 Font overview
-3 Font overview=wxfontoverview
-2 wxString overview
-3 wxString overview=wxstringoverview
-3 Copyright of the original GNU code portion=topic937
-3 Features/Additions/Modifications=topic938
-3 Function calls=topic939
-3 Header files=topic940
-3 Test program=topic941
-3 Compilers=topic942
-3 GNU Documentation
-4 GNU Documentation=topic943
-4 The wxString class=topic944
-4 Constructor examples=topic945
-4 Examples=topic946
-4 Comparing, Searching and Matching examples=topic947
-4 Substring extraction examples=topic948
-4 Concatenation examples=topic949
-4 Other manipulation examples=topic950
-4 Reading, Writing and Conversion examples=topic951
-3 Regular Expressions
-4 Regular Expressions=regularexpressions
-4 Regular Expression Overview=topic952
-4 Syntax of Regular Expressions=topic953
-2 wxString member functions
-3 wxString member functions=wxstringcategories
-2 wxSplitterWindow overview
-3 wxSplitterWindow overview=wxsplitterwindowoverview
-3 Example=topic954
-2 wxTreeCtrl overview
-3 wxTreeCtrl overview=wxtreectrloverview
-2 wxListCtrl overview
-3 wxListCtrl overview=wxlistctrloverview
-2 wxImageList overview
-3 wxImageList overview=wximagelistoverview
-2 Common dialogs overview
-3 Common dialogs overview=commondialogsoverview
+2 wxDialog overview=wxdialogoverview
+2 Font overview=wxfontoverview
+2 wxString overview=wxstringoverview
+3 Copyright of the original GNU code portion=topic933
+3 Features/Additions/Modifications=topic934
+3 Function calls=topic935
+3 Header files=topic936
+3 Test program=topic937
+3 Compilers=topic938
+3 GNU Documentation=topic939
+4 The wxString class=topic940
+4 Constructor examples=topic941
+4 Examples=topic942
+4 Comparing, Searching and Matching examples=topic943
+4 Substring extraction examples=topic944
+4 Concatenation examples=topic945
+4 Other manipulation examples=topic946
+4 Reading, Writing and Conversion examples=topic947
+3 Regular Expressions=regularexpressions
+4 Regular Expression Overview=topic948
+4 Syntax of Regular Expressions=topic949
+2 wxString member functions=wxstringcategories
+2 wxSplitterWindow overview=wxsplitterwindowoverview
+3 Example=topic950
+2 wxTreeCtrl overview=wxtreectrloverview
+2 wxListCtrl overview=wxlistctrloverview
+2 wxImageList overview=wximagelistoverview
+2 Common dialogs overview=commondialogsoverview
 3 wxColourDialog overview=wxcolourdialogoverview
 3 wxFontDialog overview=wxfontdialogoverview
 3 wxPrintDialog overview=wxprintdialogoverview
@@ -2764,38 +2812,29 @@
 3 wxMessageDialog overview=wxmessagedialogoverview
 3 wxSingleChoiceDialog overview=wxsinglechoicedialogoverview
 3 wxMultipleChoiceDialog overview=wxmultiplechoicedialogoverview
-2 Constraints overview
-3 Constraints overview=constraintsoverview
-3 Constraint layout: more detail=topic955
-3 Window layout examples
-4 Window layout examples=layoutexamples
-4 Example 1: subwindow layout=topic956
-4 Example 2: panel item layout=topic957
-2 Database classes overview
-3 Database classes overview=odbcoverview
-3 Procedures for writing an ODBC application=topic958
+2 Constraints overview=constraintsoverview
+3 Constraint layout: more detail=topic951
+3 Window layout examples=layoutexamples
+4 Example 1: subwindow layout=topic952
+4 Example 2: panel item layout=topic953
+2 Database classes overview=odbcoverview
+3 Procedures for writing an ODBC application=topic954
 3 wxDatabase overview=wxdatabaseoverview
 3 wxQueryCol overview=wxquerycoloverview
 3 wxQueryField overview=wxqueryfieldoverview
 3 wxRecordSet overview=wxrecordsetoverview
 3 ODBC SQL data types=sqltypes
-3 A selection of SQL commands
-4 A selection of SQL commands=sqlcommands
-4 Create=topic959
-4 Insert=topic960
-4 Select=topic961
-4 Update=topic962
-2 Device context overview
-3 Device context overview=dcoverview
-2 Debugging overview
-3 Debugging overview=debuggingoverview
+3 A selection of SQL commands=sqlcommands
+4 Create=topic955
+4 Insert=topic956
+4 Select=topic957
+4 Update=topic958
+2 Device context overview=dcoverview
+2 Debugging overview=debuggingoverview
 3 wxDebugContext overview=wxdebugcontextoverview
-2 Window deletion overview
-3 Window deletion overview=windowdeletionoverview
-2 Scrolling overview
-3 Scrolling overview=scrollingoverview
-2 Document/view overview
-3 Document/view overview=docviewoverview
+2 Window deletion overview=windowdeletionoverview
+2 Scrolling overview=scrollingoverview
+2 Document/view overview=docviewoverview
 3 wxDocument overview=wxdocumentoverview
 3 wxView overview=wxviewoverview
 3 wxDocTemplate overview=wxdoctemplateoverview
@@ -2804,57 +2843,43 @@
 3 wxCommandProcessor overview=wxcommandprocessoroverview
 3 wxFileHistory overview=wxfilehistoryoverview
 3 wxWindows predefined command identifiers=predefinedids
-2 Event handling overview
-3 Event handling overview=eventhandlingoverview
-3 Introduction=topic963
+2 Event handling overview=eventhandlingoverview
+3 Introduction=topic959
 3 How events are processed=eventprocessing
-3 Pluggable event handlers=topic964
+3 Pluggable event handlers=topic960
 3 Event macros summary=eventmacros
-2 Writing a wxWindows application: a rough guide
-3 Writing a wxWindows application: a rough guide=roughguide
-2 Interprocess communication overview
-3 Interprocess communication overview=ipcoverview
-3 Data transfer=topic965
-3 Examples=topic966
-3 More DDE details=topic967
-2 Printing overview
-3 Printing overview=printingoverview
-2 The wxWindows resource system
-3 The wxWindows resource system=resourceformats
-3 The format of a .WXR file=topic968
-3 Dialog resource format=topic969
-3 Menubar resource format=topic970
-3 Bitmap resource format=topic971
-3 Icon resource format=topic972
-3 Resource format design issues=topic973
-3 Compiling the resource system=topic974
-2 Run time class information overview
-3 Run time class information overview=runtimeclassoverview
+2 Writing a wxWindows application: a rough guide=roughguide
+2 Interprocess communication overview=ipcoverview
+3 Data transfer=topic961
+3 Examples=topic962
+3 More DDE details=topic963
+2 Printing overview=printingoverview
+2 The wxWindows resource system=resourceformats
+3 The format of a .WXR file=topic964
+3 Dialog resource format=topic965
+3 Menubar resource format=topic966
+3 Bitmap resource format=topic967
+3 Icon resource format=topic968
+3 Resource format design issues=topic969
+3 Compiling the resource system=topic970
+2 Run time class information overview=runtimeclassoverview
 3 wxClassInfo=wxclassinfooverview
-3 Example=topic975
-2 Window styles
-3 Window styles=windowstyles
-2 Tab classes overview
-3 Tab classes overview=wxtaboverview
-3 Example=topic976
-3 wxTab change log=topic977
-2 wxTabView overview
-3 wxTabView overview=wxtabviewoverview
-2 Toolbar overview
-3 Toolbar overview=wxtoolbaroverview
-3 Using the toolbar library=topic978
-2 Validator overview
-3 Validator overview=validatoroverview
-2 wxExpr overview
-3 wxExpr overview=exproverview
-3 wxExpr for data file manipulation=topic979
-3 wxExpr compilation=topic980
-3 Bugs=topic981
-3 Using wxExpr=topic982
-2 wxGrid classes overview
-3 wxGrid classes overview=gridoverview
-3 Example=topic983
-2 Notes on using the reference
-3 Notes on using the reference=referencenotes
+3 Example=topic971
+2 Window styles=windowstyles
+2 Tab classes overview=wxtaboverview
+3 Example=topic972
+3 wxTab change log=topic973
+2 wxTabView overview=wxtabviewoverview
+2 Toolbar overview=wxtoolbaroverview
+3 Using the toolbar library=topic974
+2 Validator overview=validatoroverview
+2 wxExpr overview=exproverview
+3 wxExpr for data file manipulation=topic975
+3 wxExpr compilation=topic976
+3 Bugs=topic977
+3 Using wxExpr=topic978
+2 wxGrid classes overview=gridoverview
+3 Example=topic979
+2 Notes on using the reference=referencenotes
 1 References
 2 References=bibliography
diff --git a/docs/latex/wx/wx.hpj b/docs/latex/wx/wx.hpj
index 43d8c37176..a748fcdeae 100644
--- a/docs/latex/wx/wx.hpj
+++ b/docs/latex/wx/wx.hpj
@@ -1,5 +1,5 @@
 [OPTIONS]
-BMROOT=d:\wx2\wxWindows\docs\latex\wx ; Assume that bitmaps are where the source is
+BMROOT=d:\wx2\wxwind~1\docs\latex\wx ; Assume that bitmaps are where the source is
 TITLE=wxWindows Manual
 CONTENTS=Contents
 COMPRESS=HIGH
-- 
2.50.0

