From 74ca9419038b1c257bfd75e4c454f1116d152de7 Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Tue, 4 May 2004 08:52:33 +0000
Subject: [PATCH] Name change replacements

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@27091 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 docs/changes.txt            |  34 ++++-----
 docs/html/faq.htm           |  10 +--
 docs/html/faqgen.htm        | 142 ++++++++++++++++++------------------
 docs/html/faqgtk.htm        |  31 +++++---
 docs/html/faqmac.htm        |  40 +++++-----
 docs/html/faqmot.htm        |   8 +-
 docs/html/faqmsw.htm        | 128 ++++++++++++++++++--------------
 docs/html/faqx11.htm        |   4 +-
 docs/html/i18n.htm          |  28 +++----
 docs/html/index.htm         |  62 ++++++++--------
 docs/html/platform.htm      |   3 +-
 docs/index.htm              |   6 +-
 docs/latex/wx/app.tex       |  30 ++++----
 docs/latex/wx/array.tex     |  14 ++--
 docs/latex/wx/artprov.tex   |   6 +-
 docs/latex/wx/bbutton.tex   |   4 +-
 docs/latex/wx/bitmap.tex    |  20 ++---
 docs/latex/wx/bmpdatob.tex  |   2 +-
 docs/latex/wx/body.tex      | 126 ++++++++++++++++----------------
 docs/latex/wx/brush.tex     |  14 ++--
 docs/latex/wx/button.tex    |   2 +-
 docs/latex/wx/calctrl.tex   |   2 +-
 docs/latex/wx/caret.tex     |   2 +-
 docs/latex/wx/category.tex  |  30 ++++----
 docs/latex/wx/checklst.tex  |   2 +-
 docs/latex/wx/choice.tex    |   2 +-
 docs/latex/wx/clasinfo.tex  |   2 +-
 docs/latex/wx/clientdat.tex |   2 +-
 docs/latex/wx/clipbrd.tex   |   2 +-
 docs/latex/wx/cmdlpars.tex  |   4 +-
 docs/latex/wx/colour.tex    |   4 +-
 docs/latex/wx/combobox.tex  |   2 +-
 docs/latex/wx/config.tex    |  10 +--
 docs/latex/wx/constant.tex  |   2 +-
 docs/latex/wx/cppconst.tex  |   6 +-
 docs/latex/wx/cursor.tex    |   4 +-
 docs/latex/wx/dataform.tex  |   2 +-
 docs/latex/wx/dataobj.tex   |   6 +-
 docs/latex/wx/date.tex      |   2 +-
 docs/latex/wx/datespan.tex  |   2 +-
 docs/latex/wx/datetime.tex  |   4 +-
 docs/latex/wx/datistrm.tex  |   4 +-
 docs/latex/wx/datostrm.tex  |   4 +-
 docs/latex/wx/db.tex        |  16 ++--
 docs/latex/wx/dc.tex        |   8 +-
 docs/latex/wx/debugcxt.tex  |   2 +-
 docs/latex/wx/dialevt.tex   |   2 +-
 docs/latex/wx/dialog.tex    |  12 +--
 docs/latex/wx/dialup.tex    |   4 +-
 docs/latex/wx/dir.tex       |   2 +-
 docs/latex/wx/dirtrav.tex   |   2 +-
 docs/latex/wx/dllload.tex   |   2 +-
 docs/latex/wx/dobjcomp.tex  |   2 +-
 docs/latex/wx/dobjsmpl.tex  |   2 +-
 docs/latex/wx/docchfrm.tex  |   2 +-
 docs/latex/wx/docmanag.tex  |   2 +-
 docs/latex/wx/docmdich.tex  |   2 +-
 docs/latex/wx/document.tex  |   6 +-
 docs/latex/wx/dynlib.tex    |   2 +-
 docs/latex/wx/encconv.tex   |   6 +-
 docs/latex/wx/event.tex     |   6 +-
 docs/latex/wx/evthand.tex   |   4 +-
 docs/latex/wx/fdrepdlg.tex  |   4 +-
 docs/latex/wx/ffile.tex     |   4 +-
 docs/latex/wx/fildatob.tex  |   2 +-
 docs/latex/wx/file.tex      |   4 +-
 docs/latex/wx/filedlg.tex   |   2 +-
 docs/latex/wx/filename.tex  |   6 +-
 docs/latex/wx/font.tex      |   4 +-
 docs/latex/wx/fontenum.tex  |   2 +-
 docs/latex/wx/fontlist.tex  |   4 +-
 docs/latex/wx/fontmap.tex   |   4 +-
 docs/latex/wx/frame.tex     |  16 ++--
 docs/latex/wx/fs.tex        |   4 +-
 docs/latex/wx/fs_mem.tex    |   2 +-
 docs/latex/wx/fsfile.tex    |   2 +-
 docs/latex/wx/ftp.tex       |   8 +-
 docs/latex/wx/function.tex  | 104 +++++++++++++-------------
 docs/latex/wx/glcanvas.tex  |   6 +-
 docs/latex/wx/grid.tex      |   2 +-
 docs/latex/wx/hash.tex      |   2 +-
 docs/latex/wx/hashmap.tex   |   2 +-
 docs/latex/wx/helpevt.tex   |   2 +-
 docs/latex/wx/helpinst.tex  |   6 +-
 docs/latex/wx/htdcrend.tex  |   2 +-
 docs/latex/wx/hthelpct.tex  |   4 +-
 docs/latex/wx/htmlprn.tex   |   2 +-
 docs/latex/wx/htprint.tex   |   2 +-
 docs/latex/wx/htwindow.tex  |   6 +-
 docs/latex/wx/hworld.tex    |  14 ++--
 docs/latex/wx/icon.tex      |  14 ++--
 docs/latex/wx/iconevt.tex   |   2 +-
 docs/latex/wx/idleevt.tex   |   2 +-
 docs/latex/wx/image.tex     |  12 +--
 docs/latex/wx/keyevent.tex  |   8 +-
 docs/latex/wx/list.tex      |   6 +-
 docs/latex/wx/listbox.tex   |   2 +-
 docs/latex/wx/listview.tex  |   4 +-
 docs/latex/wx/locale.tex    |   6 +-
 docs/latex/wx/log.tex       |  16 ++--
 docs/latex/wx/longlong.tex  |   2 +-
 docs/latex/wx/manual.tex    |  20 ++---
 docs/latex/wx/maxzevt.tex   |   2 +-
 docs/latex/wx/mcaptevt.tex  |   2 +-
 docs/latex/wx/mdi.tex       |  12 +--
 docs/latex/wx/menu.tex      |   2 +-
 docs/latex/wx/metafile.tex  |   2 +-
 docs/latex/wx/minifram.tex  |   4 +-
 docs/latex/wx/module.tex    |  22 +++---
 docs/latex/wx/mouseevt.tex  |   4 +-
 docs/latex/wx/noteevt.tex   |   2 +-
 docs/latex/wx/notifevt.tex  |   2 +-
 docs/latex/wx/object.tex    |   4 +-
 docs/latex/wx/pagedlg.tex   |   2 +-
 docs/latex/wx/panel.tex     |   6 +-
 docs/latex/wx/pen.tex       |  14 ++--
 docs/latex/wx/porting.tex   |  32 ++++----
 docs/latex/wx/postscpt.tex  |   2 +-
 docs/latex/wx/print.tex     |   4 +-
 docs/latex/wx/process.tex   |   6 +-
 docs/latex/wx/proplist.tex  |   2 +-
 docs/latex/wx/radiobox.tex  |   2 +-
 docs/latex/wx/referenc.tex  |  10 +--
 docs/latex/wx/regex.tex     |   2 +-
 docs/latex/wx/region.tex    |   2 +-
 docs/latex/wx/scpdarry.tex  |   2 +-
 docs/latex/wx/scpdptr.tex   |   2 +-
 docs/latex/wx/scrolevt.tex  |   2 +-
 docs/latex/wx/scrolwin.tex  |   6 +-
 docs/latex/wx/semaphor.tex  |   2 +-
 docs/latex/wx/size.tex      |   2 +-
 docs/latex/wx/sizeevt.tex   |   6 +-
 docs/latex/wx/sizer.tex     |   4 +-
 docs/latex/wx/snglinst.tex  |   2 +-
 docs/latex/wx/socket.tex    |   6 +-
 docs/latex/wx/socksrv.tex   |   4 +-
 docs/latex/wx/spinevt.tex   |   2 +-
 docs/latex/wx/splitevt.tex  |   2 +-
 docs/latex/wx/statbox.tex   |   2 +-
 docs/latex/wx/stdevtid.tex  |   8 +-
 docs/latex/wx/strmbase.tex  |   2 +-
 docs/latex/wx/strmsock.tex  |   4 +-
 docs/latex/wx/strtotxt.tex  |   4 +-
 docs/latex/wx/sysopt.tex    |   4 +-
 docs/latex/wx/tapp.tex      |  18 ++---
 docs/latex/wx/tbitmap.tex   |   4 +-
 docs/latex/wx/tclipbrd.tex  |   2 +-
 docs/latex/wx/tcommdlg.tex  |   4 +-
 docs/latex/wx/tconstr.tex   |   4 +-
 docs/latex/wx/tcontain.tex  |  18 ++---
 docs/latex/wx/tdate.tex     |   6 +-
 docs/latex/wx/tdb.tex       |  44 +++++------
 docs/latex/wx/tdebug.tex    |  14 ++--
 docs/latex/wx/tdelwin.tex   |  10 +--
 docs/latex/wx/tdialog.tex   |   2 +-
 docs/latex/wx/tdnd.tex      |   4 +-
 docs/latex/wx/tdocview.tex  |  22 +++---
 docs/latex/wx/tempfile.tex  |   2 +-
 docs/latex/wx/tevent.tex    |  18 ++---
 docs/latex/wx/texpr.tex     |   2 +-
 docs/latex/wx/text.tex      |   6 +-
 docs/latex/wx/textdlg.tex   |   2 +-
 docs/latex/wx/textfile.tex  |   4 +-
 docs/latex/wx/tfile.tex     |   2 +-
 docs/latex/wx/tfontenc.tex  |   4 +-
 docs/latex/wx/tglbtn.tex    |   2 +-
 docs/latex/wx/tguide.tex    |   4 +-
 docs/latex/wx/thread.tex    |   4 +-
 docs/latex/wx/ti18n.tex     |   8 +-
 docs/latex/wx/time.tex      |   2 +-
 docs/latex/wx/timespan.tex  |   2 +-
 docs/latex/wx/tipc.tex      |   6 +-
 docs/latex/wx/tlog.tex      |  18 ++---
 docs/latex/wx/tmbconv.tex   |  16 ++--
 docs/latex/wx/tnoneng.tex   |   4 +-
 docs/latex/wx/toolbar.tex   |   8 +-
 docs/latex/wx/tprint.tex    |   4 +-
 docs/latex/wx/tresourc.tex  |  34 ++++-----
 docs/latex/wx/truntime.tex  |   6 +-
 docs/latex/wx/tsamples.tex  |  52 ++++++-------
 docs/latex/wx/tscroll.tex   |   6 +-
 docs/latex/wx/tsizer.tex    |  16 ++--
 docs/latex/wx/tstream.tex   |   4 +-
 docs/latex/wx/tstring.tex   |  18 ++---
 docs/latex/wx/tthreads.tex  |   4 +-
 docs/latex/wx/ttips.tex     |   2 +-
 docs/latex/wx/ttoolbar.tex  |  10 +--
 docs/latex/wx/tunicode.tex  |  26 +++----
 docs/latex/wx/tusage.tex    |   8 +-
 docs/latex/wx/tvalidat.tex  |   2 +-
 docs/latex/wx/txrc.tex      |  18 ++---
 docs/latex/wx/txtdatob.tex  |   2 +-
 docs/latex/wx/upduievt.tex  |  12 +--
 docs/latex/wx/view.tex      |   2 +-
 docs/latex/wx/window.tex    |  26 +++----
 docs/latex/wx/wizard.tex    |   6 +-
 docs/latex/wx/wizevt.tex    |   2 +-
 docs/latex/wx/wizpage.tex   |   2 +-
 docs/latex/wx/wnddisbl.tex  |   2 +-
 docs/latex/wx/wxPython.tex  |  32 ++++----
 docs/latex/wx/wxgtk.tex     |   6 +-
 docs/latex/wx/wxmac.tex     |   4 +-
 docs/latex/wx/wxmgl.tex     |   8 +-
 docs/latex/wx/wxmsw.tex     |   4 +-
 docs/latex/wx/wxos2.tex     |   2 +-
 docs/latex/wx/wxstring.tex  |   8 +-
 docs/latex/wx/wxx11.tex     |  10 +--
 docs/latex/wx/xmlres.tex    |   4 +-
 docs/latex/wx/xmlresh.tex   |   2 +-
 docs/licence.txt            |   4 +-
 docs/licendoc.txt           |   4 +-
 docs/preamble.txt           |  18 ++---
 docs/readme.txt             |  52 ++++++-------
 docs/readme_vms.txt         |   6 +-
 docs/tech/index.txt         |  16 ++--
 docs/tech/tn0001.txt        |   4 +-
 docs/tech/tn0002.txt        |  11 ++-
 docs/tech/tn0003.txt        |  16 ++--
 docs/tech/tn0004.htm        |   6 +-
 docs/tech/tn0005.txt        |  14 ++--
 docs/tech/tn0007.txt        |  18 ++---
 docs/tech/tn0008.htm        |  22 +++---
 docs/tech/tn0009.htm        |   2 +-
 docs/tech/tn0010.htm        |  26 +++----
 docs/tech/tn0011.txt        |   7 +-
 docs/tech/tn0012.txt        |  10 +--
 docs/tech/tn0013.txt        |  12 +--
 docs/tech/tn0014.txt        |  22 +++---
 docs/tech/tn0015.txt        |   6 +-
 229 files changed, 1170 insertions(+), 1138 deletions(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index e8cc8ad127..79f950d7e5 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -1,5 +1,5 @@
-wxWindows 2 Change Log
-----------------------
+wxWidgets Change Log
+--------------------
 
 INCOMPATIBLE CHANGES SINCE 2.2.x
 ================================
@@ -15,7 +15,7 @@ INCOMPATIBLE CHANGES SINCE 2.2.x
     2.6 release.
 
     NB: if you want to build your program with different major versions
-        of wxWindows you will probably find the wxCHECK_VERSION() macro
+        of wxWidgets you will probably find the wxCHECK_VERSION() macro
         (see the documentation) useful.
 
 
@@ -205,7 +205,6 @@ Unix:
 - typo in configure which broke AIX build fixed (Swengtoo)
 - fixed priorities of mailcap entries (David Hart)
 
->>>>>>> 1.212.2.99
 wxMSW:
 
 - strip ampersands from strings returned by wxMenuBar::GetLabelTop()
@@ -213,6 +212,7 @@ wxMSW:
 - fixed hang (sometimes) in wxThread::Delete() (Carl-Friedrich Braun)
 - wxLongLong formatting with MinGW corrected
 - wxFileDialog now returns correct filter index for multiple-file dialogs
+- Fixed a bug in wxSpinCtrl::DoGetBestSize that would make wxSpinCtrl too tall
 
 wxGTK:
 
@@ -223,7 +223,7 @@ wxOS2:
 - fixed bug in Refresh (was not taking reversed coordinate system into
   account, so failed for most generic controls)
 - partly fixed wxMouseEvent (reversed coordinate system again, handling of
-  CTRL and SHIFT keys. ALT still doesn't work as expected by wxWindows, though)
+  CTRL and SHIFT keys. ALT still doesn't work as expected by wxWidgets, though)
 
 
 2.4.2
@@ -296,7 +296,7 @@ All:
 - accept '\r' as delimiter when parsing dates
 - fixed duplicate wxFontEncoding values
 - wxFileConfig now always uses UTF-8 to store settings in Unicode build;
-  it will be possible to set different charset in wxWindows >= 2.5.0
+  it will be possible to set different charset in wxWidgets >= 2.5.0
 - added wxFileName::MakeAbsolute
 - bugs in wxCalCtrl fixed (year not being updated)
 
@@ -349,7 +349,7 @@ wxMSW:
   sunken border under XP
 - partial fix for wxNotebook pages looking bad under XP: wxUSE_UXTHEME
   enables XP theme engine code, and wxUSE_UXTHEME_AUTO tells
-  wxWindows to use the theme tab colour for control backgrounds.
+  wxWidgets to use the theme tab colour for control backgrounds.
   Proper XP theme support is planned for 2.6
 - disable wxNB_RIGHT, wxNB_LEFT, wxNB_BOTTOM notebook styles
   if the version of CommCtl doesn't support it (XP)
@@ -460,10 +460,10 @@ wxBase:
 
 Unix (Base/GUI):
 
-- wxWindows may be built using BSD and Solaris (and possibly other) make
+- wxWidgets may be built using BSD and Solaris (and possibly other) make
   programs and not only GNU make
 - wxTCP-based IPC classes now support communicating over Unix domain sockets
-- wxWindows may be built as a dynamic shared library under Darwin / Mac OS X
+- wxWidgets may be built as a dynamic shared library under Darwin / Mac OS X
   lazy linking issues have been solved by linking a single module (.o) into
   the shared library (two step link using distrib/mac/shared-ld-sh)
 - fixed thread priority setting under Linux
@@ -475,7 +475,7 @@ All (GUI):
 - implemented radio menu items and radio toolbar buttons
 - added possibility to show text in the toolbar buttons
 - added wxArtProvider class that can be used to customize the look of standard
-  wxWindows dialogs
+  wxWidgets dialogs
 - significantly improved native font support
 - wxImage::ComputeHistogram() now uses wxImageHistogram instead of type-unsafe
   wxHashTable
@@ -517,11 +517,11 @@ wxMSW:
 - fixed multiple bugs in wxExecute() with IO redirection
 - refresh the buttons properly when the window is resized (Hans Van Leemputten)
 - huge (40*) speed up in wxMask::Create()
-- changing wxWindows styles also changes the underlying Windows window style
+- changing wxWidgets styles also changes the underlying Windows window style
 - wxTreeCtrl supports wxTR_HIDE_ROOT style (George Policello)
 - fixed flicker in wxTreeCtrl::SetItemXXX()
 - fixed redraw problems in dynamically resized wxStaticText
-- improvements to wxWindows applications behaviour when the system colours
+- improvements to wxWidgets applications behaviour when the system colours
   are changed
 - choose implicit parent for the dialog boxes better
 - fixed wxProgressDialog for ranges > 65535
@@ -710,7 +710,7 @@ wxMSW:
 - Fixed wxFrame::SetClientSize() with toolbar bug
 - Added mousewheel processing
 - Added wxSystemSettings::Get/SetOption so we can configure
-  wxWindows at run time; used this to implement no-maskblt option
+  wxWidgets at run time; used this to implement no-maskblt option
   in wxDC
 - Fixed bug when using MDIS_ALLCHILDSTYLES style: so now MDI
   child frame styles are honoured
@@ -980,7 +980,7 @@ wxHTML:
   fixed handling of relative and absolute font sizes in <font size>
 
 
-NOTE: for changes after wxWindows 2.1.0 b4, please see the CVS
+NOTE: for changes after wxWidgets 2.1.0 b4, please see the CVS
 change log.
 
 2.1.0, b4, May 9th 1999
@@ -1078,7 +1078,7 @@ wxMSW:
 
 - Makefiles for more compilers and samples; Cygwin makefiles
   rationalised.
-- Added VC++ project file for compiling wxWindows as DLL.
+- Added VC++ project file for compiling wxWidgets as DLL.
 
 wxMotif:
 
@@ -1406,7 +1406,7 @@ wxMSW:
 - Added wxJoystick class and event handling, and simple demo.
 - Added simple wxWave class. Needs Stop() function.
 - Added wxModule (module.h/module.cpp) to allow definition
-  of modules to be initialized and cleaned up on wxWindows
+  of modules to be initialized and cleaned up on wxWidgets
   startup/exit.
 - Start of Mingw32 compatibility (see minimal and dialogs samples
   makefile.m95 files, and install.txt).
@@ -1448,7 +1448,7 @@ wxMSW:
 - Added wxTaskBarIcon (taskbar.cpp/h, plus samples/taskbar)
   to allow maintenance of an icon in the Windows 95 taskbar
   tray area.
-- Got MFC sample working (MFC and wxWindows in the same
+- Got MFC sample working (MFC and wxWidgets in the same
   application), partly by tweaking ntwxwin.mak settings.
 - Got DLL compilation working again (VC++).
 - Changed wxProp/Dialog Editor filenames.
diff --git a/docs/html/faq.htm b/docs/html/faq.htm
index 3bf0ff6ade..d9dddfef27 100644
--- a/docs/html/faq.htm
+++ b/docs/html/faq.htm
@@ -2,7 +2,7 @@
 <html>
 
 <head>
-<title>wxWindows 2 FAQ</title>
+<title>wxWidgets 2 FAQ</title>
 </head>
 
 <body bgcolor=#ffffff text=#000000 vlink="#00376a" link="#00529c" alink="#313063">
@@ -13,7 +13,7 @@
 <tr>
 <td bgcolor="#004080" align=left height=24 background="images/bluetitlegradient.gif">
 <font size=+1 face="arial, lucida sans, helvetica" color="#ffffff">
-<b>wxWindows 2 FAQ</b>
+<b>wxWidgets 2 FAQ</b>
 </font>
 </td>
 </tr>
@@ -21,7 +21,7 @@
 
 <p>
 
-Welcome to the wxWindows FAQ. Please select a category:<p>
+Welcome to the wxWidgets FAQ. Please select a category:<p>
 
 <ul>
 <li><a href="faqgen.htm">General questions</a>
@@ -36,10 +36,10 @@ Welcome to the wxWindows FAQ. Please select a category:<p>
 <p>
 
 For further information, please see the
-<a href="http://www.wxwindows.org" target=_top>wxWindows Web site</a>,
+<a href="http://www.wxwindows.org" target=_top>wxWidgets Web site</a>,
 <a href="http://wiki.wxwindows.org" target=_top>wxWiki</a>
 and install.txt (per port), todo.txt (per port), and bugs.txt (all ports) files
-in your wxWindows installation.
+in your wxWidgets installation.
 <p>
 
 </font>
diff --git a/docs/html/faqgen.htm b/docs/html/faqgen.htm
index 45071d02c9..43d44423d5 100644
--- a/docs/html/faqgen.htm
+++ b/docs/html/faqgen.htm
@@ -2,7 +2,7 @@
 <HTML>
 
 <HEAD>
-<TITLE>wxWindows 2 FAQ: General</TITLE>
+<TITLE>wxWidgets 2 FAQ: General</TITLE>
 </HEAD>
 
 <BODY BGCOLOR=#FFFFFF TEXT=#000000 VLINK="#00376A" LINK="#00529C" ALINK="#313063">
@@ -13,7 +13,7 @@
 <tr>
 <td bgcolor="#004080" align=left height=24 background="images/bluetitlegradient.gif">
 <font size=+1 face="Arial, Lucida Sans, Helvetica" color="#FFFFFF">
-<b>wxWindows 2 FAQ: General</b>
+<b>wxWidgets 2 FAQ: General</b>
 </font>
 </td>
 </tr>
@@ -25,17 +25,17 @@ See also <a href="faq.htm">top-level FAQ page</a>.
 <hr>
 <h3>List of questions in this category</h3>
 <ul>
-<li><a href="#whatis">What is wxWindows?</a></li>
-<li><a href="#licence">Can I use wxWindows 2 for both proprietary projects, and GPL&#39;ed projects?</a></li>
+<li><a href="#whatis">What is wxWidgets?</a></li>
+<li><a href="#licence">Can I use wxWidgets 2 for both proprietary projects, and GPL&#39;ed projects?</a></li>
 <li><a href="#support">Is there support?</a></li>
-<li><a href="#users">Who uses wxWindows?</a></li>
-<li><a href="#platforms">What platforms are supported by wxWindows?</a></li>
-<li><a href="#specific">How does wxWindows support platform-specific features?</a></li>
-<li><a href="#stl">Does wxWindows use STL? or the standard string class?</a></li>
-<li><a href="#richedit">Is there a rich edit/markup widget for wxWindows?</a></ li>
-<li><a href="#exceptions">How to use C++ exceptions with wxWindows?</a></ li>
-<li><a href="#dev">How is wxWindows being developed?</a></li>
-<li><a href="#distrib">How is wxWindows distributed?</a></li>
+<li><a href="#users">Who uses wxWidgets?</a></li>
+<li><a href="#platforms">What platforms are supported by wxWidgets?</a></li>
+<li><a href="#specific">How does wxWidgets support platform-specific features?</a></li>
+<li><a href="#stl">Does wxWidgets use STL? or the standard string class?</a></li>
+<li><a href="#richedit">Is there a rich edit/markup widget for wxWidgets?</a></ li>
+<li><a href="#exceptions">How to use C++ exceptions with wxWidgets?</a></ li>
+<li><a href="#dev">How is wxWidgets being developed?</a></li>
+<li><a href="#distrib">How is wxWidgets distributed?</a></li>
 <li><a href="#future">What are the plans for the future?</a></li>
 <li><a href="#base">What is wxBase?</a></li>
 <li><a href="#univ">What is wxUniversal?</a></li>
@@ -45,10 +45,10 @@ See also <a href="faq.htm">top-level FAQ page</a>.
 </ul>
 <hr>
 
-<H3><a name="whatis">What is wxWindows?</a></H3>
+<H3><a name="whatis">What is wxWidgets?</a></H3>
 
-wxWindows is a class library that allows you to compile graphical C++ programs on a range of
-different platforms. wxWindows defines a common API across platforms, but uses the native graphical user interface (GUI) on each platform,
+wxWidgets is a class library that allows you to compile graphical C++ programs on a range of
+different platforms. wxWidgets defines a common API across platforms, but uses the native graphical user interface (GUI) on each platform,
 so your program will take on the native &#39;look and feel&#39; that users are familiar with.<P>
 
 Although GUI applications are mostly built programmatically, there are several dialog editors to help
@@ -56,32 +56,32 @@ build attractive dialogs and panels. Robert Roebling&#39;s <a href="http://www.r
 and Anthemion Software's <a href="http://www.anthemion.co.uk/dialogblocks/" target=_new>DialogBlocks</a>
 are two commercial examples, but there are others: see the <a href="lnk_tools.htm">Useful Tools</a> page.<P>
 
-You don&#39;t have to use C++ to use wxWindows: there is a <a href="http://wxpython.org">Python interface</a> for wxWindows 2,
+You don&#39;t have to use C++ to use wxWidgets: there is a <a href="http://wxpython.org">Python interface</a> for wxWidgets 2,
 and also a <a href="http://wxperl.sourceforge.net" target=_top>Perl interface</a>.
 <P>
 
-<h3><a name="licence">Can I use wxWindows 2 for both proprietary (commercial) projects, and GPL&#39;ed projects?</a></h3>
+<h3><a name="licence">Can I use wxWidgets 2 for both proprietary (commercial) projects, and GPL&#39;ed projects?</a></h3>
 
 Yes. Please see the <a href="newlicen.htm">licence</a> for details, but basically
-you can distribute proprietary binaries without distributing any source code, and neither will wxWindows
+you can distribute proprietary binaries without distributing any source code, and neither will wxWidgets
 conflict with GPL code you may be using or developing with it.
 <P>
-The conditions for using wxWindows 2 are the same whether you are a personal, academic
+The conditions for using wxWidgets 2 are the same whether you are a personal, academic
 or commercial developer.
 <P>
 
 <h3><a name="support">Is there support?</a></h3>
 
 No official support, but the mailing list is very helpful and some people say that
-wxWindows support is better than for much commercial software. The developers are
+wxWidgets support is better than for much commercial software. The developers are
 keen to fix bugs as soon as possible, though obviously there are no guarantees.
 <P>
 
-<H3><a name="users">Who uses wxWindows?</a></H3>
+<H3><a name="users">Who uses wxWidgets?</a></H3>
 
 Many organisations - commercial, government, and academic - across the
 world. It&#39;s impossible to estimate the true number of users, since
-wxWindows is obtained by many different means, and we cannot monitor
+wxWidgets is obtained by many different means, and we cannot monitor
 distribution. The mailing list contains around 300-400 entries which is
 quite large for a list of this type.<P>
 
@@ -91,7 +91,7 @@ Our highest-profile user yet is industry veteran and Lotus Corp. founder Mitch K
 and his <a href="http://www.osafoundation.org" target=_new>Open Source Applications Foundation</a>.
 <P>
 
-<H3><a name="platforms">What platforms are supported by wxWindows 2?</a></H3>
+<H3><a name="platforms">What platforms are supported by wxWidgets 2?</a></H3>
 
 <ul>
 <li>Windows 3.1, Windows 95/98, Windows NT, Windows 2000, Windows ME.
@@ -99,20 +99,20 @@ and his <a href="http://www.osafoundation.org" target=_new>Open Source Applicati
 <li>Unix with Motif or the free Motif clone Lesstif.
 <li>Mac OS.
 <li>Embedded platforms are being investigated. See the <a href="wxuniv.htm">wxUniversal</a> project.
-<li>An OS/2 port is in progress, and you can also compile wxWindows for GTK+ or Motif
+<li>An OS/2 port is in progress, and you can also compile wxWidgets for GTK+ or Motif
 on OS/2.
 </ul>
 <P>
 
-<H3><a name="specific">How does wxWindows 2 support platform-specific
+<H3><a name="specific">How does wxWidgets 2 support platform-specific
 features?</a></H3>
 
 This is a hotly-debated topic amongst the developers. My own philosophy
-is to make wxWindows as platform-independent as possible, but allow in a
+is to make wxWidgets as platform-independent as possible, but allow in a
 few classes (functions, window styles) that are platform-specific.
 For example, Windows metafiles and Windows 95 taskbar icons have
 their own classes on Windows, but nowhere else. Because these classes
-are provided and are wxWindows-compatible, it doesn&#39;t take much
+are provided and are wxWidgets-compatible, it doesn&#39;t take much
 coding effort for an application programmer to add support for
 some functionality that the user on a particular platform might otherwise
 miss. Also, some classes that started off as platform-specific, such
@@ -120,29 +120,29 @@ as the MDI classes, have been emulated on other platforms. I can imagine
 that even wxTaskBarIcon may be implemented for Unix desktops one day.
 <P>
 
-In other words, wxWindows is not a &#39;lowest common denominator&#39; approach,
+In other words, wxWidgets is not a &#39;lowest common denominator&#39; approach,
 but it will still be possible to write portable programs using the
 core API. Forbidding some platform-specific classes would be a stupid
 approach that would alienate many potential users, and encourage
-the perception that toolkits such as wxWindows are not up to the demands
+the perception that toolkits such as wxWidgets are not up to the demands
 of today&#39;s sophisticated applications.<P>
 
 Currently resources such as bitmaps and icons are handled in a platform-specific
 way, but it is hoped to reduce this dependence in due course.<P>
 
-Another reason why wxWindows 2 is not a &#39;lowest common denominator&#39; toolkit is that
+Another reason why wxWidgets 2 is not a &#39;lowest common denominator&#39; toolkit is that
 some functionality missing on some platform has been provided using generic,
 platform-independent code, such as the wxTreeCtrl and wxListCtrl classes.<P>
 
-<H3><a name="stl">Does wxWindows use STL? or the standard string class?</a></H3>
+<H3><a name="stl">Does wxWidgets use STL? or the standard string class?</a></H3>
 
 No. This is a much-discussed topic that has (many times) ended with the conclusion that it is in
-wxWindows&#39; best interests to avoid use of templates. Not all compilers can handle
+wxWidgets&#39; best interests to avoid use of templates. Not all compilers can handle
 templates adequately so it would dramatically reduce the number of compilers
 and platforms that could be supported. It would also be undersirable to make
-wxWindows dependent on another large library that may have to be downloaded and installed.
+wxWidgets dependent on another large library that may have to be downloaded and installed.
 In addition, use of templates can lead to executable bloat, which is something
-wxWindows 2 is strenously trying to avoid.<P>
+wxWidgets 2 is strenously trying to avoid.<P>
 
 The standard C++ string class is not used, again because it is not available to all compilers,
 and it is not necessarily a very efficient implementation. Also, we retain more flexibility
@@ -150,7 +150,7 @@ by being able to modify our own string class. Some compatibility with the string
 has been built into wxString.<P>
 
 There is nothing to stop an application using templates or the string class for its own
-purposes. With wxWindows debugging options on, you may find you get errors when including
+purposes. With wxWidgets debugging options on, you may find you get errors when including
 STL headers. You can work around it either by switching off memory checking,
 or by adding this to a header before you include any STL files:<P>
 
@@ -163,41 +163,41 @@ or by adding this to a header before you include any STL files:<P>
 <P>
 
 
-<H3><a name="richedit">Is there a rich edit/markup widget for wxWindows 2?</a></H3>
+<H3><a name="richedit">Is there a rich edit/markup widget for wxWidgets 2?</a></H3>
 
 These are the possibilities so far:<P>
 
 <ul>
 <li>See <a href="http://www.scintilla.org" target=_top>www.scintilla.org</a> for
-a very nice syntax-highlighting editor widget. Robin Dunn has written a wxWindows wrapper
-for this widget, available in the wxWindows distribution under contrib/src/stc.
+a very nice syntax-highlighting editor widget. Robin Dunn has written a wxWidgets wrapper
+for this widget, available in the wxWidgets distribution under contrib/src/stc.
 <li>If you only need to display marked-up information, rather than edit it,
-then wxHTML will suit your needs. wxHTML is built into wxWindows - please see the reference
+then wxHTML will suit your needs. wxHTML is built into wxWidgets - please see the reference
 manual for details, and samples/html.
 <li>There are rich edit widgets in both WIN32 and GTK+, but there is currently
-no wxWindows wrapper for these (but text attribute functions are being added in the wxWindows 2.3.x series).
+no wxWidgets wrapper for these (but text attribute functions are being added in the wxWidgets 2.3.x series).
 </ul>
 
 <P>
 
-<h3><a name="exceptions">How to use C++ exceptions with wxWindows?</a></h3>
+<h3><a name="exceptions">How to use C++ exceptions with wxWidgets?</a></h3>
 
-wxWindows library itself is unfortunately <i>not</i> exception-safe (as its
+wxWidgets library itself is unfortunately <i>not</i> exception-safe (as its
 initial version predates, by far, the addition of the exceptions to the C++
 language). However you can still use the exceptions in your own code and use
 the other libraries using the exceptions for the error reporting together with
-wxWindows.
+wxWidgets.
 
 <p>
 There are a few issues to keep in mind, though:
 <ul>
-    <li>You shouldn&#39;t let the exceptions propagate through wxWindows code,
+    <li>You shouldn&#39;t let the exceptions propagate through wxWidgets code,
         in particular you should always catch the exceptions thrown by the
         functions called from an event handler in the handler itself and not
-        let them propagate upwards to wxWindows.
+        let them propagate upwards to wxWidgets.
 
     <li>You may need to ensure that the compiler support for the exceptions is
-        enabled as, considering that wxWindows itself doesn&#39;t use the
+        enabled as, considering that wxWidgets itself doesn&#39;t use the
         exceptions and turning their support on results in the library size
         augmentation of 10% to 20%, it is turned off by default for a few
         compilers. Moreover, for gcc (or at least its mingw version) you must
@@ -208,18 +208,18 @@ There are a few issues to keep in mind, though:
 
 <p>
 
-<H3><a name="dev">How is wxWindows being developed?</a></H3>
+<H3><a name="dev">How is wxWidgets being developed?</a></H3>
 
-We are using the <a href="cvs.htm">CVS</a> system to develop and maintain wxWindows. This allows
+We are using the <a href="cvs.htm">CVS</a> system to develop and maintain wxWidgets. This allows
 us to make alterations and upload them instantly to the server, from
 which others can update their source.<P>
 
-To build source from CVS, see the file BuildCVS.txt in the top-level wxWindows distribution
+To build source from CVS, see the file BuildCVS.txt in the top-level wxWidgets distribution
 directory.<P>
 
-<H3><a name="distrib">How is wxWindows distributed?</a></H3>
+<H3><a name="distrib">How is wxWidgets distributed?</a></H3>
 
-By ftp, and via the <a href="cdrom2.htm">wxWindows CD-ROM</a>.
+By ftp, and via the <a href="cdrom2.htm">wxWidgets CD-ROM</a>.
 <P>
 If you are feeling adventurous, you may also check out the sources directly
 from <a href="cvs.htm">cvs</a>.
@@ -227,40 +227,40 @@ from <a href="cvs.htm">cvs</a>.
 
 <H3><a name="future">What are the plans for the future?</a></H3>
 
-Currently we&#39;re working too hard on getting wxWindows finished (are GUI toolkits ever
-finished?) to think very far ahead. However, we know we want to make wxWindows as robust
+Currently we&#39;re working too hard on getting wxWidgets finished (are GUI toolkits ever
+finished?) to think very far ahead. However, we know we want to make wxWidgets as robust
 and well-publicised as possible. We also want to aim for better platform-independence of
 resources such as icons and bitmaps, standardising on PNG and XPM for all platforms.<P>
 
-Other possibilities include: DCOM/CORBA compatibility; a wxWindows book;
+Other possibilities include: DCOM/CORBA compatibility; a wxWidgets book;
 <a href="http://wxworkshop.sourceforge.net/">wxWorkshop</a>, an IDE;
 other platforms, especially embedded systems; other interface abilities such as speech output.<P>
 
-We will investigate the possibility of compiler or operating system vendors bundling wxWindows with
+We will investigate the possibility of compiler or operating system vendors bundling wxWidgets with
 their product.<P>
 
-The high-level goal of wxWindows is to be thought of as the number one C++ framework,
+The high-level goal of wxWidgets is to be thought of as the number one C++ framework,
 for virtually any platform. Move over, MFC!<P>
 
 <h3><a name="base">What is wxBase?</a></h3>
 
-wxBase is a subset of wxWindows comprised by the non-GUI classes. It includes
-wxWindows container and primitive data type classes (including wxString,
+wxBase is a subset of wxWidgets comprised by the non-GUI classes. It includes
+wxWidgets container and primitive data type classes (including wxString,
 wxDateTime and so on) and also useful wrappers for the operating system objects
 such as files, processes, threads, sockets and so on. With very minor
-exceptions wxBase may be used in exactly the same way as wxWindows but it
+exceptions wxBase may be used in exactly the same way as wxWidgets but it
 doesn&#39;t require a GUI to run and so is ideal for creating console mode
 utilities or server programs. It is also possible to create a program which can
 be compiled either as a console application (using wxBase) or a GUI one (using
-a full featured wxWindows port).
+a full featured wxWidgets port).
 
 <H3><a name="univ">What is wxUniversal?</a></H3>
 
 The main difference between wxUniversal-based ports (such as wxX11, wxMGL) and other ports (such as wxMSW, wxGTK+, wxMac)
 is that wxUniversal implements all controls (or widgets) in
-wxWindows itself thus allowing to have much more flexibility (for example, support for
+wxWidgets itself thus allowing to have much more flexibility (for example, support for
 themes even under MS Windows). It also means that it is now much easier to
-port wxWindows to a new platform as only the low-level classes must be ported
+port wxWidgets to a new platform as only the low-level classes must be ported
 which make for a small part of the library.
 <p>
 You may find more about wxUniversal <a href=wxuniv.htm>here</a>.
@@ -269,7 +269,7 @@ You may find more about wxUniversal <a href=wxuniv.htm>here</a>.
 
 The Java honeymoon period is over :-) and people are realising that it cannot
 meet all their cross-platform development needs. We don&#39;t anticipate a major threat
-from Java, and the level of interest in wxWindows is as high as ever.<P>
+from Java, and the level of interest in wxWidgets is as high as ever.<P>
 
 <H3><a name="dotnet">What about .NET/Mono?</a></H3>
 
@@ -281,25 +281,27 @@ garbage collection and various other Java-like language features.<P>
 
 Although this may be attractive to some developers, there
 is a variety of reasons why the .NET/Mono combination is unlikely
-to make wxWindows redundant. Please note that the following comments
+to make wxWidgets redundant. Please note that the following comments
 are Julian Smart's opinions.<P>
 
 <ol>
 <li>Not everyone wants or needs net services.
 <li>C++ will be used for a long time to come; compared with C++, C&#35; is a recent development and its future is not certain.
 <li>Mono Forms may only target Winelib (at least to begin with), so the end result is not as native as
-wxWindows (I'm aware there is GTK&#35; for use with the C&#35; language).
+wxWidgets (I'm aware there is GTK&#35; for use with the C&#35; language).
 <li>C&#35; is usually byte-compiled and therefore slower. Plus, .NET adds a layer of overhead to the client computer
-that wxWindows does not require.
-<li>Mono hasn't proven its long-term viability yet (it's a complex system of components); wxWindows is ready now.
+that wxWidgets does not require.
+<li>Mono hasn't proven its long-term viability yet (it's a complex system of components); wxWidgets is ready now.
 <li>You may not wish to buy into Microsoft marketing spin and APIs.
+<li>Microsoft may at some point sue developers of non-Microsoft .NET implementations. After all,
+platform-independence is not in Microsoft's interest.
 <li>.NET might never be implemented on some platforms, especially Mac and embedded variants of Linux.
-<li>wxPython and other language variants provide further reasons for wxWindows to continue.
+<li>wxPython and other language variants provide further reasons for wxWidgets to continue.
 <li>The same issue exists for Qt: if Qt sales remain strong, it's a good indication that
-the market for a C++-based approach is still there. (Either that, or everyone's turning to wxWindows!)
+the market for a C++-based approach is still there. (Either that, or everyone's turning to wxWidgets!)
 </ol>
 
-There is nothing to stop folk from developing a C&#35; version of the wxWindows API;
+There is nothing to stop folk from developing a C&#35; version of the wxWidgets API;
 we already have bindings to Python, Perl, JavaScript, Lua, Basic, and Eiffel.
 Update: a <a href="http://wxnet.sourceforge.net/" target=_new>wx.NET</a> project is now in progress.
 
diff --git a/docs/html/faqgtk.htm b/docs/html/faqgtk.htm
index df33965ef4..c5f4949ca5 100644
--- a/docs/html/faqgtk.htm
+++ b/docs/html/faqgtk.htm
@@ -2,7 +2,7 @@
 <HTML>
 
 <HEAD>
-<TITLE>wxWindows 2 for GTK FAQ</TITLE>
+<TITLE>wxWidgets 2 for GTK FAQ</TITLE>
 </HEAD>
 
 <BODY BGCOLOR=#FFFFFF TEXT=#000000 VLINK="#00376A" LINK="#00529C" ALINK="#313063">
@@ -13,7 +13,7 @@
 <tr>
 <td bgcolor="#004080" align=left height=24 background="images/bluetitlegradient.gif">
 <font size=+1 face="Arial, Lucida Sans, Helvetica" color="#FFFFFF">
-<b>wxWindows 2 for GTK FAQ</b>
+<b>wxWidgets 2 for GTK FAQ</b>
 </font>
 </td>
 </tr>
@@ -26,25 +26,26 @@ See also <a href="faq.htm">top-level FAQ page</a>.
 <h3>List of questions in this category</h3>
 
 <ul>
-<li><a href="#wxgtk">What is wxWindows 2 for GTK+?</a></li>
-<li><a href="#locale">Why doesn&#39;t reading floating point numbers work when using wxWindows?</a></li>
+<li><a href="#wxgtk">What is wxWidgets 2 for GTK+?</a></li>
+<li><a href="#locale">Why doesn&#39;t reading floating point numbers work when using wxWidgets?</a></li>
 <li><a href="#gnome">Does wxGTK have GNOME support?</a></li>
 <li><a href="#redhat">Warning about GTK libraries supplied with RedHat</a></li>
 <li><a href="#bincompat">What range of Intel Linux platforms will a given application binary be usable on?</a></li>
 <li><a href="#static">Can I statically link the GTK+ library?</a></li>
-<li><a href="#charinframe">Why does my simple program using <tt>EVT_CHAR</tt> doesn't work?</a></li>
+<li><a href="#charinframe">Why does my simple program using <tt>EVT_CHAR</tt> not work?</a></li>
+<li><a href="#debugging">How do I trace the cause of an X11 error such as BadMatch?</a></li>
 </ul>
 
 <hr>
 
-<h3><a name="wxgtk">What is wxWindows 2 for GTK?</a></h3>
+<h3><a name="wxgtk">What is wxWidgets 2 for GTK?</a></h3>
 
-wxWindows 2 for GTK is a port of wxWindows to the <a href="http://www.gimp.org/gtk" target=_top>GTK+ toolkit</a>,
-which is freely available for most flavours of Unix with X. wxWindows 2 for GTK is
+wxWidgets 2 for GTK is a port of wxWidgets to the <a href="http://www.gimp.org/gtk" target=_top>GTK+ toolkit</a>,
+which is freely available for most flavours of Unix with X. wxWidgets 2 for GTK is
 often abbreviated to wxGTK. wxGTK has a separate home page <a href="http://www.freiburg.linux.de/~wxxt" target=_top>here</a>.
 <P>
 
-<h3><a name="locale">Why doesn&#39;t reading floating point numbers work when using wxWindows?</a></h3>
+<h3><a name="locale">Why doesn&#39;t reading floating point numbers work when using wxWidgets?</a></h3>
 
 If your program reads the floating point numbers in the format <tt>123.45</tt>
 from a file, it may suddently start returning just <tt>123</tt> instead of the
@@ -74,7 +75,7 @@ future, probably as a separate library.
 <h3><a name="redhat">Warning about GTK+ libraries supplied with RedHat</a></h3>
 
 It seems that some versions of RedHat include a badly patched version of GTK+ (not wxGTK)
-which causes some trouble with wxWindows&#39; socket code. Common symptoms are that when
+which causes some trouble with wxWidgets&#39; socket code. Common symptoms are that when
 a client tries to establish a connection to an existing server which refuses the request,
 the client will get notified twice, first getting a LOST event and then a CONNECT event.
 This problem can be solved by updating GTK with an official distribution of the library.
@@ -99,7 +100,7 @@ No, this is not possible. It leads to crashes in GTK+.
 <P>
 
 <h3><a name="#charinframe">Why does my simple program using
-<tt>EVT_CHAR</tt> doesn't work?</a></h3>
+<tt>EVT_CHAR</tt> not work?</a></h3>
 
 In wxGTK, the frames never get focus and so can never receive <tt>CHAR</tt>
 nor <tt>KEY</tt> events so an <tt>EVT_CHAR</tt> handler for a frame will be
@@ -109,6 +110,14 @@ frame.
 
 <p>
 
+<h3><a name="#debugging">How do I trace the cause of an X11 error such as BadMatch?</h3>
+
+When a fatal X11 error occurs, the application quits with no stack trace.
+To find out where the problem is, put a breakpoint on g_log (<tt>b g_log</tt>
+in gdb).
+
+<p>
+
 </font>
 
 </BODY>
diff --git a/docs/html/faqmac.htm b/docs/html/faqmac.htm
index 4896e7e599..3e7f255569 100644
--- a/docs/html/faqmac.htm
+++ b/docs/html/faqmac.htm
@@ -2,7 +2,7 @@
 <HTML>
 
 <HEAD>
-<TITLE>wxWindows 2 for Mac FAQ</TITLE>
+<TITLE>wxWidgets 2 for Mac FAQ</TITLE>
 </HEAD>
 
 <BODY BGCOLOR=#FFFFFF TEXT=#000000 VLINK="#00376A" LINK="#00529C" ALINK="#313063">
@@ -13,7 +13,7 @@
 <tr>
 <td bgcolor="#004080" align=left height=24 background="images/bluetitlegradient.gif">
 <font size=+1 face="Arial, Lucida Sans, Helvetica" color="#FFFFFF">
-<b>wxWindows 2 for Mac FAQ</b>
+<b>wxWidgets 2 for Mac FAQ</b>
 </font>
 </td>
 </tr>
@@ -38,7 +38,7 @@ See also <a href="faq.htm">top-level FAQ page</a>.
 <li><a href="#smarterrors">What are the smart preprocessing errors with the Apple Developer Tools?</a></li>
 <li><a href="#aboutmenu">How does wxMac support the standard Apple About menu item and Help menu?</a></li>
 <li><a href="#findericon">How do I add an icon to my application?</a></li>
-<li><a href="#switching">How can I easily switch between different versions of wxWindows in CodeWarrior?</a></li>
+<li><a href="#switching">How can I easily switch between different versions of wxWidgets in CodeWarrior?</a></li>
 </ul>
 <hr>
 
@@ -54,15 +54,15 @@ The author of this port is <a href="mailto:csomor@advancedconcepts.ch">Stefan Cs
 
 <h3><a name="macplat">Which Mac platforms are supported?</a></h3>
 
-wxWindows 2 can be used to develop and deliver applications on Classic Mac OS (e.g. Mac OS 8.x/9.x) both as Carbon and non-Carbon applications.
+wxWidgets 2 can be used to develop and deliver applications on Classic Mac OS (e.g. Mac OS 8.x/9.x) both as Carbon and non-Carbon applications.
 <P>
-A Mac OS X port is in progress in order to be able to build wxWindows applications using the Apple Developer Tools that are delivered with every copy of Mac OS X.
+A Mac OS X port is in progress in order to be able to build wxWidgets applications using the Apple Developer Tools that are delivered with every copy of Mac OS X.
 The Mac OS X port is based on and, for the most part, merged with the Carbon code for Classic Mac OS.
 <P>
 
 <h3><a name="macosx">How is the Mac OS X port different from the Classic Mac OS port?</a></h3>
 
-wxMac for Mac OS X shares code both with wxMac for Mac OS and common Unix code in wxWindows. The aim is to use the same Mac OS Carbon code both for Classic Mac OS and for Mac OS X while leveraging the fact that Mac OS X is a BSD Unix.
+wxMac for Mac OS X shares code both with wxMac for Mac OS and common Unix code in wxWidgets. The aim is to use the same Mac OS Carbon code both for Classic Mac OS and for Mac OS X while leveraging the fact that Mac OS X is a BSD Unix.
 <P>
 This hybrid approach was suggested by Apple to the <a href="http://www.mozilla.org/ports/fizzilla/">Fizzilla</a> team working on <a href="http://www.mozilla.org/">Mozilla</a> for Mac OS X.
 <P>
@@ -87,7 +87,7 @@ Under Mac OS X, the Developer Tools are sufficient to build wxMac. CodeWarrior P
 
 <h3><a name="filetypes">How does CVS handle file types/creators under Mac OS 8.x/9.x?</a></h3>
 
-Before checking out the wxWindows code using a CVS client under Mac OS 8.x/9.x, be sure your computer is set up to treat <code>xpm</code> and <code>xbm</code> images correctly:
+Before checking out the wxWidgets code using a CVS client under Mac OS 8.x/9.x, be sure your computer is set up to treat <code>xpm</code> and <code>xbm</code> images correctly:
 <ul>
 <li>bring up the Internet control panel, select the <i>Advanced Options</i> tab, click on the <i>File Mapping</i> icon from the list at the left and see if there are is an entry for ".xpm" files and another for ".xbm".
 <li>if an entry exists, click <i>Change...</i> and make sure <i>File Type</i> is <code>TEXT</code> (just those four capital letters); correct it if necessary. If there is no entry, make one with type set to <code>TEXT</code> and creator set to anything you like; reasonable choices include <code>GKON</code> (Graphic Converter) or <code>CWIE</code> (CodeWarrior).
@@ -101,8 +101,8 @@ The Mac OS X CVS client does not handle file types and creators at all (just lik
 <P>
 All files checked out under Mac OS X will be untyped and CodeWarrior will not recognize them correctly. To correct this, use the autotyper provided in the CVS sources:
 <ul>
-<li>decode and decompress the file <code>wxWindows/docs/mac/TypeAsMetrowerksText.sea.hqx</code>
-<li>drag the wxWindows CVS sandbox directory onto the autotyper and most of the files will be typed according to the file extension
+<li>decode and decompress the file <code>wxWidgets/docs/mac/TypeAsMetrowerksText.sea.hqx</code>
+<li>drag the wxWidgets CVS sandbox directory onto the autotyper and most of the files will be typed according to the file extension
 </ul>
 <P>
 
@@ -125,11 +125,11 @@ This is also necessary even if you don&#39;want to build the Carbon targets.
 <P>
 Build the projects (<code>makemac6.mcp</code> for CodeWarrior Pro 6; <code>makemac.mpc</code> for CodeWarrior Pro 5) in the following five directories:
 <ul>
-<li>wxWindows:src:
-<li>wxWindows:src:jpeg:
-<li>wxWindows:src:png:
-<li>wxWindows:src:tiff:
-<li>wxWindows:src:zlib:
+<li>wxWidgets:src:
+<li>wxWidgets:src:jpeg:
+<li>wxWidgets:src:png:
+<li>wxWidgets:src:tiff:
+<li>wxWidgets:src:zlib:
 </ul>
 <P>
 
@@ -139,8 +139,8 @@ You need to have the Apple Developer Tools installed. The Developer Tools CD is
 <P>
 Building wxMac completely without configure is not supported.
 <P>
-Building wxWindows directly in the CVS sandbox is not recommended. Instead, wxWindows should be built in a directory configured relatively to the CVS sandbox.
-For instance, to build wxMac with configure, start in the base wxWindows directory and type:
+Building wxWidgets directly in the CVS sandbox is not recommended. Instead, wxWidgets should be built in a directory configured relatively to the CVS sandbox.
+For instance, to build wxMac with configure, start in the base wxWidgets directory and type:
 <ul>
 <li><code>mkdir macbuild</code>
 <li><code>cd macbuild</code>
@@ -197,12 +197,12 @@ This error can sometimes be corrected or avoided by modifying the source code. H
 
 <h3><a name="aboutmenu">How does wxMac support the standard Apple About menu item and Help menu?</a></h3>
 
-Because wxWindows does not have a specific API for the <i>About</i> menu item or the <i>Help</i> menu, the Mac OS port uses some static variables to help the engine make the right decisions:
+Because wxWidgets does not have a specific API for the <i>About</i> menu item or the <i>Help</i> menu, the Mac OS port uses some static variables to help the engine make the right decisions:
 <ul>
 <li>It assumes that the <i>About</i> menu item is part of a <i>Help</i> menu.
 <li>The title of the <i>Help</i> menu is stored in <code>wxApp::s_macHelpMenuTitleName</code>, it defaults to "&Help", but you can change it in your constructor to your specific menu title.
 <li>The item Id of the <i>About</i> menu is stored in <code>wxApp::s_macAboutMenuItemID</code>, it defaults to <code>wxID_ABOUT</code>, but can be changed as well to suit your needs.
-<li>The other items of the wxWindows help menu are appended to the Mac OS <i>Help</i> menu and the translation of Ids is handled transparently for your application.
+<li>The other items of the wxWidgets help menu are appended to the Mac OS <i>Help</i> menu and the translation of Ids is handled transparently for your application.
 </ul>
 <P>
 
@@ -215,10 +215,10 @@ your project and in the CodeWarrior Settings add a check mark under Linker:Outpu
 Flags/Finder Flags/Has Custom Icon.
 <P>
 
-<h3><a name="switching">How can I easily switch between different versions of wxWindows in CodeWarrior?</a></h3>
+<h3><a name="switching">How can I easily switch between different versions of wxWidgets in CodeWarrior?</a></h3>
 
 Sometimes you want to test your application against different versions
-of wxWindows, for example a stable version of wxWindows versus a development version.
+of wxWidgets, for example a stable version of wxWidgets versus a development version.
 The easiest way to do this is to create a symbolic path.<P>
 
 Under Edit-Preferences in General:Source Trees, type a name (for example WXWIN)
diff --git a/docs/html/faqmot.htm b/docs/html/faqmot.htm
index 8920cbe82d..a35ca9371f 100644
--- a/docs/html/faqmot.htm
+++ b/docs/html/faqmot.htm
@@ -2,7 +2,7 @@
 <HTML>
 
 <HEAD>
-<TITLE>wxWindows 2 for Motif FAQ</TITLE>
+<TITLE>wxWidgets 2 for Motif FAQ</TITLE>
 </HEAD>
 
 <BODY BGCOLOR=#FFFFFF TEXT=#000000 VLINK="#00376A" LINK="#00529C" ALINK="#313063">
@@ -13,7 +13,7 @@
 <tr>
 <td bgcolor="#004080" align=left height=24 background="images/bluetitlegradient.gif">
 <font size=+1 face="Arial, Lucida Sans, Helvetica" color="#FFFFFF">
-<b>wxWindows 2 for Motif FAQ</b>
+<b>wxWidgets 2 for Motif FAQ</b>
 </font>
 </td>
 </tr>
@@ -27,7 +27,7 @@ See also <a href="faq.htm">top-level FAQ page</a>.
 <ul>
 <li><a href="#versiob">What version of Motif do I need?</a></li>
 <li><a href="#missing">What features are missing or partially implemented?</a></li>
-<li><a href="#dialoged">Does Dialog Editor work with wxWindows for Motif?</a></li>
+<li><a href="#dialoged">Does Dialog Editor work with wxWidgets for Motif?</a></li>
 <li><a href="#refresh">Why are windows are not refreshed properly until I resize them?</a></li>
 </ul>
 <hr>
@@ -62,7 +62,7 @@ system is in preparation.
 
 <p>
 
-<h3><a name="dialoged">Does Dialog Editor work with wxWindows for Motif?</a></h3>
+<h3><a name="dialoged">Does Dialog Editor work with wxWidgets for Motif?</a></h3>
 
 Suport for Dialog Editor is almost there, but there are some wrinkles to iron
 out. You may find it&#39;s useful though: compile it and see.
diff --git a/docs/html/faqmsw.htm b/docs/html/faqmsw.htm
index 4a0c928197..2886be5533 100644
--- a/docs/html/faqmsw.htm
+++ b/docs/html/faqmsw.htm
@@ -2,7 +2,7 @@
 <HTML>
 
 <HEAD>
-<TITLE>wxWindows 2 for Windows FAQ</TITLE>
+<TITLE>wxWidgets 2 for Windows FAQ</TITLE>
 </HEAD>
 
 <BODY BGCOLOR=#FFFFFF TEXT=#000000 VLINK="#00376A" LINK="#00529C" ALINK="#313063">
@@ -13,7 +13,7 @@
 <tr>
 <td bgcolor="#004080" align=left height=24 background="images/bluetitlegradient.gif">
 <font size=+1 face="Arial, Lucida Sans, Helvetica" color="#FFFFFF">
-<b>wxWindows 2 for Windows FAQ</b>
+<b>wxWidgets 2 for Windows FAQ</b>
 </font>
 </td>
 </tr>
@@ -29,18 +29,19 @@ See also <a href="faq.htm">top-level FAQ page</a>.
 <li><a href="#wince">What about Windows CE?</a></li>
 <li><a href="#winxp">What do I need to do for Windows XP?</a></li>
 <li><a href="#compilers">What compilers are supported?</a></li>
-<li><a href="#bestcompiler">Which is the best compiler to use with wxWindows 2?</a></li>
+<li><a href="#bestcompiler">Which is the best compiler to use with wxWidgets 2?</a></li>
 <li><a href="#unicode">Is Unicode supported?</a></li>
-<li><a href="#doublebyte">Does wxWindows support double byte fonts (Chinese/Japanese/Korean etc.)?</a></li>
-<li><a href="#dll">Can you compile wxWindows 2 as a DLL?</a></li>
+<li><a href="#doublebyte">Does wxWidgets support double byte fonts (Chinese/Japanese/Korean etc.)?</a></li>
+<li><a href="#dll">Can you compile wxWidgets 2 as a DLL?</a></li>
 <li><a href="#exesize">How can I reduce executable size?</a></li>
-<li><a href="#mfc">Is wxWindows compatible with MFC?</a></li>
+<li><a href="#mfc">Is wxWidgets compatible with MFC?</a></li>
+<li><a href="#setuph">Why do I get errors about setup.h not being found?</a></li>
 <li><a href="#asuffix">Why do I get errors about FooBarA when I only use FooBar in my program?</a></li>
 <li><a href="#newerrors">Why my code fails to compile with strange errors about new operator?</a></li>
-<li><a href="#mfcport">How do I port MFC applications to wxWindows?</a></li>
+<li><a href="#mfcport">How do I port MFC applications to wxWidgets?</a></li>
 <li><a href="#crash">Why do I sometimes get bizarre crash problems using VC++ 5/6?</a></li>
-<li><a href="#makefiles">How are the wxWindows makefiles edited under Windows?</a></li>
-<li><a href="#vcdebug">How do you use VC++&#39;s memory leak checking instead of that in wxWindows?</a></li>
+<li><a href="#makefiles">How are the wxWidgets makefiles edited under Windows?</a></li>
+<li><a href="#vcdebug">How do you use VC++&#39;s memory leak checking instead of that in wxWidgets?</a></li>
 <li><a href="#shortcutproblem">Why are menu hotkeys or shortcuts not working in my application?</a></li>
 <li><a href="#regconfig">Why can I not write to the HKLM part of the registry with wxRegConfig?</a></li>
 <li><a href="#access">Is MS Active Accessibility supported?</a></li>
@@ -49,11 +50,11 @@ See also <a href="faq.htm">top-level FAQ page</a>.
 
 <h3><a name="platforms">Which Windows platforms are supported?</a></h3>
 
-wxWindows 2 can be used to develop and deliver applications on Windows 3.1, Win32s,
+wxWidgets 2 can be used to develop and deliver applications on Windows 3.1, Win32s,
 Windows 95, Windows 98, Windows NT, Windows 2000, and Windows XP. A Windows CE
 version is being looked into (see below).<P>
 
-wxWindows 2 is designed to make use of WIN32 features and controls. However, unlike Microsoft,
+wxWidgets 2 is designed to make use of WIN32 features and controls. However, unlike Microsoft,
 we have not forgotten users of 16-bit Windows. Most features
 work under Windows 3.1, including wxTreeCtrl and wxListCtrl using the generic implementation.
 However, don&#39;t expect very Windows-95-specific classes to work, such as wxTaskBarIcon. The wxRegConfig
@@ -63,23 +64,23 @@ makefiles to see what other files have been left out.
 16-bit compilation is supported under Visual C++ 1.5, and Borland BC++ 4 to 5.
 <P>
 
-wxWindows 2 for Windows will also compile on Unix with gcc using Wine from <a href="http://www.winehq.org" target=_top>WineHQ</a>.
+wxWidgets 2 for Windows will also compile on Unix with gcc using Wine from <a href="http://www.winehq.org" target=_top>WineHQ</a>.
 The resulting executables are Unix binaries that work with the Wine Windows API emulator.<P>
 
-You can also compile wxWindows 2 for Windows on Unix with Cygwin or Mingw32, resulting
+You can also compile wxWidgets 2 for Windows on Unix with Cygwin or Mingw32, resulting
 in executables that will run on Windows. So in theory you could write your applications
-using wxGTK or wxMotif, then check/debug your wxWindows for Windows
+using wxGTK or wxMotif, then check/debug your wxWidgets for Windows
 programs with Wine, and finally produce an ix86 Windows executable using Cygwin/Mingw32,
 without ever needing a copy of Microsoft Windows. See the Technical Note on the Web site detailing cross-compilation.<P>
 
 <h3><a name="wince">What about Windows CE?</a></h3>
 
-This is under consideration, though we need to get wxWindows Unicode-aware first.
+This is under consideration, though we need to get wxWidgets Unicode-aware first.
 There are other interesting issues, such as how to combine the menubar and toolbar APIs
 as Windows CE requires. But there&#39;s no doubt that it will be possible, albeit
-by mostly cutting down wxWindows 2 API functionality, and adding a few classes here
-and there. Since wxWindows for 2 produces small binaries (less than 300K for
-the statically-linked &#39;minimal&#39; sample), shoehorning wxWindows 2 into a Windows CE device&#39;s limited
+by mostly cutting down wxWidgets 2 API functionality, and adding a few classes here
+and there. Since wxWidgets for 2 produces small binaries (less than 300K for
+the statically-linked &#39;minimal&#39; sample), shoehorning wxWidgets 2 into a Windows CE device&#39;s limited
 storage should not be a problem.<P>
 
 <h3><a name="winxp">What do I need to do for Windows XP?</a></h3>
@@ -121,7 +122,7 @@ line:<P>
   1 24 "winxp.manifest"
 </PRE>
 
-In wxWindows 2.5, this will be in the wx/msw/wx.rc and
+In wxWidgets 2.5, this will be in the wx/msw/wx.rc and
 so will happen automatically so long as you include wx.rc
 in your own .rc file.<P>
 
@@ -132,7 +133,7 @@ article</a>.
 
 <h3><a name="compilers">What compilers are supported?</a></h3>
 
-Please see the wxWindows 2 for Windows install.txt file for up-to-date information, but
+Please see the wxWidgets 2 for Windows install.txt file for up-to-date information, but
 currently the following are known to work:<P>
 
 <ul>
@@ -149,18 +150,18 @@ currently the following are known to work:<P>
 There is a linking problem with Symantec C++ which I hope someone can help solve.
 <P>
 
-<h3><a name="bestcompiler">Which is the best compiler to use with wxWindows 2?</a></h3>
+<h3><a name="bestcompiler">Which is the best compiler to use with wxWidgets 2?</a></h3>
 
 It&#39;s partly a matter of taste, but I (JACS) prefer Visual C++ since the debugger is very
 good, it&#39;s very stable, the documentation is extensive, and it generates small executables.
 Since project files are plain text, it&#39;s easy for me to generate appropriate project files
-for wxWindows samples.<P>
+for wxWidgets samples.<P>
 
 Borland C++ is fine - and very fast - but it&#39;s hard (impossible?) to use the debugger without using project files, and
 the debugger is nowhere near up to VC++&#39;s quality. The IDE isn&#39;t great.<P>
 
-C++Builder&#39;s power isn&#39;t really used with wxWindows since it needs integration with its
-own class library (VCL). For wxWindows, I&#39;ve only used it with makefiles, in which case
+C++Builder&#39;s power isn&#39;t really used with wxWidgets since it needs integration with its
+own class library (VCL). For wxWidgets, I&#39;ve only used it with makefiles, in which case
 it&#39;s almost identical to BC++ 5.0 (the same makefiles can be used).<P>
 
 You can&#39;t beat Cygwin&#39;s price (free), and you can debug adequately using gdb. However, it&#39;s
@@ -173,45 +174,45 @@ Watcom C++ is a little slow and the debugger is not really up to today&#39;s sta
 
 Among the free compilers the best choice seem to be Borland C++ command line
 tools and mingw32 (port of gcc to Win32). Both of them are supported by
-wxWindows.
+wxWidgets.
 
 <h3><a name="unicode">Is Unicode supported?</a></h3>
 
 Yes, Unicode is fully supported under Windows NT/2000 (Windows 9x don&#39;t
 have Unicode support anyhow).
 
-<h3><a name="doublebyte">Does wxWindows support double byte fonts (Chinese/Japanese/Korean etc.)?</a></h3>
+<h3><a name="doublebyte">Does wxWidgets support double byte fonts (Chinese/Japanese/Korean etc.)?</a></h3>
 
 An answer from <a href="mailto:goedde@logosoft.de">Klaus Goedde</a>:<p>
 
-"For Japanese under Win2000, it seems that wxWindows has no problems to work with double byte char sets
+"For Japanese under Win2000, it seems that wxWidgets has no problems to work with double byte char sets
 (I mean DBCS, that&#39;s not Unicode). First you have to install Japanese support on your Win2K system
 and choose for ANSI translation 
 HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Nls\CodePage=932 (default is 1252 for Western).
-Then you can see all the funny Japanese letters under wxWindows too.<P>
+Then you can see all the funny Japanese letters under wxWidgets too.<P>
 
 In a wxTextCtrl control you have to set the window style "wxTE_RICH", otherwise this control shows the wrong 
 letters.
 
-I don&#39;t now whether it works on non W2K systems, because I&#39;m just starting using wxWindows."
+I don&#39;t now whether it works on non W2K systems, because I&#39;m just starting using wxWidgets."
 <P>
 
-<h3><a name="dll">Can you compile wxWindows 2 as a DLL?</a></h3>
+<h3><a name="dll">Can you compile wxWidgets 2 as a DLL?</a></h3>
 
 Yes (using the Visual C++ or Borland C++ makefile), but be aware that distributing DLLs is a thorny issue
 and you may be better off compiling statically-linked applications, unless you&#39;re
-delivering a suite of separate programs, or you&#39;re compiling a lot of wxWindows applications
+delivering a suite of separate programs, or you&#39;re compiling a lot of wxWidgets applications
 and have limited hard disk space.<P>
 
-With a DLL approach, and with different versions and configurations of wxWindows
+With a DLL approach, and with different versions and configurations of wxWidgets
 needing to be catered for, the end user may end up with a host of large DLLs in his or her Windows system directory,
 negating the point of using DLLs. Of course, this is not a problem just associated with
-wxWindows!
+wxWidgets!
 <P>
 
 <h3><a name="exesize">How can I reduce executable size?</a></h3>
 
-You can compile wxWindows as a DLL (see above, VC++/BC++ only at present). You should also
+You can compile wxWidgets as a DLL (see above, VC++/BC++ only at present). You should also
 compile your programs for release using non-debugging and space-optimisation options, but
 take with VC++ 5/6 space optimisation: it can sometimes cause problems.<P>
 
@@ -224,24 +225,39 @@ use DLLs. Another good compression tool (probably better than Petite) is <a href
 
 Please do not be surprised if MinGW produces a statically-linked minimal executable of 1 MB. Firstly, gcc
 produces larger executables than some compilers. Secondly, this figure will
-include most of the overhead of wxWindows, so as your application becomes more
+include most of the overhead of wxWidgets, so as your application becomes more
 complex, the overhead becomes proportionally less significant. And thirdly, trading executable compactness
-for the enormous increase in productivity you get with wxWindows is almost always well worth it.<P>
+for the enormous increase in productivity you get with wxWidgets is almost always well worth it.<P>
 
 If you have a really large executable compiled with MinGW (for example 20MB) then
-you need to configure wxWindows to compile without debugging information: see
+you need to configure wxWidgets to compile without debugging information: see
 docs/msw/install.txt for details. You may find that using configure instead
 of makefile.g95 is easier, particularly since you can maintain debug and
 release versions of the library simultaneously, in different directories.
 Also, run 'strip' after linking to remove all traces of debug info.
 <P>
 
-<H3><a name="mfc">Is wxWindows compatible with MFC?</a></H3>
+<H3><a name="mfc">Is wxWidgets compatible with MFC?</a></H3>
 
-There is a sample which demonstrates MFC and wxWindows code co-existing in the same
-application. However, don&#39;t expect to be able to enable wxWindows windows with OLE-2
+There is a sample which demonstrates MFC and wxWidgets code co-existing in the same
+application. However, don&#39;t expect to be able to enable wxWidgets windows with OLE-2
 functionality using MFC.<P>
 
+<H3><a name="setuph">Why do I get errors about setup.h not being found?</a></H3>
+
+When you build the wxWidgets library, setup.h is copied
+from include/wx/msw/setup.h to e.g. lib/mswd/wx/setup.h (the path
+depends on the configuration you're building). So you need to add
+this include path if building using the static Debug library:<P>
+
+lib/mswd<P>
+
+or if building the static Release library, lib/msw.<P>
+
+See also the <a href="http://wiki.wxwindows.org/wiki.pl?Table_Of_Contents">wxWiki Contents</a>
+for more information.<P>
+
+
 <H3><a name="asuffix">Why do I get errors about FooBarA when I only use FooBar in my program?</H3>
 
 If you get errors like
@@ -271,16 +287,16 @@ The most common cause of this problem is the memory debugging settings in
          setting <tt>wxUSE_GLOBAL_MEMORY_OPERATORS</tt> and
          <tt>wxUSE_DEBUG_NEW_ALWAYS</tt> to 0 in this file
     <li> Or leave them on but do <tt>#undef new</tt> after including any
-         wxWindows headers, like this the memory debugging will be still on
-         for wxWindows sources but off for your own code
+         wxWidgets headers, like this the memory debugging will be still on
+         for wxWidgets sources but off for your own code
 </ul>
 
 Notice that IMHO the first solution is preferable for VC++ users who can use
 the <a href="#vcdebug">VC++ CRT memory debugging features</a> instead.
 
-<H3><a name="mfcport">How do I port MFC applications to wxWindows?</a></H3>
+<H3><a name="mfcport">How do I port MFC applications to wxWidgets?</a></H3>
 
-Set up your interface from scratch using wxWindows (especially <a href="http://www.robeling.de" target=_top>wxDesigner</a>
+Set up your interface from scratch using wxWidgets (especially <a href="http://www.robeling.de" target=_top>wxDesigner</a>
 or <a href="http://www.anthemion.co.uk/dialogblocks/" target=_new>DialogBlocks</a> --
 it&#39;ll save you a <i>lot</i> of time) and when you have a shell prepared, you can start
 &#39;pouring in&#39; code from the MFC app, with appropriate
@@ -288,14 +304,14 @@ modifications. This is the approach I have used, and I found
 it very satisfactory. A two-step process then - reproduce the bare
 interface first, then wire it up afterwards. That way you deal
 with each area of complexity separately. Don&#39;t try to think MFC
-and wxWindows simultaneously from the beginning - it is easier to
+and wxWidgets simultaneously from the beginning - it is easier to
 reproduce the initial UI by looking at the behaviour of the MFC
 app, not its code.
 
 <H3><a name="crash">Why do I sometimes get bizarre crash problems using VC++ 5/6?</a></H3>
 
 Some crash problems can be due to inconsistent compiler
-options (and of course this isn&#39;t limited to wxWindows).
+options (and of course this isn&#39;t limited to wxWidgets).
 If strange/weird/impossible things start to happen please
 check (dumping IDE project file as makefile and doing text comparison
 if necessary) that the project settings, especially the list of defined
@@ -308,13 +324,13 @@ Editor, in Release mode with optimizations on. If in doubt,
 switch off optimisations, although this will result in much
 larger executables. It seems possible that the library can be created with
 strong optimization, so long as the application is not strongly
-optimized. For example, in wxWindows project, set to &#39;Minimum
+optimized. For example, in wxWidgets project, set to &#39;Minimum
 Size&#39;. In Dialog Editor project, set to &#39;Customize: Favor Small
 Code&#39; (and no others). This will then work.<P>
 
-<H3><a name="makefiles">How are the wxWindows makefiles edited under Windows?</a></H3>
+<H3><a name="makefiles">How are the wxWidgets makefiles edited under Windows?</a></H3>
 
-As of wxWindows 2.1, there is a new system written by Vadim Zeitlin, that
+As of wxWidgets 2.1, there is a new system written by Vadim Zeitlin, that
 generates the makefiles from templates using tmake.<P>
 
 Here are Vadim&#39;s notes:<P>
@@ -360,7 +376,7 @@ files to be compiled. Some of them are only compiled in 16/32 bit mode.
 Some other are only compiled with some compilers (others can&#39;t compile
 them) - all this info is contained in this file.<P>
 
-So now adding a new file to wxWindows is as easy as modifying filelist.txt
+So now adding a new file to wxWidgets is as easy as modifying filelist.txt
 (and Makefile.ams for Unix ports) and regenerating the makefiles - no
 need to modify all files manually any more.<P>
 
@@ -370,11 +386,11 @@ I don&#39;t need it and can&#39;t test it, but it should be trivial to create
 one from vc6.t - probably the only things to change would be the
 version number in the very beginning and the /Z option - VC5 doesn&#39;t
 support edit-and=continue). This is not an officially supported way
-of building wxWindows (that is, nobody guarantees that it will work),
+of building wxWidgets (that is, nobody guarantees that it will work),
 but it has been very useful to me and I hope it will be also for
-others. To generate wxWindows.dsp run<P>
+others. To generate wxWidgets.dsp run<P>
 
-<pre>tmake -t vc6 wxwin.pro -o ../../wxWindows.dsp</pre><P>
+<pre>tmake -t vc6 wxwin.pro -o ../../wxWidgets.dsp</pre><P>
 
 Then just include this project in any workspace or open it from VC IDE
 and it will create a new workspace for you.<P>
@@ -388,13 +404,13 @@ directory by 10 (and the number of files to be maintained too).
 
 <P>
 
-<H3><a name="vcdebug">How do you use VC++&#39;s memory leak checking instead of that in wxWindows?</a></H3>
+<H3><a name="vcdebug">How do you use VC++&#39;s memory leak checking instead of that in wxWidgets?</a></H3>
 
 Vadim Zeitlin:
 
 <pre>
 On the VC++ level, it&#39;s just the matter of calling _CrtSetDbgFlag() in the very
-beginning of the program. In wxWindows, this is done automatically when
+beginning of the program. In wxWidgets, this is done automatically when
 compiling with VC++ in debug mode unless wxUSE_GLOBAL_MEMORY_OPERATORS or
 __NO_VC_CRTDBG__ are defined - this check is done in wx/msw/msvcrt.h which
 is included from app.cpp which then calls wxCrtSetDbgFlag() without any
@@ -431,7 +447,7 @@ Currently this is not possible because the wxConfig family of classes is
 supposed to deal with per-user application configuration data, and HKLM is
 only supposed to be writeable by a user with Administrator privileges. In theory,
 only installers should write to HKLM. This is still a point debated by the
-wxWindows developers. There are at least two ways to work around it if you really
+wxWidgets developers. There are at least two ways to work around it if you really
 need to write to HKLM.<P>
 
 First, you can use wxRegKey directly, for example:
diff --git a/docs/html/faqx11.htm b/docs/html/faqx11.htm
index ad2af5839f..fde5ff8f1d 100644
--- a/docs/html/faqx11.htm
+++ b/docs/html/faqx11.htm
@@ -2,7 +2,7 @@
 <HTML>
 
 <HEAD>
-<TITLE>wxWindows 2 for X11 FAQ</TITLE>
+<TITLE>wxWidgets 2 for X11 FAQ</TITLE>
 </HEAD>
 
 <BODY BGCOLOR=#FFFFFF TEXT=#000000 VLINK="#00376A" LINK="#00529C" ALINK="#313063">
@@ -13,7 +13,7 @@
 <tr>
 <td bgcolor="#004080" align=left height=24 background="images/bluetitlegradient.gif">
 <font size=+1 face="Arial, Lucida Sans, Helvetica" color="#FFFFFF">
-<b>wxWindows 2 for X11 FAQ</b>
+<b>wxWidgets 2 for X11 FAQ</b>
 </font>
 </td>
 </tr>
diff --git a/docs/html/i18n.htm b/docs/html/i18n.htm
index d0468baa37..076811cb1b 100644
--- a/docs/html/i18n.htm
+++ b/docs/html/i18n.htm
@@ -2,7 +2,7 @@
 <head>
    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
    <meta name="Author" content="Vadim Zeitlin">
-   <title>List of translators for wxWindows</title>
+   <title>List of translators for wxWidgets</title>
 </head>
 <body>
 
@@ -10,7 +10,7 @@
 <tr>
 <td bgcolor="#004080" align=left height=24 background="images/bluetitlegradient.gif">
 <font size=+1 face="Arial, Lucida Sans, Helvetica" color="#FFFFFF">
-<b>wxWindows internationalization</b>
+<b>wxWidgets internationalization</b>
 </font>
 </td>
 </tr>
@@ -23,9 +23,9 @@
 </center>
 
 <p>
-wxWindows uses a certain number of user-readable strings such as
+wxWidgets uses a certain number of user-readable strings such as
 <tt>"help"</tt> or <tt>"Load file"</tt> which should be translated to the
-users language if it is different from English. wxWindows has built in support
+users language if it is different from English. wxWidgets has built in support
 for internationalization (i18n from now on) which allows for this to happen
 automatically if the translations to the current language are available.
 
@@ -33,7 +33,7 @@ automatically if the translations to the current language are available.
 You may find here the list of all existing translations with the addresses of
 the official translators whom you should contact if you would like to submit
 any corrections to the translations for your language. Also, please
-<a href="#howtohelp">see below</a> if you would like to translate wxWindows to
+<a href="#howtohelp">see below</a> if you would like to translate wxWidgets to
 your language if it is not mentioned here (or to help with one which already
 is -- it is quite helpful to have several translators for one language at
 least for proof reading).
@@ -45,16 +45,16 @@ least for proof reading).
 <hr>
 
 <p>
-Below is the table containing the list of languages supported by wxWindows.
+Below is the table containing the list of languages supported by wxWidgets.
 The columns of this table have the obvious meaning: in each row you will see
 the language, the official translator (if any) for it and the status of the
-translations as of wxWindows 2.3.
+translations as of wxWidgets 2.3.
 
 <p>
 <table width=100% border=4 cellpadding=5 cellspacing=0>
 
 <tr>
-<td bgcolor="#004080" colspan=3> <font size=+1 face="Arial, Lucida Sans, Helvetica" color="#FFFFFF"> Languages supported in wxWindows 2.x </font> </td>
+<td bgcolor="#004080" colspan=3> <font size=+1 face="Arial, Lucida Sans, Helvetica" color="#FFFFFF"> Languages supported in wxWidgets 2.x </font> </td>
 </tr>
 
 <tr>
@@ -236,16 +236,16 @@ translations as of wxWindows 2.3.
 <hr>
 
 <p>
-wxWindows uses the standard GNU gettext tools for i18n so if you are already
-familiar with them you shouldn&#39;t have any problems with working on wxWindows
+wxWidgets uses the standard GNU gettext tools for i18n so if you are already
+familiar with them you shouldn&#39;t have any problems with working on wxWidgets
 translations. Here are the the steps you should follow:
 <ol>
     <li>Get the latest version of the file <tt>locale/wxstd.po</tt> from the
-        wxWindows source tree: if you&#39;re using <a href="cvs.htm">cvs</a>
+        wxWidgets source tree: if you&#39;re using <a href="cvs.htm">cvs</a>
         or the <a href="http://wxwindows.sf.net/snapshots/">daily snapshots</a>,
         you should already have it. Otherwise you can always
         retrieve it directly from the cvs repository via the Web interface
-        <a href="http://cvs.wxwindows.org/viewcvs.cgi/wxWindows/locale/wxstd.po">here</a>.
+        <a href="http://cvs.wxwindows.org/viewcvs.cgi/wxWidgets/locale/wxstd.po">here</a>.
 
     <li>Rename it to <tt>XY.po</tt> where <tt>"XY"</tt> is the 2 letter
         <a href="http://lcweb.loc.gov/standards/iso639-2/englangn.html">ISO 639-1 language code</a>
@@ -264,13 +264,13 @@ translations. Here are the the steps you should follow:
 
     <li>Send the finished translation to
         <a href="mailto:vadim@wxwindows.org">Vadim Zeitlin</a> and it will be
-        added to the next wxWindows release or snapshot.
+        added to the next wxWidgets release or snapshot.
 </ol>
 
 <p>
 In addition, please consider subscribing to the very low volume
 <a href="http://lists.wxwindows.org/mailman/listinfo/wx-translators">
-wxWindows translators</a> mailing list on which the news especially important
+wxWidgets translators</a> mailing list on which the news especially important
 for the translators are announced.
 
 <p>
diff --git a/docs/html/index.htm b/docs/html/index.htm
index 808bfe3bb2..1e9679d0bb 100644
--- a/docs/html/index.htm
+++ b/docs/html/index.htm
@@ -1,7 +1,7 @@
 <HTML>
 
 <HEAD>
-<TITLE>wxWindows Documentation</TITLE>
+<TITLE>wxWidgets Documentation</TITLE>
 
 </HEAD>
 
@@ -13,11 +13,11 @@
 
 <IMG src="logo.gif" align=right hspace=10 vspace=0>
 
-<b>Welcome to wxWindows 2, the premi&egrave;re cross-platform GUI C++ framework.</b><P>
+<b>Welcome to wxWidgets 2, the premi&egrave;re cross-platform GUI C++ framework.</b><P>
 
 This is an index of
 the plain text, HTML, Windows Help and Acrobat documentation: availability depends on what you've
-downloaded from the <a href="http://www.wxwindows.org">wxWindows Web site</a>.<br clear=all><P>
+downloaded from the <a href="http://www.wxwindows.org">wxWidgets Web site</a>.<br clear=all><P>
 
 <CENTER>
 <FONT size=-1>
@@ -44,8 +44,8 @@ downloaded from the <a href="http://www.wxwindows.org">wxWindows Web site</a>.<b
 
 <P>
 
-Unless you installed a binary version of wxWindows using RPMs,
-you will probably have to compile the wxWindows library first.
+Unless you installed a binary version of wxWidgets using RPMs,
+you will probably have to compile the wxWidgets library first.
 Please read the platform-specific readme.txt and install.txt
 for how to do this.
 
@@ -77,18 +77,18 @@ for how to do this.
 <li><a href="faq.htm"><B>FAQ</B></a>:
   <ul>
   <li><a href="faqgen.htm">General questions</a>
-  <li><a href="faqgtk.htm">wxWindows 2 for GTK+</a>
-  <li><a href="faqmsw.htm">wxWindows 2 for Windows</a>
-  <li><a href="faqmot.htm">wxWindows 2 for Motif</a>
-  <li><a href="faqx11.htm">wxWindows 2 for X11</a>
-  <li><a href="faqmac.htm">wxWindows 2 for Mac</a>
+  <li><a href="faqgtk.htm">wxWidgets 2 for GTK+</a>
+  <li><a href="faqmsw.htm">wxWidgets 2 for Windows</a>
+  <li><a href="faqmot.htm">wxWidgets 2 for Motif</a>
+  <li><a href="faqx11.htm">wxWidgets 2 for X11</a>
+  <li><a href="faqmac.htm">wxWidgets 2 for Mac</a>
   </ul>
 <li>ToDo: <a href="../todo.txt"><b>General ToDo</b></a>,
 <a href="../gtk/todo.txt">wxGTK</a>,
 <a href="../motif/todo.txt">wxMotif</a>,
 <a href="../msw/todo.txt">wxMSW</a>,
 <a href="../mac/todo.txt">wxMac</a>
-<li>List of <a href="../symbols.txt">preprocessor symbols</a> used in wxWindows
+<li>List of <a href="../symbols.txt">preprocessor symbols</a> used in wxWidgets
 </ul>
 
 Further platform-specific notes:
@@ -103,7 +103,7 @@ Further platform-specific notes:
 <tr>
 <td bgcolor="#004080" align=left height=24 background="images/bluetitlegradient.gif">
 <font size=+1 face="Arial, Lucida Sans, Helvetica" color="#FFFFFF">
-<b><a name="manuals">wxWindows manuals</a></b>
+<b><a name="manuals">wxWidgets manuals</a></b>
 </font>
 </td>
 </tr>
@@ -115,7 +115,7 @@ To use manuals in wxHTML Help form (extension htb), you can use the <b>HelpView<
 application, either compiling it from utils/helpview in the distribution,
 or downloading a binary, for example from <a href="http://www.storylinescentral.com/helpview.htm">here</a>.<P>
 
-See also the <a href="../pdf/wxTutorial.pdf">wxWindows Tutorial</a>
+See also the <a href="../pdf/wxTutorial.pdf">wxWidgets Tutorial</a>
 by Franky Braem, in PDF format.<P>
 
 <P>
@@ -142,23 +142,23 @@ by Franky Braem, in PDF format.<P>
 
 <tr>
 <td align=center>
-<a href="wx/wx.htm">wxWindows Reference</a>
+<a href="wx/wx.htm">wxWidgets Reference</a>
 </td>
 
 <td align=center>
-<a href="../winhelp/wx.hlp">wxWindows Reference</a>
+<a href="../winhelp/wx.hlp">wxWidgets Reference</a>
 </td>
 
 <td align=center>
-<a href="../htmlhelp/wx.chm">wxWindows Reference</a>
+<a href="../htmlhelp/wx.chm">wxWidgets Reference</a>
 </td>
 
 <td align=center>
-<a href="../htb/wx.htb">wxWindows Reference</a>
+<a href="../htb/wx.htb">wxWidgets Reference</a>
 </td>
 
 <td align=center>
-<a href="../pdf/wx.pdf">wxWindows Reference</a>
+<a href="../pdf/wx.pdf">wxWidgets Reference</a>
 </td>
 </tr>
 
@@ -272,7 +272,7 @@ by Franky Braem, in PDF format.<P>
 <li><a href="../tech/index.txt">Index of technical notes</a>
 <li><a href="../tech/">Technical notes</a>
 <li><a href="platform.htm">Platforms supported</a>
-<li><a href="i18n.htm">Languages supported by wxWindows</a>
+<li><a href="i18n.htm">Languages supported by wxWidgets</a>
 </ul>
 
 <P>
@@ -307,11 +307,11 @@ by Franky Braem, in PDF format.<P>
 
 <P>
 
-Each of the following samples demonstrates one or more aspect of wxWindows.<P>
+Each of the following samples demonstrates one or more aspect of wxWidgets.<P>
 
 <ul>
 <li><a href="../../samples/calendar">artprov</a>: shows how you can customize the look of standard
-wxWindows dialogs by replacing default bitmaps/icons with your own versions.
+wxWidgets dialogs by replacing default bitmaps/icons with your own versions.
 <li><a href="../../samples/calendar">calendar</a>: a sample to test the wxCalendarCtrl class.
 <li><a href="../../samples/caret">caret</a>: a sample to test the wxCaret class.
 <li><a href="../../samples/checklst">checklst</a>: demonstrates wxCheckListBox on
@@ -319,7 +319,7 @@ supported platforms (currently Windows and GTK only).
 <li><a href="../../samples/config">config</a>: demonstrates use of wxConfig, which
 defaults to wxRegConfig on WIN32, wxIniConfig on WIN16, and wxFileConfig on other platforms.
 <li><a href="../../samples/console">console</a>: demonstrates a console application using
-console-mode (no-GUI) compilation of wxWindows.
+console-mode (no-GUI) compilation of wxWidgets.
 <li><a href="../../samples/controls">controls</a>: sample showing a variety of controls, including
 wxNotebook.
 <li><a href="../../samples/db">db</a>: wxDB ODBC sample.
@@ -343,7 +343,7 @@ dynamically.
 <li><a href="../../samples/exec">exec</a>: demonstrates wxExecute.
 <li><a href="../../samples/font">font</a>: tests fonts, font enumerator, font encodings.
 <li><a href="../../samples/grid">grid</a>: demonstrates the wxGrid class. This demo should work
-when the old grid implementation is compiled into wxWindows, and also with the new implementation.
+when the old grid implementation is compiled into wxWidgets, and also with the new implementation.
 Please see newgrid below for a full demo of the new implementation's capabilities.
 <li><a href="../../samples/help">help</a>: shows how to use wxHelpController.
 <li><a href="../../samples/html">html</a>: a number of demos for the wxHTML class library, used inside
@@ -359,7 +359,7 @@ applications and also as a help facility.
   <li><a href="../../samples/html/zip">zip</a>: shows how help files can be packaged in zip archives.
   </ul>
 <li><a href="../../samples/image">image</a>: shows off the cross-platform wxImage class.
-<li><a href="../../samples/internat">internat</a>: use of wxWindows' internationalization support.
+<li><a href="../../samples/internat">internat</a>: use of wxWidgets' internationalization support.
 <li><a href="../../samples/joytest">joytest</a>: tests the wxJoystick class (currently Windows and GTK only).
 <li><a href="../../samples/keyboard">keyboard</a>: tests keyboard support.
 <li><a href="../../samples/layout">layout</a>: shows the constraint layout system in action.
@@ -370,15 +370,15 @@ WIN32, and using a generic version on other platforms).
 scheme is used whereby child windows have full sizing and moving rights within the main
 window. On other platforms, tabbed windows are used, where the children are always maximized.
 <li><a href="../../samples/memcheck">memcheck</a>: demonstrates the memory checking/debugging facilities.
-<li><a href="../../samples/mfc">mfc</a>: shows how to use MFC and wxWindows code in the same application (Windows only).
-To compile this, you must edit include/wx/wxprec.h, comment out the windows.h inclusion, and recompile wxWindows.
+<li><a href="../../samples/mfc">mfc</a>: shows how to use MFC and wxWidgets code in the same application (Windows only).
+To compile this, you must edit include/wx/wxprec.h, comment out the windows.h inclusion, and recompile wxWidgets.
 <li><a href="../../samples/minifram">minifram</a>: demonstrates a frame with a small title bar. On
 platforms that don't support it, a normal-sized title bar is displayed.
 <li><a href="../../samples/minimal">minimal</a>: just shows a frame, a menubar, and a statusbar. About as
-small a wxWindows application as you can get.
+small a wxWidgets application as you can get.
 <li><a href="../../samples/mobile">mobile</a>: mini applications for embedded platforms.
-<li><a href="../../samples/nativdlg">nativdlg</a>: shows how wxWindows can load a standard Windows
-dialog resource, translating the controls into wxWindows controls (Windows only).
+<li><a href="../../samples/nativdlg">nativdlg</a>: shows how wxWidgets can load a standard Windows
+dialog resource, translating the controls into wxWidgets controls (Windows only).
 <li><a href="../../samples/newgrid">newgrid</a>: demonstrates the new wxGrid implementation, by Michael Bedward and others.
 <li><a href="../../samples/notebook">notebook</a>: shows the wxNotebook (tabbed window) control.
 <li><a href="../../samples/oleauto">oleauto</a>: a little OLE automation controller (Windows only; requires
@@ -389,7 +389,7 @@ Excel to be present).
 <li><a href="../../samples/proplist">proplist</a>: demonstrates the property list classes (a VB-style property editor).
 <li><a href="../../samples/propsize">propsize</a>: demonstrates proportional sizer classes.
 <li><a href="../../samples/regtest">regtest</a>: tests the low-level Windows registry functions (Windows only).
-<li><a href="../../samples/resource">resource</a>: shows how to use wxWindows resources (.wxr files).
+<li><a href="../../samples/resource">resource</a>: shows how to use wxWidgets resources (.wxr files).
 <!-- <li><a href="../../samples/richedit">richedit</a>: a work-in-progress rich text editor with plain text and HTML export
 facilities.
 -->
@@ -439,7 +439,7 @@ The following are fully-fledged applications.<P>
 <li><a href="../../demos/dbbrowse">dbbrowse</a>: ODBC database browser application.
 <li><a href="../../demos/forty">forty</a>: a great little card game by Chris Breeze.
 <li><a href="../../demos/fractal">fractal</a>: fractal mountains by Andrew Davison.
-<li><a href="../../demos/life">life</a>: the game of Life by J. H. Conway, implemented in wxWindows by Guillermo Rodriguez Garcia.
+<li><a href="../../demos/life">life</a>: the game of Life by J. H. Conway, implemented in wxWidgets by Guillermo Rodriguez Garcia.
 <li><a href="../../demos/poem">poem</a>: a little poetry display program.
 </ul>
 
diff --git a/docs/html/platform.htm b/docs/html/platform.htm
index d185504cd2..f312ae8078 100644
--- a/docs/html/platform.htm
+++ b/docs/html/platform.htm
@@ -1,4 +1,3 @@
-
 <html>
 <head>
    <title>Platforms supported by wxWindows 2.4</title>
@@ -92,7 +91,7 @@ often don&#39;t work.
 <tr> <td bgcolor="#fafafa"><br></td><td bgcolor="#fafafa" colspan=5> All BSD systems tests are for wxGTK using gcc. </td>
 <tr>
 <td bgcolor="#F0F0F0" align=center valign=center rowspan=1>FreeBSD</td>
-     <td>all version between 3.2 and 5.0 x86</td><td align=center><IMG SRC="images/yes.gif" ALT=Ok></td><td>VZ</td><td><br></td>
+     <td>all versions between 3.2 and 5.1 x86</td><td align=center><IMG SRC="images/yes.gif" ALT=Ok></td><td>VZ</td><td><br></td>
 </tr>
 
 <tr>
diff --git a/docs/index.htm b/docs/index.htm
index 7225bf9ba6..a2a4b66116 100644
--- a/docs/index.htm
+++ b/docs/index.htm
@@ -1,7 +1,7 @@
 <HTML>
 
 <HEAD>
-<TITLE>Welcome to wxWindows 2</TITLE>
+<TITLE>Welcome to wxWidgets 2</TITLE>
 
 </HEAD>
 
@@ -15,7 +15,7 @@
 <tr>
 <td bgcolor="#660000">
 <font size=+1 face="Arial, Lucida Sans, Helvetica" color="#FFFFFF">
-Welcome to wxWindows 2
+Welcome to wxWidgets 2
 </font>
 </td>
 </tr>
@@ -23,7 +23,7 @@ Welcome to wxWindows 2
 
 <P>
 
-Welcome to wxWindows 2, the premiere cross-platform GUI C++ framework.<P>
+Welcome to wxWidgets 2, the premiere cross-platform GUI C++ framework.<P>
 
 Please click on <a href="html/index.htm">docs/html/index.htm</a> to view the main document index.<P>
 
diff --git a/docs/latex/wx/app.tex b/docs/latex/wx/app.tex
index 1e776e2f8a..c4c45e03c6 100644
--- a/docs/latex/wx/app.tex
+++ b/docs/latex/wx/app.tex
@@ -12,7 +12,7 @@ objects in the application.
 \end{itemize}
 
 You should use the macro IMPLEMENT\_APP(appClass) in your application implementation
-file to tell wxWindows how to create an instance of your application class.
+file to tell wxWidgets how to create an instance of your application class.
 
 Use DECLARE\_APP(appClass) in a header file if you want the wxGetApp function (which returns
 a reference to your application object) to be visible to other files.
@@ -104,7 +104,7 @@ Returns the application name.
 
 \wxheading{Remarks}
 
-wxWindows sets this to a reasonable default before
+wxWidgets sets this to a reasonable default before
 calling \helpref{wxApp::OnInit}{wxapponinit}, but the application can reset it at will.
 
 \membersection{wxApp::GetAuto3D}\label{wxappgetauto3d}
@@ -194,7 +194,7 @@ dialogs to pop up before the main loop has been entered).
 
 \func{int}{MainLoop}{\void}
 
-Called by wxWindows on creation of the application. Override this if you wish
+Called by wxWidgets on creation of the application. Override this if you wish
 to provide your own (environment-dependent) main loop.
 
 \wxheading{Return value}
@@ -269,7 +269,7 @@ was used}
 Provide this member function for any processing which needs to be
 done as the application is about to exit. OnExit is called after
 destroying all application windows and controls, but before
-wxWindows cleanup.
+wxWidgets cleanup.
 
 \membersection{wxApp::OnCmdLineError}\label{wxapponcmdlineerror}
 
@@ -346,11 +346,11 @@ work and, in fact, probably won't.
 %%since this forwards OnIdle events to windows and also performs garbage collection for
 %%windows whose destruction has been delayed.
 %%
-%%wxWindows' strategy for OnIdle processing is as follows. After pending user interface events for an
-%%application have all been processed, wxWindows sends an OnIdle event to the application object. wxApp::OnIdle itself
+%%wxWidgets' strategy for OnIdle processing is as follows. After pending user interface events for an
+%%application have all been processed, wxWidgets sends an OnIdle event to the application object. wxApp::OnIdle itself
 %%sends an OnIdle event to each application window, allowing windows to do idle processing such as updating
 %%their appearance. If either wxApp::OnIdle or a window OnIdle function requested more time, by
-%%calling \helpref{wxIdleEvent::RequestMore}{wxidleeventrequestmore}, wxWindows will send another OnIdle
+%%calling \helpref{wxIdleEvent::RequestMore}{wxidleeventrequestmore}, wxWidgets will send another OnIdle
 %%event to the application object. This will occur in a loop until either a user event is found to be
 %%pending, or OnIdle requests no more time. Then all pending user events are processed until the system
 %%goes idle again, when OnIdle is called, and so on.
@@ -395,7 +395,7 @@ application's main window, optionally calling
 \helpref{wxApp::SetTopWindow}{wxappsettopwindow}.
 
 Notice that if you want to to use the command line processing provided by
-wxWindows you have to call the base class version in the derived class
+wxWidgets you have to call the base class version in the derived class
 OnInit().
 
 Return TRUE to continue processing, FALSE to exit the application.
@@ -451,14 +451,14 @@ Under Windows, OnQueryEndSession is called in response to the WM\_QUERYENDSESSIO
 Windows-only function for processing a message. This function
 is called from the main message loop, checking for windows that
 may wish to process it. The function returns TRUE if the message
-was processed, FALSE otherwise. If you use wxWindows with another class
+was processed, FALSE otherwise. If you use wxWidgets with another class
 library with its own message loop, you should make sure that this
-function is called to allow wxWindows to receive messages. For example,
+function is called to allow wxWidgets to receive messages. For example,
 to allow co-existence with the Microsoft Foundation Classes, override
 the PreTranslateMessage function:
 
 \begin{verbatim}
-// Provide wxWindows message loop compatibility
+// Provide wxWidgets message loop compatibility
 BOOL CTheApp::PreTranslateMessage(MSG *msg)
 {
   if (wxTheApp && wxTheApp->ProcessMessage((WXMSW *)msg))
@@ -505,7 +505,7 @@ If TRUE is returned, more OnIdle processing is requested by one or more window.
 
 Sets the name of the application. The name may be used in dialogs
 (for example by the document/view framework). A default name is set by
-wxWindows.
+wxWidgets.
 
 \wxheading{See also}
 
@@ -563,10 +563,10 @@ deleted. If FALSE, the application will continue to run.}
 \func{void}{SetTopWindow}{\param{wxWindow* }{window}}
 
 Sets the `top' window. You can call this from within \helpref{wxApp::OnInit}{wxapponinit} to
-let wxWindows know which is the main window. You don't have to set the top window;
+let wxWidgets know which is the main window. You don't have to set the top window;
 it is only a convenience so that (for example) certain dialogs without parents can use a
 specific window as the top window. If no top window is specified by the application,
-wxWindows just uses the first frame or dialog in its top-level window list, when it
+wxWidgets just uses the first frame or dialog in its top-level window list, when it
 needs to use the top window.
 
 \wxheading{Parameters}
@@ -584,7 +584,7 @@ needs to use the top window.
 
 Sets the name of application's vendor. The name will be used
 in registry access. A default name is set by
-wxWindows.
+wxWidgets.
 
 \wxheading{See also}
 
diff --git a/docs/latex/wx/array.tex b/docs/latex/wx/array.tex
index 7c10633888..7791b14ee0 100644
--- a/docs/latex/wx/array.tex
+++ b/docs/latex/wx/array.tex
@@ -22,7 +22,7 @@ but the price is preallocating the memory in advance. In the \helpref{memory man
 you may find some useful hints about optimizing wxArray memory usage. As for executable size, all
 wxArray functions are inline, so they do not take {\it any space at all}.
 
-wxWindows has three different kinds of array. All of them derive from
+wxWidgets has three different kinds of array. All of them derive from
 wxBaseArray class which works with untyped data and can not be used directly.
 The standard macros WX\_DEFINE\_ARRAY(), WX\_DEFINE\_SORTED\_ARRAY() and
 WX\_DEFINE\_OBJARRAY() are used to define a new class deriving from it. The
@@ -39,14 +39,14 @@ deleted when the element is removed from the array. It should be noted that
 all of wxArray's functions are inline, so it costs strictly nothing to define as
 many array types as you want (either in terms of the executable size or the
 speed) as long as at least one of them is defined and this is always the case
-because wxArrays are used by wxWindows internally. This class has one serious
+because wxArrays are used by wxWidgets internally. This class has one serious
 limitation: it can only be used for storing integral types (bool, char, short,
 int, long and their unsigned variants) or pointers (of any kind). An attempt
 to use with objects of sizeof() greater than sizeof(long) will provoke a
 runtime assertion failure, however declaring a wxArray of floats will not (on
 the machines where sizeof(float) <= sizeof(long)), yet it will {\bf not} work,
 please use wxObjArray for storing floats and doubles (NB: a more efficient
-wxArrayDouble class is scheduled for the next release of wxWindows).
+wxArrayDouble class is scheduled for the next release of wxWidgets).
 
 wxSortedArray is a wxArray variant which should be used when searching in the
 array is a frequently used operation. It requires you to define an additional
@@ -232,7 +232,7 @@ does exactly the same as \helpref{Item()}{wxarrayitem} method.
 \func{}{WX\_DEFINE\_USER\_EXPORTED\_ARRAY}{\param{}{T}, \param{}{name}, \param{}{exportspec}}
 
 This macro defines a new array class named {\it name} and containing the
-elements of type {\it T}. The second form is used when compiling wxWindows as
+elements of type {\it T}. The second form is used when compiling wxWidgets as
 a DLL under Windows and array needs to be visible outside the DLL.  The third is
 needed for exporting an array from a user DLL.
 
@@ -245,7 +245,7 @@ class MyClass;
 WX_DEFINE_ARRAY(MyClass *, wxArrayOfMyClass);
 \end{verbatim}
 
-Note that wxWindows predefines the following standard array classes: wxArrayInt,
+Note that wxWidgets predefines the following standard array classes: wxArrayInt,
 wxArrayLong and wxArrayPtrVoid.
 
 \membersection{WX\_DEFINE\_SORTED\_ARRAY}\label{wxdefinesortedarray}
@@ -257,7 +257,7 @@ wxArrayLong and wxArrayPtrVoid.
 \func{}{WX\_DEFINE\_SORTED\_USER\_EXPORTED\_ARRAY}{\param{}{T}, \param{}{name}}
 
 This macro defines a new sorted array class named {\it name} and containing
-the elements of type {\it T}. The second form is used when compiling wxWindows as
+the elements of type {\it T}. The second form is used when compiling wxWidgets as
 a DLL under Windows and array needs to be visible outside the DLL.  The third is
 needed for exporting an array from a user DLL.
 
@@ -299,7 +299,7 @@ wxArrayOfMyClass another(CompareMyClassObjects);
 \func{}{WX\_DECLARE\_USER\_EXPORTED\_OBJARRAY}{\param{}{T}, \param{}{name}}
 
 This macro declares a new object array class named {\it name} and containing
-the elements of type {\it T}. The second form is used when compiling wxWindows as
+the elements of type {\it T}. The second form is used when compiling wxWidgets as
 a DLL under Windows and array needs to be visible outside the DLL.  The third is
 needed for exporting an array from a user DLL.
 
diff --git a/docs/latex/wx/artprov.tex b/docs/latex/wx/artprov.tex
index 3937cd5ebc..af2f6f5066 100644
--- a/docs/latex/wx/artprov.tex
+++ b/docs/latex/wx/artprov.tex
@@ -5,8 +5,8 @@
 
 \section{\class{wxArtProvider}}\label{wxartprovider}
 
-wxArtProvider class is used to customize the look of wxWindows application.
-When wxWindows need to display an icon or a bitmap (e.g. in the standard file
+wxArtProvider class is used to customize the look of wxWidgets application.
+When wxWidgets need to display an icon or a bitmap (e.g. in the standard file
 dialog), it does not use hard-coded resource but asks wxArtProvider for it
 instead. This way the users can plug in own wxArtProvider class and easily
 replace standard art with his/her own version. It is easy thing to do: all
@@ -32,7 +32,7 @@ There's another way of taking advantage of this class: you can use it in your co
 platform native icons as provided by
 \helpref{wxArtProvider::GetBitmap}{wxartprovidergetbitmap} or 
 \helpref{wxArtProvider::GetIcon}{wxartprovidergeticon} (NB: this is not yet really
-possible as of wxWindows 2.3.3, the set of wxArtProvider bitmaps is too
+possible as of wxWidgets 2.3.3, the set of wxArtProvider bitmaps is too
 small). 
 
 \membersection{Identifying art resources}
diff --git a/docs/latex/wx/bbutton.tex b/docs/latex/wx/bbutton.tex
index 14d993ffe5..48e4395af9 100644
--- a/docs/latex/wx/bbutton.tex
+++ b/docs/latex/wx/bbutton.tex
@@ -18,7 +18,7 @@ almost any other window.
 
 \wxheading{Remarks}
 
-A bitmap button can be supplied with a single bitmap, and wxWindows will draw
+A bitmap button can be supplied with a single bitmap, and wxWidgets will draw
 all button states using this bitmap. If the application needs more control, additional bitmaps for
 the selected state, unpressed focused state, and greyed-out state may be supplied.
 
@@ -91,7 +91,7 @@ appropriately for the bitmap.}
 
 \wxheading{Remarks}
 
-The {\it bitmap} parameter is normally the only bitmap you need to provide, and wxWindows will
+The {\it bitmap} parameter is normally the only bitmap you need to provide, and wxWidgets will
 draw the button correctly in its different states. If you want more control, call
 any of the functions \helpref{wxBitmapButton::SetBitmapSelected}{wxbitmapbuttonsetbitmapselected},\rtfsp
 \helpref{wxBitmapButton::SetBitmapFocus}{wxbitmapbuttonsetbitmapfocus},\rtfsp
diff --git a/docs/latex/wx/bitmap.tex b/docs/latex/wx/bitmap.tex
index a88539e439..70fbd1956c 100644
--- a/docs/latex/wx/bitmap.tex
+++ b/docs/latex/wx/bitmap.tex
@@ -117,8 +117,8 @@ Its meaning is determined by the {\it type} parameter.}
 \twocolitem{\indexit{wxBITMAP\_TYPE\_RESOURCE}}{Load a Windows resource name.}
 \end{twocollist}
 
-The validity of these flags depends on the platform and wxWindows configuration.
-If all possible wxWindows settings are used, the Windows platform supports BMP file, BMP resource,
+The validity of these flags depends on the platform and wxWidgets configuration.
+If all possible wxWidgets settings are used, the Windows platform supports BMP file, BMP resource,
 XPM data, and XPM. Under wxGTK, the available formats are BMP file, XPM data, XPM file, and PNG file.
 Under wxMotif, the available formats are XBM data, XBM file, XPM data, XPM file.
 
@@ -145,7 +145,7 @@ X and Windows.
 
 The sixth form constructs a new bitmap.
 
-The seventh form constructs a bitmap from pixmap (XPM) data, if wxWindows has been configured
+The seventh form constructs a bitmap from pixmap (XPM) data, if wxWidgets has been configured
 to incorporate this feature.
 
 To use this constructor, you must first include an XPM file. For
@@ -205,7 +205,7 @@ destroyed at this point - only when the reference count is zero will the
 data be deleted.
 
 If the application omits to delete the bitmap explicitly, the bitmap will be
-destroyed automatically by wxWindows when the application exits.
+destroyed automatically by wxWidgets when the application exits.
 
 Do not delete a bitmap that is selected into a memory device context.
 
@@ -228,7 +228,7 @@ of a given handler class in an application session.}
 
 Deletes all bitmap handlers.
 
-This function is called by wxWindows on exit.
+This function is called by wxWidgets on exit.
 
 \membersection{wxBitmap::ConvertToImage}\label{wxbitmapconverttoimage}
 
@@ -375,10 +375,10 @@ the bitmap. This function preserves bit depth and mask information.
 
 \func{static void}{InitStandardHandlers}{\void}
 
-Adds the standard bitmap format handlers, which, depending on wxWindows
+Adds the standard bitmap format handlers, which, depending on wxWidgets
 configuration, can be handlers for Windows bitmap, Windows bitmap resource, and XPM.
 
-This function is called by wxWindows on startup.
+This function is called by wxWidgets on startup.
 
 \wxheading{See also}
 
@@ -419,7 +419,7 @@ The meaning of {\it name} is determined by the {\it type} parameter.}
 \twocolitem{{\bf wxBITMAP\_TYPE\_XPM}}{Load an XPM bitmap file.}
 \end{twocollist}
 
-The validity of these flags depends on the platform and wxWindows configuration.
+The validity of these flags depends on the platform and wxWidgets configuration.
 
 In addition, wxBitmap can read all formats that \helpref{wxImage}{wximage} can
 (wxBITMAP\_TYPE\_JPEG, wxBITMAP\_TYPE\_PNG, wxBITMAP\_TYPE\_GIF, wxBITMAP\_TYPE\_PCX, wxBITMAP\_TYPE\_PNM).
@@ -482,7 +482,7 @@ Saves a bitmap in the named file.
 \twocolitem{{\bf wxBITMAP\_TYPE\_XPM}}{Save an XPM bitmap file.}
 \end{twocollist}
 
-The validity of these flags depends on the platform and wxWindows configuration.
+The validity of these flags depends on the platform and wxWidgets configuration.
 
 In addition, wxBitmap can save all formats that \helpref{wxImage}{wximage} can
 (wxBITMAP\_TYPE\_JPEG, wxBITMAP\_TYPE\_PNG).
@@ -498,7 +498,7 @@ TRUE if the operation succeeded, FALSE otherwise.
 
 \wxheading{Remarks}
 
-Depending on how wxWindows has been configured, not all formats may be available.
+Depending on how wxWidgets has been configured, not all formats may be available.
 
 \wxheading{See also}
 
diff --git a/docs/latex/wx/bmpdatob.tex b/docs/latex/wx/bmpdatob.tex
index fb7b1c8535..b675df71b9 100644
--- a/docs/latex/wx/bmpdatob.tex
+++ b/docs/latex/wx/bmpdatob.tex
@@ -47,7 +47,7 @@ Constructor, optionally passing a bitmap (otherwise use
 
 Returns the bitmap associated with the data object. You may wish to override
 this method when offering data on-demand, but this is not required by
-wxWindows' internals. Use this method to get data in bitmap form from
+wxWidgets' internals. Use this method to get data in bitmap form from
 the \helpref{wxClipboard}{wxclipboard}.
 
 \membersection{wxBitmapDataObject::SetBitmap}\label{wxbitmapdataobjectsetbitmap}
diff --git a/docs/latex/wx/body.tex b/docs/latex/wx/body.tex
index 9a2e1ab78b..dae41011fb 100644
--- a/docs/latex/wx/body.tex
+++ b/docs/latex/wx/body.tex
@@ -3,21 +3,21 @@
 \setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
 \setfooter{\thepage}{}{}{}{}{\thepage}%
 
-\section{What is wxWindows?}
+\section{What is wxWidgets?}
 
-wxWindows is a C++ framework providing GUI (Graphical User
+wxWidgets is a C++ framework providing GUI (Graphical User
 Interface) and other facilities on more than one platform.  Version 2 currently
 supports all desktop versions of MS Windows, Unix with GTK+, Unix with Motif,
 and MacOS. An OS/2 port is in progress.
 
-wxWindows was originally developed at the Artificial Intelligence
+wxWidgets was originally developed at the Artificial Intelligence
 Applications Institute, University of Edinburgh, for internal use,
 and was first made publicly available in 1992.
 Version 2 is a vastly improved version written and maintained by
 Julian Smart, Robert Roebling, Vadim Zeitlin, Vaclav Slavik and many others.
 
 This manual contains a class reference and topic overviews.
-For a selection of wxWindows tutorials, please see the documentation page on the \urlref{wxWindows web site}{http://www.wxwindows.org}.
+For a selection of wxWidgets tutorials, please see the documentation page on the \urlref{wxWidgets web site}{http://www.wxwidgets.org}.
 
 Please note that in the following, ``MS Windows" often refers to all
 platforms related to Microsoft Windows, including 16-bit and 32-bit
@@ -25,7 +25,7 @@ variants, unless otherwise stated. All trademarks are acknowledged.
 
 \section{Why another cross-platform development tool?}
 
-wxWindows was developed to provide a cheap and flexible way to maximize
+wxWidgets was developed to provide a cheap and flexible way to maximize
 investment in GUI application development.  While a number of commercial
 class libraries already existed for cross-platform development,
 none met all of the following criteria:
@@ -37,14 +37,14 @@ none met all of the following criteria:
 \item support for a wide range of compilers.
 \end{enumerate}
 
-Since wxWindows was started, several other free or almost-free
+Since wxWidgets was started, several other free or almost-free
 GUI frameworks have emerged. However, none has the range of
 features, flexibility, documentation and the well-established
-development team that wxWindows has.
+development team that wxWidgets has.
 
-As open source software, wxWindows has benefited from comments,
+As open source software, wxWidgets has benefited from comments,
 ideas, bug fixes, enhancements and the sheer enthusiasm of
-users. This gives wxWindows a certain advantage over its
+users. This gives wxWidgets a certain advantage over its
 commercial competitors (and over free libraries without an
 independent development team), plus a robustness against the
 transience of one individual or company. This openness and
@@ -61,19 +61,19 @@ The importance of using a platform-independent class library
 cannot be overstated, since GUI application development is very
 time-consuming, and sustained popularity of particular GUIs
 cannot be guaranteed. Code can very quickly become obsolete if
-it addresses the wrong platform or audience.  wxWindows helps to
+it addresses the wrong platform or audience.  wxWidgets helps to
 insulate the programmer from these winds of change. Although
-wxWindows may not be suitable for every application (such as an
+wxWidgets may not be suitable for every application (such as an
 OLE-intensive program), it provides access to most of the
 functionality a GUI program normally requires, plus many extras
 such as network programming, PostScript output, and HTML
 rendering; and it can of course be extended as needs dictate.
 As a bonus, it provides a far cleaner and easier programming
 interface than the native APIs. Programmers may find it
-worthwhile to use wxWindows even if they are developing on only
+worthwhile to use wxWidgets even if they are developing on only
 one platform.
 
-It is impossible to sum up the functionality of wxWindows in a few paragraphs, but
+It is impossible to sum up the functionality of wxWidgets in a few paragraphs, but
 here are some of the benefits:
 
 \begin{itemize}\itemsep=0pt
@@ -135,9 +135,9 @@ Additions and changes:
 \end{itemize}
 \end{comment}
 
-\section{wxWindows requirements}\label{requirements}
+\section{wxWidgets requirements}\label{requirements}
 
-To make use of wxWindows, you currently need one of the following setups.
+To make use of wxWidgets, you currently need one of the following setups.
 
 (a) MS-Windows:
 
@@ -166,22 +166,22 @@ Metrowerks CodeWarrior.
 \item At least 60 MB of disk space.
 \end{enumerate}
 
-\section{Availability and location of wxWindows}
+\section{Availability and location of wxWidgets}
 
-\winhelponly{wxWindows is available by anonymous FTP and World Wide Web
-from ftp://biolpc22.york.ac.uk/pub and/or http://www.wxwindows.org.}
-\winhelpignore{wxWindows is available by anonymous FTP and World Wide Web
+\winhelponly{wxWidgets is available by anonymous FTP and World Wide Web
+from ftp://biolpc22.york.ac.uk/pub and/or http://www.wxwidgets.org.}
+\winhelpignore{wxWidgets is available by anonymous FTP and World Wide Web
 from \urlref{ftp://biolpc22.york.ac.uk/pub}{ftp://biolpc22.york.ac.uk/pub} 
-and/or \urlref{http://www.wxwindows.org}{http://www.wxwindows.org}.}
+and/or \urlref{http://www.wxwidgets.org}{http://www.wxwidgets.org}.}
 
 You can also buy a CD-ROM using the form on the Web site.
 
 \section{Acknowledgements}
 
 Thanks are due to AIAI for being willing to release the original version of
-wxWindows into the public domain, and to our patient partners.
+wxWidgets into the public domain, and to our patient partners.
 
-We would particularly like to thank the following for their contributions to wxWindows, and the many others who have been involved in
+We would particularly like to thank the following for their contributions to wxWidgets, and the many others who have been involved in
 the project over the years. Apologies for any unintentional omissions from this list. 
  
 Yiorgos Adamopoulos, Jamshid Afshar, Alejandro Aguilar-Sierra, AIAI, Patrick Albert, Karsten Ballueder, Michael Bedward, Kai Bendorf, Yura Bidus, Keith 
@@ -212,18 +212,18 @@ written prior permission.  M.I.T. makes no representations about the
 suitability of this software for any purpose.  It is provided ``as is''
 without express or implied warranty.}
 
-\chapter{Multi-platform development with wxWindows}\label{multiplat}
+\chapter{Multi-platform development with wxWidgets}\label{multiplat}
 \setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
 \setfooter{\thepage}{}{}{}{}{\thepage}%
 
-This chapter describes the practical details of using wxWindows. Please
+This chapter describes the practical details of using wxWidgets. Please
 see the file install.txt for up-to-date installation instructions, and
 changes.txt for differences between versions.
 
 \section{Include files}
 
 The main include file is {\tt "wx/wx.h"}; this includes the most commonly
-used modules of wxWindows.
+used modules of wxWidgets.
 
 To save on compilation time, include only those header files relevant to the
 source file. If you are using precompiled headers, you should include
@@ -254,7 +254,7 @@ Borland precompilation is largely automatic. Visual C++ requires specification o
 the file to use for precompilation. Watcom C++ is automatic apart from the specification of
 the .pch file. Watcom C++ is strange in requiring the precompiled header to be used only for
 object files compiled in the same directory as that in which the precompiled header was created.
-Therefore, the wxWindows Watcom C++ makefiles go through hoops deleting and recreating
+Therefore, the wxWidgets Watcom C++ makefiles go through hoops deleting and recreating
 a single precompiled header file for each module, thus preventing an accumulation of many
 multi-megabyte .pch files.
 
@@ -264,7 +264,7 @@ The GTK and Motif ports of wxWindow can create either a static library or a shar
 library on most Unix or Unix-like systems. The static library is called libwx\_gtk.a
 and libwx\_motif.a whereas the name of the shared library is dependent on the
 system it is created on and the version you are using. The library name for the
-GTK version of wxWindows 2.2 on Linux and Solaris will be libwx\_gtk-2.2.so.0.0.0,
+GTK version of wxWidgets 2.2 on Linux and Solaris will be libwx\_gtk-2.2.so.0.0.0,
 on HP-UX, it will be libwx\_gtk-2.2.sl, on AIX just libwx\_gtk.a etc.
 
 Under Windows, use the library wx.lib (release) or wxd.lib (debug) for stand-alone Windows
@@ -279,8 +279,8 @@ others can be set to minimize the size of the library. Please see the setup.h fi
 and {\tt install.txt} files for details on configuration.
 
 Under Unix (GTK and Motif) the corresponding setup.h files are generated automatically
-when configuring the wxWindows using the "configure" script. When using the RPM packages
-for installing wxWindows on Linux, a correct setup.h is shipped in the package and
+when configuring the wxWidgets using the "configure" script. When using the RPM packages
+for installing wxWidgets on Linux, a correct setup.h is shipped in the package and
 this must not be changed.
 
 \section{Makefiles}
@@ -298,7 +298,7 @@ Sample makefiles for Unix (suffix .unx), MS C++ (suffix .DOS and .NT), Borland
 C++ (.BCC and .B32) and Symantec C++ (.SC) are included for the library, demos
 and utilities.
 
-The controlling makefile for wxWindows is in the MS-Windows
+The controlling makefile for wxWidgets is in the MS-Windows
 directory {\tt src/msw} for the different Windows compiler and
 in the build directory when using the Unix ports. The build
 directory can be chosen by the user. It is the directory in
@@ -311,7 +311,7 @@ Please see the platform-specific {\tt install.txt} file for further details.
 
 \section{Windows-specific files}
 
-wxWindows application compilation under MS Windows requires at least two
+wxWidgets application compilation under MS Windows requires at least two
 extra files, resource and module definition files.
 
 \subsection{Resource file}\label{resources}
@@ -323,7 +323,7 @@ is the following statement:
 rcinclude "wx/msw/wx.rc"
 \end{verbatim}
 
-which includes essential internal wxWindows definitions.  The resource script
+which includes essential internal wxWidgets definitions.  The resource script
 may also contain references to icons, cursors, etc., for example:
 
 \begin{verbatim}
@@ -356,7 +356,7 @@ STACKSIZE    8192
 The only lines which will usually have to be changed per application are
 NAME and DESCRIPTION.
 
-\section{Allocating and deleting wxWindows objects}
+\section{Allocating and deleting wxWidgets objects}
 
 In general, classes derived from wxWindow must dynamically allocated
 with {\it new} and deleted with {\it delete}. If you delete a window,
@@ -364,7 +364,7 @@ all of its children and descendants will be automatically deleted,
 so you don't need to delete these descendants explicitly.
 
 When deleting a frame or dialog, use {\bf Destroy} rather than {\bf delete} so
-that the wxWindows delayed deletion can take effect. This waits until idle time
+that the wxWidgets delayed deletion can take effect. This waits until idle time
 (when all messages have been processed) to actually delete the window, to avoid
 problems associated with the GUI sending events to deleted windows.
 
@@ -372,8 +372,8 @@ Don't create a window on the stack, because this will interfere
 with delayed deletion.
 
 If you decide to allocate a C++ array of objects (such as wxBitmap) that may
-be cleaned up by wxWindows, make sure you delete the array explicitly
-before wxWindows has a chance to do so on exit, since calling {\it delete} on
+be cleaned up by wxWidgets, make sure you delete the array explicitly
+before wxWidgets has a chance to do so on exit, since calling {\it delete} on
 array members will cause memory problems.
 
 wxColour can be created statically: it is not automatically cleaned
@@ -392,7 +392,7 @@ A problem which sometimes arises from writing multi-platform programs is that
 the basic C types are not defined the same on all platforms. This holds true
 for both the length in bits of the standard types (such as int and long) as 
 well as their byte order, which might be little endian (typically
-on Intel computers) or big endian (typically on some Unix workstations). wxWindows
+on Intel computers) or big endian (typically on some Unix workstations). wxWidgets
 defines types and macros that make it easy to write architecture independent
 code. The types are:
 
@@ -408,7 +408,7 @@ are described in the \helpref{Byte order macros}{byteordermacros} section.
 
 \section{Conditional compilation}
 
-One of the purposes of wxWindows is to reduce the need for conditional
+One of the purposes of wxWidgets is to reduce the need for conditional
 compilation in source code, which can be messy and confusing to follow.
 However, sometimes it is necessary to incorporate platform-specific
 features (such as metafile use under MS Windows). The symbols
@@ -421,11 +421,11 @@ The following documents some miscellaneous C++ issues.
 
 \subsection{Templates}
 
-wxWindows does not use templates since it is a notoriously unportable feature.
+wxWidgets does not use templates since it is a notoriously unportable feature.
 
 \subsection{RTTI}
 
-wxWindows does not use run-time type information since wxWindows provides
+wxWidgets does not use run-time type information since wxWidgets provides
 its own run-time type information system, implemented using macros.
 
 \subsection{Type of NULL}
@@ -441,7 +441,7 @@ as
 \end{verbatim}
 }
 
-It is recommended to adhere to this in all code using wxWindows as
+It is recommended to adhere to this in all code using wxWidgets as
 this make the code (a bit) more portable.
 
 \subsection{Precompiled headers}
@@ -449,8 +449,8 @@ this make the code (a bit) more portable.
 Some compilers, such as Borland C++ and Microsoft C++, support
 precompiled headers. This can save a great deal of compiling time. The
 recommended approach is to precompile {\tt "wx.h"}, using this
-precompiled header for compiling both wxWindows itself and any
-wxWindows applications. For Windows compilers, two dummy source files
+precompiled header for compiling both wxWidgets itself and any
+wxWidgets applications. For Windows compilers, two dummy source files
 are provided (one for normal applications and one for creating DLLs)
 to allow initial creation of the precompiled header.
 
@@ -458,7 +458,7 @@ However, there are several downsides to using precompiled headers. One
 is that to take advantage of the facility, you often need to include
 more header files than would normally be the case. This means that
 changing a header file will cause more recompilations (in the case of
-wxWindows, everything needs to be recompiled since everything includes {\tt "wx.h"}!)
+wxWidgets, everything needs to be recompiled since everything includes {\tt "wx.h"}!)
 
 A related problem is that for compilers that don't have precompiled
 headers, including a lot of header files slows down compilation
@@ -500,34 +500,34 @@ dos2unix).
 See also the File Functions section of the reference manual for
 descriptions of miscellaneous file handling functions.
 
-\chapter{Utilities and libraries supplied with wxWindows}\label{utilities}
+\chapter{Utilities and libraries supplied with wxWidgets}\label{utilities}
 \setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
 \setfooter{\thepage}{}{}{}{}{\thepage}%
 
-In addition to the core wxWindows library, a number of further
+In addition to the core wxWidgets library, a number of further
 libraries and utilities are supplied with each distribution.
 
 Some are under the 'contrib' hierarchy which mirrors the
-structure of the main wxWindows hierarchy. See also the 'utils'
+structure of the main wxWidgets hierarchy. See also the 'utils'
 hierarchy. The first place to look for documentation about
-these tools and libraries is under the wxWindows 'docs' hierarchy,
+these tools and libraries is under the wxWidgets 'docs' hierarchy,
 for example {\tt docs/htmlhelp/fl.chm}.
 
 For other user-contributed packages, please see the Contributions page
-on the \urlref{wxWindows Web site}{http://www.wxwindows.org}.
+on the \urlref{wxWidgets Web site}{http://www.wxwidgets.org}.
 
 \begin{description}\itemsep=0pt
 \item[{\bf Helpview}]
-Helpview is a program for displaying wxWindows HTML
-Help files. In many cases, you may wish to use the wxWindows HTML
+Helpview is a program for displaying wxWidgets HTML
+Help files. In many cases, you may wish to use the wxWidgets HTML
 Help classes from within your application, but this provides a
 handy stand-alone viewer. See \helpref{wxHTML Notes}{wxhtml} for more details.
 You can find it in {\tt samples/html/helpview}.
 
 \item[{\bf Tex2RTF}]
-Supplied with wxWindows is a utility called Tex2RTF for converting\rtfsp
+Supplied with wxWidgets is a utility called Tex2RTF for converting\rtfsp
 \LaTeX\ manuals HTML, MS HTML Help, wxHTML Help, RTF, and Windows
-Help RTF formats. Tex2RTF is used for the wxWindows manuals and can be used independently
+Help RTF formats. Tex2RTF is used for the wxWidgets manuals and can be used independently
 by authors wishing to create on-line and printed manuals from the same\rtfsp
 \LaTeX\ source. Please see the separate documentation for Tex2RTF.
 You can find it under {\tt utils/tex2rtf}.
@@ -602,17 +602,17 @@ You can find this in {\tt contrib/src/plot}, {\tt contrib/include/wx/plot}, and
 \setfooter{\thepage}{}{}{}{}{\thepage}%
 
 This chapter is intended to list strategies that may be useful when
-writing and debugging wxWindows programs. If you have any good tips,
+writing and debugging wxWidgets programs. If you have any good tips,
 please submit them for inclusion here.
 
 \section{Strategies for reducing programming errors}
 
 \subsection{Use ASSERT}
 
-Although I haven't done this myself within wxWindows, it is good
+Although I haven't done this myself within wxWidgets, it is good
 practice to use ASSERT statements liberally, that check for conditions that
 should or should not hold, and print out appropriate error messages.
-These can be compiled out of a non-debugging version of wxWindows
+These can be compiled out of a non-debugging version of wxWidgets
 and your application. Using ASSERT is an example of `defensive programming':
 it can alert you to problems later on.
 
@@ -636,13 +636,13 @@ Don't use absolute panel item positioning if you can avoid it. Different GUIs ha
 very differently sized panel items. Consider using the constraint system, although this
 can be complex to program.
 
-Alternatively, you could use alternative .wrc (wxWindows resource files) on different
+Alternatively, you could use alternative .wrc (wxWidgets resource files) on different
 platforms, with slightly different dimensions in each. Or space your panel items out
 to avoid problems.
 
-\subsection{Use wxWindows resource files}
+\subsection{Use wxWidgets resource files}
 
-Use .wrc (wxWindows resource files) where possible, because they can be easily changed
+Use .wrc (wxWidgets resource files) where possible, because they can be easily changed
 independently of source code. Bitmap resources can be set up to load different
 kinds of bitmap depending on platform (see the section on resource files).
 
@@ -691,11 +691,11 @@ Using tracing statements may be more convenient than using the debugger
 in some circumstances (such as when your debugger doesn't support a lot
 of debugging code, or you wish to print a bunch of variables).
 
-\subsection{Use the wxWindows debugging facilities}
+\subsection{Use the wxWidgets debugging facilities}
 
 You can use wxDebugContext to check for
-memory leaks and corrupt memory: in fact in debugging mode, wxWindows will
-automatically check for memory leaks at the end of the program if wxWindows is suitably
+memory leaks and corrupt memory: in fact in debugging mode, wxWidgets will
+automatically check for memory leaks at the end of the program if wxWidgets is suitably
 configured. Depending on the operating system and compiler, more or less
 specific information about the problem will be logged.
 
@@ -714,7 +714,7 @@ possible it will show invalid handles being used. You may have fun seeing
 what commercial programs cause these normally hidden errors! Microsoft
 recommend using the debugging version of Windows, which shows up even
 more problems. However, I doubt it is worth the hassle for most
-applications. wxWindows is designed to minimize the possibility of such
+applications. wxWidgets is designed to minimize the possibility of such
 errors, but they can still happen occasionally, slipping through unnoticed
 because they are not severe enough to cause a crash.
 
diff --git a/docs/latex/wx/brush.tex b/docs/latex/wx/brush.tex
index c7dfa3ae11..a832c76cf3 100644
--- a/docs/latex/wx/brush.tex
+++ b/docs/latex/wx/brush.tex
@@ -34,7 +34,7 @@ wxRED\_BRUSH}
 
 \wxheading{Remarks}
 
-On a monochrome display, wxWindows shows
+On a monochrome display, wxWidgets shows
 all brushes as white unless the colour is really black.
 
 Do not initialize objects on the stack before the program commences,
@@ -130,7 +130,7 @@ system, since wxBrush uses a reference counting system for efficiency.
 
 Although all remaining brushes are deleted when the application exits,
 the application should try to clean up all brushes itself. This is because
-wxWindows cannot know if a pointer to the brush object is stored in an
+wxWidgets cannot know if a pointer to the brush object is stored in an
 application data structure, and there is a risk of double deletion.
 
 \membersection{wxBrush::GetColour}\label{wxbrushgetcolour}
@@ -304,7 +304,7 @@ be deleted and their resources freed, eliminating the possibility of
 `memory leaks'. However, it is best not to rely on this automatic
 cleanup because it can lead to double deletion in some circumstances.
 
-There are two mechanisms in recent versions of wxWindows which make the
+There are two mechanisms in recent versions of wxWidgets which make the
 brush list less useful than it once was. Under Windows, scarce resources
 are cleaned up internally if they are not being used. Also, a referencing
 counting mechanism applied to all GDI objects means that some sharing
@@ -318,9 +318,9 @@ and copy brushes as you see fit. If your Windows resource meter suggests
 your application is using too many resources, you can resort to using
 GDI lists to share objects explicitly.
 
-The only compelling use for the brush list is for wxWindows to keep
+The only compelling use for the brush list is for wxWidgets to keep
 track of brushes in order to clean them up on exit. It is also kept for
-backward compatibility with earlier versions of wxWindows.
+backward compatibility with earlier versions of wxWidgets.
 
 \wxheading{See also}
 
@@ -339,7 +339,7 @@ use the object pointer {\bf wxTheBrushList}.
 
 \func{void}{AddBrush}{\param{wxBrush *}{brush}}
 
-Used internally by wxWindows to add a brush to the list.
+Used internally by wxWidgets to add a brush to the list.
 
 \membersection{wxBrushList::FindOrCreateBrush}\label{wxbrushlistfindorcreatebrush}
 
@@ -367,6 +367,6 @@ Finds a brush of the given specification, or creates one and adds it to the list
 
 \func{void}{RemoveBrush}{\param{wxBrush *}{brush}}
 
-Used by wxWindows to remove a brush from the list.
+Used by wxWidgets to remove a brush from the list.
 
 
diff --git a/docs/latex/wx/button.tex b/docs/latex/wx/button.tex
index 043d6d9d5e..b967d1a16e 100644
--- a/docs/latex/wx/button.tex
+++ b/docs/latex/wx/button.tex
@@ -133,7 +133,7 @@ Note that under Motif, calling this function immediately after
 creation of a button and before the creation of other buttons
 will cause misalignment of the row of buttons, since default
 buttons are larger. To get around this, call {\it SetDefault}\rtfsp
-after you have created a row of buttons: wxWindows will
+after you have created a row of buttons: wxWidgets will
 then set the size of all buttons currently on the panel to
 the same size.
 
diff --git a/docs/latex/wx/calctrl.tex b/docs/latex/wx/calctrl.tex
index a2a6ab8293..53ca377bd1 100644
--- a/docs/latex/wx/calctrl.tex
+++ b/docs/latex/wx/calctrl.tex
@@ -6,7 +6,7 @@
 %% Created:     03.01.00
 %% RCS-ID:      $Id$
 %% Copyright:   (c) Vadim Zeitlin
-%% License:     wxWindows license
+%% License:     wxWidgets license
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \section{\class{wxCalendarCtrl}}\label{wxcalendarctrl}
diff --git a/docs/latex/wx/caret.tex b/docs/latex/wx/caret.tex
index 9252196b3a..f9b6f52372 100644
--- a/docs/latex/wx/caret.tex
+++ b/docs/latex/wx/caret.tex
@@ -6,7 +6,7 @@
 %% Created:     20.06.00
 %% RCS-ID:      $Id$
 %% Copyright:   (c) Vadim Zeitlin
-%% License:     wxWindows license
+%% License:     wxWidgets license
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \section{\class{wxCaret}}\label{wxcaret}
diff --git a/docs/latex/wx/category.tex b/docs/latex/wx/category.tex
index 5a77af4789..59ef53c23b 100644
--- a/docs/latex/wx/category.tex
+++ b/docs/latex/wx/category.tex
@@ -2,7 +2,7 @@
 \setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
 \setfooter{\thepage}{}{}{}{}{\thepage}%
 
-A classification of wxWindows classes by category.
+A classification of wxWidgets classes by category.
 
 {\large {\bf Managed windows}}
 
@@ -259,7 +259,7 @@ user input.
 
 {\large {\bf Data structures}}
 
-These are the data structure classes supported by wxWindows.
+These are the data structure classes supported by wxWidgets.
 
 \twocolwidtha{6cm}
 \begin{twocollist}\itemsep=0pt
@@ -275,7 +275,7 @@ These are the data structure classes supported by wxWindows.
 \twocolitem{\helpref{wxList}{wxlist}}{A simple linked list implementation}
 \twocolitem{\helpref{wxLongLong}{wxlonglong}}{A portable 64 bit integer type}
 \twocolitem{\helpref{wxNode}{wxnode}}{Represents a node in the wxList implementation}
-\twocolitem{\helpref{wxObject}{wxobject}}{The root class for most wxWindows classes}
+\twocolitem{\helpref{wxObject}{wxobject}}{The root class for most wxWidgets classes}
 \twocolitem{\helpref{wxPathList}{wxpathlist}}{A class to help search multiple paths}
 \twocolitem{\helpref{wxPoint}{wxpoint}}{Representation of a point}
 \twocolitem{\helpref{wxRect}{wxrect}}{A class representing a rectangle}
@@ -295,7 +295,7 @@ These are the data structure classes supported by wxWindows.
 
 \overview{Overview}{runtimeclassoverview}
 
-wxWindows supports run-time manipulation of class information, and dynamic
+wxWidgets supports run-time manipulation of class information, and dynamic
 creation of objects given class names.
 
 \twocolwidtha{6cm}
@@ -309,7 +309,7 @@ creation of objects given class names.
 
 \overview{Overview}{wxlogoverview}
 
-wxWindows provides several classes and functions for message logging.
+wxWidgets provides several classes and functions for message logging.
 Please see the \helpref{wxLog overview}{wxlogoverview} for more details.
 
 \twocolwidtha{6cm}
@@ -332,7 +332,7 @@ to redirect output sent to {\tt cout} to a \helpref{wxTextCtrl}{wxtextctrl}}
 
 \overview{Overview}{debuggingoverview}
 
-wxWindows supports some aspects of debugging an application through
+wxWidgets supports some aspects of debugging an application through
 classes, functions and macros.
 
 \twocolwidtha{6cm}
@@ -347,7 +347,7 @@ classes, functions and macros.
 
 {\large {\bf Networking classes}}
 
-wxWindows provides its own classes for socket based networking.
+wxWidgets provides its own classes for socket based networking.
 
 \twocolwidtha{6cm}
 \begin{twocollist}\itemsep=0pt
@@ -367,7 +367,7 @@ wxWindows provides its own classes for socket based networking.
 
 \overview{Overview}{ipcoverview}
 
-wxWindows provides simple interprocess communications facilities
+wxWidgets provides simple interprocess communications facilities
 based on Windows DDE, but available on most platforms using TCP.
 
 \twocolwidtha{6cm}
@@ -382,7 +382,7 @@ based on Windows DDE, but available on most platforms using TCP.
 
 \overview{Overview}{docviewoverview}
 
-wxWindows supports a document/view framework which provides
+wxWidgets supports a document/view framework which provides
 housekeeping for a document-centric application.
 
 \twocolwidtha{6cm}
@@ -442,7 +442,7 @@ facilities.
 
 {\large {\bf File related classes}}
 
-wxWindows has several small classes to work with disk files, see \helpref{file classes
+wxWidgets has several small classes to work with disk files, see \helpref{file classes
 overview}{wxfileoverview} for more details.
 
 \twocolwidtha{6cm}
@@ -458,7 +458,7 @@ overview}{wxfileoverview} for more details.
 
 {\large {\bf Stream classes}}
 
-wxWindows has its own set of stream classes, as an alternative to often buggy standard stream
+wxWidgets has its own set of stream classes, as an alternative to often buggy standard stream
 libraries, and to provide enhanced functionality.
 
 \twocolwidtha{6cm}
@@ -493,7 +493,7 @@ libraries, and to provide enhanced functionality.
 
 \overview{Multithreading overview}{wxthreadoverview}
 
-wxWindows provides a set of classes to make use of the native thread
+wxWidgets provides a set of classes to make use of the native thread
 capabilities of the various platforms.
 
 \twocolwidtha{6cm}
@@ -509,7 +509,7 @@ capabilities of the various platforms.
 
 {\large {\bf HTML classes}}
 
-wxWindows provides a set of classes to display text in HTML format. These
+wxWidgets provides a set of classes to display text in HTML format. These
 class include a help system based on the HTML widget.
 
 \twocolwidtha{6cm}
@@ -526,7 +526,7 @@ class include a help system based on the HTML widget.
 
 {\large {\bf Virtual file system classes}}
 
-wxWindows provides a set of classes that implement an extensible virtual file system,
+wxWidgets provides a set of classes that implement an extensible virtual file system,
 used internally by the HTML classes.
 
 \twocolwidtha{6cm}
@@ -567,7 +567,7 @@ from specifications stored in an XML format.
 
 \overview{Database classes overview}{odbcoverview}
 
-wxWindows provides two alternative sets of classes for accessing Microsoft's ODBC (Open Database Connectivity)
+wxWidgets provides two alternative sets of classes for accessing Microsoft's ODBC (Open Database Connectivity)
 product. The new version by Remstar, known as wxODBC, is more powerful,
 portable, flexible and better supported, so please use the classes below for
 working with databases:
diff --git a/docs/latex/wx/checklst.tex b/docs/latex/wx/checklst.tex
index 9b6a5dfdcc..c049996f39 100644
--- a/docs/latex/wx/checklst.tex
+++ b/docs/latex/wx/checklst.tex
@@ -3,7 +3,7 @@
 A checklistbox is like a listbox, but allows items to be checked or unchecked.
 
 This class is currently implemented under Windows and GTK. When using this
-class under Windows wxWindows must be compiled with USE\_OWNER\_DRAWN set to 1.
+class under Windows wxWidgets must be compiled with USE\_OWNER\_DRAWN set to 1.
 
 Only the new functions for this class are documented; see also \helpref{wxListBox}{wxlistbox}.
 
diff --git a/docs/latex/wx/choice.tex b/docs/latex/wx/choice.tex
index 7f909cc8ae..90d98fb160 100644
--- a/docs/latex/wx/choice.tex
+++ b/docs/latex/wx/choice.tex
@@ -205,7 +205,7 @@ Gets the selected string, or the empty string if no string is selected.
 
 {\bf Obsolescence note:} This method is obsolete and was replaced with 
 \helpref{GetCount}{wxchoicegetcount}, please use the new method in the new
-code. This method is only available if wxWindows was compiled with 
+code. This method is only available if wxWidgets was compiled with 
 {\tt WXWIN\_COMPATIBILITY\_2\_2} defined and will disappear completely in
 future versions.
 
diff --git a/docs/latex/wx/clasinfo.tex b/docs/latex/wx/clasinfo.tex
index 66a1bd1f63..66579d6ca2 100644
--- a/docs/latex/wx/clasinfo.tex
+++ b/docs/latex/wx/clasinfo.tex
@@ -68,7 +68,7 @@ Returns the size of the class.
 \func{static void}{InitializeClasses}{\void}
 
 Initializes pointers in the wxClassInfo objects for fast execution
-of IsKindOf. Called in base wxWindows library initialization.
+of IsKindOf. Called in base wxWidgets library initialization.
 
 \membersection{wxClassInfo::IsKindOf}\label{wxclassinfoiskindof}
 
diff --git a/docs/latex/wx/clientdat.tex b/docs/latex/wx/clientdat.tex
index 74bdbeeefd..c038eff313 100644
--- a/docs/latex/wx/clientdat.tex
+++ b/docs/latex/wx/clientdat.tex
@@ -4,7 +4,7 @@ All classes deriving from \helpref{wxEvtHandler}{wxevthandler}
 (such as all controls and \helpref{wxApp}{wxapp})
 can hold arbitrary data which is here referred to as "client data".
 This is useful e.g. for scripting languages which need to handle
-shadow objects for most of wxWindows' classes and which store
+shadow objects for most of wxWidgets' classes and which store
 a handle to such a shadow class as client data in that class.
 This data can either be of type void - in which case the data
 {\it container} does not take care of freeing the data again
diff --git a/docs/latex/wx/clipbrd.tex b/docs/latex/wx/clipbrd.tex
index f7799f706a..ea60261d63 100644
--- a/docs/latex/wx/clipbrd.tex
+++ b/docs/latex/wx/clipbrd.tex
@@ -1,7 +1,7 @@
 \section{\class{wxClipboard}}\label{wxclipboard}
 
 A class for manipulating the clipboard. Note that this is not compatible with the
-clipboard class from wxWindows 1.xx, which has the same name but a different implementation.
+clipboard class from wxWidgets 1.xx, which has the same name but a different implementation.
 
 To use the clipboard, you call member functions of the global {\bf wxTheClipboard} object.
 
diff --git a/docs/latex/wx/cmdlpars.tex b/docs/latex/wx/cmdlpars.tex
index 89b3ce8057..6890185c2a 100644
--- a/docs/latex/wx/cmdlpars.tex
+++ b/docs/latex/wx/cmdlpars.tex
@@ -6,7 +6,7 @@
 %% Created:     27.03.00
 %% RCS-ID:      $Id$
 %% Copyright:   (c) Vadim Zeitlin
-%% License:     wxWindows license
+%% License:     wxWidgets license
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \section{\class{wxCmdLineParser}}\label{wxcmdlineparser}
@@ -215,7 +215,7 @@ terminate after this) or a positive number if there was an error during the
 command line parsing.
 
 In the latter case, the appropriate error message and usage information are
-logged by wxCmdLineParser itself using the standard wxWindows logging functions.
+logged by wxCmdLineParser itself using the standard wxWidgets logging functions.
 
 \membersection{Getting results}\label{wxcmdlineparsergettingresults}
 
diff --git a/docs/latex/wx/colour.tex b/docs/latex/wx/colour.tex
index 7aad1266ed..af6988c460 100644
--- a/docs/latex/wx/colour.tex
+++ b/docs/latex/wx/colour.tex
@@ -239,7 +239,7 @@ Assignment operator for the colour data.
 
 \section{\class{wxColourDatabase}}\label{wxcolourdatabase}
 
-wxWindows maintains a database of standard RGB colours for a predefined
+wxWidgets maintains a database of standard RGB colours for a predefined
 set of named colours (such as ``BLACK'', ``LIGHT GREY''). The
 application may add to this set if desired by using {\it Append}.  There
 is only one instance of this class: {\bf wxTheColourDatabase}.
@@ -298,7 +298,7 @@ Finds a colour name given the colour. Returns NULL if not found.
 
 \func{void}{Initialize}{\void}
 
-Initializes the database with a number of stock colours.  Called by wxWindows
+Initializes the database with a number of stock colours.  Called by wxWidgets
 on start-up.
 
 
diff --git a/docs/latex/wx/combobox.tex b/docs/latex/wx/combobox.tex
index d74934fc51..63bf509fdb 100644
--- a/docs/latex/wx/combobox.tex
+++ b/docs/latex/wx/combobox.tex
@@ -242,7 +242,7 @@ Returns the current value in the combobox text field.
 
 {\bf Obsolescence note:} This method is obsolete and was replaced with 
 \helpref{GetCount}{wxcomboboxgetcount}, please use the new method in the new
-code. This method is only available if wxWindows was compiled with 
+code. This method is only available if wxWidgets was compiled with 
 {\tt WXWIN\_COMPATIBILITY\_2\_2} defined and will disappear completely in
 future versions.
 
diff --git a/docs/latex/wx/config.tex b/docs/latex/wx/config.tex
index 3a76db5598..e0f04833ad 100644
--- a/docs/latex/wx/config.tex
+++ b/docs/latex/wx/config.tex
@@ -9,7 +9,7 @@ you're working with but you would just use the wxConfigBase methods. This
 allows you to write the same code regardless of whether you're working with
 the registry under Win32 or text-based config files under Unix (or even
 Windows 3.1 .INI files if you're really unlucky). To make writing the portable
-code even easier, wxWindows provides a typedef wxConfig
+code even easier, wxWidgets provides a typedef wxConfig
 which is mapped onto the native wxConfigBase implementation on the given
 platform: i.e. wxRegConfig under Win32, wxIniConfig under Win16 and
 wxFileConfig otherwise.
@@ -26,7 +26,7 @@ No base class
 
 \wxheading{Include files}
 
-<wx/config.h> (to let wxWindows choose a wxConfig class for your platform)\\
+<wx/config.h> (to let wxWidgets choose a wxConfig class for your platform)\\
 <wx/confbase.h> (base config class)\\
 <wx/fileconf.h> (wxFileConfig class)\\
 <wx/msw/regconf.h> (wxRegConfig class)\\
@@ -87,7 +87,7 @@ one (especially because creating a wxFileConfig object might be a time
 consuming operation). In this case, you may create this global config object
 in the very start of the program and {\it Set()} it as the default. Then, from
 anywhere in your program, you may access it using the {\it Get()} function.
-Note that wxWindows will delete this config object for you during the program
+Note that wxWidgets will delete this config object for you during the program
 shutdown (from \helpref{wxApp::OnExit}{wxapponexit} to be precise) but you can
 also do it yourself earlier if needed.
 
@@ -96,7 +96,7 @@ you may forget about calling {\it Set()}. When {\it Get()} is called and there
 is no current object, it will create one using {\it Create()} function. To
 disable this behaviour {\it DontCreateOnDemand()} is provided.
 
-{\bf Note:} You should use either {\it Set()} or {\it Get()} because wxWindows
+{\bf Note:} You should use either {\it Set()} or {\it Get()} because wxWidgets
 library itself would take advantage of it and could save various information
 in it. For example \helpref{wxFontMapper}{wxfontmapper} or Unix version
 of \helpref{wxFileDialog}{wxfiledialog} have ability to use wxConfig class.
@@ -376,7 +376,7 @@ a {\it foo} key with some backslash characters will be stored as {\tt foo=C:$\ba
 of the usual storage of {\tt foo=C:$\backslash\backslash$mydir}.
 
 The wxCONFIG\_USE\_NO\_ESCAPE\_CHARACTERS style can be helpful if your config 
-file must be read or written to by a non-wxWindows program (which might not 
+file must be read or written to by a non-wxWidgets program (which might not 
 understand the escape characters). Note, however, that if 
 wxCONFIG\_USE\_NO\_ESCAPE\_CHARACTERS style is used, it is is now 
 your application's responsibility to ensure that there is no newline or 
diff --git a/docs/latex/wx/constant.tex b/docs/latex/wx/constant.tex
index 3e53ff89d9..ecfe355c4a 100644
--- a/docs/latex/wx/constant.tex
+++ b/docs/latex/wx/constant.tex
@@ -2,7 +2,7 @@
 \setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
 \setfooter{\thepage}{}{}{}{}{\thepage}
 
-This chapter describes the constants defined by wxWindows.
+This chapter describes the constants defined by wxWidgets.
 
 \input cppconst.tex
 \input stdevtid.tex
diff --git a/docs/latex/wx/cppconst.tex b/docs/latex/wx/cppconst.tex
index 04ae14f236..f3137007e5 100644
--- a/docs/latex/wx/cppconst.tex
+++ b/docs/latex/wx/cppconst.tex
@@ -1,6 +1,6 @@
-\section{Preprocesser symbols defined by wxWindows}\label{cppconst}
+\section{Preprocesser symbols defined by wxWidgets}\label{cppconst}
 
-Here is the list of preprocessor symbols used in the wxWindows source grouped
+Here is the list of preprocessor symbols used in the wxWidgets source grouped
 by category (and sorted by alphabetical order inside each category).
 
 \subsection{GUI system}
@@ -22,7 +22,7 @@ defined)}
 \twocolitem{\_\_WXPM\_\_}{OS/2 native Presentation Manager}
 \twocolitem{\_\_WXSTUBS\_\_}{Stubbed version ('template' wxWin implementation)}
 \twocolitem{\_\_WXXT\_\_}{Xt; mutually exclusive with WX\_MOTIF, not
-implemented in wxWindows 2.x}
+implemented in wxWidgets 2.x}
 \twocolitem{\_\_WXX11\_\_}{wxX11 (\_\_WXUNIVERSAL\_\_ will be also defined)}
 \twocolitem{\_\_WXWINE\_\_}{WINE (i.e. Win32 on Unix)}
 \twocolitem{\_\_WXUNIVERSAL\_\_}{wxUniversal port, always defined in addition
diff --git a/docs/latex/wx/cursor.tex b/docs/latex/wx/cursor.tex
index 5a74959399..9f174dab8d 100644
--- a/docs/latex/wx/cursor.tex
+++ b/docs/latex/wx/cursor.tex
@@ -10,7 +10,7 @@ conditional compilation will probably be required (see \helpref{wxIcon}{wxicon}
 an example).
 
 A single cursor object may be used in many windows (any subwindow type).
-The wxWindows convention is to set the cursor for a window, as in X,
+The wxWidgets convention is to set the cursor for a window, as in X,
 rather than to set it globally as in MS Windows, although a
 global \helpref{::wxSetCursor}{wxsetcursor} is also available for MS Windows use.
 
@@ -228,7 +228,7 @@ hotSpotY=0)}}{Constructs a cursor from a filename}
 
 Destroys the cursor. A cursor can be reused for more
 than one window, and does not get destroyed when the window is
-destroyed. wxWindows destroys all cursors on application exit, although
+destroyed. wxWidgets destroys all cursors on application exit, although
 it is best to clean them up explicitly.
 
 \membersection{wxCursor::Ok}\label{wxcursorok}
diff --git a/docs/latex/wx/dataform.tex b/docs/latex/wx/dataform.tex
index bf80cd95d0..29273ae516 100644
--- a/docs/latex/wx/dataform.tex
+++ b/docs/latex/wx/dataform.tex
@@ -6,7 +6,7 @@
 %% Created:     03.11.99
 %% RCS-ID:      $Id$
 %% Copyright:   (c) Vadim Zeitlin
-%% License:     wxWindows license
+%% License:     wxWidgets license
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \section{\class{wxDataFormat}}\label{wxdataformat}
diff --git a/docs/latex/wx/dataobj.tex b/docs/latex/wx/dataobj.tex
index 3366463cbf..56cd41e22f 100644
--- a/docs/latex/wx/dataobj.tex
+++ b/docs/latex/wx/dataobj.tex
@@ -5,8 +5,8 @@
 %% Modified by:
 %% Created:     18.10.99
 %% RCS-ID:      $Id$
-%% Copyright:   (c) wxWindows team
-%% License:     wxWindows license
+%% Copyright:   (c) wxWidgets team
+%% License:     wxWidgets license
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \section{\class{wxDataObject}}\label{wxdataobject}
@@ -41,7 +41,7 @@ reasonable for the situations when you really need to support multiple formats,
 but may be annoying if you only want to do something simple like cut and paste
 text.
 
-To provide a solution for both cases, wxWindows has two predefined classes
+To provide a solution for both cases, wxWidgets has two predefined classes
 which derive from wxDataObject: \helpref{wxDataObjectSimple}{wxdataobjectsimple} and 
 \helpref{wxDataObjectComposite}{wxdataobjectcomposite}. 
 \helpref{wxDataObjectSimple}{wxdataobjectsimple} is
diff --git a/docs/latex/wx/date.tex b/docs/latex/wx/date.tex
index c09e0d66da..d8eaf549e4 100644
--- a/docs/latex/wx/date.tex
+++ b/docs/latex/wx/date.tex
@@ -4,7 +4,7 @@ A class for manipulating dates.
 
 {\bf NOTE:} this class is retained only for compatibility,
 and has been replaced by \helpref{wxDateTime}{wxdatetime}. wxDate
-may be withdrawn in future versions of wxWindows.
+may be withdrawn in future versions of wxWidgets.
 
 \wxheading{Derived from}
 
diff --git a/docs/latex/wx/datespan.tex b/docs/latex/wx/datespan.tex
index bef43ef9c2..a68f58c762 100644
--- a/docs/latex/wx/datespan.tex
+++ b/docs/latex/wx/datespan.tex
@@ -6,7 +6,7 @@
 %% Created:     04.04.00
 %% RCS-ID:      $Id$
 %% Copyright:   (c) Vadim Zeitlin
-%% License:     wxWindows license
+%% License:     wxWidgets license
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \section{\class{wxDateSpan}}\label{wxdatespan}
diff --git a/docs/latex/wx/datetime.tex b/docs/latex/wx/datetime.tex
index 9de18864b2..5063be9170 100644
--- a/docs/latex/wx/datetime.tex
+++ b/docs/latex/wx/datetime.tex
@@ -6,7 +6,7 @@
 %% Created:     07.03.00
 %% RCS-ID:      $Id$
 %% Copyright:   (c) Vadim Zeitlin
-%% License:     wxWindows license
+%% License:     wxWidgets license
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \section{\class{wxDateTime}}\label{wxdatetime}
@@ -1107,7 +1107,7 @@ the character which stopped the scan.
 This function does the same as the standard ANSI C {\tt strftime(3)} function.
 Please see its description for the meaning of {\it format} parameter.
 
-It also accepts a few wxWindows-specific extensions: you can optionally specify
+It also accepts a few wxWidgets-specific extensions: you can optionally specify
 the width of the field to follow using {\tt printf(3)}-like syntax and the
 format specification {\tt \%l} can be used to get the number of milliseconds.
 
diff --git a/docs/latex/wx/datistrm.tex b/docs/latex/wx/datistrm.tex
index 2bff0f65e6..5d64290fc9 100644
--- a/docs/latex/wx/datistrm.tex
+++ b/docs/latex/wx/datistrm.tex
@@ -46,7 +46,7 @@ None
 \func{}{wxDataInputStream}{\param{wxInputStream\&}{ stream}, \param{wxMBConv\&}{ conv = wxMBConvUTF8}}
 
 Constructs a datastream object from an input stream. Only read methods will
-be available. The second form is only available in Unicode build of wxWindows.
+be available. The second form is only available in Unicode build of wxWidgets.
 
 \wxheading{Parameters}
 
@@ -110,7 +110,7 @@ Reads a string from a stream. Actually, this function first reads a long
 integer specifying the length of the string (without the last null character) 
 and then reads the string.
 
-In Unicode build of wxWindows, the fuction first reads multibyte (char*)
+In Unicode build of wxWidgets, the fuction first reads multibyte (char*)
 string from the stream and then converts it to Unicode using the {\it conv}
 object passed to constructor and returns the result as wxString. You are
 responsible for using the same convertor as when writing the stream.
diff --git a/docs/latex/wx/datostrm.tex b/docs/latex/wx/datostrm.tex
index 53616ac33d..b9f7f4b8ac 100644
--- a/docs/latex/wx/datostrm.tex
+++ b/docs/latex/wx/datostrm.tex
@@ -26,7 +26,7 @@ None
 \func{}{wxDataOutputStream}{\param{wxOutputStream\&}{ stream}, \param{wxMBConv\&}{ conv = wxMBConvUTF8}}
 
 Constructs a datastream object from an output stream. Only write methods will
-be available. The second form is only available in Unicode build of wxWindows.
+be available. The second form is only available in Unicode build of wxWidgets.
 
 \wxheading{Parameters}
 
@@ -91,7 +91,7 @@ Writes the double {\it f} to the stream using the IEEE format.
 Writes {\it string} to the stream. Actually, this method writes the size of
 the string before writing {\it string} itself.
 
-In ANSI build of wxWindows, the string is written to the stream in exactly
+In ANSI build of wxWidgets, the string is written to the stream in exactly
 same way it is represented in memory. In Unicode build, however, the string
 is first converted to multibyte representation with {\it conv} object passed
 to stream's constructor (consequently, ANSI application can read data 
diff --git a/docs/latex/wx/db.tex b/docs/latex/wx/db.tex
index 0b051394a2..4740f223aa 100644
--- a/docs/latex/wx/db.tex
+++ b/docs/latex/wx/db.tex
@@ -254,7 +254,7 @@ ODBC errors.}
 \wxheading{Remarks}
 
 Default cursor scrolling is defined by wxODBC\_FWD\_ONLY\_CURSORS in setup.h
-when the wxWindows library is built.  This behavior can be overridden when
+when the wxWidgets library is built.  This behavior can be overridden when
 an instance of a wxDb is created (see \helpref{wxDb constructor}{wxdbconstr}).
 Default setting of this value TRUE, as not all databases/drivers support
 both types of cursors.
@@ -596,7 +596,7 @@ Possible values returned by this function can be viewed in the
 \helpref{Enumerated types}{wxdbenumeratedtypes} section of wxDb.
 
 There are known issues with conformance to the ODBC standards with several
-datasources supported by the wxWindows ODBC classes.  Please see the overview
+datasources supported by the wxWidgets ODBC classes.  Please see the overview
 for specific details on which datasource have which issues.
 
 \wxheading{Return value}
@@ -731,7 +731,7 @@ of processing.
 
 \func{bool}{IsFwdOnlyCursors}{\void}
 
-Older form (pre-2.3/2.4 of wxWindows) of the
+Older form (pre-2.3/2.4 of wxWidgets) of the
 \helpref{wxDb::IsFwdOnlyCursors}{wxdbisfwdonlycursors}.  This method is
 provided for backward compatibility only.  The method
 \helpref{wxDb::IsFwdOnlyCursors}{wxdbisfwdonlycursors} should be
@@ -1093,12 +1093,12 @@ use backward scrolling cursors and their associated functions (see note above).
 
 \wxheading{Remarks}
 
-Added as of wxWindows v2.4 release, this function is a renamed version of
-wxDb::FwdOnlyCursors() to match the normal wxWindows naming conventions for
+Added as of wxWidgets v2.4 release, this function is a renamed version of
+wxDb::FwdOnlyCursors() to match the normal wxWidgets naming conventions for
 class member functions.
 
 This function is not available in versions prior to v2.4.  You should
-use \helpref{wxDb::FwdOnlyCursors}{wxdbfwdonlycursors} for wxWindows
+use \helpref{wxDb::FwdOnlyCursors}{wxdbfwdonlycursors} for wxWidgets
 versions prior to 2.4.
 
 \wxheading{See also}
@@ -1962,7 +1962,7 @@ class so a program can create a wxDbTableInf array instance to maintain all
 information about all tables in the datasource to have all the datasource's
 information in one memory structure.
 
-Primarily, this class is used internally by the wxWindows ODBC classes.
+Primarily, this class is used internally by the wxWidgets ODBC classes.
 
 \begin{verbatim}
     wxChar        catalog[128+1];
@@ -3053,7 +3053,7 @@ calls which defined the columns accessible to this wxDbTable instance.}
 
 \wxheading{Remarks}
 
-NULL column support is currently not fully implemented as of wxWindows 2.4.
+NULL column support is currently not fully implemented as of wxWidgets 2.4.
 
 \membersection{wxDbTable::IsCursorClosedOnCommit}\label{wxdbtableiscursorclosedoncommit}
 
diff --git a/docs/latex/wx/dc.tex b/docs/latex/wx/dc.tex
index 49b7c0b390..0a84bfe644 100644
--- a/docs/latex/wx/dc.tex
+++ b/docs/latex/wx/dc.tex
@@ -105,7 +105,7 @@ This sequence of operations ensures that the source's transparent area need not
 and logical functions are supported.
 
 {\bf Note:} on Windows, blitting with masks can be speeded up considerably by compiling
-wxWindows with the wxUSE\_DC\_CACHE option enabled. You can also influence whether MaskBlt
+wxWidgets with the wxUSE\_DC\_CACHE option enabled. You can also influence whether MaskBlt
 or the explicit mask blitting code above is used, by using \helpref{wxSystemOptions}{wxsystemoptions} and
 setting the {\bf no-maskblt} option to 1.
 
@@ -357,7 +357,7 @@ The current pen is used for drawing the outline, and the current brush
 for filling the shape.  Using a transparent brush suppresses filling.
 The programmer is responsible for deleting the list of points.
 
-Note that wxWindows automatically closes the first and last points.
+Note that wxWidgets automatically closes the first and last points.
 
 \pythonnote{The wxPython version of this method accepts a Python list
 of wxPoint objects.}
@@ -951,9 +951,9 @@ The mapping mode can be one of the following:
 If {\it optimize} is TRUE (the default), this function sets optimization mode on.
 This currently means that under X, the device context will not try to set a pen or brush
 property if it is known to be set already. This approach can fall down
-if non-wxWindows code is using the same device context or window, for example
+if non-wxWidgets code is using the same device context or window, for example
 when the window is a panel on which the windowing system draws panel items.
-The wxWindows device context 'memory' will now be out of step with reality.
+The wxWidgets device context 'memory' will now be out of step with reality.
 
 Setting optimization off, drawing, then setting it back on again, is a trick
 that must occasionally be employed.
diff --git a/docs/latex/wx/debugcxt.tex b/docs/latex/wx/debugcxt.tex
index 6e34ed172e..66f4852ab1 100644
--- a/docs/latex/wx/debugcxt.tex
+++ b/docs/latex/wx/debugcxt.tex
@@ -2,7 +2,7 @@
 
 A class for performing various debugging and memory tracing
 operations. Full functionality (such as printing out objects
-currently allocated) is only present in a debugging build of wxWindows,
+currently allocated) is only present in a debugging build of wxWidgets,
 i.e. if the \_\_WXDEBUG\_\_ symbol is defined. wxDebugContext
 and related functions and macros can be compiled out by setting
 wxUSE\_DEBUG\_CONTEXT to 0 is setup.h
diff --git a/docs/latex/wx/dialevt.tex b/docs/latex/wx/dialevt.tex
index b434db72f5..c3d70c244d 100644
--- a/docs/latex/wx/dialevt.tex
+++ b/docs/latex/wx/dialevt.tex
@@ -6,7 +6,7 @@
 %% Created:     08.04.00
 %% RCS-ID:      $Id$
 %% Copyright:   (c) Vadim Zeitlin
-%% License:     wxWindows license
+%% License:     wxWidgets license
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \section{\class{wxDialUpEvent}}\label{wxdialupevent}
diff --git a/docs/latex/wx/dialog.tex b/docs/latex/wx/dialog.tex
index 4262dbd4d1..9181fd85dc 100644
--- a/docs/latex/wx/dialog.tex
+++ b/docs/latex/wx/dialog.tex
@@ -51,10 +51,10 @@ below:
     }
 \end{verbatim}
 
-A dialog may be loaded from a wxWindows resource file (extension {\tt wxr}),
+A dialog may be loaded from a wxWidgets resource file (extension {\tt wxr}),
 which may itself be created by Dialog Editor. For details, see 
-\helpref{The wxWindows resource system}{resourceformats}, 
-\helpref{wxWindows resource functions}{resourcefuncs} 
+\helpref{The wxWidgets resource system}{resourceformats}, 
+\helpref{wxWidgets resource functions}{resourcefuncs} 
 and the resource sample.
 
 An application can define an \helpref{wxCloseEvent}{wxcloseevent} handler for
@@ -78,7 +78,7 @@ with {\tt NULL} parent window will be given the
 style to prevent this from happening and create a really orphan dialog (note
 that this is not recommended for modal dialogs).}
 \twocolitem{\windowstyle{wxDIALOG\_EX\_CONTEXTHELP}}{Under Windows, puts a query button on the
-caption. When pressed, Windows will go into a context-sensitive help mode and wxWindows will send
+caption. When pressed, Windows will go into a context-sensitive help mode and wxWidgets will send
 a wxEVT\_HELP event if the user clicked on an application window. {\it Note}\ that this is an extended
 style and must be set by calling \helpref{SetExtraStyle}{wxwindowsetextrastyle} before Create is called (two-step construction).}
 \end{twocollist}
@@ -120,10 +120,10 @@ Constructor.
 \docparam{title}{The title of the dialog.}
 
 \docparam{pos}{The dialog position. A value of (-1, -1) indicates a default position, chosen by
-either the windowing system or wxWindows, depending on platform.}
+either the windowing system or wxWidgets, depending on platform.}
 
 \docparam{size}{The dialog size. A value of (-1, -1) indicates a default size, chosen by
-either the windowing system or wxWindows, depending on platform.}
+either the windowing system or wxWidgets, depending on platform.}
 
 \docparam{style}{The window style. See \helpref{wxDialog}{wxdialog}.}
 
diff --git a/docs/latex/wx/dialup.tex b/docs/latex/wx/dialup.tex
index 02b305cae8..d676885fe6 100644
--- a/docs/latex/wx/dialup.tex
+++ b/docs/latex/wx/dialup.tex
@@ -6,7 +6,7 @@
 %% Created:     08.04.00
 %% RCS-ID:      $Id$
 %% Copyright:   (c) Vadim Zeitlin
-%% License:     wxWindows license
+%% License:     wxWidgets license
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \section{\class{wxDialUpManager}}\label{wxdialupmanager}
@@ -22,7 +22,7 @@ network the next time or, on the contrary, to stop receiving data from the net
 when the user hangs up the modem). For this, you need to use one of the event
 macros described below.
 
-This class is different from other wxWindows classes in that there is at most
+This class is different from other wxWidgets classes in that there is at most
 one instance of this class in the program accessed via 
 \helpref{wxDialUpManager::Create()}{wxdialupmanagercreate} and you can't
 create the objects of this class directly.
diff --git a/docs/latex/wx/dir.tex b/docs/latex/wx/dir.tex
index 96144d5fa9..087b990fd9 100644
--- a/docs/latex/wx/dir.tex
+++ b/docs/latex/wx/dir.tex
@@ -6,7 +6,7 @@
 %% Created:     04.04.00
 %% RCS-ID:      $Id$
 %% Copyright:   (c) Vadim Zeitlin
-%% License:     wxWindows license
+%% License:     wxWidgets license
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \section{\class{wxDir}}\label{wxdir}
diff --git a/docs/latex/wx/dirtrav.tex b/docs/latex/wx/dirtrav.tex
index bf7ef9df13..a7b6b713a0 100644
--- a/docs/latex/wx/dirtrav.tex
+++ b/docs/latex/wx/dirtrav.tex
@@ -6,7 +6,7 @@
 %% Created:     14.01.02 (extracted from dir.tex)
 %% RCS-ID:      $Id$
 %% Copyright:   (c) Vadim Zeitlin
-%% License:     wxWindows license
+%% License:     wxWidgets license
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \section{\class{wxDirTraverser}}\label{wxdirtraverser}
diff --git a/docs/latex/wx/dllload.tex b/docs/latex/wx/dllload.tex
index 05dfd62573..fa72d672be 100644
--- a/docs/latex/wx/dllload.tex
+++ b/docs/latex/wx/dllload.tex
@@ -6,7 +6,7 @@
 %% Created:     02.04.00
 %% RCS-ID:      $Id$
 %% Copyright:   (c) Vadim Zeitlin
-%% License:     wxWindows license
+%% License:     wxWidgets license
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \section{\class{wxDllLoader}}\label{wxdllloader}
diff --git a/docs/latex/wx/dobjcomp.tex b/docs/latex/wx/dobjcomp.tex
index fbdc1c5ac4..c701c3f077 100644
--- a/docs/latex/wx/dobjcomp.tex
+++ b/docs/latex/wx/dobjcomp.tex
@@ -6,7 +6,7 @@
 %% Created:     02.11.99
 %% RCS-ID:      $Id$
 %% Copyright:   (c) Vadim Zeitlin
-%% License:     wxWindows license
+%% License:     wxWidgets license
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \section{\class{wxDataObjectComposite}}\label{wxdataobjectcomposite}
diff --git a/docs/latex/wx/dobjsmpl.tex b/docs/latex/wx/dobjsmpl.tex
index 2d5f2bc477..fe71bb3d9a 100644
--- a/docs/latex/wx/dobjsmpl.tex
+++ b/docs/latex/wx/dobjsmpl.tex
@@ -6,7 +6,7 @@
 %% Created:     02.11.99
 %% RCS-ID:      $Id$
 %% Copyright:   (c) Vadim Zeitlin
-%% License:     wxWindows license
+%% License:     wxWidgets license
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \section{\class{wxDataObjectSimple}}\label{wxdataobjectsimple}
diff --git a/docs/latex/wx/docchfrm.tex b/docs/latex/wx/docchfrm.tex
index 01fc056869..c7332e832b 100644
--- a/docs/latex/wx/docchfrm.tex
+++ b/docs/latex/wx/docchfrm.tex
@@ -3,7 +3,7 @@
 The wxDocChildFrame class provides a default frame for displaying documents
 on separate windows. This class can only be used for SDI (not MDI) child frames.
 
-The class is part of the document/view framework supported by wxWindows,
+The class is part of the document/view framework supported by wxWidgets,
 and cooperates with the \helpref{wxView}{wxview}, \helpref{wxDocument}{wxdocument},
 \rtfsp\helpref{wxDocManager}{wxdocmanager} and \helpref{wxDocTemplate}{wxdoctemplate} classes.
 
diff --git a/docs/latex/wx/docmanag.tex b/docs/latex/wx/docmanag.tex
index 3491c598e6..dda9ce59a1 100644
--- a/docs/latex/wx/docmanag.tex
+++ b/docs/latex/wx/docmanag.tex
@@ -1,6 +1,6 @@
 \section{\class{wxDocManager}}\label{wxdocmanager}
 
-The wxDocManager class is part of the document/view framework supported by wxWindows,
+The wxDocManager class is part of the document/view framework supported by wxWidgets,
 and cooperates with the \helpref{wxView}{wxview}, \helpref{wxDocument}{wxdocument}\rtfsp
 and \helpref{wxDocTemplate}{wxdoctemplate} classes.
 
diff --git a/docs/latex/wx/docmdich.tex b/docs/latex/wx/docmdich.tex
index d203beace2..7c831f14b8 100644
--- a/docs/latex/wx/docmdich.tex
+++ b/docs/latex/wx/docmdich.tex
@@ -3,7 +3,7 @@
 The wxDocMDIChildFrame class provides a default frame for displaying documents
 on separate windows. This class can only be used for MDI child frames.
 
-The class is part of the document/view framework supported by wxWindows,
+The class is part of the document/view framework supported by wxWidgets,
 and cooperates with the \helpref{wxView}{wxview}, \helpref{wxDocument}{wxdocument},
 \rtfsp\helpref{wxDocManager}{wxdocmanager} and \helpref{wxDocTemplate}{wxdoctemplate} classes.
 
diff --git a/docs/latex/wx/document.tex b/docs/latex/wx/document.tex
index 99346f20e9..179281b9a0 100644
--- a/docs/latex/wx/document.tex
+++ b/docs/latex/wx/document.tex
@@ -1,7 +1,7 @@
 \section{\class{wxDocument}}\label{wxdocument}
 
 The document class can be used to model an application's file-based
-data. It is part of the document/view framework supported by wxWindows,
+data. It is part of the document/view framework supported by wxWidgets,
 and cooperates with the \helpref{wxView}{wxview}, \helpref{wxDocTemplate}{wxdoctemplate}\rtfsp
 and \helpref{wxDocManager}{wxdocmanager} classes.
 
@@ -200,7 +200,7 @@ Override this function and call it from your own LoadObject before
 streaming your own data. LoadObject is called by the framework
 automatically when the document contents need to be loaded.
 
-Note that only one of these forms exists, depending on how wxWindows
+Note that only one of these forms exists, depending on how wxWidgets
 was configured.
 
 \membersection{wxDocument::Modify}\label{wxdocumentmodify}
@@ -311,7 +311,7 @@ Override this function and call it from your own SaveObject before
 streaming your own data. SaveObject is called by the framework
 automatically when the document contents need to be saved.
 
-Note that only one of these forms exists, depending on how wxWindows
+Note that only one of these forms exists, depending on how wxWidgets
 was configured.
 
 \membersection{wxDocument::SetCommandProcessor}
diff --git a/docs/latex/wx/dynlib.tex b/docs/latex/wx/dynlib.tex
index 8693f8ae88..7447f8ddf9 100644
--- a/docs/latex/wx/dynlib.tex
+++ b/docs/latex/wx/dynlib.tex
@@ -6,7 +6,7 @@
 %% Created:     14.01.02 (extracted from dllload.tex)
 %% RCS-ID:      $Id$
 %% Copyright:   (c) Vadim Zeitlin
-%% License:     wxWindows license
+%% License:     wxWidgets license
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \section{\class{wxDynamicLibrary}}\label{wxdynamiclibrary}
diff --git a/docs/latex/wx/encconv.tex b/docs/latex/wx/encconv.tex
index f1fd19c595..7a183c42f5 100644
--- a/docs/latex/wx/encconv.tex
+++ b/docs/latex/wx/encconv.tex
@@ -7,7 +7,7 @@
 
 This class is capable of converting strings between two
 8-bit encodings/charsets. It can also convert from/to Unicode (but only
-if you compiled wxWindows with wxUSE\_WCHAR\_T set to 1). Only limited subset
+if you compiled wxWidgets with wxUSE\_WCHAR\_T set to 1). Only limited subset
 of encodings in supported by wxEncodingConverter:
 {\tt wxFONTENCODING\_ISO8859\_1..15}, {\tt wxFONTENCODING\_CP1250..1257} and 
 {\tt wxFONTENCODING\_KOI8}.
@@ -74,7 +74,7 @@ as input string.
 
 FALSE if given conversion is impossible, TRUE otherwise
 (conversion may be impossible either if you try to convert
-to Unicode with non-Unicode build of wxWindows or if input
+to Unicode with non-Unicode build of wxWidgets or if input
 or output encoding is not supported.)
 
 \membersection{wxEncodingConverter::Convert}\label{wxencodingconverterconvert}
@@ -106,7 +106,7 @@ Convert wxString and return new wxString object.
 
 You must call \helpref{Init}{wxencodingconverterinit} before using this method!
 
-{\tt wchar\_t} versions of the method are not available if wxWindows was compiled
+{\tt wchar\_t} versions of the method are not available if wxWidgets was compiled
 with {\tt wxUSE\_WCHAR\_T} set to 0.
 
 \membersection{wxEncodingConverter::GetPlatformEquivalents}\label{wxencodingconvertergetplatformequivalents}
diff --git a/docs/latex/wx/event.tex b/docs/latex/wx/event.tex
index d6099d0c7b..702b8b39da 100644
--- a/docs/latex/wx/event.tex
+++ b/docs/latex/wx/event.tex
@@ -62,14 +62,14 @@ Timestamp for this event.
 
 Returns a copy of the event.
 
-Any event that is posted to the wxWindows event system for later action (via
+Any event that is posted to the wxWidgets event system for later action (via
 \helpref{wxEvtHandler::AddPendingEvent}{wxevthandleraddpendingevent} or
-\helpref{wxPostEvent}{wxpostevent}) must implement this method. All wxWindows
+\helpref{wxPostEvent}{wxpostevent}) must implement this method. All wxWidgets
 events fully implement this method, but any derived events implemented by the
 user should also implement this method just in case they (or some event
 derived from them) are ever posted.
 
-All wxWindows events implement a copy constructor, so the easiest way of
+All wxWidgets events implement a copy constructor, so the easiest way of
 implementing the Clone function is to implement a copy constructor for
 a new event (call it MyEvent) and then define the Clone function like this:
 \begin{verbatim}
diff --git a/docs/latex/wx/evthand.tex b/docs/latex/wx/evthand.tex
index e6948087df..64291c29f7 100644
--- a/docs/latex/wx/evthand.tex
+++ b/docs/latex/wx/evthand.tex
@@ -215,14 +215,14 @@ call \helpref{wxEvent::Skip}{wxeventskip}.
 
 \wxheading{Remarks}
 
-Normally, your application would not call this function: it is called in the wxWindows
+Normally, your application would not call this function: it is called in the wxWidgets
 implementation to dispatch incoming user interface events to the framework (and application).
 
 However, you might need to call it if implementing new functionality (such as a new control) where
 you define new event types, as opposed to allowing the user to override virtual functions.
 
 An instance where you might actually override the {\bf ProcessEvent} function is where you want
-to direct event processing to event handlers not normally noticed by wxWindows. For example,
+to direct event processing to event handlers not normally noticed by wxWidgets. For example,
 in the document/view architecture, documents and views are potential event handlers.
 When an event reaches a frame, {\bf ProcessEvent} will need to be called on the associated
 document and view in case event handler functions are associated with these objects.
diff --git a/docs/latex/wx/fdrepdlg.tex b/docs/latex/wx/fdrepdlg.tex
index e5e8be2eb5..177e87493d 100644
--- a/docs/latex/wx/fdrepdlg.tex
+++ b/docs/latex/wx/fdrepdlg.tex
@@ -6,7 +6,7 @@
 %% Created:     01.08.01
 %% RCS-ID:      $Id$
 %% Copyright:   (c) 2001 Vadim Zeitlin
-%% License:     wxWindows license
+%% License:     wxWidgets license
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \section{\class{wxFindDialogEvent}}\label{wxfinddialogevent}
@@ -46,7 +46,7 @@ any pointers to it cannot be used any longer.}
 
 \func{}{wxFindDialogEvent}{\param{wxEventType }{commandType = wxEVT\_NULL}, \param{int }{id = 0}}
 
-Constuctor used by wxWindows only.
+Constuctor used by wxWidgets only.
 
 \membersection{wxFindDialogEvent::GetFlags}\label{wxfinddialogeventgetflags}
 
diff --git a/docs/latex/wx/ffile.tex b/docs/latex/wx/ffile.tex
index fd49d497bb..6133d085eb 100644
--- a/docs/latex/wx/ffile.tex
+++ b/docs/latex/wx/ffile.tex
@@ -6,7 +6,7 @@
 %% Created:     14.01.02 (extracted from file.tex)
 %% RCS-ID:      $Id$
 %% Copyright:   (c) Vadim Zeitlin
-%% License:     wxWindows license
+%% License:     wxWidgets license
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \section{\class{wxFFile}}\label{wxffile}
@@ -207,7 +207,7 @@ Number of bytes written.
 
 Writes the contents of the string to the file, returns TRUE on success.
 
-The second argument is only meaningful in Unicode build of wxWindows when
+The second argument is only meaningful in Unicode build of wxWidgets when
 {\it conv} is used to convert {\it s} to multibyte representation.
 
 
diff --git a/docs/latex/wx/fildatob.tex b/docs/latex/wx/fildatob.tex
index 32b35fc26d..5662452774 100644
--- a/docs/latex/wx/fildatob.tex
+++ b/docs/latex/wx/fildatob.tex
@@ -9,7 +9,7 @@ class.
 
 {\bf Warning:} Under all non-Windows platforms this class is currently
 "input-only", i.e. you can receive the files from another application, but
-copying (or dragging) file(s) from a wxWindows application is not currently
+copying (or dragging) file(s) from a wxWidgets application is not currently
 supported.
 
 \wxheading{Virtual functions to override}
diff --git a/docs/latex/wx/file.tex b/docs/latex/wx/file.tex
index d4c5f0aaa9..d95c88fdcd 100644
--- a/docs/latex/wx/file.tex
+++ b/docs/latex/wx/file.tex
@@ -6,7 +6,7 @@
 %% Created:     14.01.02 (extracted from file.tex)
 %% RCS-ID:      $Id$
 %% Copyright:   (c) Vadim Zeitlin
-%% License:     wxWindows license
+%% License:     wxWidgets license
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \section{\class{wxFile}}\label{wxfile}
@@ -295,6 +295,6 @@ the number of bytes actually written
 
 Writes the contents of the string to the file, returns TRUE on success.
 
-The second argument is only meaningful in Unicode build of wxWindows when
+The second argument is only meaningful in Unicode build of wxWidgets when
 {\it conv} is used to convert {\it s} to multibyte representation.
 
diff --git a/docs/latex/wx/filedlg.tex b/docs/latex/wx/filedlg.tex
index 29e10053dc..32b541dd87 100644
--- a/docs/latex/wx/filedlg.tex
+++ b/docs/latex/wx/filedlg.tex
@@ -85,7 +85,7 @@ wildcards; see the Remarks section above.}
 
 \docparam{pos}{Dialog position. Not implemented.}
 
-{\bf NB:} Previous versions of wxWindows used {\tt wxCHANGE\_DIR} by default
+{\bf NB:} Previous versions of wxWidgets used {\tt wxCHANGE\_DIR} by default
 under MS Windows which allowed the program to simply remember the last
 directory where user selected the files to open/save. This (desired)
 functionality must be implemented in the program itself now (manually remember
diff --git a/docs/latex/wx/filename.tex b/docs/latex/wx/filename.tex
index dd1b882482..9db893bf57 100644
--- a/docs/latex/wx/filename.tex
+++ b/docs/latex/wx/filename.tex
@@ -6,7 +6,7 @@
 %% Created:     30.11.01
 %% RCS-ID:      $Id$
 %% Copyright:   (c) 2001 Vadim Zeitlin
-%% License:     wxWindows license
+%% License:     wxWidgets license
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \section{\class{wxFileName}}\label{wxfilename}
@@ -14,7 +14,7 @@
 wxFileName encapsulates a file name. This class serves two purposes: first, it
 provides the functions to split the file names into components and to recombine
 these components in the full file name which can then be passed to the OS file
-functions (and \helpref{wxWindows functions}{filefunctions} wrapping them).
+functions (and \helpref{wxWidgets functions}{filefunctions} wrapping them).
 Second, it includes the functions for working with the files itself. Note that
 to change the file data you should use \helpref{wxFile}{wxfile} class instead.
 wxFileName provides functions for working with the file attributes.
@@ -540,7 +540,7 @@ Make the file name absolute. This is a shortcut for
 
 \wxheading{Note}
 
-This method was added in wxWindows 2.4.1.
+This method was added in wxWidgets 2.4.1.
 
 \membersection{wxFileName::MakeRelativeTo}\label{wxfilenamemakerelativeto}
 
diff --git a/docs/latex/wx/font.tex b/docs/latex/wx/font.tex
index 611e2584c5..b94b2a2d45 100644
--- a/docs/latex/wx/font.tex
+++ b/docs/latex/wx/font.tex
@@ -173,7 +173,7 @@ system, since wxFont uses a reference counting system for efficiency.
 
 Although all remaining fonts are deleted when the application exits,
 the application should try to clean up all fonts itself. This is because
-wxWindows cannot know if a pointer to the font object is stored in an
+wxWidgets cannot know if a pointer to the font object is stored in an
 application data structure, and there is a risk of double deletion.
 
 \membersection{wxFont::IsFixedWidth}\label{wxfontisfixedwidth}
@@ -300,7 +300,7 @@ Sets the facename for the font.
 
 To avoid portability problems, don't rely on a specific face, but specify the font family
 instead or as well. A suitable font will be found on the end-user's system. If both the
-family and the facename are specified, wxWindows will first search for the specific face,
+family and the facename are specified, wxWidgets will first search for the specific face,
 and then for a font belonging to the same family.
 
 \wxheading{See also}
diff --git a/docs/latex/wx/fontenum.tex b/docs/latex/wx/fontenum.tex
index f60c0f5c8b..06d4ae2f8d 100644
--- a/docs/latex/wx/fontenum.tex
+++ b/docs/latex/wx/fontenum.tex
@@ -6,7 +6,7 @@
 %% Created:     03.11.99
 %% RCS-ID:      $Id$
 %% Copyright:   (c) Vadim Zeitlin
-%% License:     wxWindows license
+%% License:     wxWidgets license
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \section{\class{wxFontEnumerator}}\label{wxfontenumerator}
diff --git a/docs/latex/wx/fontlist.tex b/docs/latex/wx/fontlist.tex
index f46812756e..1d2043e5ab 100644
--- a/docs/latex/wx/fontlist.tex
+++ b/docs/latex/wx/fontlist.tex
@@ -33,7 +33,7 @@ use the object pointer {\bf wxTheFontList}.
 
 \func{void}{AddFont}{\param{wxFont *}{font}}
 
-Used by wxWindows to add a font to the list, called in the font constructor.
+Used by wxWidgets to add a font to the list, called in the font constructor.
 
 \membersection{wxFontList::FindOrCreateFont}\label{findorcreatefont}
 
@@ -47,6 +47,6 @@ details of the arguments.
 
 \func{void}{RemoveFont}{\param{wxFont *}{font}}
 
-Used by wxWindows to remove a font from the list.
+Used by wxWidgets to remove a font from the list.
 
 
diff --git a/docs/latex/wx/fontmap.tex b/docs/latex/wx/fontmap.tex
index 7644bb396e..37088e12a7 100644
--- a/docs/latex/wx/fontmap.tex
+++ b/docs/latex/wx/fontmap.tex
@@ -106,7 +106,7 @@ available on this system). If successful, return TRUE and fill info
 structure with the parameters required to create the font, otherwise
 return FALSE.
 
-The first form is for wxWindows' internal use while the second one
+The first form is for wxWidgets' internal use while the second one
 is better suitable for general use -- it returns wxFontEncoding which
 can consequently be passed to wxFont constructor.
 
@@ -155,7 +155,7 @@ The title for the dialogs (note that default is quite reasonable).
 
 Set the current font mapper object and return previous one (may be NULL).
 This method is only useful if you want to plug-in an alternative font mapper
-into wxWindows.
+into wxWidgets.
 
 \wxheading{See also}
 
diff --git a/docs/latex/wx/frame.tex b/docs/latex/wx/frame.tex
index 6896a3c32f..ab51cb9683 100644
--- a/docs/latex/wx/frame.tex
+++ b/docs/latex/wx/frame.tex
@@ -47,7 +47,7 @@ Has no effect under other platforms.}
 on top of its parent (unlike wxSTAY\_ON\_TOP). A frame created with this style
 must have a non-NULL parent.}
 \twocolitem{\windowstyle{wxFRAME\_EX\_CONTEXTHELP}}{Under Windows, puts a query button on the
-caption. When pressed, Windows will go into a context-sensitive help mode and wxWindows will send
+caption. When pressed, Windows will go into a context-sensitive help mode and wxWidgets will send
 a wxEVT\_HELP event if the user clicked on an application window. {\it Note} that this is an extended
 style and must be set by calling \helpref{SetExtraStyle}{wxwindowsetextrastyle} before Create is called (two-step construction).
 You cannot use this style together with wxMAXIMIZE\_BOX or wxMINIMIZE\_BOX, so
@@ -101,10 +101,10 @@ always be displayed on top of the parent window on Windows.}
 \docparam{title}{The caption to be displayed on the frame's title bar.}
 
 \docparam{pos}{The window position. A value of (-1, -1) indicates a default position, chosen by
-either the windowing system or wxWindows, depending on platform.}
+either the windowing system or wxWidgets, depending on platform.}
 
 \docparam{size}{The window size. A value of (-1, -1) indicates a default size, chosen by
-either the windowing system or wxWindows, depending on platform.}
+either the windowing system or wxWidgets, depending on platform.}
 
 \docparam{style}{The window style. See \helpref{wxFrame}{wxframe}.}
 
@@ -174,7 +174,7 @@ value greater than 1 to create a multi-field status bar.}
 of valid styles.}
 
 \docparam{id}{The status bar window identifier. If -1, an identifier will be chosen by
-wxWindows.}
+wxWidgets.}
 
 \docparam{name}{The status bar window name.}
 
@@ -211,7 +211,7 @@ Creates a toolbar at the top or left of the frame.
 of valid styles.}
 
 \docparam{id}{The toolbar window identifier. If -1, an identifier will be chosen by
-wxWindows.}
+wxWidgets.}
 
 \docparam{name}{The toolbar window name.}
 
@@ -368,7 +368,7 @@ Virtual function called when a status bar is requested by \helpref{wxFrame::Crea
 of valid styles.}
 
 \docparam{id}{The window identifier. If -1, an identifier will be chosen by
-wxWindows.}
+wxWidgets.}
 
 \docparam{name}{The window name.}
 
@@ -398,7 +398,7 @@ Virtual function called when a toolbar is requested by \helpref{wxFrame::CreateT
 of valid styles.}
 
 \docparam{id}{The toolbar window identifier. If -1, an identifier will be chosen by
-wxWindows.}
+wxWidgets.}
 
 \docparam{name}{The toolbar window name.}
 
@@ -503,7 +503,7 @@ See also \helpref{wxIconBundle}{wxiconbundle}.
 %\end{verbatim}
 %
 %You can replace std.ico, mdi.ico and child.ico with your own defaults
-%for all your wxWindows application. Currently they show the same icon.
+%for all your wxWidgets application. Currently they show the same icon.
 
 \membersection{wxFrame::SetMenuBar}\label{wxframesetmenubar}
 
diff --git a/docs/latex/wx/fs.tex b/docs/latex/wx/fs.tex
index b948bafb23..f16a84be96 100644
--- a/docs/latex/wx/fs.tex
+++ b/docs/latex/wx/fs.tex
@@ -31,7 +31,7 @@ Locations (aka filenames aka addresses) are constructed from four parts:
 \item {\bf protocol} - handler can recognize if it is able to open a
 file by checking its protocol. Examples are "http", "file" or "ftp".
 \item {\bf right location} - is the name of file within the protocol.
-In "http://www.wxwindows.org/index.html" the right location is "//www.wxwindows.org/index.html".
+In "http://www.wxwidgets.org/index.html" the right location is "//www.wxwidgets.org/index.html".
 \item {\bf anchor} - an anchor is optional and is usually not present.
 In "index.htm\#chapter2" the anchor is "chapter2".
 \item {\bf left location} - this is usually an empty string. 
@@ -55,7 +55,7 @@ There are {\bf two} protocols used in this example: "zip" and "file".
 
 \wxheading{File Systems Included in wxHTML}
 
-The following virtual file system handlers are part of wxWindows so far:
+The following virtual file system handlers are part of wxWidgets so far:
 
 \begin{twocollist}
 \twocolitem{{\bf wxInternetFSHandler}}{A handler for accessing documents
diff --git a/docs/latex/wx/fs_mem.tex b/docs/latex/wx/fs_mem.tex
index 733b6d61f8..8ce62251a5 100644
--- a/docs/latex/wx/fs_mem.tex
+++ b/docs/latex/wx/fs_mem.tex
@@ -87,7 +87,7 @@ data (bitmap, text or raw data)
 will be copied into private memory stream and available under 
 name "memory:" + filename.
 
-Note that when storing image/bitmap, you must use image format that wxWindows
+Note that when storing image/bitmap, you must use image format that wxWidgets
 can write (e.g. JPG, PNG, see \helpref{wxImage documentation}{wximage})!
 
 
diff --git a/docs/latex/wx/fsfile.tex b/docs/latex/wx/fsfile.tex
index cece4a2aef..69eb209946 100644
--- a/docs/latex/wx/fsfile.tex
+++ b/docs/latex/wx/fsfile.tex
@@ -98,7 +98,7 @@ Returns full location of the file, including path and protocol.
 Examples : 
 
 \begin{verbatim}
-http://www.wxwindows.org
+http://www.wxwidgets.org
 http://www.ms.mff.cuni.cz/~vsla8348/wxhtml/archive.zip#zip:info.txt
 file:/home/vasek/index.htm
 relative-file.htm
diff --git a/docs/latex/wx/ftp.tex b/docs/latex/wx/ftp.tex
index def46870b0..c614429909 100644
--- a/docs/latex/wx/ftp.tex
+++ b/docs/latex/wx/ftp.tex
@@ -5,8 +5,8 @@
 %% Modified by:
 %% Created:     ~1997
 %% RCS-ID:      $Id$
-%% Copyright:   (c) wxWindows team
-%% License:     wxWindows license
+%% Copyright:   (c) wxWidgets team
+%% License:     wxWidgets license
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \section{\class{wxFTP}}\label{wxftp}
@@ -30,14 +30,14 @@ Example of using wxFTP for file downloading:
     ftp.SetUser("user");
     ftp.SetPassword("password");
 
-    if ( !ftp.Connect("ftp.wxwindows.org") )
+    if ( !ftp.Connect("ftp.wxwidgets.org") )
     {
         wxLogError("Couldn't connect");
         return;
     }
 
     ftp.ChDir("/pub");
-    wxInputStream *in = ftp.GetInputStream("wxWindows-4.2.0.tar.gz");
+    wxInputStream *in = ftp.GetInputStream("wxWidgets-4.2.0.tar.gz");
     if ( !in )
     {
         wxLogError("Coudln't get file");
diff --git a/docs/latex/wx/function.tex b/docs/latex/wx/function.tex
index f59683aded..33bf924ee3 100644
--- a/docs/latex/wx/function.tex
+++ b/docs/latex/wx/function.tex
@@ -2,7 +2,7 @@
 \setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
 \setfooter{\thepage}{}{}{}{}{\thepage}
 
-The functions and macros defined in wxWindows are described here: you can
+The functions and macros defined in wxWidgets are described here: you can
 either look up a function using the alphabetical listing of them or find it in
 the corresponding topic.
 
@@ -233,21 +233,21 @@ the corresponding topic.
 
 \section{Version macros}\label{versionfunctions}
 
-The following constants are defined in wxWindows:
+The following constants are defined in wxWidgets:
 
 \begin{itemize}\itemsep=0pt
-\item {\tt wxMAJOR\_VERSION} is the major version of wxWindows
-\item {\tt wxMINOR\_VERSION} is the minor version of wxWindows
+\item {\tt wxMAJOR\_VERSION} is the major version of wxWidgets
+\item {\tt wxMINOR\_VERSION} is the minor version of wxWidgets
 \item {\tt wxRELEASE\_NUMBER} is the release number
 \end{itemize}
 
-For example, the values or these constants for wxWindows 2.1.15 are 2, 1 and
+For example, the values or these constants for wxWidgets 2.1.15 are 2, 1 and
 15.
 
 Additionally, {\tt wxVERSION\_STRING} is a user-readable string containing
-the full wxWindows version and {\tt wxVERSION\_NUMBER} is a combination of the
+the full wxWidgets version and {\tt wxVERSION\_NUMBER} is a combination of the
 three version numbers above: for 2.1.15, it is 2115 and it is 2200 for
-wxWindows 2.2.
+wxWidgets 2.2.
 
 \wxheading{Include files}
 
@@ -257,10 +257,10 @@ wxWindows 2.2.
 
 \func{bool}{wxCHECK\_VERSION}{\param{}{major, minor, release}}
 
-This is a macro which evaluates to true if the current wxWindows version is at
+This is a macro which evaluates to true if the current wxWidgets version is at
 least major.minor.release.
 
-For example, to test if the program is compiled with wxWindows 2.2 or higher,
+For example, to test if the program is compiled with wxWidgets 2.2 or higher,
 the following can be done:
 
 \begin{verbatim}
@@ -282,31 +282,31 @@ to control the behaviour of the main event loop of the GUI programs.
 
 \membersection{::wxEntry}\label{wxentry}
 
-This initializes wxWindows in a platform-dependent way. Use this if you
-are not using the default wxWindows entry code (e.g. main or WinMain). For example,
-you can initialize wxWindows from an Microsoft Foundation Classes application using
+This initializes wxWidgets in a platform-dependent way. Use this if you
+are not using the default wxWidgets entry code (e.g. main or WinMain). For example,
+you can initialize wxWidgets from an Microsoft Foundation Classes application using
 this function.
 
 \func{void}{wxEntry}{\param{HANDLE}{ hInstance}, \param{HANDLE}{ hPrevInstance},
  \param{const wxString\& }{commandLine}, \param{int}{ cmdShow}, \param{bool}{ enterLoop = TRUE}}
 
-wxWindows initialization under Windows (non-DLL). If {\it enterLoop} is FALSE, the
-function will return immediately after calling wxApp::OnInit. Otherwise, the wxWindows
+wxWidgets initialization under Windows (non-DLL). If {\it enterLoop} is FALSE, the
+function will return immediately after calling wxApp::OnInit. Otherwise, the wxWidgets
 message loop will be entered.
 
 \func{void}{wxEntry}{\param{HANDLE}{ hInstance}, \param{HANDLE}{ hPrevInstance},
  \param{WORD}{ wDataSegment}, \param{WORD}{ wHeapSize}, \param{const wxString\& }{ commandLine}}
 
-wxWindows initialization under Windows (for applications constructed as a DLL).
+wxWidgets initialization under Windows (for applications constructed as a DLL).
 
 \func{int}{wxEntry}{\param{int}{ argc}, \param{const wxString\& *}{argv}}
 
-wxWindows initialization under Unix.
+wxWidgets initialization under Unix.
 
 \wxheading{Remarks}
 
-To clean up wxWindows, call wxApp::OnExit followed by the static function
-wxApp::CleanUp. For example, if exiting from an MFC application that also uses wxWindows:
+To clean up wxWidgets, call wxApp::OnExit followed by the static function
+wxApp::CleanUp. For example, if exiting from an MFC application that also uses wxWidgets:
 
 \begin{verbatim}
 int CTheApp::ExitInstance()
@@ -356,7 +356,7 @@ see \helpref{wxImage}{wximage}.
 
 This function is used in wxBase only and only if you don't create
 \helpref{wxApp}{wxapp} object at all. In this case you must call it from your
-{\tt main()} function before calling any other wxWindows functions.
+{\tt main()} function before calling any other wxWidgets functions.
 
 If the function returns {\tt FALSE} the initialization could not be performed,
 in this case the library cannot be used and
@@ -796,7 +796,7 @@ directory doesn't exist).
 This function is implemented for Win16 (only for drives less than 2Gb), Win32,
 Mac OS and generic Unix provided the system has {\tt statfs()} function.
 
-This function first appeared in wxWindows 2.3.2.
+This function first appeared in wxWidgets 2.3.2.
 
 \membersection{::wxGetOSDirectory}\label{wxgetosdirectory}
 
@@ -1047,7 +1047,7 @@ the domain name.
 
 Under Windows or NT, this function first looks in the environment
 variable SYSTEM\_NAME; if this is not found, the entry {\bf HostName}\rtfsp
-in the {\bf wxWindows} section of the WIN.INI file is tried.
+in the {\bf wxWidgets} section of the WIN.INI file is tried.
 
 The first variant of this function returns the hostname if successful or an
 empty string otherwise. The second (deprecated) function returns TRUE
@@ -1072,7 +1072,7 @@ something like "jsmith". It uniquely identifies the current user (on this system
 
 Under Windows or NT, this function first looks in the environment
 variables USER and LOGNAME; if neither of these is found, the entry {\bf UserId}\rtfsp
-in the {\bf wxWindows} section of the WIN.INI file is tried.
+in the {\bf wxWidgets} section of the WIN.INI file is tried.
 
 The first variant of this function returns the login name if successful or an
 empty string otherwise. The second (deprecated) function returns TRUE
@@ -1151,7 +1151,7 @@ Returns the home directory for the given user. If the username is empty
 This function returns the full user name (something like "Mr. John Smith").
 
 Under Windows or NT, this function looks for the entry {\bf UserName}\rtfsp
-in the {\bf wxWindows} section of the WIN.INI file. If PenWindows
+in the {\bf wxWidgets} section of the WIN.INI file. If PenWindows
 is running, the entry {\bf Current} in the section {\bf User} of
 the PENWIN.INI file is used.
 
@@ -1884,7 +1884,7 @@ the equivalent of the following code to the start of the metafile data:
  SetWindowExt(dc, maxX - minX, maxY - minY);
 \end{verbatim}
 
-This simulates the wxMM\_TEXT mapping mode, which wxWindows assumes.
+This simulates the wxMM\_TEXT mapping mode, which wxWidgets assumes.
 
 Placeable metafiles may be imported by many Windows applications, and can be
 used in RTF (Rich Text Format) files.
@@ -2186,7 +2186,7 @@ the given {\bf id}.
 
 \func{void}{wxDDECleanUp}{\void}
 
-Called when wxWindows exits, to clean up the DDE system. This no longer needs to be
+Called when wxWidgets exits, to clean up the DDE system. This no longer needs to be
 called by the application.
 
 See also \helpref{wxDDEInitialize}{wxddeinitialize}.
@@ -2202,7 +2202,7 @@ See also \helpref{wxDDEInitialize}{wxddeinitialize}.
 Initializes the DDE system. May be called multiple times without harm.
 
 This no longer needs to be called by the application: it will be called
-by wxWindows if necessary.
+by wxWidgets if necessary.
 
 See also \helpref{wxDDEServer}{wxddeserver}, \helpref{wxDDEClient}{wxddeclient}, \helpref{wxDDEConnection}{wxddeconnection},
 \helpref{wxDDECleanUp}{wxddecleanup}.
@@ -2534,7 +2534,7 @@ data in big-endian format.
 
 \section{RTTI functions}\label{rttimacros}
 
-wxWindows uses its own RTTI ("run-time type identification") system which
+wxWidgets uses its own RTTI ("run-time type identification") system which
 predates the current standard C++ RTTI and so is kept for backwards
 compatibility reasons but also because it allows some things which the
 standard RTTI doesn't directly support (such as creating a class from its
@@ -2542,7 +2542,7 @@ name).
 
 The standard C++ RTTI can be used in the user code without any problems and in
 general you shouldn't need to use the functions and the macros in this section
-unless you are thinking of modifying or adding any wxWindows classes.
+unless you are thinking of modifying or adding any wxWidgets classes.
 
 \wxheading{See also}
 
@@ -2676,7 +2676,7 @@ a class that has run-time type information and two base classes. The same as IMP
 \func{}{IMPLEMENT\_APP}{className}
 
 This is used in the application class implementation file to make the application class known to
-wxWindows for dynamic construction. You use this instead of
+wxWidgets for dynamic construction. You use this instead of
 
 Old form:
 
@@ -2853,14 +2853,14 @@ result of executing an equivalent of {\tt static\_cast<classname *>(ptr)}.
 
 \overview{Resource functions}{resourceformats}
 
-This section details functions for manipulating wxWindows (.WXR) resource
+This section details functions for manipulating wxWidgets (.WXR) resource
 files and loading user interface elements from resources.
 
 \normalbox{Please note that this use of the word `resource' is different from that used when talking
 about initialisation file resource reading and writing, using such functions
 as wxWriteResource and wxGetResource. It is just an unfortunate clash of terminology.}
 
-\helponly{For an overview of the wxWindows resource mechanism, see \helpref{the wxWindows resource system}{resourceformats}.}
+\helponly{For an overview of the wxWidgets resource mechanism, see \helpref{the wxWidgets resource system}{resourceformats}.}
 
 See also \helpref{wxWindow::LoadFromResource}{wxwindowloadfromresource} for
 loading from resource data.
@@ -2877,14 +2877,14 @@ perhaps for implementing resource functionality for interpreted languages.
 
 \func{void}{wxResourceClear}{\void}
 
-Clears the wxWindows resource table.
+Clears the wxWidgets resource table.
 
 \membersection{::wxResourceCreateBitmap}\label{wxresourcecreatebitmap}
 
 \func{wxBitmap *}{wxResourceCreateBitmap}{\param{const wxString\& }{resource}}
 
 Creates a new bitmap from a file, static data, or Windows resource, given a valid
-wxWindows bitmap resource identifier. For example, if the .WXR file contains
+wxWidgets bitmap resource identifier. For example, if the .WXR file contains
 the following:
 
 \begin{verbatim}
@@ -2904,7 +2904,7 @@ then this function can be called as follows:
 \func{wxIcon *}{wxResourceCreateIcon}{\param{const wxString\& }{resource}}
 
 Creates a new icon from a file, static data, or Windows resource, given a valid
-wxWindows icon resource identifier. For example, if the .WXR file contains
+wxWidgets icon resource identifier. For example, if the .WXR file contains
 the following:
 
 \begin{verbatim}
@@ -2923,7 +2923,7 @@ then this function can be called as follows:
 
 \func{wxMenuBar *}{wxResourceCreateMenuBar}{\param{const wxString\& }{resource}}
 
-Creates a new menu bar given a valid wxWindows menubar resource
+Creates a new menu bar given a valid wxWidgets menubar resource
 identifier. For example, if the .WXR file contains the following:
 
 \begin{verbatim}
@@ -2962,10 +2962,10 @@ See \helpref{wxResourceAddIdentifier}{wxresourceaddidentifier}.
 
 \func{bool}{wxResourceParseData}{\param{const wxString\& }{resource}, \param{wxResourceTable *}{table = NULL}}
 
-Parses a string containing one or more wxWindows resource objects. If
+Parses a string containing one or more wxWidgets resource objects. If
 the resource objects are global static data that are included into the
 C++ program, then this function must be called for each variable
-containing the resource data, to make it known to wxWindows.
+containing the resource data, to make it known to wxWidgets.
 
 {\it resource} should contain data in the following form:
 
@@ -2978,7 +2978,7 @@ dialog(name = 'dialog1',
   control = [1000, wxStaticBox, 'Groupbox', '0', 'group6', 5, 4, 380, 262,
       [11, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0]],
   control = [1001, wxTextCtrl, '', 'wxTE_MULTILINE', 'text3',
-      156, 126, 200, 70, 'wxWindows is a multi-platform, GUI toolkit.',
+      156, 126, 200, 70, 'wxWidgets is a multi-platform, GUI toolkit.',
       [11, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0],
       [11, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0]]).
 \end{verbatim}
@@ -2997,18 +2997,18 @@ of these variables should be passed to wxResourceParseData.
 
 \func{bool}{wxResourceParseFile}{\param{const wxString\& }{filename}, \param{wxResourceTable *}{table = NULL}}
 
-Parses a file containing one or more wxWindows resource objects
+Parses a file containing one or more wxWidgets resource objects
 in C++-compatible syntax. Use this function to dynamically load
-wxWindows resource data.
+wxWidgets resource data.
 
 \membersection{::wxResourceParseString}\label{wxresourceparsestring}
 
 \func{bool}{wxResourceParseString}{\param{char *}{s}, \param{wxResourceTable *}{table = NULL}}
 
-Parses a string containing one or more wxWindows resource objects. If
+Parses a string containing one or more wxWidgets resource objects. If
 the resource objects are global static data that are included into the
 C++ program, then this function must be called for each variable
-containing the resource data, to make it known to wxWindows.
+containing the resource data, to make it known to wxWidgets.
 
 {\it resource} should contain data with the following form:
 
@@ -3021,7 +3021,7 @@ dialog(name = 'dialog1',
   control = [1000, wxStaticBox, 'Groupbox', '0', 'group6', 5, 4, 380, 262,
       [11, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0]],
   control = [1001, wxTextCtrl, '', 'wxTE_MULTILINE', 'text3',
-      156, 126, 200, 70, 'wxWindows is a multi-platform, GUI toolkit.',
+      156, 126, 200, 70, 'wxWidgets is a multi-platform, GUI toolkit.',
       [11, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0],
       [11, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0]]).
 \end{verbatim}
@@ -3036,7 +3036,7 @@ load an entire {\tt .wxr file} into a string.
 
 \func{bool}{wxResourceRegisterBitmapData}{\param{const wxString\& }{name}, \param{char **}{xpm\_data}}
 
-Makes {\tt\#}included XBM or XPM bitmap data known to the wxWindows resource system.
+Makes {\tt\#}included XBM or XPM bitmap data known to the wxWidgets resource system.
 This is required if other resources will use the bitmap data, since otherwise there
 is no connection between names used in resources, and the global bitmap data.
 
@@ -3049,7 +3049,7 @@ Another name for \helpref{wxResourceRegisterBitmapData}{registerbitmapdata}.
 These functions provide a variety of logging functions: see \helpref{Log classes overview}{wxlogoverview} for
 further information. The functions use (implicitly) the currently active log
 target, so their descriptions here may not apply if the log target is not the
-standard one (installed by wxWindows in the beginning of the program).
+standard one (installed by wxWidgets in the beginning of the program).
 
 \wxheading{Include files}
 
@@ -3081,14 +3081,14 @@ instead.
 
 \membersection{::wxError}\label{wxerror}
 
-\func{void}{wxError}{\param{const wxString\& }{msg}, \param{const wxString\& }{title = "wxWindows Internal Error"}}
+\func{void}{wxError}{\param{const wxString\& }{msg}, \param{const wxString\& }{title = "wxWidgets Internal Error"}}
 
 {\bf NB:} This function is now obsolete, please use \helpref{wxLogError}{wxlogerror}
 instead.
 
 Displays {\it msg} and continues. This writes to standard error under
 Unix, and pops up a message box under Windows. Used for internal
-wxWindows errors. See also \helpref{wxFatalError}{wxfatalerror}.
+wxWidgets errors. See also \helpref{wxFatalError}{wxfatalerror}.
 
 \wxheading{Include files}
 
@@ -3096,14 +3096,14 @@ wxWindows errors. See also \helpref{wxFatalError}{wxfatalerror}.
 
 \membersection{::wxFatalError}\label{wxfatalerror}
 
-\func{void}{wxFatalError}{\param{const wxString\& }{msg}, \param{const wxString\& }{title = "wxWindows Fatal Error"}}
+\func{void}{wxFatalError}{\param{const wxString\& }{msg}, \param{const wxString\& }{title = "wxWidgets Fatal Error"}}
 
 {\bf NB:} This function is now obsolete, please use
 \helpref{wxLogFatalError}{wxlogfatalerror} instead.
 
 Displays {\it msg} and exits. This writes to standard error under Unix,
 and pops up a message box under Windows. Used for fatal internal
-wxWindows errors. See also \helpref{wxError}{wxerror}.
+wxWidgets errors. See also \helpref{wxError}{wxerror}.
 
 \wxheading{Include files}
 
@@ -3182,7 +3182,7 @@ If the target frame doesn't have a statusbar, the message will be lost.
 
 \func{void}{wxVLogSysError}{\param{const char *}{formatString}, \param{va\_list }{argPtr}}
 
-Mostly used by wxWindows itself, but might be handy for logging errors after
+Mostly used by wxWidgets itself, but might be handy for logging errors after
 system call (API function) failure. It logs the specified message text as well
 as the last system error code ({\it errno} or {\it ::GetLastError()} depending
 on the platform) and the corresponding error message. The second form
@@ -3231,7 +3231,7 @@ the value of the trace mask (possible during the run-time).
 For the second function (taking a string mask), the message is logged only if
 the mask has been previously enabled by the call to
 \helpref{AddTraceMask}{wxlogaddtracemask}. The predefined string trace masks
-used by wxWindows are:
+used by wxWidgets are:
 
 \begin{itemize}\itemsep=0pt
 \item wxTRACE\_MemAlloc: trace memory allocation (new/delete)
@@ -3484,7 +3484,7 @@ standard usleep() function is not MT safe.
 \section{Debugging macros and functions}\label{debugmacros}
 
 Useful macros and functions for error checking and defensive programming.
-wxWindows defines three families of the assert-like macros:
+wxWidgets defines three families of the assert-like macros:
 the wxASSERT and wxFAIL macros only do anything if \_\_WXDEBUG\_\_ is defined
 (in other words, in the debug build) but disappear completely in the release
 build. On the other hand, the wxCHECK macros stay event in release builds but a
diff --git a/docs/latex/wx/glcanvas.tex b/docs/latex/wx/glcanvas.tex
index 8ba14c4d6c..cf03a64855 100644
--- a/docs/latex/wx/glcanvas.tex
+++ b/docs/latex/wx/glcanvas.tex
@@ -79,10 +79,10 @@ Constructor.
 
 \docparam{id}{Window identifier. If -1, will automatically create an identifier.}
 
-\docparam{pos}{Window position. wxDefaultPosition is (-1, -1) which indicates that wxWindows
+\docparam{pos}{Window position. wxDefaultPosition is (-1, -1) which indicates that wxWidgets
 should generate a default position for the window.}
 
-\docparam{size}{Window size. wxDefaultSize is (-1, -1) which indicates that wxWindows should
+\docparam{size}{Window size. wxDefaultSize is (-1, -1) which indicates that wxWidgets should
 generate a default size for the window. If no suitable size can be found, the window will be sized to 20x20 pixels so that the window is visible but obviously not correctly sized.}
 
 \docparam{style}{Window style.}
@@ -118,7 +118,7 @@ as the target device context for OpenGL operations.
 
 \func{void}{SetColour}{\param{const char*}{ colour}}
 
-Sets the current colour for this window, using the wxWindows colour database to find a named colour.
+Sets the current colour for this window, using the wxWidgets colour database to find a named colour.
 
 \membersection{wxGLCanvas::SwapBuffers}\label{wxglcanvasswapbuffers}
 
diff --git a/docs/latex/wx/grid.tex b/docs/latex/wx/grid.tex
index fd909dde2e..8c361d5722 100644
--- a/docs/latex/wx/grid.tex
+++ b/docs/latex/wx/grid.tex
@@ -12,7 +12,7 @@ examples of simple and more complex applications, explains the
 relationship between the various grid classes and has a summary of the
 keyboard shortcuts and mouse functions provided by wxGrid.
 
-wxGrid has been greatly expanded and redesigned for wxWindows 2.2
+wxGrid has been greatly expanded and redesigned for wxWidgets 2.2
 onwards. If you have been using the old wxGrid class you will probably
 want to have a look at the \helpref{wxGrid classes overview}{gridoverview} to see
 how things have changed. The new grid classes are reasonably backward-compatible
diff --git a/docs/latex/wx/hash.tex b/docs/latex/wx/hash.tex
index 3609e1c5f5..4a72cc8fb2 100644
--- a/docs/latex/wx/hash.tex
+++ b/docs/latex/wx/hash.tex
@@ -3,7 +3,7 @@
 {\bf Please note} that this class is retained for backward compatibility
 reasons; you should use \helpref{wxHashMap}{wxhashmap}.
 
-This class provides hash table functionality for wxWindows, and for an
+This class provides hash table functionality for wxWidgets, and for an
 application if it wishes.  Data can be hashed on an integer or string
 key.
 
diff --git a/docs/latex/wx/hashmap.tex b/docs/latex/wx/hashmap.tex
index 19a3d5bc01..23cb83be45 100644
--- a/docs/latex/wx/hashmap.tex
+++ b/docs/latex/wx/hashmap.tex
@@ -68,7 +68,7 @@ and VALUE\_T values.
 \end{verbatim}
 
 The HASH\_T and KEY\_EQ\_T are the types
-used for the hashing function and key comparison. wxWindows provides
+used for the hashing function and key comparison. wxWidgets provides
 three predefined hashing functions: {\tt wxIntegerHash}
 for integer types ( {\tt int}, {\tt long}, {\tt short},
 and their unsigned counterparts ), {\tt wxStringHash} for strings
diff --git a/docs/latex/wx/helpevt.tex b/docs/latex/wx/helpevt.tex
index ed8f7836ed..3737be6c2e 100644
--- a/docs/latex/wx/helpevt.tex
+++ b/docs/latex/wx/helpevt.tex
@@ -10,7 +10,7 @@ A help event is sent to the window that the user clicked on, and is propagated u
 window hierarchy until the event is processed or there are no more event handlers.
 The application should call wxEvent::GetId to check the identity of the clicked-on window,
 and then either show some suitable help or call wxEvent::Skip if the identifier is unrecognised.
-Calling Skip is important because it allows wxWindows to generate further events for ancestors
+Calling Skip is important because it allows wxWidgets to generate further events for ancestors
 of the clicked-on window. Otherwise it would be impossible to show help for container windows,
 since processing would stop after the first window found.
 
diff --git a/docs/latex/wx/helpinst.tex b/docs/latex/wx/helpinst.tex
index 43a266c295..0c11db4e41 100644
--- a/docs/latex/wx/helpinst.tex
+++ b/docs/latex/wx/helpinst.tex
@@ -20,7 +20,7 @@ appropriate class is aliased to the name wxHelpController for each platform, as
 \begin{itemize}\itemsep=0pt
 \item On Windows, wxWinHelpController is used.
 \item On all other platforms, wxHtmlHelpController is used if wxHTML is
-compiled into wxWindows; otherwise wxExtHelpController is used (for invoking an external
+compiled into wxWidgets; otherwise wxExtHelpController is used (for invoking an external
 browser).
 \end{itemize}
 
@@ -33,7 +33,7 @@ There are currently the following help controller classes defined:
 \item wxWinHelpController, for controlling Windows Help.
 \item wxCHMHelpController, for controlling MS HTML Help. To use this, you need to set wxUSE\_MS\_HTML\_HELP
 to 1 in setup.h and have htmlhelp.h header from Microsoft's HTML Help kit (you don't need
-VC++ specific htmlhelp.lib because wxWindows loads necessary DLL at runtime and so it
+VC++ specific htmlhelp.lib because wxWidgets loads necessary DLL at runtime and so it
 works with all compilers).
 \item wxBestHelpController, for controlling MS HTML Help or, if Microsoft's runtime is
 not available, \helpref{wxHtmlHelpController}{wxhtmlhelpcontroller}. You need to provide
@@ -56,7 +56,7 @@ wxHelpControllerBase\\
 
 \wxheading{Include files}
 
-<wx/help.h> (wxWindows chooses the appropriate help controller class)\\
+<wx/help.h> (wxWidgets chooses the appropriate help controller class)\\
 <wx/helpbase.h> (wxHelpControllerBase class)\\
 <wx/helpwin.h> (Windows Help controller)\\
 <wx/msw/helpchm.h> (MS HTML Help controller)\\
diff --git a/docs/latex/wx/htdcrend.tex b/docs/latex/wx/htdcrend.tex
index 1d97e3d224..03f243dfff 100644
--- a/docs/latex/wx/htdcrend.tex
+++ b/docs/latex/wx/htdcrend.tex
@@ -46,7 +46,7 @@ See also \helpref{SetSize}{wxhtmldcrenderersetsize}.
 
 \wxheading{Note}
 
-This method was added in wxWindows 2.4.1.
+This method was added in wxWidgets 2.4.1.
 
 \membersection{wxHtmlDCRenderer::SetSize}\label{wxhtmldcrenderersetsize}
 
diff --git a/docs/latex/wx/hthelpct.tex b/docs/latex/wx/hthelpct.tex
index acb5cbfe7e..f1b29ac971 100644
--- a/docs/latex/wx/hthelpct.tex
+++ b/docs/latex/wx/hthelpct.tex
@@ -5,7 +5,7 @@
 
 \section{\class{wxHtmlHelpController}}\label{wxhtmlhelpcontroller}
 
-{\bf WARNING!} Although this class has an API compatible with other wxWindows
+{\bf WARNING!} Although this class has an API compatible with other wxWidgets
 help controllers as documented by \helpref{wxHelpController}{wxhelpcontroller}, it
 is recommended that you use the enhanced capabilities of wxHtmlHelpController's API.
 
@@ -13,7 +13,7 @@ This help controller provides an easy way of displaying HTML help in your
 application (see {\it test} sample). The help system is based on {\bf books} 
 (see \helpref{AddBook}{wxhtmlhelpcontrolleraddbook}). A book is a logical
 section of documentation (for example "User's Guide" or "Programmer's Guide" or
-"C++ Reference" or "wxWindows Reference"). The help controller can handle as
+"C++ Reference" or "wxWidgets Reference"). The help controller can handle as
 many books as you want.
 
 wxHTML uses Microsoft's HTML Help Workshop project files (.hhp, .hhk, .hhc) as its
diff --git a/docs/latex/wx/htmlprn.tex b/docs/latex/wx/htmlprn.tex
index c6367628a8..f52852c23a 100644
--- a/docs/latex/wx/htmlprn.tex
+++ b/docs/latex/wx/htmlprn.tex
@@ -5,7 +5,7 @@ The wxHTML library provides printing facilities with several levels of complexit
 The easiest way to print an HTML document is to use 
 \helpref{wxHtmlEasyPrinting class}{wxhtmleasyprinting}. It lets you print HTML documents with only one
 command and you don't have to worry about deriving from the wxPrintout class at all. It is only a simple wrapper around the 
-\helpref{wxHtmlPrintout}{wxhtmlprintout}, normal wxWindows printout class.
+\helpref{wxHtmlPrintout}{wxhtmlprintout}, normal wxWidgets printout class.
 
 And finally there is the low level class \helpref{wxHtmlDCRenderer}{wxhtmldcrenderer} which you can use to
 render HTML into a rectangular area on any DC. It supports rendering into multiple rectangles with the same
diff --git a/docs/latex/wx/htprint.tex b/docs/latex/wx/htprint.tex
index 542f4618be..00ec538da5 100644
--- a/docs/latex/wx/htprint.tex
+++ b/docs/latex/wx/htprint.tex
@@ -36,7 +36,7 @@ detailed description.
 
 \wxheading{Note}
 
-This method was added in wxWindows 2.4.1.
+This method was added in wxWidgets 2.4.1.
 
 \membersection{wxHtmlPrintout::SetFooter}\label{wxhtmlprintoutsetfooter}
 
diff --git a/docs/latex/wx/htwindow.tex b/docs/latex/wx/htwindow.tex
index 9095564858..b088cec4b2 100644
--- a/docs/latex/wx/htwindow.tex
+++ b/docs/latex/wx/htwindow.tex
@@ -159,7 +159,7 @@ FALSE if an error occurred, TRUE otherwise
 
 \wxheading{Note}
 
-This method was added in wxWindows 2.4.1.
+This method was added in wxWidgets 2.4.1.
 
 \wxheading{See also}
 
@@ -327,9 +327,9 @@ platforms. Default face names are empty strings.
 
 \wxheading{Note}
 
-{\tt NULL} is valid value of {\it sizes} since wxWindows 2.4.1. Older
+{\tt NULL} is valid value of {\it sizes} since wxWidgets 2.4.1. Older
 versions did not accept {\tt NULL} value. wxHTML\_FONT\_SIZE\_n constants
-were added in wxWindows 2.4.1.
+were added in wxWidgets 2.4.1.
 
 \membersection{wxHtmlWindow::SetPage}\label{wxhtmlwindowsetpage}
 
diff --git a/docs/latex/wx/hworld.tex b/docs/latex/wx/hworld.tex
index 8a821f1e21..a51ceac34b 100644
--- a/docs/latex/wx/hworld.tex
+++ b/docs/latex/wx/hworld.tex
@@ -1,11 +1,11 @@
-\section{wxWindows Hello World sample}\label{helloworld}
+\section{wxWidgets Hello World sample}\label{helloworld}
 
 As many people have requested a mini-sample to be published here
 so that some quick judgment concerning syntax
-and basic principles can be made, you can now look at wxWindows'
+and basic principles can be made, you can now look at wxWidgets'
 "Hello World":
 
-You have to include wxWindows' header files, of course. This can
+You have to include wxWidgets' header files, of course. This can
 be done on a file by file basis (such as \#include "wx/window.h")
 or using one global include (\#include "wx/wx.h"). This is
 also useful on platforms which support precompiled headers such
@@ -15,7 +15,7 @@ as all major compilers on the Windows platform.
 //
 // file name: hworld.cpp
 //
-//   purpose: wxWindows "Hello world"
+//   purpose: wxWidgets "Hello world"
 //
 
 // For compilers that support precompilation, includes "wx/wx.h".
@@ -94,7 +94,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 END_EVENT_TABLE()
 \end{verbatim}
 
-As in all programs there must be a "main" function. Under wxWindows main is implemented
+As in all programs there must be a "main" function. Under wxWidgets main is implemented
 using this macro, which creates an application instance and starts the program.
 
 \begin{verbatim}
@@ -137,7 +137,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     SetMenuBar( menuBar );
 
     CreateStatusBar();
-    SetStatusText( "Welcome to wxWindows!" );
+    SetStatusText( "Welcome to wxWidgets!" );
 }
 \end{verbatim}
 
@@ -159,7 +159,7 @@ case a typical "About" window with information about the program.
 \begin{verbatim}
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
-    wxMessageBox( "This is a wxWindows' Hello world sample",
+    wxMessageBox( "This is a wxWidgets' Hello world sample",
                   "About Hello World", wxOK | wxICON_INFORMATION );
 }
 \end{verbatim}
diff --git a/docs/latex/wx/icon.tex b/docs/latex/wx/icon.tex
index 29cfd76ac8..5fd66b0aa4 100644
--- a/docs/latex/wx/icon.tex
+++ b/docs/latex/wx/icon.tex
@@ -119,8 +119,8 @@ Its meaning is determined by the {\it flags} parameter.}
 %\twocolitem{\indexit{wxBITMAP\_TYPE\_RESOURCE}}{Load a Windows resource name.}
 \end{twocollist}
 
-The validity of these flags depends on the platform and wxWindows configuration.
-If all possible wxWindows settings are used, the Windows platform supports ICO file, ICO resource,
+The validity of these flags depends on the platform and wxWidgets configuration.
+If all possible wxWidgets settings are used, the Windows platform supports ICO file, ICO resource,
 XPM data, and XPM file. Under wxGTK, the available formats are BMP file, XPM data, XPM file, and PNG file.
 Under wxMotif, the available formats are XBM data, XBM file, XPM data, XPM file.}
 
@@ -141,7 +141,7 @@ X and Windows.
 
 The sixth form constructs a new icon.
 
-The seventh form constructs an icon from pixmap (XPM) data, if wxWindows has been configured
+The seventh form constructs an icon from pixmap (XPM) data, if wxWidgets has been configured
 to incorporate this feature.
 
 To use this constructor, you must first include an XPM file. For
@@ -211,7 +211,7 @@ destroyed at this point - only when the reference count is zero will the
 data be deleted.
 
 If the application omits to delete the icon explicitly, the icon will be
-destroyed automatically by wxWindows when the application exits.
+destroyed automatically by wxWidgets when the application exits.
 
 Do not delete an icon that is selected into a memory device context.
 
@@ -260,7 +260,7 @@ The meaning of {\it name} is determined by the {\it type} parameter.}
 \twocolitem{{\bf wxBITMAP\_TYPE\_XPM}}{Load an XPM bitmap file.}
 \end{twocollist}
 
-The validity of these flags depends on the platform and wxWindows configuration.}
+The validity of these flags depends on the platform and wxWidgets configuration.}
 
 \wxheading{Return value}
 
@@ -297,7 +297,7 @@ Saves an icon in the named file.
 \twocolitem{{\bf wxBITMAP\_TYPE\_XPM}}{Save an XPM bitmap file.}
 \end{twocollist}
 
-The validity of these flags depends on the platform and wxWindows configuration.}
+The validity of these flags depends on the platform and wxWidgets configuration.}
 
 \docparam{palette}{An optional palette used for saving the icon.}
 
@@ -307,7 +307,7 @@ TRUE if the operation succeeded, FALSE otherwise.
 
 \wxheading{Remarks}
 
-Depending on how wxWindows has been configured, not all formats may be available.
+Depending on how wxWidgets has been configured, not all formats may be available.
 
 \wxheading{See also}
 
diff --git a/docs/latex/wx/iconevt.tex b/docs/latex/wx/iconevt.tex
index 5a02b8f1da..1573ccaefc 100644
--- a/docs/latex/wx/iconevt.tex
+++ b/docs/latex/wx/iconevt.tex
@@ -6,7 +6,7 @@
 %% Created:
 %% RCS-ID:      $Id$
 %% Copyright:   (c) 2001 Vadim Zeitlin
-%% License:     wxWindows license
+%% License:     wxWidgets license
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \section{\class{wxIconizeEvent}}\label{wxiconizeevent}
diff --git a/docs/latex/wx/idleevt.tex b/docs/latex/wx/idleevt.tex
index edba768343..101721db3d 100644
--- a/docs/latex/wx/idleevt.tex
+++ b/docs/latex/wx/idleevt.tex
@@ -41,7 +41,7 @@ Constructor.
 
 \func{void}{RequestMore}{\param{bool}{ needMore = TRUE}}
 
-Tells wxWindows that more processing is required. This function can be called by an OnIdle
+Tells wxWidgets that more processing is required. This function can be called by an OnIdle
 handler for a window or window event handler to indicate that wxApp::OnIdle should
 forward the OnIdle event once more to the application windows. If no window calls this function
 during OnIdle, then the application will remain in a passive event loop (not calling OnIdle) until a
diff --git a/docs/latex/wx/image.tex b/docs/latex/wx/image.tex
index b24b325cd0..ec29b973f5 100644
--- a/docs/latex/wx/image.tex
+++ b/docs/latex/wx/image.tex
@@ -137,7 +137,7 @@ the GIF and TIFF handler and as the largest and most colourful one by the ICO ha
 
 \wxheading{Remarks}
 
-Depending on how wxWindows has been configured, not all formats may be available.
+Depending on how wxWidgets has been configured, not all formats may be available.
 
 Note: any handler other than BMP must be previously
 initialized with \helpref{wxImage::AddHandler}{wximageaddhandler} or 
@@ -208,7 +208,7 @@ returns TRUE if the current image handlers can read this file
 
 Deletes all image handlers.
 
-This function is called by wxWindows on exit.
+This function is called by wxWidgets on exit.
 
 \membersection{wxImage::ComputeHistogram}\label{wximagecomputehistogram}
 
@@ -515,7 +515,7 @@ Returns TRUE if the given option is present. The function is case-insensitive to
 Internal use only. Adds standard image format handlers. It only install BMP
 for the time being, which is used by wxBitmap.
 
-This function is called by wxWindows on startup, and shouldn't be called by
+This function is called by wxWidgets on startup, and shouldn't be called by
 the user.
 
 \wxheading{See also}
@@ -584,7 +584,7 @@ the GIF and TIFF handler and as the largest and most colourful one by the ICO ha
 
 \wxheading{Remarks}
 
-Depending on how wxWindows has been configured, not all formats may be available.
+Depending on how wxWidgets has been configured, not all formats may be available.
 
 Note: you can use \helpref{GetOptionInt}{wximagegetoptionint} to get the 
 hotspot for loaded cursor file:
@@ -693,7 +693,7 @@ TRUE if the operation succeeded, FALSE otherwise.
 
 \wxheading{Remarks}
 
-Depending on how wxWindows has been configured, not all formats may be available.
+Depending on how wxWidgets has been configured, not all formats may be available.
 
 Note: you can use \helpref{GetOptionInt}{wximagegetoptionint} to set the 
 hotspot before saving an image into a cursor file (default hotspot is in 
@@ -952,7 +952,7 @@ application initialisation.
 
 This software is based in part on the work of the Independent JPEG Group.
 
-(Applies when wxWindows is linked with JPEG support. wxJPEGHandler uses libjpeg
+(Applies when wxWidgets is linked with JPEG support. wxJPEGHandler uses libjpeg
 created by IJG.)
 
 \wxheading{Derived from}
diff --git a/docs/latex/wx/keyevent.tex b/docs/latex/wx/keyevent.tex
index 027b874038..d3a60d8244 100644
--- a/docs/latex/wx/keyevent.tex
+++ b/docs/latex/wx/keyevent.tex
@@ -2,7 +2,7 @@
 
 This event class contains information about keypress (character) events.
 
-Notice that there are three different kinds of keyboard events in wxWindows:
+Notice that there are three different kinds of keyboard events in wxWidgets:
 key down and up events and char events. The difference between the first two
 is clear - the first corresponds to a key press and the second to a key
 release - otherwise they are identical. Just note that if the key is
@@ -37,7 +37,7 @@ same key code {\tt 'a'} as usual but the char event will have key code of
 $1$, the ASCII value of this key combination.
 
 You may discover how the other keys on your system behave interactively by
-running the \helpref{text}{sampletext} wxWindows sample and pressing some keys
+running the \helpref{text}{sampletext} wxWidgets sample and pressing some keys
 in any of the text controls shown in it.
 
 {\bf Note:} If a key down ({\tt EVT\_KEY\_DOWN}) event is caught and
@@ -46,10 +46,10 @@ char event ({\tt EVT\_CHAR}) will not happen.  This is by design and
 enables the programs that handle both types of events to be a bit
 simpler.
 
-{\bf Note for Windows programmers:} The key and char events in wxWindows are
+{\bf Note for Windows programmers:} The key and char events in wxWidgets are
 similar to but slightly different from Windows {\tt WM\_KEYDOWN} and
 {\tt WM\_CHAR} events. In particular, Alt-x combination will generate a char
-event in wxWindows (unless it is used as an accelerator).
+event in wxWidgets (unless it is used as an accelerator).
 
 {\bf Tip:} be sure to call {\tt event.Skip()} for events that you don't process in
 key event function, otherwise menu shortcuts may cease to work under Windows.
diff --git a/docs/latex/wx/list.tex b/docs/latex/wx/list.tex
index 351e5e5cc1..db07884a2f 100644
--- a/docs/latex/wx/list.tex
+++ b/docs/latex/wx/list.tex
@@ -1,19 +1,19 @@
 \section{\class{wxList}}\label{wxlist}
 
-wxList classes provide linked list functionality for wxWindows, and for an
+wxList classes provide linked list functionality for wxWidgets, and for an
 application if it wishes.  Depending on the form of constructor used, a list
 can be keyed on integer or string keys to provide a primitive look-up ability,
 but please note that this feature is {\bf deprecated}.
 See \helpref{wxHashMap}{wxhashmap}\rtfsp for a faster method of storage
 when random access is required.
 
-While wxList class in the previous versions of wxWindows only could contain
+While wxList class in the previous versions of wxWidgets only could contain
 elements of type wxObject and had essentially untyped interface (thus allowing
 you to put apples in the list and read back oranges from it), the new wxList
 classes family may contain elements of any type and has much more strict type
 checking. Unfortunately, it also requires an additional line to be inserted in
 your program for each list class you use (which is the only solution short of
-using templates which is not done in wxWindows because of portability issues).
+using templates which is not done in wxWidgets because of portability issues).
 
 The general idea is to have the base class wxListBase working with {\it void *}
 data but make all of its dangerous (because untyped) functions protected, so
diff --git a/docs/latex/wx/listbox.tex b/docs/latex/wx/listbox.tex
index 07b133a76c..d445d8b044 100644
--- a/docs/latex/wx/listbox.tex
+++ b/docs/latex/wx/listbox.tex
@@ -309,7 +309,7 @@ and {\tt items}.}
 
 {\bf Obsolescence note:} This method is obsolete and was replaced with 
 \helpref{GetCount}{wxlistboxgetcount}, please use the new method in the new
-code. This method is only available if wxWindows was compiled with 
+code. This method is only available if wxWidgets was compiled with 
 {\tt WXWIN\_COMPATIBILITY\_2\_2} defined and will disappear completely in
 future versions.
 
diff --git a/docs/latex/wx/listview.tex b/docs/latex/wx/listview.tex
index 76138d5310..7b175ecf1c 100644
--- a/docs/latex/wx/listview.tex
+++ b/docs/latex/wx/listview.tex
@@ -5,8 +5,8 @@
 %% Modified by:
 %% Created:     07.11.02
 %% RCS-ID:      $Id$
-%% Copyright:   (c) 2002 Vadim Zeitlin <vadim@wxwindows.org>
-%% License:     wxWindows license
+%% Copyright:   (c) 2002 Vadim Zeitlin <vadim@wxwidgets.org>
+%% License:     wxWidgets license
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \section{\class{wxListView}}\label{wxlistview}
diff --git a/docs/latex/wx/locale.tex b/docs/latex/wx/locale.tex
index bba0d75453..82a25585ad 100644
--- a/docs/latex/wx/locale.tex
+++ b/docs/latex/wx/locale.tex
@@ -3,7 +3,7 @@
 wxLocale class encapsulates all language-dependent settings and is a
 generalization of the C locale concept.
 
-In wxWindows this class manages message catalogs which contain the translations
+In wxWidgets this class manages message catalogs which contain the translations
 of the strings used to the current language.
 
 \perlnote{In wxPerl you can't use the '\_' function name, so
@@ -522,7 +522,7 @@ language (see \helpref{GetSystemLanguage}{wxlocalegetsystemlanguage}).}
 \docparam{flags}{Combination of the following:
 \begin{twocollist}\itemsep=0pt
 \twocolitem{\windowstyle{wxLOCALE\_LOAD\_DEFAULT}}{Load the message catalog
-for the given locale containing the translations of standard wxWindows messages
+for the given locale containing the translations of standard wxWidgets messages
 automatically.}
 \twocolitem{\windowstyle{wxLOCALE\_CONV\_ENCODING}}{Automatically convert message
 catalogs to platform's default encoding. Note that it will do only basic 
@@ -541,7 +541,7 @@ directory prefix when looking for the message catalog files.}
 platform-specific.}
 
 \docparam{bLoadDefault}{May be set to FALSE to prevent loading of the message catalog
-for the given locale containing the translations of standard wxWindows messages.
+for the given locale containing the translations of standard wxWidgets messages.
 This parameter would be rarely used in normal circumstances.}
 
 \docparam{bConvertEncoding}{May be set to TRUE to do automatic conversion of message
diff --git a/docs/latex/wx/log.tex b/docs/latex/wx/log.tex
index c8a697c45e..14eee1c0ba 100644
--- a/docs/latex/wx/log.tex
+++ b/docs/latex/wx/log.tex
@@ -6,12 +6,12 @@
 %% Created:     some time ago
 %% RCS-ID:      $Id$
 %% Copyright:   (c) 1997-2001 Vadim Zeitlin
-%% License:     wxWindows license
+%% License:     wxWidgets license
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \section{\class{wxLog}}\label{wxlog}
 
-wxLog class defines the interface for the {\it log targets} used by wxWindows
+wxLog class defines the interface for the {\it log targets} used by wxWidgets
 logging functions as explained in the \helpref{wxLog overview}{wxlogoverview}.
 The only situations when you need to directly use this class is when you want
 to derive your own log target because the existing ones don't satisfy your
@@ -23,7 +23,7 @@ completely) the timestamp on the messages.
 Otherwise, it is completely hidden behind the {\it wxLogXXX()} functions and
 you may not even know about its existence.
 
-See \helpref{log overview}{wxlogoverview} for the descriptions of wxWindows
+See \helpref{log overview}{wxlogoverview} for the descriptions of wxWidgets
 logging facilities.
 
 \wxheading{Derived from}
@@ -463,9 +463,9 @@ object was created.
 
 \section{\class{wxLogGui}}\label{wxloggui}
 
-This is the default log target for the GUI wxWindows applications. It is passed
+This is the default log target for the GUI wxWidgets applications. It is passed
 to \helpref{wxLog::SetActiveTarget}{wxlogsetactivetarget} at the program
-startup and is deleted by wxWindows during the program shut down.
+startup and is deleted by wxWidgets during the program shut down.
 
 \wxheading{Derived from}
 
@@ -490,7 +490,7 @@ Default constructor.
 This class allows to temporarily suspend logging. All calls to the log
 functions during the life time of an object of this class are just ignored.
 
-In particular, it can be used to suppress the log messages given by wxWindows
+In particular, it can be used to suppress the log messages given by wxWidgets
 itself but it should be noted that it is rarely the best way to cope with this
 problem as {\bf all} log messages are suppressed, even if they indicate a
 completely different error than the one the programmer wanted to suppress.
@@ -585,7 +585,7 @@ Default ctor installs this object as the current active log target.
 
 This class can be used to redirect the log messages to a C file stream (not to
 be confused with C++ streams). It is the default log target for the non-GUI
-wxWindows applications which send all the output to {\tt stderr}.
+wxWidgets applications which send all the output to {\tt stderr}.
 
 \wxheading{Derived from}
 
@@ -614,7 +614,7 @@ Constructs a log target which sends all the log messages to the given
 
 This class can be used to redirect the log messages to a C++ stream.
 
-Please note that this class is only available if wxWindows was compiled with
+Please note that this class is only available if wxWidgets was compiled with
 the standard iostream library support ({\tt wxUSE\_STD\_IOSTREAM} must be on).
 
 \wxheading{Derived from}
diff --git a/docs/latex/wx/longlong.tex b/docs/latex/wx/longlong.tex
index e3e44f2785..7622c9c58c 100644
--- a/docs/latex/wx/longlong.tex
+++ b/docs/latex/wx/longlong.tex
@@ -6,7 +6,7 @@
 %% Created:     07.03.00
 %% RCS-ID:      $Id$
 %% Copyright:   (c) Vadim Zeitlin
-%% License:     wxWindows license
+%% License:     wxWidgets license
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \section{\class{wxLongLong}}\label{wxlonglong}
diff --git a/docs/latex/wx/manual.tex b/docs/latex/wx/manual.tex
index c5eeeec8d2..f9449232e2 100644
--- a/docs/latex/wx/manual.tex
+++ b/docs/latex/wx/manual.tex
@@ -26,7 +26,7 @@
 %\special{!/@scaleunit 1 def}
 \parskip=10pt
 \parindent=0pt
-\title{wxWindows 2.4.2: A portable C++ and Python GUI toolkit}
+\title{wxWidgets 2.4.2: A portable C++ and Python GUI toolkit}
 \winhelponly{\author{by Julian Smart et al
 %\winhelponly{\\$$\image{1cm;0cm}{wxwin.wmf}$$}
 }}
@@ -47,7 +47,7 @@ Robin Dunn, et al}
 % A special table of contents for the WinHelp manual
 \begin{comment}
 \winhelponly{
-\chapter{wxWindows class library reference}\label{winhelpcontents}
+\chapter{wxWidgets class library reference}\label{winhelpcontents}
 
 \centerline{
 %\image{}{wxwin.wmf}
@@ -62,19 +62,19 @@ Robin Dunn, et al}
 
 \image{}{book1.bmp} \helpref{Topic overviews}{overviews}
 
-\image{}{hand1.bmp} \helpref{Guide to wxWindows}{wxwinchapters}
+\image{}{hand1.bmp} \helpref{Guide to wxWidgets}{wxwinchapters}
 }
 \sethotspotcolour{on}%
 \sethotspotunderline{on}%
 
-\chapter*{Overview of wxWindows}\label{wxwinchapters}
+\chapter*{Overview of wxWidgets}\label{wxwinchapters}
 
 \helpref{Introduction}{introduction}\\
 %\helpref{Resource guide}{resguide}\\
 %\helpref{Comparison with other GUI models}{comparison}\\
-%\helpref{Multi-platform development with wxWindows}{multiplat}\\
+%\helpref{Multi-platform development with wxWidgets}{multiplat}\\
 %\helpref{Tutorial}{tutorial}\\
-\helpref{The wxWindows resource system}{resourceformats}\\
+\helpref{The wxWidgets resource system}{resourceformats}\\
 \helpref{Utilities}{utilities}\\
 \helpref{Programming strategies}{strategies}\\
 \helpref{Bugs and future directions}{bugs}\\
@@ -88,14 +88,14 @@ Robin Dunn, et al}
 
 \begin{center}
 Copyright (c) 1992-2002 Julian Smart, Robert Roebling, Vadim Zeitlin and other
-members of the wxWindows team\\
+members of the wxWidgets team\\
 Portions (c) 1996 Artificial Intelligence Applications Institute\\
 \end{center}
 
-Please also see the wxWindows license files (preamble.txt, lgpl.txt, gpl.txt, license.txt,
+Please also see the wxWidgets license files (preamble.txt, lgpl.txt, gpl.txt, license.txt,
 licendoc.txt) for conditions of software and documentation use.
 
-\section*{wxWindows Library License, Version 3}
+\section*{wxWidgets Library License, Version 3}
 
 Copyright (c) 1992-2002 Julian Smart, Robert Roebling, Vadim Zeitlin et al. 
 
@@ -126,7 +126,7 @@ EXCEPTION NOTICE
 
 1. As a special exception, the copyright holders of this library give 
 permission for additional uses of the text contained in this release of 
-the library as licensed under the wxWindows Library License, applying 
+the library as licensed under the wxWidgets Library License, applying 
 either version 3 of the License, or (at your option) any later version of 
 the License as published by the copyright holders of version 3 of the 
 License document. 
diff --git a/docs/latex/wx/maxzevt.tex b/docs/latex/wx/maxzevt.tex
index b64d98fb88..f89b387c25 100644
--- a/docs/latex/wx/maxzevt.tex
+++ b/docs/latex/wx/maxzevt.tex
@@ -6,7 +6,7 @@
 %% Created:
 %% RCS-ID:      $Id$
 %% Copyright:   (c) 2001 Vadim Zeitlin
-%% License:     wxWindows license
+%% License:     wxWidgets license
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \section{\class{wxMaximizeEvent}}\label{wxmaximizeevent}
diff --git a/docs/latex/wx/mcaptevt.tex b/docs/latex/wx/mcaptevt.tex
index 05810e3430..49a872886d 100644
--- a/docs/latex/wx/mcaptevt.tex
+++ b/docs/latex/wx/mcaptevt.tex
@@ -46,5 +46,5 @@ Constructor.
 
 \constfunc{wxWindow*}{GetCapturedWindow}{\void}
 
-Returns the window that gained the capture, or NULL if it was a non-wxWindows window.
+Returns the window that gained the capture, or NULL if it was a non-wxWidgets window.
 
diff --git a/docs/latex/wx/mdi.tex b/docs/latex/wx/mdi.tex
index 391c38ec88..40420973e2 100644
--- a/docs/latex/wx/mdi.tex
+++ b/docs/latex/wx/mdi.tex
@@ -36,7 +36,7 @@ See also \helpref{window styles overview}{windowstyles}.
 
 \wxheading{Remarks}
 
-Although internally an MDI child frame is a child of the MDI client window, in wxWindows
+Although internally an MDI child frame is a child of the MDI client window, in wxWidgets
 you create it as a child of \helpref{wxMDIParentFrame}{wxmdiparentframe}. You can usually
 forget that the client window exists.
 
@@ -77,10 +77,10 @@ Constructor, creating the window.
 \docparam{title}{The caption to be displayed on the frame's title bar.}
 
 \docparam{pos}{The window position. A value of (-1, -1) indicates a default position, chosen by
-either the windowing system or wxWindows, depending on platform.}
+either the windowing system or wxWidgets, depending on platform.}
 
 \docparam{size}{The window size. A value of (-1, -1) indicates a default size, chosen by
-either the windowing system or wxWindows, depending on platform.}
+either the windowing system or wxWidgets, depending on platform.}
 
 \docparam{style}{The window style. See \helpref{wxMDIChildFrame}{wxmdichildframe}.}
 
@@ -311,10 +311,10 @@ Constructor, creating the window.
 \docparam{title}{The caption to be displayed on the frame's title bar.}
 
 \docparam{pos}{The window position. A value of (-1, -1) indicates a default position, chosen by
-either the windowing system or wxWindows, depending on platform.}
+either the windowing system or wxWidgets, depending on platform.}
 
 \docparam{size}{The window size. A value of (-1, -1) indicates a default size, chosen by
-either the windowing system or wxWindows, depending on platform.}
+either the windowing system or wxWidgets, depending on platform.}
 
 \docparam{style}{The window style. See \helpref{wxMDIParentFrame}{wxmdiparentframe}.}
 
@@ -469,7 +469,7 @@ Returns the window being used as the toolbar for this frame.
 
 \constfunc{wxMenu*}{GetWindowMenu}{\void}
 
-Returns the current Window menu (added by wxWindows to the menubar). This function
+Returns the current Window menu (added by wxWidgets to the menubar). This function
 is available under Windows only.
 
 \membersection{wxMDIParentFrame::OnCreateClient}\label{wxmdiparentframeoncreateclient}
diff --git a/docs/latex/wx/menu.tex b/docs/latex/wx/menu.tex
index cee22fffea..ba5ab9a337 100644
--- a/docs/latex/wx/menu.tex
+++ b/docs/latex/wx/menu.tex
@@ -12,7 +12,7 @@ associated command but just makes a separator line appear in the menu.
 Menu items may be either normal items, check items or radio items. Normal items
 don't have any special properties while the check items have a boolean flag
 associated to them and they show a checkmark in the menu when the flag is set.
-wxWindows automatically toggles the flag value when the item is clicked and its
+wxWidgets automatically toggles the flag value when the item is clicked and its
 value may be retrieved using either \helpref{IsChecked}{wxmenuischecked} method
 of wxMenu or wxMenuBar itself or by using 
 \helpref{wxEvent::IsChecked}{wxcommandeventischecked} when you get the menu
diff --git a/docs/latex/wx/metafile.tex b/docs/latex/wx/metafile.tex
index ebea0188ec..93362c4de5 100644
--- a/docs/latex/wx/metafile.tex
+++ b/docs/latex/wx/metafile.tex
@@ -1,7 +1,7 @@
 \section{\class{wxMetafile}}\label{wxmetafile}
 
 A {\bf wxMetafile} represents the MS Windows metafile object, so metafile
-operations have no effect in X. In wxWindows, only sufficient functionality
+operations have no effect in X. In wxWidgets, only sufficient functionality
 has been provided for copying a graphic to the clipboard; this may be extended
 in a future version. Presently, the only way of creating a metafile
 is to use a wxMetafileDC.
diff --git a/docs/latex/wx/minifram.tex b/docs/latex/wx/minifram.tex
index 0acfcd6567..46bb5f38e2 100644
--- a/docs/latex/wx/minifram.tex
+++ b/docs/latex/wx/minifram.tex
@@ -75,10 +75,10 @@ always be displayed on top of the parent window on Windows.}
 \docparam{title}{The caption to be displayed on the frame's title bar.}
 
 \docparam{pos}{The window position. A value of (-1, -1) indicates a default position, chosen by
-either the windowing system or wxWindows, depending on platform.}
+either the windowing system or wxWidgets, depending on platform.}
 
 \docparam{size}{The window size. A value of (-1, -1) indicates a default size, chosen by
-either the windowing system or wxWindows, depending on platform.}
+either the windowing system or wxWidgets, depending on platform.}
 
 \docparam{style}{The window style. See \helpref{wxMiniFrame}{wxminiframe}.}
 
diff --git a/docs/latex/wx/module.tex b/docs/latex/wx/module.tex
index bb515828dc..738d1fdab0 100644
--- a/docs/latex/wx/module.tex
+++ b/docs/latex/wx/module.tex
@@ -1,13 +1,13 @@
 \section{\class{wxModule}}\label{wxmodule}
 
-The module system is a very simple mechanism to allow applications (and parts of wxWindows itself) to
-define initialization and cleanup functions that are automatically called on wxWindows
+The module system is a very simple mechanism to allow applications (and parts of wxWidgets itself) to
+define initialization and cleanup functions that are automatically called on wxWidgets
 startup and exit.
 
 To define a new kind of module, derive a class from wxModule, override the OnInit and OnExit functions,
 and add the DECLARE\_DYNAMIC\_CLASS and IMPLEMENT\_DYNAMIC\_CLASS to header and implementation files
-(which can be the same file). On initialization, wxWindows will find all classes derived from wxModule,
-create an instance of each, and call each OnInit function. On exit, wxWindows will call the OnExit
+(which can be the same file). On initialization, wxWidgets will find all classes derived from wxModule,
+create an instance of each, and call each OnInit function. On exit, wxWidgets will call the OnExit
 function for each module instance.
 
 Note that your module class does not have to be in a header file.
@@ -57,28 +57,28 @@ Destructor.
 
 \func{static void}{CleanupModules}{\void}
 
-Calls Exit for each module instance. Called by wxWindows on exit, so there is no
+Calls Exit for each module instance. Called by wxWidgets on exit, so there is no
 need for an application to call it.
 
 \membersection{wxModule::Exit}\label{wxmoduleexit}
 
 \func{void}{Exit}{\void}
 
-Calls OnExit. This function is called by wxWindows and should not need to be called
+Calls OnExit. This function is called by wxWidgets and should not need to be called
 by an application.
 
 \membersection{wxModule::Init}\label{wxmoduleinit}
 
 \func{bool}{Init}{\void}
 
-Calls OnInit. This function is called by wxWindows and should not need to be called
+Calls OnInit. This function is called by wxWidgets and should not need to be called
 by an application.
 
 \membersection{wxModule::InitializeModules}\label{wxmoduleinitializemodules}
 
 \func{static bool}{InitializeModules}{\void}
 
-Calls Init for each module instance. Called by wxWindows on startup, so there is no
+Calls Init for each module instance. Called by wxWidgets on startup, so there is no
 need for an application to call it.
 
 \membersection{wxModule::OnExit}\label{wxmoduleonexit}
@@ -92,19 +92,19 @@ Provide this function with appropriate cleanup for your module.
 \func{virtual bool}{OnInit}{\void}
 
 Provide this function with appropriate initialization for your module. If the function
-returns FALSE, wxWindows will exit immediately.
+returns FALSE, wxWidgets will exit immediately.
 
 \membersection{wxModule::RegisterModule}\label{wxmoduleregistermodule}
 
 \func{static void}{RegisterModule}{\param{wxModule*}{ module}}
 
-Registers this module with wxWindows. Called by wxWindows on startup, so there is no
+Registers this module with wxWidgets. Called by wxWidgets on startup, so there is no
 need for an application to call it.
 
 \membersection{wxModule::RegisterModules}\label{wxmoduleregistermodules}
 
 \func{static bool}{RegisterModules}{\void}
 
-Creates instances of and registers all modules. Called by wxWindows on startup, so there is no
+Creates instances of and registers all modules. Called by wxWidgets on startup, so there is no
 need for an application to call it.
 
diff --git a/docs/latex/wx/mouseevt.tex b/docs/latex/wx/mouseevt.tex
index a26d2b4c76..9cc0ab4f8a 100644
--- a/docs/latex/wx/mouseevt.tex
+++ b/docs/latex/wx/mouseevt.tex
@@ -9,7 +9,7 @@ a middle button so a portable application should avoid relying on the events
 from it.
 
 {\bf NB:} Note that under Windows mouse enter and leave events are not natively supported
-by the system but are generated by wxWindows itself. This has several
+by the system but are generated by wxWidgets itself. This has several
 drawbacks: the LEAVE\_WINDOW event might be received some time after the mouse
 left the window and the state variables for it may have changed during this
 time.
@@ -24,7 +24,7 @@ example, when the user is dragging the mouse you can use
 whether the left mouse button is (still) depressed. Also, by convention, if
 \helpref{LeftDown}{wxmouseeventleftdown} returns {\tt TRUE},
 \helpref{LeftIsDown}{wxmouseeventleftisdown} will also return {\tt TRUE} in
-wxWindows whatever the underlying GUI behaviour is (which is
+wxWidgets whatever the underlying GUI behaviour is (which is
 platform-dependent). The same applies, of course, to other mouse buttons as
 well.
 
diff --git a/docs/latex/wx/noteevt.tex b/docs/latex/wx/noteevt.tex
index 51bc22e9fe..13ae5bc081 100644
--- a/docs/latex/wx/noteevt.tex
+++ b/docs/latex/wx/noteevt.tex
@@ -40,7 +40,7 @@ unnecessary to process both events at once.
 \func{}{wxNotebookEvent}{\param{wxEventType}{ eventType = wxEVT\_NULL},
  \param{int}{ id = 0}, \param{int}{ sel = $-1$}, \param{int}{ oldSel = $-1$}}
 
-Constructor (used internally by wxWindows only).
+Constructor (used internally by wxWidgets only).
 
 \membersection{wxNotebookEvent::GetOldSelection}\label{wxnotebookeventgetoldselection}
 
diff --git a/docs/latex/wx/notifevt.tex b/docs/latex/wx/notifevt.tex
index 1f48b5a78d..625679e160 100644
--- a/docs/latex/wx/notifevt.tex
+++ b/docs/latex/wx/notifevt.tex
@@ -32,7 +32,7 @@ None
 
 \func{}{wxNotifyEvent}{\param{wxEventType}{ eventType = wxEVT\_NULL}, \param{int}{ id = 0}}
 
-Constructor (used internally by wxWindows only).
+Constructor (used internally by wxWidgets only).
 
 \membersection{wxNotifyEvent::Allow}\label{wxnotifyeventallow}
 
diff --git a/docs/latex/wx/object.tex b/docs/latex/wx/object.tex
index a93d8e02d1..14a11a903e 100644
--- a/docs/latex/wx/object.tex
+++ b/docs/latex/wx/object.tex
@@ -1,6 +1,6 @@
 \section{\class{wxObject}}\label{wxobject}
 
-This is the root class of all wxWindows classes.
+This is the root class of all wxWidgets classes.
 It declares a virtual destructor which ensures that
 destructors get called for all derived class objects where necessary.
 
@@ -68,7 +68,7 @@ memory states.
 
 \wxheading{Remarks}
 
-Currently wxWindows does not define Dump for derived classes, but
+Currently wxWidgets does not define Dump for derived classes, but
 programmers may wish to use it for their own applications. Be sure to
 call the Dump member of the class's base class to allow all information to be dumped.
 
diff --git a/docs/latex/wx/pagedlg.tex b/docs/latex/wx/pagedlg.tex
index f400abbfef..59ae3837aa 100644
--- a/docs/latex/wx/pagedlg.tex
+++ b/docs/latex/wx/pagedlg.tex
@@ -1,7 +1,7 @@
 \section{\class{wxPageSetupDialog}}\label{wxpagesetupdialog}
 
 This class represents the page setup common dialog. The page setup dialog is standard from
-Windows 95 on, replacing the print setup dialog (which is retained in Windows and wxWindows
+Windows 95 on, replacing the print setup dialog (which is retained in Windows and wxWidgets
 for backward compatibility). On Windows 95 and NT 4.0 and above, the page setup dialog is
 native to the windowing system, otherwise it is emulated.
 
diff --git a/docs/latex/wx/panel.tex b/docs/latex/wx/panel.tex
index 63b331c13f..237620e2d4 100644
--- a/docs/latex/wx/panel.tex
+++ b/docs/latex/wx/panel.tex
@@ -29,7 +29,7 @@ See also \helpref{window styles overview}{windowstyles}.
 
 By default, a panel has the same colouring as a dialog.
 
-A panel may be loaded from a wxWindows resource file (extension {\tt wxr}).
+A panel may be loaded from a wxWidgets resource file (extension {\tt wxr}).
 
 \wxheading{See also}
 
@@ -58,10 +58,10 @@ Constructor.
 \docparam{id}{An identifier for the panel. A value of -1 is taken to mean a default.}
 
 \docparam{pos}{The panel position. A value of (-1, -1) indicates a default position, chosen by
-either the windowing system or wxWindows, depending on platform.}
+either the windowing system or wxWidgets, depending on platform.}
 
 \docparam{size}{The panel size. A value of (-1, -1) indicates a default size, chosen by
-either the windowing system or wxWindows, depending on platform.}
+either the windowing system or wxWidgets, depending on platform.}
 
 \docparam{style}{The window style. See \helpref{wxPanel}{wxpanel}.}
 
diff --git a/docs/latex/wx/pen.tex b/docs/latex/wx/pen.tex
index 00bf9999af..9903cd806d 100644
--- a/docs/latex/wx/pen.tex
+++ b/docs/latex/wx/pen.tex
@@ -34,7 +34,7 @@ wxLIGHT\_GREY\_PEN}
 
 \wxheading{Remarks}
 
-On a monochrome display, wxWindows shows all non-white pens as black.
+On a monochrome display, wxWidgets shows all non-white pens as black.
 
 Do not initialize objects on the stack before the program commences,
 since other required structures may not have been set up yet. Instead,
@@ -151,7 +151,7 @@ system, since wxBrush uses a reference counting system for efficiency.
 
 Although all remaining pens are deleted when the application exits,
 the application should try to clean up all pens itself. This is because
-wxWindows cannot know if a pointer to the pen object is stored in an
+wxWidgets cannot know if a pointer to the pen object is stored in an
 application data structure, and there is a risk of double deletion.
 
 \membersection{wxPen::GetCap}\label{wxpengetcap}
@@ -348,7 +348,7 @@ be deleted and their resources freed, eliminating the possibility of
 `memory leaks'. However, it is best not to rely on this automatic
 cleanup because it can lead to double deletion in some circumstances.
 
-There are two mechanisms in recent versions of wxWindows which make the
+There are two mechanisms in recent versions of wxWidgets which make the
 pen list less useful than it once was. Under Windows, scarce resources
 are cleaned up internally if they are not being used. Also, a referencing
 counting mechanism applied to all GDI objects means that some sharing
@@ -362,9 +362,9 @@ and copy pens as you see fit. If your Windows resource meter suggests
 your application is using too many resources, you can resort to using
 GDI lists to share objects explicitly.
 
-The only compelling use for the pen list is for wxWindows to keep
+The only compelling use for the pen list is for wxWidgets to keep
 track of pens in order to clean them up on exit. It is also kept for
-backward compatibility with earlier versions of wxWindows.
+backward compatibility with earlier versions of wxWidgets.
 
 \wxheading{See also}
 
@@ -383,7 +383,7 @@ use the object pointer {\bf wxThePenList}.
 
 \func{void}{AddPen}{\param{wxPen*}{ pen}}
 
-Used internally by wxWindows to add a pen to the list.
+Used internally by wxWidgets to add a pen to the list.
 
 \membersection{wxPenList::FindOrCreatePen}\label{wxpenlistfindorcreatepen}
 
@@ -411,6 +411,6 @@ to the pen list, and returns it.
 
 \func{void}{RemovePen}{\param{wxPen*}{ pen}}
 
-Used by wxWindows to remove a pen from the list.
+Used by wxWidgets to remove a pen from the list.
 
 
diff --git a/docs/latex/wx/porting.tex b/docs/latex/wx/porting.tex
index 14aac3ca3b..f480f33e02 100644
--- a/docs/latex/wx/porting.tex
+++ b/docs/latex/wx/porting.tex
@@ -1,7 +1,7 @@
-\chapter{Porting from wxWindows 1.xx}\label{porting}
+\chapter{Porting from wxWidgets 1.xx}\label{porting}
 
 This addendum gives guidelines and tips for porting applications from
-version 1.xx of wxWindows to version 2.0.
+version 1.xx of wxWidgets to version 2.0.
 
 The first section offers tips for writing 1.xx applications in a way to
 minimize porting time. The following sections detail the changes and
@@ -9,7 +9,7 @@ how you can modify your application to be 2.0-compliant.
 
 You may be worrying that porting to 2.0 will be a lot of work,
 particularly if you have only recently started using 1.xx. In fact,
-the wxWindows 2.0 API has far more in common with 1.xx than it has differences.
+the wxWidgets 2.0 API has far more in common with 1.xx than it has differences.
 The main challenges are using the new event system, doing without the default
 panel item layout, and the lack of automatic labels in some controls.
 
@@ -18,7 +18,7 @@ and will be supported by the user community for some time. And when you have
 changed to 2.0, we hope that you will appreciate the benefits in terms
 of greater flexibility, better user interface aesthetics, improved C++ conformance,
 improved compilation speed, and many other enhancements. The revised architecture
-of 2.0 will ensure that wxWindows can continue to evolve for the foreseeable
+of 2.0 will ensure that wxWidgets can continue to evolve for the foreseeable
 future.
 
 {\it Please note that this document is a work in progress.}
@@ -53,7 +53,7 @@ be 32-bit integers in 2.0.
 they are going.
 \item {\bf Using member callbacks} called from global callback functions will make the transition
 easier - see the FAQ
-for some notes on using member functions for callbacks. wxWindows 2.0 will banish global
+for some notes on using member functions for callbacks. wxWidgets 2.0 will banish global
 callback functions (and OnMenuCommand), and nearly all event handling will be done by functions taking a single event argument.
 So in future you will have code like:
 
@@ -70,13 +70,13 @@ You may find that writing the extra code to call a member function isn't worth i
 but the option is there.
 \item {\bf Use wxString wherever possible.} 2.0 replaces char * with wxString
 in most cases, and if you use wxString to receive strings returned from
-wxWindows functions (except when you need to save the pointer if deallocation is required), there should
+wxWidgets functions (except when you need to save the pointer if deallocation is required), there should
 be no conversion problems later on.
 \item Be aware that under Windows, {\bf font sizes will change} to match standard Windows
 font sizes (for example, a 12-point font will appear bigger than before). Write your application
 to be flexible where fonts are concerned.
 Don't rely on fonts being similarly-sized across platforms, as they were (by chance) between
-Windows and X under wxWindows 1.66. Yes, this is not easy... but I think it is better to conform to the
+Windows and X under wxWidgets 1.66. Yes, this is not easy... but I think it is better to conform to the
 standards of each platform, and currently the size difference makes it difficult to
 conform to Windows UI standards. You may eventually wish to build in a global 'fudge-factor' to compensate
 for size differences. The old font sizing will still be available via wx\_setup.h, so do not panic...
@@ -85,18 +85,18 @@ wxPropertyFormView can be used in a wxForm-like way, except that you specify a p
 or dialog; or you can use a wxPropertyListView to show attributes in a scrolling list - you don't even need
 to lay panel items out.
 
-Because wxForm uses a number of features to be dropped in wxWindows 2.0, it cannot be
+Because wxForm uses a number of features to be dropped in wxWidgets 2.0, it cannot be
 supported in the future, at least in its present state.
 \item {\bf When creating a wxListBox}, put the wxLB\_SINGLE, wxLB\_MULTIPLE, wxLB\_EXTENDED styles in the window style parameter, and put
 zero in the {\it multiple} parameter. The {\it multiple} parameter will be removed in 2.0.
 \item {\bf For MDI applications}, don't reply on MDI being run-time-switchable in the way that the
-MDI sample is. In wxWindows 2.0, MDI functionality is separated into distinct classes.
+MDI sample is. In wxWidgets 2.0, MDI functionality is separated into distinct classes.
 \end{itemize}
 
 \section{The new event system}\label{portingeventsystem}
 
-The way that events are handled has been radically changed in wxWindows 2.0. Please
-read the topic `Event handling overview' in the wxWindows 2.0 manual for background
+The way that events are handled has been radically changed in wxWidgets 2.0. Please
+read the topic `Event handling overview' in the wxWidgets 2.0 manual for background
 on this.
 
 \subsection{Callbacks}
@@ -218,14 +218,14 @@ wxGroupBox is renamed wxStaticBox.
 
 \wxheading{wxForm}
 
-Note that wxForm is no longer supported in wxWindows 2.0. Consider using the wxPropertyFormView class
+Note that wxForm is no longer supported in wxWidgets 2.0. Consider using the wxPropertyFormView class
 instead, which takes standard dialogs and panels and associates controls with property objects.
 You may also find that the new validation method, combined with dialog resources, is easier
 and more flexible than using wxForm.
 
 \section{Device contexts and painting}\label{portingdc}
 
-In wxWindows 2.0, device contexts are used for drawing into, as per 1.xx, but the way
+In wxWidgets 2.0, device contexts are used for drawing into, as per 1.xx, but the way
 they are accessed and constructed is a bit different.
 
 You no longer use {\bf GetDC} to access device contexts for panels, dialogs and canvases.
@@ -254,8 +254,8 @@ this should not normally require you to change your code if the syntax is otherw
 same. This is because C++ will automatically convert a char* or const char* to a wxString by virtue
 of appropriate wxString constructors.
 
-However, when a wxString is returned from a function in wxWindows 2.0 where a char* was
-returned in wxWindows 1.xx, your application will need to be changed. Usually you can
+However, when a wxString is returned from a function in wxWidgets 2.0 where a char* was
+returned in wxWidgets 1.xx, your application will need to be changed. Usually you can
 simplify your application's allocation and deallocation of memory for the returned string,
 and simply assign the result to a wxString object. For example, replace this:
 
@@ -293,7 +293,7 @@ Try to use the {\bf const} keyword in your own code where possible.
 
 \section{Backward compatibility}\label{portingcompat}
 
-Some wxWindows 1.xx functionality has been left to ease the transition to 2.0. This functionality
+Some wxWidgets 1.xx functionality has been left to ease the transition to 2.0. This functionality
 (usually) only works if you compile with WXWIN\_COMPATIBILITY set to 1 in setup.h.
 
 Mostly this defines old names to be the new names (e.g. wxRectangle is defined to be wxRect).
diff --git a/docs/latex/wx/postscpt.tex b/docs/latex/wx/postscpt.tex
index c901a61772..84019bfb71 100644
--- a/docs/latex/wx/postscpt.tex
+++ b/docs/latex/wx/postscpt.tex
@@ -1,6 +1,6 @@
 \section{\class{wxPostScriptDC}}\label{wxpostscriptdc}
 
-This defines the wxWindows Encapsulated PostScript device context,
+This defines the wxWidgets Encapsulated PostScript device context,
 which can write PostScript files on any platform. See \helpref{wxDC}{wxdc} for
 descriptions of the member functions.
 
diff --git a/docs/latex/wx/print.tex b/docs/latex/wx/print.tex
index 19a28b38d6..9bc7b3b79e 100644
--- a/docs/latex/wx/print.tex
+++ b/docs/latex/wx/print.tex
@@ -910,8 +910,8 @@ is called once for every print job (regardless of how many copies are being prin
 Called once by the framework to allow the application to perform general
 preparation tasks.
 
-In wxWindows 2.4, this function is called {\it after} GetPageInfo is called,
-which is not ideal. In wxWindows 2.5, the function is correctly called
+In wxWidgets 2.4, this function is called {\it after} GetPageInfo is called,
+which is not ideal. In wxWidgets 2.5, the function is correctly called
 before GetPageInfo is called. Please see Patch 781346 on SourceForge
 for a backport of this fix. Unfortunately we cannot apply it to 2.4,
 for binary compatibility reasons.
diff --git a/docs/latex/wx/process.tex b/docs/latex/wx/process.tex
index e3ced73249..bba9e1c766 100644
--- a/docs/latex/wx/process.tex
+++ b/docs/latex/wx/process.tex
@@ -48,7 +48,7 @@ for explicit destruction.}
 \func{}{wxProcess}{\param{int }{flags}}
 
 Constructs a process object. {\it id} is only used in the case you want to
-use wxWindows events. It identifies this object, or another window that will
+use wxWidgets events. It identifies this object, or another window that will
 receive the event.
 
 If the {\it parent} parameter is different from NULL, it will receive
@@ -138,7 +138,7 @@ error stream.
 
 Returns {\tt TRUE} if there is data to be read on the child process standard
 output stream. This allows to write simple (and extremely inefficient)
-polling-based code waiting for a better mechanism in future wxWindows versions.
+polling-based code waiting for a better mechanism in future wxWidgets versions.
 
 See the \helpref{exec sample}{sampleexec} for an example of using this
 function.
@@ -220,7 +220,7 @@ Returns {\tt TRUE} if the given process exists in the system.
 \constfunc{void}{OnTerminate}{\param{int}{ pid}, \param{int}{ status}}
 
 It is called when the process with the pid {\it pid} finishes.
-It raises a wxWindows event when it isn't overridden.
+It raises a wxWidgets event when it isn't overridden.
 
 \docparam{pid}{The pid of the process which has just terminated.}
 
diff --git a/docs/latex/wx/proplist.tex b/docs/latex/wx/proplist.tex
index f9ce7a77a2..28aae2a7f3 100644
--- a/docs/latex/wx/proplist.tex
+++ b/docs/latex/wx/proplist.tex
@@ -452,7 +452,7 @@ which are only implicit in the current representation of it. For
 example, in Visual Basic and similar programming environments, you can
 `edit a button', or rather, edit the button's properties.  One of the
 properties you can edit is {\it width} - but there is no explicit
-representation of width in a wxWindows button; instead, you call SetSize
+representation of width in a wxWidgets button; instead, you call SetSize
 and GetSize members. To translate this into a consistent,
 property-oriented scheme, we could derive a new class
 wxButtonWithProperties, which has two new functions: SetProperty and
diff --git a/docs/latex/wx/radiobox.tex b/docs/latex/wx/radiobox.tex
index 72f27204b6..44a17b7cc2 100644
--- a/docs/latex/wx/radiobox.tex
+++ b/docs/latex/wx/radiobox.tex
@@ -199,7 +199,7 @@ Returns the selected string.
 
 {\bf Obsolescence note:} This method is obsolete and was replaced with 
 \helpref{GetCount}{wxradioboxgetcount}, please use the new method in the new
-code. This method is only available if wxWindows was compiled with 
+code. This method is only available if wxWidgets was compiled with 
 {\tt WXWIN\_COMPATIBILITY\_2\_2} defined and will disappear completely in
 future versions.
 
diff --git a/docs/latex/wx/referenc.tex b/docs/latex/wx/referenc.tex
index 03981d1306..2ed8e0d2f7 100644
--- a/docs/latex/wx/referenc.tex
+++ b/docs/latex/wx/referenc.tex
@@ -16,7 +16,7 @@
 
 \parskip=10pt
 \parindent=0pt
-\title{Reference Manual for wxWindows 2.0: a portable C++ GUI toolkit}
+\title{Reference Manual for wxWidgets 2.0: a portable C++ GUI toolkit}
 \author{Julian Smart}
 \date{November 4th 1998}
 
@@ -38,7 +38,7 @@
 
 \begin{center}
 Copyright (c) 1998 Julian Smart, Markus Holzem, Robert Roebling and other
-members of the wxWindows team\\
+members of the wxWidgets team\\
 Portions (c) 1996 Artificial Intelligence Applications Institute\\
 \end{center}
 
@@ -63,11 +63,11 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 \setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
 \setfooter{\thepage}{}{}{}{}{\thepage}
 
-wxWindows is a class library for C++ providing GUI (Graphical User
+wxWidgets is a class library for C++ providing GUI (Graphical User
 Interface) and other facilities on more than one platform. This document
 gives detailed information about the classes and functions that make up
-the wxWindows API (Application Programming Interface).  Please refer to the
-wxWindows user manual for a more general description of wxWindows.
+the wxWidgets API (Application Programming Interface).  Please refer to the
+wxWidgets user manual for a more general description of wxWidgets.
 
 \input{classes.tex}
 \input{category.tex}
diff --git a/docs/latex/wx/regex.tex b/docs/latex/wx/regex.tex
index 0c9adcbbfa..34254a48b3 100644
--- a/docs/latex/wx/regex.tex
+++ b/docs/latex/wx/regex.tex
@@ -6,7 +6,7 @@
 %% Created:     14.07.01
 %% RCS-ID:      $Id$
 %% Copyright:   (c) 2001 Vadim Zeitlin
-%% License:     wxWindows license
+%% License:     wxWidgets license
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \section{\class{wxRegEx}}\label{wxregex}
diff --git a/docs/latex/wx/region.tex b/docs/latex/wx/region.tex
index 88ad86ecff..2ed194a09c 100644
--- a/docs/latex/wx/region.tex
+++ b/docs/latex/wx/region.tex
@@ -46,7 +46,7 @@ Constructs a region corresponding to the polygon made of {\it n} points in the
 provided array. {\it fillStyle} parameter may have values
 {\tt wxWINDING\_RULE} or {\tt wxODDEVEN\_RULE}.
 
-{\bf NB:} This constructor is only implemented for Win32 and GTK+ wxWindows ports.
+{\bf NB:} This constructor is only implemented for Win32 and GTK+ wxWidgets ports.
 
 \func{}{wxRegion}{\param{const wxBitmap&}{ bmp},
                   \param{const wxColour&}{ transColour = wxNullColour},
diff --git a/docs/latex/wx/scpdarry.tex b/docs/latex/wx/scpdarry.tex
index 077656725f..b35224b90a 100644
--- a/docs/latex/wx/scpdarry.tex
+++ b/docs/latex/wx/scpdarry.tex
@@ -6,7 +6,7 @@ use macros instead.
 
 \wxheading{Example}
 
-Below is an example of using a wxWindows scoped smart pointer and 
+Below is an example of using a wxWidgets scoped smart pointer and 
 pointer array.
 
 \begin{verbatim}
diff --git a/docs/latex/wx/scpdptr.tex b/docs/latex/wx/scpdptr.tex
index 3fab597dfa..ba2792697b 100644
--- a/docs/latex/wx/scpdptr.tex
+++ b/docs/latex/wx/scpdptr.tex
@@ -6,7 +6,7 @@ use macros instead.
 
 \wxheading{Example}
 
-Below is an example of using a wxWindows scoped smart pointer and 
+Below is an example of using a wxWidgets scoped smart pointer and 
 pointer array.
 
 \begin{verbatim}
diff --git a/docs/latex/wx/scrolevt.tex b/docs/latex/wx/scrolevt.tex
index 4ab49ae1d4..a2a899b7ba 100644
--- a/docs/latex/wx/scrolevt.tex
+++ b/docs/latex/wx/scrolevt.tex
@@ -2,7 +2,7 @@
 
 A scroll event holds information about events sent from stand-alone
 \helpref{scrollbars}{wxscrollbar} and \helpref{sliders}{wxslider}. Note that
-starting from wxWindows 2.1, scrolled windows send the 
+starting from wxWidgets 2.1, scrolled windows send the 
 \helpref{wxScrollWinEvent}{wxscrollwinevent} which does not derive from
 wxCommandEvent, but from wxEvent directly - don't confuse these two kinds of
 events and use the event table macros mentioned below only for the
diff --git a/docs/latex/wx/scrolwin.tex b/docs/latex/wx/scrolwin.tex
index 1336f32ef0..2e02c32366 100644
--- a/docs/latex/wx/scrolwin.tex
+++ b/docs/latex/wx/scrolwin.tex
@@ -4,13 +4,13 @@ The wxScrolledWindow class manages scrolling for its client area, transforming
 the coordinates according to the scrollbar positions, and setting the
 scroll positions, thumb sizes and ranges according to the area in view.
 
-Starting from version 2.4 of wxWindows, there are several ways to use a
+Starting from version 2.4 of wxWidgets, there are several ways to use a
 wxScrolledWindow. In particular, there are now three ways to set the
 size of the scrolling area:
 
 One way is to set the scrollbars directly using a call to
 \helpref{wxScrolledWindow::SetScrollbars}{wxscrolledwindowsetscrollbars}.
-This is the way it used to be in any previous version of wxWindows
+This is the way it used to be in any previous version of wxWidgets
 and it will be kept for backwards compatibility.
 
 An additional method of manual control, which requires a little less
@@ -34,7 +34,7 @@ increment.  You can influence the minimum size of the scrolled area
 controlled by a sizer by calling
 \helpref{wxWindow::SetVirtualSizeHints}{wxwindowsetvirtualsizehints}.
 (calling \helpref{wxScrolledWindow::SetScrollbars}{wxscrolledwindowsetscrollbars}
- has analogous effects in wxWindows 2.4 -- in later versions it may not continue
+ has analogous effects in wxWidgets 2.4 -- in later versions it may not continue
  to override the sizer)
 
 Note:  if Maximum size hints are still supported by SetVirtualSizeHints, use
diff --git a/docs/latex/wx/semaphor.tex b/docs/latex/wx/semaphor.tex
index 68da8177ec..dfd0796a1d 100644
--- a/docs/latex/wx/semaphor.tex
+++ b/docs/latex/wx/semaphor.tex
@@ -6,7 +6,7 @@
 %% Created:     02.04.02
 %% RCS-ID:      $Id$
 %% Copyright:   (c) 2002 Vadim Zeitlin
-%% License:     wxWindows license
+%% License:     wxWidgets license
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \section{\class{wxSemaphore}}\label{wxsemaphore}
diff --git a/docs/latex/wx/size.tex b/docs/latex/wx/size.tex
index a29fc06484..3b94964f17 100644
--- a/docs/latex/wx/size.tex
+++ b/docs/latex/wx/size.tex
@@ -3,7 +3,7 @@
 A {\bf wxSize} is a useful data structure for graphics operations.
 It simply contains integer {\it width} and {\it height} members.
 
-wxSize is used throughout wxWindows as well as wxPoint which, although almost
+wxSize is used throughout wxWidgets as well as wxPoint which, although almost
 equivalent to wxSize, has a different meaning: wxPoint represents a position
 while wxSize - the size.
 
diff --git a/docs/latex/wx/sizeevt.tex b/docs/latex/wx/sizeevt.tex
index e9f78d76a1..0feab785be 100644
--- a/docs/latex/wx/sizeevt.tex
+++ b/docs/latex/wx/sizeevt.tex
@@ -1,12 +1,12 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Name:        sizeevt.tex
 %% Purpose:     wxSizeEvent documentation
-%% Author:      wxWindows team
+%% Author:      wxWidgets team
 %% Modified by:
 %% Created:
 %% RCS-ID:      $Id$
-%% Copyright:   (c) wxWindows team
-%% License:     wxWindows license
+%% Copyright:   (c) wxWidgets team
+%% License:     wxWidgets license
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \section{\class{wxSizeEvent}}\label{wxsizeevent}
diff --git a/docs/latex/wx/sizer.tex b/docs/latex/wx/sizer.tex
index b7d1b8ee4e..b18efccc06 100644
--- a/docs/latex/wx/sizer.tex
+++ b/docs/latex/wx/sizer.tex
@@ -7,7 +7,7 @@ classes derived from it. Currently there are \helpref{wxBoxSizer}{wxboxsizer},
 \helpref{wxNotebookSizer}{wxnotebooksizer}, \helpref{wxGridSizer}{wxgridsizer} 
 and \helpref{wxFlexGridSizer}{wxflexgridsizer}.
 
-The layout algorithm used by sizers in wxWindows is closely related to layout
+The layout algorithm used by sizers in wxWidgets is closely related to layout
 in other GUI toolkits, such as Java's AWT, the GTK toolkit or the Qt toolkit. It is
 based upon the idea of the individual subwindows reporting their minimal required
 size and their ability to get stretched if the size of the parent window has changed.
@@ -19,7 +19,7 @@ a hierarchy of sizers can be constructed. Note that wxSizer does not derive from
 and thus do not interfere with tab ordering and requires very little resources compared
 to a real window on screen.
 
-What makes sizers so well fitted for use in wxWindows is the fact that every control
+What makes sizers so well fitted for use in wxWidgets is the fact that every control
 reports its own minimal size and the algorithm can handle differences in font sizes
 or different window (dialog item) sizes on different platforms without problems. If e.g.
 the standard font as well as the overall design of Motif widgets requires more space than
diff --git a/docs/latex/wx/snglinst.tex b/docs/latex/wx/snglinst.tex
index cab6ba0d4e..a7ab982c93 100644
--- a/docs/latex/wx/snglinst.tex
+++ b/docs/latex/wx/snglinst.tex
@@ -6,7 +6,7 @@
 %% Created:     08.06.01
 %% RCS-ID:      $Id$
 %% Copyright:   (c) 2001 Vadim Zeitlin
-%% License:     wxWindows license
+%% License:     wxWidgets license
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \section{\class{wxSingleInstanceChecker}}\label{wxsingleinstancechecker}
diff --git a/docs/latex/wx/socket.tex b/docs/latex/wx/socket.tex
index 33a9ae651d..f5f596a145 100644
--- a/docs/latex/wx/socket.tex
+++ b/docs/latex/wx/socket.tex
@@ -5,8 +5,8 @@
 %% Modified by:
 %% Created:     1999
 %% RCS-ID:      $Id$
-%% Copyright:   (c) wxWindows team
-%% License:     wxWindows license
+%% Copyright:   (c) wxWidgets team
+%% License:     wxWidgets license
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \section{\class{wxSocketBase}}\label{wxsocketbase}
@@ -169,7 +169,7 @@ Functions that allow applications to receive socket events.
 Callback functions are also available, but they are provided for backwards
 compatibility only. Their use is strongly discouraged in favour of events,
 and should be considered deprecated. Callbacks may be unsupported in future
-releases of wxWindows.
+releases of wxWidgets.
 
 \helpref{Callback}{wxsocketbasecallback}\\
 \helpref{CallbackData}{wxsocketbasecallbackdata}
diff --git a/docs/latex/wx/socksrv.tex b/docs/latex/wx/socksrv.tex
index 29bb083b2c..57d968868d 100644
--- a/docs/latex/wx/socksrv.tex
+++ b/docs/latex/wx/socksrv.tex
@@ -5,8 +5,8 @@
 %% Modified by:
 %% Created:     14.01.02 (extracted from socket.tex)
 %% RCS-ID:      $Id$
-%% Copyright:   (c) wxWindows team
-%% License:     wxWindows license
+%% Copyright:   (c) wxWidgets team
+%% License:     wxWidgets license
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 % ---------------------------------------------------------------------------
diff --git a/docs/latex/wx/spinevt.tex b/docs/latex/wx/spinevt.tex
index 9886823716..8dee57944a 100644
--- a/docs/latex/wx/spinevt.tex
+++ b/docs/latex/wx/spinevt.tex
@@ -6,7 +6,7 @@
 %% Created:     29.03.00
 %% RCS-ID:      $Id$
 %% Copyright:   (c) Vadim Zeitlin
-%% License:     wxWindows license
+%% License:     wxWidgets license
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \section{\class{wxSpinEvent}}\label{wxspinevent}
diff --git a/docs/latex/wx/splitevt.tex b/docs/latex/wx/splitevt.tex
index 7cf2b96e93..520df0d44f 100644
--- a/docs/latex/wx/splitevt.tex
+++ b/docs/latex/wx/splitevt.tex
@@ -59,7 +59,7 @@ wxEVT\_COMMAND\_SPLITTER\_DOUBLECLICKED event.}
 \func{}{wxSplitterEvent}{\param{wxEventType}{ eventType = wxEVT\_NULL},
                          \param{wxSplitterWindow *}{ splitter = NULL}}
 
-Constructor. Used internally by wxWindows only.
+Constructor. Used internally by wxWidgets only.
 
 
 \membersection{wxSplitterEvent::GetSashPosition}\label{wxsplittereventgetsashposition}
diff --git a/docs/latex/wx/statbox.tex b/docs/latex/wx/statbox.tex
index a3ce189d80..4890ac73c8 100644
--- a/docs/latex/wx/statbox.tex
+++ b/docs/latex/wx/statbox.tex
@@ -5,7 +5,7 @@ a logical grouping of items.
 
 Please note that a static box should {\bf not} be used as the parent for the
 controls it contains, instead they should be siblings of each other. Although
-using a static box as a parent might work in some versions of wxWindows, it
+using a static box as a parent might work in some versions of wxWidgets, it
 results in a crash under, for example, wxGTK.
 
 \wxheading{Derived from}
diff --git a/docs/latex/wx/stdevtid.tex b/docs/latex/wx/stdevtid.tex
index 679ff5b976..b98eb3ff57 100644
--- a/docs/latex/wx/stdevtid.tex
+++ b/docs/latex/wx/stdevtid.tex
@@ -1,18 +1,18 @@
 \section{Standard event identifiers}\label{stdevtid}
 
-wxWindows defines a special identifier value {\tt wxID\_ANY} which is used in
+wxWidgets defines a special identifier value {\tt wxID\_ANY} which is used in
 the following two situations:
 \begin{itemize}
     \item when creating a new window you may specify {\tt wxID\_ANY} to let
-          wxWindows assign an unused identifier to it automatically
+          wxWidgets assign an unused identifier to it automatically
     \item when installing an event handler using either the event table
           macros or \helpref{wxEvtHandler::Connect}{wxevthandlerconnect}
           you may use it to indicate that you want to handle the events
           coming from any control, regardless of its identifier
 \end{itemize}
 
-wxWindows also defines a few standard command identifiers which may be used by
-the user code and also are sometimes used by wxWindows itself. These reserved
+wxWidgets also defines a few standard command identifiers which may be used by
+the user code and also are sometimes used by wxWidgets itself. These reserved
 identifiers are all in the range between {\tt wxID\_LOWEST} and 
 {\tt wxID\_HIGHEST} and, accordingly, the user code should avoid defining its
 own constants in this range.
diff --git a/docs/latex/wx/strmbase.tex b/docs/latex/wx/strmbase.tex
index 243e5a48ef..a68cbdd0da 100644
--- a/docs/latex/wx/strmbase.tex
+++ b/docs/latex/wx/strmbase.tex
@@ -3,7 +3,7 @@
 % -----------------------------------------------------------------------------
 \section{\class{wxStreamBase}}\label{wxstreambase}
 
-This class is the base class of most stream related classes in wxWindows. It must
+This class is the base class of most stream related classes in wxWidgets. It must
 not be used directly.
 
 \wxheading{Derived from}
diff --git a/docs/latex/wx/strmsock.tex b/docs/latex/wx/strmsock.tex
index d7179d0cbb..10c8b19e9e 100644
--- a/docs/latex/wx/strmsock.tex
+++ b/docs/latex/wx/strmsock.tex
@@ -5,8 +5,8 @@
 %% Modified by:
 %% Created:     1999
 %% RCS-ID:      $Id$
-%% Copyright:   (c) wxWindows team
-%% License:     wxWindows license
+%% Copyright:   (c) wxWidgets team
+%% License:     wxWidgets license
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 % -----------------------------------------------------------------------------
diff --git a/docs/latex/wx/strtotxt.tex b/docs/latex/wx/strtotxt.tex
index c370668e54..5cea51c94e 100644
--- a/docs/latex/wx/strtotxt.tex
+++ b/docs/latex/wx/strtotxt.tex
@@ -5,8 +5,8 @@
 %% Modified by:
 %% Created:     19.10.01
 %% RCS-ID:      $Id$
-%% Copyright:   (c) 2001 Vadim Zeitlin <vadim@wxwindows.org>
-%% License:     wxWindows license
+%% Copyright:   (c) 2001 Vadim Zeitlin <vadim@wxwidgets.org>
+%% License:     wxWidgets license
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \section{\class{wxStreamToTextRedirector}}\label{wxstreamtotextredirector}
diff --git a/docs/latex/wx/sysopt.tex b/docs/latex/wx/sysopt.tex
index b04265f49f..e4d34ce884 100644
--- a/docs/latex/wx/sysopt.tex
+++ b/docs/latex/wx/sysopt.tex
@@ -1,11 +1,11 @@
 \section{\class{wxSystemOptions}}\label{wxsystemoptions}
 
-wxSystemOptions stores option/value pairs that wxWindows itself or
+wxSystemOptions stores option/value pairs that wxWidgets itself or
 applications can use to alter behaviour at run-time. It can be
 used to optimize behaviour that doesn't deserve a distinct API,
 but is still important to be able to configure.
 
-These options are currently recognised by wxWindows:
+These options are currently recognised by wxWidgets:
 
 \twocolwidtha{7cm}
 \begin{twocollist}\itemsep=0pt
diff --git a/docs/latex/wx/tapp.tex b/docs/latex/wx/tapp.tex
index 9deac1d1ba..346d209efa 100644
--- a/docs/latex/wx/tapp.tex
+++ b/docs/latex/wx/tapp.tex
@@ -2,13 +2,13 @@
 
 Classes: \helpref{wxApp}{wxapp}
 
-A wxWindows application does not have a {\it main} procedure; the equivalent is the
+A wxWidgets application does not have a {\it main} procedure; the equivalent is the
 \rtfsp\helpref{OnInit}{wxapponinit} member defined for a class derived from wxApp.\rtfsp
 \rtfsp{\it OnInit} will usually create a top window as a bare minimum.
 
-Unlike in earlier versions of wxWindows, OnInit does not return a frame. Instead it
+Unlike in earlier versions of wxWidgets, OnInit does not return a frame. Instead it
 returns a boolean value which indicates whether processing should continue (TRUE) or not (FALSE).
-You call \helpref{wxApp::SetTopWindow}{wxappsettopwindow} to let wxWindows know
+You call \helpref{wxApp::SetTopWindow}{wxappsettopwindow} to let wxWidgets know
 about the top window.
 
 Note that the program's command line arguments, represented by {\it argc} 
@@ -47,8 +47,8 @@ bool DerivedApp::OnInit()
 }
 \end{verbatim}
 
-Note the use of IMPLEMENT\_APP(appClass), which allows wxWindows to dynamically create an instance of the application object
-at the appropriate point in wxWindows initialization. Previous versions of wxWindows used
+Note the use of IMPLEMENT\_APP(appClass), which allows wxWidgets to dynamically create an instance of the application object
+at the appropriate point in wxWidgets initialization. Previous versions of wxWidgets used
 to rely on the creation of a global application object, but this is no longer recommended,
 because required global initialization may not have been performed at application object
 construction time.
@@ -63,7 +63,7 @@ closed. This is normally the expected behaviour and means that it is enough to
 call \helpref{Close()}{wxwindowclose} in response to the {\tt "Exit"} menu
 command if your program has a single top level window. If this behaviour is not
 desirable \helpref{wxApp::SetExitOnFrameDelete}{wxappsetexitonframedelete} can
-be called to change it. Note that starting from wxWindows 2.3.3 such logic
+be called to change it. Note that starting from wxWidgets 2.3.3 such logic
 doesn't apply for the windows shown before the program enters the main loop: in
 other words, you can safely show a dialog from 
 \helpref{wxApp::OnInit}{wxapponinit} and not be afraid that your application
@@ -72,8 +72,8 @@ moment -- is closed.
 
 
 Another aspect of the application shutdown is the \helpref{OnExit}{wxapponexit} 
-which is called when the application exits but {\it before} wxWindows cleans up
-its internal structures. Your should delete all wxWindows object that your
+which is called when the application exits but {\it before} wxWidgets cleans up
+its internal structures. Your should delete all wxWidgets object that your
 created by the time OnExit finishes. In particular, do {\bf not} destroy them
 from application class' destructor!
 
@@ -90,7 +90,7 @@ class MyApp : public wxApp
 
 The reason for that is that {\tt m\_helpCtrl} is a member object and is 
 thus destroyed from MyApp destructor. But MyApp object is deleted after 
-wxWindows structures that wxCHMHelpController depends on were 
+wxWidgets structures that wxCHMHelpController depends on were 
 uninitialized! The solution is to destroy HelpCtrl in {\it OnExit}:
 
 \begin{verbatim}
diff --git a/docs/latex/wx/tbitmap.tex b/docs/latex/wx/tbitmap.tex
index a9e751a9ee..22788f246d 100644
--- a/docs/latex/wx/tbitmap.tex
+++ b/docs/latex/wx/tbitmap.tex
@@ -18,7 +18,7 @@ version of the graphic which appears on the main window.
 
 See \helpref{wxMemoryDC}{wxmemorydc} for an example of drawing onto a bitmap.
 
-All wxWindows platforms support XPMs for small bitmaps and icons.
+All wxWidgets platforms support XPMs for small bitmaps and icons.
 You may include the XPM inline as below, since it's C code, or you
 can load it at run-time.
 
@@ -76,7 +76,7 @@ The following lists the formats handled on different platforms. Note
 that missing or partially-implemented formats are automatically supplemented
 by the \helpref{wxImage}{wximage} to load the data, and then converting
 it to wxBitmap form. Note that using wxImage is the preferred way to
-load images in wxWindows, with the exception of resources (XPM-files or
+load images in wxWidgets, with the exception of resources (XPM-files or
 native Windows resources). Writing an image format handler for wxImage
 is also far easier than writing one for wxBitmap, because wxImage has
 exactly one format on all platforms whereas wxBitmap can store pixel data
diff --git a/docs/latex/wx/tclipbrd.tex b/docs/latex/wx/tclipbrd.tex
index ae3f102ab3..f4e49ff2c5 100644
--- a/docs/latex/wx/tclipbrd.tex
+++ b/docs/latex/wx/tclipbrd.tex
@@ -9,7 +9,7 @@ Classes: \helpref{wxDataObject}{wxdataobject},
 See also: \helpref{Drag and drop overview}{wxdndoverview} and \helpref{DnD sample}{samplednd}
 
 This overview discusses data transfer through clipboard or drag and drop. In
-wxWindows, these two ways to transfer data (either between different
+wxWidgets, these two ways to transfer data (either between different
 applications or inside one and the same) are very similar which allows to
 implement both of them using almost the same code - or, in other
 words, if you implement drag and drop support for your application, you get
diff --git a/docs/latex/wx/tcommdlg.tex b/docs/latex/wx/tcommdlg.tex
index cd91cc9036..0f4109c9dd 100644
--- a/docs/latex/wx/tcommdlg.tex
+++ b/docs/latex/wx/tcommdlg.tex
@@ -92,10 +92,10 @@ Under Windows, the native font selector common dialog is used. This
 presents a dialog box with controls for font name, point size, style, weight,
 underlining, strikeout and text foreground colour. A sample of the
 font is shown on a white area of the dialog box. Note that
-in the translation from full MS Windows fonts to wxWindows font
+in the translation from full MS Windows fonts to wxWidgets font
 conventions, strikeout is ignored and a font family (such as
 Swiss or Modern) is deduced from the actual font name (such as Arial
-or Courier). The full range of Windows fonts cannot be used in wxWindows
+or Courier). The full range of Windows fonts cannot be used in wxWidgets
 at present.
 
 {\bf The generic font selector}
diff --git a/docs/latex/wx/tconstr.tex b/docs/latex/wx/tconstr.tex
index 6eea4c6c49..c5c546109c 100644
--- a/docs/latex/wx/tconstr.tex
+++ b/docs/latex/wx/tconstr.tex
@@ -57,13 +57,13 @@ This object contains a constraint for each of the window edges, two for the cent
 and two for the window size. By setting some or all of these constraints appropriately,
 the user can achieve quite complex layout by defining relationships between windows.
 
-In wxWindows, each window can be constrained relative to either its {\it
+In wxWidgets, each window can be constrained relative to either its {\it
 siblings} on the same window, or the {\it parent}. The layout algorithm
 therefore operates in a top-down manner, finding the correct layout for
 the children of a window, then the layout for the grandchildren, and so
 on. Note that this differs markedly from native Motif layout, where
 constraints can ripple upwards and can eventually change the frame
-window or dialog box size. We assume in wxWindows that the {\it user} is
+window or dialog box size. We assume in wxWidgets that the {\it user} is
 always `boss' and specifies the size of the outer window, to which
 subwindows must conform. Obviously, this might be a limitation in some
 circumstances, but it suffices for most situations, and the
diff --git a/docs/latex/wx/tcontain.tex b/docs/latex/wx/tcontain.tex
index c2e7364f36..a218f7de0f 100644
--- a/docs/latex/wx/tcontain.tex
+++ b/docs/latex/wx/tcontain.tex
@@ -2,23 +2,23 @@
 
 Classes: \helpref{wxList}{wxlist}, \helpref{wxArray}{wxarray}
 
-wxWindows uses itself several container classes including doubly-linked lists
+wxWidgets uses itself several container classes including doubly-linked lists
 and dynamic arrays (i.e. arrays which expand automatically when they become
-full). For both historical and portability reasons wxWindows does not
+full). For both historical and portability reasons wxWidgets does not
 use STL which provides the standard implementation of many container classes in
-C++. First of all, wxWindows has existed since well before STL was written, and
+C++. First of all, wxWidgets has existed since well before STL was written, and
 secondly we don't believe that today compilers can deal really well with all of
 STL classes (this is especially true for some less common platforms). Of
 course, the compilers are evolving quite rapidly and hopefully their progress
-will allow to base future versions of wxWindows on STL - but this is not yet
+will allow to base future versions of wxWidgets on STL - but this is not yet
 the case.
 
-wxWindows container classes don't pretend to be as powerful or full as STL
+wxWidgets container classes don't pretend to be as powerful or full as STL
 ones, but they are quite useful and may be compiled with absolutely any C++
-compiler. They're used internally by wxWindows, but may, of course, be used in
+compiler. They're used internally by wxWidgets, but may, of course, be used in
 your programs as well if you wish.
 
-The list classes in wxWindows are doubly-linked lists which may either own the
+The list classes in wxWidgets are doubly-linked lists which may either own the
 objects they contain (meaning that the list deletes the object when it is
 removed from the list or the list itself is destroyed) or just store the
 pointers depending on whether you called or not 
@@ -31,7 +31,7 @@ two sorts: the "plain" arrays which store either built-in types such as "char",
 "int" or "bool" or the pointers to arbitrary objects, or "object arrays" which
 own the object pointers to which they store.
 
-For the same portability reasons, the container classes implementation in wxWindows
+For the same portability reasons, the container classes implementation in wxWidgets
 does not use templates, but is rather based on C preprocessor i.e. is done with
 the macros: {\it WX\_DECLARE\_LIST} and {\it WX\_DEFINE\_LIST} for the linked
 lists and {\it WX\_DECLARE\_ARRAY}, {\it WX\_DECLARE\_OBJARRAY} and {\it WX\_DEFINE\_OBJARRAY} for
@@ -47,7 +47,7 @@ no WX\_DEFINE\_ARRAY macro for them.
 Examples of usage of these macros may be found in \helpref{wxList}{wxlist} and 
 \helpref{wxArray}{wxarray} documentation.
 
-Finally, wxWindows predefines several commonly used container classes. wxList
+Finally, wxWidgets predefines several commonly used container classes. wxList
 is defined for compatibility with previous versions as a list containing
 wxObjects and wxStringList as a list of C-style strings (char *), both of these
 classes are deprecated and should not be used in new programs. The following
diff --git a/docs/latex/wx/tdate.tex b/docs/latex/wx/tdate.tex
index 5b1219cab7..7c81c9a637 100644
--- a/docs/latex/wx/tdate.tex
+++ b/docs/latex/wx/tdate.tex
@@ -6,7 +6,7 @@
 %% Created:     07.03.00
 %% RCS-ID:      $Id$
 %% Copyright:   (c) Vadim Zeitlin
-%% License:     wxWindows license
+%% License:     wxWidgets license
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \section{Date and time classes overview}\label{wxdatetimeoverview}
@@ -15,7 +15,7 @@ Classes: \helpref{wxDateTime}{wxdatetime}, \helpref{wxDateSpan}{wxdatespan}, \he
 
 \subsection{Introduction}
 
-wxWindows provides a set of powerful classes to work with dates and times. Some
+wxWidgets provides a set of powerful classes to work with dates and times. Some
 of the supported features of \helpref{wxDateTime}{wxdatetime} class are:
 
 \twocolwidtha{7cm}
@@ -211,7 +211,7 @@ TODO.
 
 \subsection{Compatibility}\label{tdatecompatibility}
 
-The old classes for date/time manipulations ported from wxWindows version 1.xx
+The old classes for date/time manipulations ported from wxWidgets version 1.xx
 are still included but are reimplemented in terms of wxDateTime. However, using
 them is strongly discouraged because they have a few quirks/bugs and were not
 `Y2K' compatible.
diff --git a/docs/latex/wx/tdb.tex b/docs/latex/wx/tdb.tex
index bb4377d0da..f56f75b500 100644
--- a/docs/latex/wx/tdb.tex
+++ b/docs/latex/wx/tdb.tex
@@ -1,23 +1,23 @@
 \section{Database classes overview}\label{odbcoverview}
 
 \normalboxd{The more sophisticated wxODBC classes (wxDb/wxDbTable) are the 
-recommended classes for doing database/ODBC work with wxWindows. These new 
-classes replace the wxWindows v1.6x classes wxDatabase. Documentation for the 
+recommended classes for doing database/ODBC work with wxWidgets. These new 
+classes replace the wxWidgets v1.6x classes wxDatabase. Documentation for the 
 old wxDatabase class and its associated classes is still 
 included in the class documentation and in this overview section, but support 
 for these old classes has been phased out, and all future development work 
 is being done solely on the new wxDb/wxDbTable classes.}
 
-\subsection{Different ODBC Class Libraries in wxWindows}
+\subsection{Different ODBC Class Libraries in wxWidgets}
 
-Following is a detailed overview of how to use the wxWindows ODBC classes - \helpref{wxDb}{wxdb} 
+Following is a detailed overview of how to use the wxWidgets ODBC classes - \helpref{wxDb}{wxdb} 
 and \helpref{wxDbTable}{wxdbtable} and their associated functions. These are 
 the ODBC classes donated by Remstar International, and are collectively 
 referred to herein as the wxODBC classes. Since their initial inclusion with 
-wxWindows v2.x, they have become the recommended wxWindows classes for database 
+wxWidgets v2.x, they have become the recommended wxWidgets classes for database 
 access.
 
-An older version of some classes ported over from wxWindows v1.68 still exist 
+An older version of some classes ported over from wxWidgets v1.68 still exist 
 (see \helpref{wxDatabase}{wxdatabase} in odbc.cpp), but are now deprecated in favor of the more 
 robust and comprehensive wxDb/wxDbTable classes. All current and future 
 feature development, as well as active debugging, are only being done on 
@@ -172,7 +172,7 @@ returned.
 For each result set, a cursor is maintained (typically by the database) 
 which keeps track of where in the result set the user currently is. 
 Depending on the database, ODBC driver, and how you configured the 
-wxWindows ODBC settings in setup.h (see \helpref{wxODBC - Compiling}{wxodbccompiling}), cursors can be 
+wxWidgets ODBC settings in setup.h (see \helpref{wxODBC - Compiling}{wxodbccompiling}), cursors can be 
 either forward or backward scrolling. At a minimum, cursors must scroll 
 forward. For example, if a query resulted in a result set with 100 rows, 
 as the data is read by the client application, it will read row 1, then 2, 
@@ -258,7 +258,7 @@ the datasource will only be available to the user who configured the DSN.
 
 Under Unix, iODBC is used for implementation of the ODBC API. To compile the 
 wxODBC classes, you must first obtain iODBC from \urlref{http://www.iodbc.org}{www.iodbc.org} and install it. 
-(Note: wxWindows currently includes a version of iODBC.) Then you must create the file "~/.odbc.ini" (or optionally create 
+(Note: wxWidgets currently includes a version of iODBC.) Then you must create the file "~/.odbc.ini" (or optionally create 
 "/etc/odbc.ini" for access for all users on the system). This file contains 
 the settings for your system/datasource. Below is an example section of a 
 odbc.ini file for use with the "samples/db" sample program using MySQL:
@@ -277,7 +277,7 @@ odbc.ini file for use with the "samples/db" sample program using MySQL:
 
 \subsection{wxODBC - Compiling}\label{wxodbccompiling}
 
-The wxWindows setup.h file has several settings in it pertaining to compiling 
+The wxWidgets setup.h file has several settings in it pertaining to compiling 
 the wxODBC classes.
 
 \begin{twocollist}\itemsep=0pt
@@ -293,7 +293,7 @@ either the \helpref{wxDbGetConnection}{wxdbfunctions} or
 \helpref{wxDb constructor}{wxdbconstr}. The default is 1.}
 \twocolitem{wxODBC\_BACKWARD\_COMPATABILITY}{Between v2.0 and 2.2, massive 
 renaming efforts were done to the ODBC classes to get naming conventions 
-similar to those used throughout wxWindows, as well as to preface all wxODBC 
+similar to those used throughout wxWidgets, as well as to preface all wxODBC 
 classes names and functions with a wxDb preface. Because this renaming would 
 affect applications written using the v2.0 names, this compile-time directive 
 was added to allow those programs written for v2.0 to still compile using the 
@@ -308,7 +308,7 @@ is 0.}
 
 You are required to include the "odbc32.lib" provided by your compiler vendor 
 in the list of external libraries to be linked in. If using the makefiles 
-supplied with wxWindows, this library should already be included for use with 
+supplied with wxWidgets, this library should already be included for use with 
 makefile.b32, makefile.vc, and makefile.g95. 
 
 You cannot compile the wxODBC classes under Win16 - sorry.
@@ -351,7 +351,7 @@ Authorization string (password). A fourth piece of information, a default
 directory indicating where the data file is stored, is required for Text and 
 dBase drivers for ODBC.
 
-The wxWindows data class wxDbConnectInf exists for holding all of these 
+The wxWidgets data class wxDbConnectInf exists for holding all of these 
 values, plus some others that may be desired.
 
 The 'Henv' member is the environment handle used to access memory for use by the 
@@ -518,7 +518,7 @@ One final note on creating a connection. When a connection is created, it
 will default to only allowing cursor scrolling to be either forward only, 
 or both backward and forward scrolling. The default behavior is 
 determined by the setting {\tt wxODBC\_FWD\_ONLY\_CURSORS} in setup.h when you 
-compile the wxWindows library. The library default is to only support 
+compile the wxWidgets library. The library default is to only support 
 forward scrolling cursors only, though this can be overridden by parameters 
 for wxDb() constructor or the \helpref{wxDbGetConnection}{wxdbfunctions} 
 function. All datasources and ODBC drivers must support forward scrolling 
@@ -848,7 +848,7 @@ connections still using the handle.}
 
 \subsection{wxODBC - Known Issues}\label{wxodbcknownissues}
 
-As with creating wxWindows, writing the wxODBC classes was not the simple 
+As with creating wxWidgets, writing the wxODBC classes was not the simple 
 task of writing an application to run on a single type of computer system. 
 The classes need to be cross-platform for different operating systems, and 
 they also needed to take in to account different database manufacturers and 
@@ -917,7 +917,7 @@ functionality as the driver can emulate.
 \begin{itemize}\itemsep=0pt
 \item If a column is part of the Primary Key, the column cannot be NULL.
 \item Cannot support selecting for update [\helpref{wxDbTable::CanSelectForUpdate}{wxdbtablecanselectforupdate}]. Always returns FALSE.
-\item Columns that are part of primary or secondary keys must be defined as being NOT NULL when they are created. Some code is added in \helpref{wxDbTable::CreateIndex}{wxdbtablecreateindex} to try to adjust the column definition if it is not defined correctly, but it is experimental (as of wxWindows v2.2.1)
+\item Columns that are part of primary or secondary keys must be defined as being NOT NULL when they are created. Some code is added in \helpref{wxDbTable::CreateIndex}{wxdbtablecreateindex} to try to adjust the column definition if it is not defined correctly, but it is experimental (as of wxWidgets v2.2.1)
 \item Does not support sub-queries in SQL statements
 \end{itemize}
 
@@ -1064,24 +1064,24 @@ Classes: \helpref{wxDatabase}{wxdatabase}, \helpref{wxRecordSet}{wxrecordset}, \
 \rtfsp\helpref{wxQueryField}{wxqueryfield}
 
 \normalboxd{The more sophisticated wxODBC classes (wxDb/wxDbTable) are the 
-recommended classes for doing database/ODBC work with wxWindows. These new 
-classes replace the wxWindows v1.6x classes wxDatabase.
+recommended classes for doing database/ODBC work with wxWidgets. These new 
+classes replace the wxWidgets v1.6x classes wxDatabase.
 
 Documentation for the old wxDatabase class and its associated classes is still 
 included in the class documentation and in this overview section, but support 
 for these old classes has been phased out, and all future development work 
 is being done solely on the new wxDb/wxDbTable classes.}
 
-wxWindows provides a set of classes for accessing a subset of Microsoft's ODBC (Open Database Connectivity)
+wxWidgets provides a set of classes for accessing a subset of Microsoft's ODBC (Open Database Connectivity)
 product. Currently, this wrapper is available under MS Windows only, although
 ODBC may appear on other platforms, and a generic or product-specific SQL emulator for the ODBC
-classes may be provided in wxWindows at a later date.
+classes may be provided in wxWidgets at a later date.
 
 ODBC presents a unified API (Application Programmer's Interface) to a
 wide variety of databases, by interfacing indirectly to each database or
 file via an ODBC driver. The language for most of the database
 operations is SQL, so you need to learn a small amount of SQL as well as
-the wxWindows ODBC wrapper API. Even though the databases may not be
+the wxWidgets ODBC wrapper API. Even though the databases may not be
 SQL-based, the ODBC drivers translate SQL into appropriate operations
 for the database or file: even text files have rudimentary ODBC support,
 along with dBASE, Access, Excel and other file formats.
@@ -1101,7 +1101,7 @@ ODBC drivers must be installed on the user's machine. If you do not use the data
 classes, odbc.dll will be loaded but not called (so ODBC does not need to be
 setup fully if no ODBC calls will be made).
 
-A sample is distributed with wxWindows in {\tt samples/odbc}. You will need to install
+A sample is distributed with wxWidgets in {\tt samples/odbc}. You will need to install
 the sample dbf file as a data source using the ODBC setup utility, available from
 the control panel if ODBC has been fully installed.
 
@@ -1211,7 +1211,7 @@ your queries in sequential order using the same wxRecordSet.
 \subsection{ODBC SQL data types [DEPRECATED]}\label{sqltypes}
 
 These are the data types supported in ODBC SQL. Note that there are other, extended level conformance
-types, not currently supported in wxWindows.
+types, not currently supported in wxWidgets.
 
 \begin{twocollist}\itemsep=0pt
 \twocolitem{CHAR(n)}{A character string of fixed length {\it n}.}
diff --git a/docs/latex/wx/tdebug.tex b/docs/latex/wx/tdebug.tex
index 04eb2fa0e0..dc73ccef8f 100644
--- a/docs/latex/wx/tdebug.tex
+++ b/docs/latex/wx/tdebug.tex
@@ -3,9 +3,9 @@
 Classes, functions and macros: \helpref{wxDebugContext}{wxdebugcontext}, \helpref{wxObject}{wxobject}, \helpref{wxLog}{wxlog},
 \rtfsp\helpref{Log functions}{logfunctions}, \helpref{Debug macros}{debugmacros}
 
-Various classes, functions and macros are provided in wxWindows to help you debug
-your application. Most of these are only available if you compile both wxWindows,
-your application and {\it all} libraries that use wxWindows with the \_\_WXDEBUG\_\_ symbol
+Various classes, functions and macros are provided in wxWidgets to help you debug
+your application. Most of these are only available if you compile both wxWidgets,
+your application and {\it all} libraries that use wxWidgets with the \_\_WXDEBUG\_\_ symbol
 defined. You can also test the \_\_WXDEBUG\_\_ symbol in your own applications to execute
 code that should be active only in debug mode.
 
@@ -16,13 +16,13 @@ various static functions and variables. It allows you to dump all objects to tha
 check memory for errors.
 
 It is good practice to define a \helpref{wxObject::Dump}{wxobjectdump} member function for each class you derive
-from a wxWindows class, so that \helpref{wxDebugContext::Dump}{wxdebugcontextdump} can call it and
+from a wxWidgets class, so that \helpref{wxDebugContext::Dump}{wxdebugcontextdump} can call it and
 give valuable information about the state of the application.
 
 If you have difficulty tracking down a memory leak, recompile
 in debugging mode and call \helpref{wxDebugContext::Dump}{wxdebugcontextdump} and \helpref{wxDebugContext::PrintStatistics}{wxdebugcontextprintstatistics} at
 appropriate places. They will tell you what objects have not yet been
-deleted, and what kinds of object they are. In fact, in debug mode wxWindows will automatically
+deleted, and what kinds of object they are. In fact, in debug mode wxWidgets will automatically
 detect memory leaks when your application is about to exit, and if there are any leaks,
 will give you information about the problem. (How much information depends on the operating system
 and compiler -- some systems don't allow all memory logging to be enabled). See the
@@ -45,7 +45,7 @@ wxUSE\_DEBUG\_NEW\_ALWAYS are set to 1 in setup.h, 'new' is defined to be:
 \end{verbatim}
 }%
 
-All occurrences of 'new' in wxWindows and your own application will use
+All occurrences of 'new' in wxWidgets and your own application will use
 the overridden form of the operator with two extra arguments. This means that the debugging
 output (and error messages reporting memory problems) will tell you what
 file and on what line you allocated the object. Unfortunately not all
@@ -114,7 +114,7 @@ allocations done after the checkpoint will be dumped.
 
 You can use wxDebugContext if \_\_WXDEBUG\_\_ is defined, or you can use it
 at any other time (if wxUSE\_DEBUG\_CONTEXT is set to 1 in setup.h). It is not disabled
-in non-debug mode because you may not wish to recompile wxWindows and your entire application
+in non-debug mode because you may not wish to recompile wxWidgets and your entire application
 just to make use of the error logging facility.
 
 Note: wxDebugContext::SetFile has a problem at present, so use the default stream instead.
diff --git a/docs/latex/wx/tdelwin.tex b/docs/latex/wx/tdelwin.tex
index d425e42ae4..793eea2aaf 100644
--- a/docs/latex/wx/tdelwin.tex
+++ b/docs/latex/wx/tdelwin.tex
@@ -9,7 +9,7 @@ to close windows.
 \wxheading{What is the sequence of events in a window deletion?}
 
 When the user clicks on the system close button or system close command,
-in a frame or a dialog, wxWindows calls \helpref{wxWindow::Close}{wxwindowclose}. This
+in a frame or a dialog, wxWidgets calls \helpref{wxWindow::Close}{wxwindowclose}. This
 in turn generates an EVT\_CLOSE event: see \helpref{wxCloseEvent}{wxcloseevent}.
 
 It is the duty of the application to define a suitable event handler, and
@@ -24,7 +24,7 @@ to the calling code.
 
 The wxCloseEvent handler should only call \helpref{wxWindow::Destroy}{wxwindowdestroy} to
 delete the window, and not use the {\bf delete} operator. This is because
-for some window classes, wxWindows delays actual deletion of the window until all events have been processed,
+for some window classes, wxWidgets delays actual deletion of the window until all events have been processed,
 since otherwise there is the danger that events will be sent to a non-existent window.
 
 As reinforced in the next section, calling Close does not guarantee that the window
@@ -70,8 +70,8 @@ the exit command altogether.
 
 \wxheading{What should I do to upgrade my 1.xx OnClose to 2.0?}
 
-In wxWindows 1.xx, the {\bf OnClose} function did not actually delete 'this', but signaled
-to the calling function (either {\bf Close}, or the wxWindows framework) to delete
+In wxWidgets 1.xx, the {\bf OnClose} function did not actually delete 'this', but signaled
+to the calling function (either {\bf Close}, or the wxWidgets framework) to delete
 or not delete the window.
 
 To update your code, you should provide an event table entry in your frame or
@@ -113,7 +113,7 @@ dialog, using the EVT\_CLOSE macro. The event handler function might look like t
 
 \wxheading{How do I exit the application gracefully?}
 
-A wxWindows application automatically exits when the designated top window, or the
+A wxWidgets application automatically exits when the designated top window, or the
 last frame or dialog, is destroyed. Put any application-wide cleanup code in \helpref{wxApp::OnExit}{wxapponexit} (this
 is a virtual function, not an event handler).
 
diff --git a/docs/latex/wx/tdialog.tex b/docs/latex/wx/tdialog.tex
index a3ac9fbd6a..94a06e5149 100644
--- a/docs/latex/wx/tdialog.tex
+++ b/docs/latex/wx/tdialog.tex
@@ -17,7 +17,7 @@ Under Windows 3, modal dialogs have to be emulated using
 modeless dialogs and a message loop. This is because Windows 3 expects
 the contents of a modal dialog to be loaded from a resource file or
 created on receipt of a dialog initialization message. This is too
-restrictive for wxWindows, where any window may be created and displayed
+restrictive for wxWidgets, where any window may be created and displayed
 before its contents are created.
 
 For a set of dialog convenience functions, including file selection, see
diff --git a/docs/latex/wx/tdnd.tex b/docs/latex/wx/tdnd.tex
index 7e2737f23f..7831168c8f 100644
--- a/docs/latex/wx/tdnd.tex
+++ b/docs/latex/wx/tdnd.tex
@@ -8,7 +8,7 @@ Classes: \helpref{wxDataObject}{wxdataobject},
 \helpref{wxFileDropTarget}{wxfiledroptarget}
 
 Note that wxUSE\_DRAG\_AND\_DROP must be defined in setup.h in order
-to use drag and drop in wxWindows.
+to use drag and drop in wxWidgets.
 
 See also: \helpref{wxDataObject overview}{wxdataobjectoverview} and \helpref{DnD sample}{samplednd}
 
@@ -69,7 +69,7 @@ wxDropTarget and override its pure virtual methods. Alternatively, you may
 derive from \helpref{wxTextDropTarget}{wxtextdroptarget} or
 \helpref{wxFileDropTarget}{wxfiledroptarget} and override their OnDropText()
 or OnDropFiles() method.
-\item {\bf Drop:} When the user releases the mouse over a window, wxWindows
+\item {\bf Drop:} When the user releases the mouse over a window, wxWidgets
 asks the associated wxDropTarget object if it accepts the data. For this,
 a \helpref{wxDataObject}{wxdataobject} must be associated with the drop target
 and this data object will be responsible for the format negotiation between
diff --git a/docs/latex/wx/tdocview.tex b/docs/latex/wx/tdocview.tex
index 0cf6922896..35a2f3357b 100644
--- a/docs/latex/wx/tdocview.tex
+++ b/docs/latex/wx/tdocview.tex
@@ -60,7 +60,7 @@ class, to provide multi-page document facilities.
 \end{itemize}
 
 Note that to activate framework functionality, you need to use some or all of
-the wxWindows \helpref{predefined command identifiers}{predefinedids} in your menus.
+the wxWidgets \helpref{predefined command identifiers}{predefinedids} in your menus.
 
 \perlnote{The document/view framework is available in wxPerl. To use it,
 you will need the following statements in your application code:\par
@@ -78,7 +78,7 @@ use Wx ':docview';   # import constants (optional)
 Class: \helpref{wxDocument}{wxdocument}
 
 The wxDocument class can be used to model an application's file-based
-data. It is part of the document/view framework supported by wxWindows,
+data. It is part of the document/view framework supported by wxWidgets,
 and cooperates with the \helpref{wxView}{wxview}, \helpref{wxDocTemplate}{wxdoctemplate}\rtfsp
 and \helpref{wxDocManager}{wxdocmanager} classes.
 
@@ -107,7 +107,7 @@ a \helpref{wxDocTemplate}{wxdoctemplate} object on application initialization, y
 should pass CLASSINFO(YourDocumentClass) to the wxDocTemplate constructor
 so that it knows how to create an instance of this class.
 
-If you do not wish to use the wxWindows method of creating document
+If you do not wish to use the wxWidgets method of creating document
 objects dynamically, you must override wxDocTemplate::CreateDocument
 to return an instance of the appropriate class.
 
@@ -118,7 +118,7 @@ to return an instance of the appropriate class.
 Class: \helpref{wxView}{wxview}
 
 The wxView class can be used to model the viewing and editing component of
-an application's file-based data. It is part of the document/view framework supported by wxWindows,
+an application's file-based data. It is part of the document/view framework supported by wxWidgets,
 and cooperates with the \helpref{wxDocument}{wxdocument}, \helpref{wxDocTemplate}{wxdoctemplate}
 and \helpref{wxDocManager}{wxdocmanager} classes.
 
@@ -135,7 +135,7 @@ a \helpref{wxDocTemplate}{wxdoctemplate} object on application initialization, y
 should pass CLASSINFO(YourViewClass) to the wxDocTemplate constructor
 so that it knows how to create an instance of this class.
 
-If you do not wish to use the wxWindows method of creating view
+If you do not wish to use the wxWidgets method of creating view
 objects dynamically, you must override wxDocTemplate::CreateView
 to return an instance of the appropriate class.
 
@@ -172,7 +172,7 @@ For the case where an application has one document type and one view type,
 a single document template is constructed, and dialogs will be appropriately
 simplified.
 
-wxDocTemplate is part of the document/view framework supported by wxWindows,
+wxDocTemplate is part of the document/view framework supported by wxWidgets,
 and cooperates with the \helpref{wxView}{wxview}, \helpref{wxDocument}{wxdocument} 
 and \helpref{wxDocManager}{wxdocmanager} classes.
 
@@ -181,12 +181,12 @@ See the example application in {\tt samples/docview}.
 To use the wxDocTemplate class, you do not need to derive a new class.
 Just pass relevant information to the constructor including CLASSINFO(YourDocumentClass) and
 CLASSINFO(YourViewClass) to allow dynamic instance creation.
-If you do not wish to use the wxWindows method of creating document
+If you do not wish to use the wxWidgets method of creating document
 objects dynamically, you must override wxDocTemplate::CreateDocument
 and wxDocTemplate::CreateView to return instances of the appropriate class.
 
 {\it NOTE}: the document template has nothing to do with the C++ template construct. C++
-templates are not used anywhere in wxWindows.
+templates are not used anywhere in wxWidgets.
 
 \subsection{wxDocManager overview}\label{wxdocmanageroverview}
 
@@ -194,7 +194,7 @@ templates are not used anywhere in wxWindows.
 
 Class: \helpref{wxDocManager}{wxdocmanager}
 
-The wxDocManager class is part of the document/view framework supported by wxWindows,
+The wxDocManager class is part of the document/view framework supported by wxWidgets,
 and cooperates with the \helpref{wxView}{wxview}, \helpref{wxDocument}{wxdocument}\rtfsp
 and \helpref{wxDocTemplate}{wxdoctemplate} classes.
 
@@ -228,7 +228,7 @@ When a user interface event occurs, the application {\it submits} a command
 to a \helpref{wxCommandProcessor}{wxcommandprocessoroverview} object to execute and
 store.
 
-The wxWindows document/view framework handles Undo and Redo by use of
+The wxWidgets document/view framework handles Undo and Redo by use of
 wxCommand and wxCommandProcessor objects. You might find further uses
 for wxCommand, such as implementing a macro facility that stores, loads
 and replays commands.
@@ -287,7 +287,7 @@ void wxDocParentFrame::OnMRUFile(wxCommandEvent& event)
 \end{verbatim}
 }
 
-\subsection{wxWindows predefined command identifiers}\label{predefinedids}
+\subsection{wxWidgets predefined command identifiers}\label{predefinedids}
 
 To allow communication between the application's menus and the
 document/view framework, several command identifiers are predefined for you
diff --git a/docs/latex/wx/tempfile.tex b/docs/latex/wx/tempfile.tex
index 343a3ea55d..16958e7410 100644
--- a/docs/latex/wx/tempfile.tex
+++ b/docs/latex/wx/tempfile.tex
@@ -91,7 +91,7 @@ Write to the file, return {\tt TRUE} on success, {\tt FALSE} on failure.
 
 Write to the file, return {\tt TRUE} on success, {\tt FALSE} on failure.
 
-The second argument is only meaningful in Unicode build of wxWindows when
+The second argument is only meaningful in Unicode build of wxWidgets when
 {\it conv} is used to convert {\it str} to multibyte representation.
 
 \membersection{wxTempFile::Commit}\label{wxtempfilecommit}
diff --git a/docs/latex/wx/tevent.tex b/docs/latex/wx/tevent.tex
index f58d767d67..969b294214 100644
--- a/docs/latex/wx/tevent.tex
+++ b/docs/latex/wx/tevent.tex
@@ -4,13 +4,13 @@ Classes: \helpref{wxEvtHandler}{wxevthandler}, \helpref{wxWindow}{wxwindow}, \he
 
 \subsection{Introduction}
 
-Before version 2.0 of wxWindows, events were handled by the application
+Before version 2.0 of wxWidgets, events were handled by the application
 either by supplying callback functions, or by overriding virtual member
 functions such as {\bf OnSize}.
 
-From wxWindows 2.0, {\it event tables} are used instead, with a few exceptions.
+From wxWidgets 2.0, {\it event tables} are used instead, with a few exceptions.
 
-An event table is placed in an implementation file to tell wxWindows how to map
+An event table is placed in an implementation file to tell wxWidgets how to map
 events to member functions. These member functions are not virtual functions, but
 they are all similar in form: they take a single wxEvent-derived argument, and have a void return
 type.
@@ -70,11 +70,11 @@ protected:
 
 \subsection{How events are processed}\label{eventprocessing}
 
-When an event is received from the windowing system, wxWindows calls 
+When an event is received from the windowing system, wxWidgets calls 
 \helpref{wxEvtHandler::ProcessEvent}{wxevthandlerprocessevent} on the first
 event handler object belonging to the window generating the event.
 
-It may be noted that wxWindows' event processing system implements something
+It may be noted that wxWidgets' event processing system implements something
 very close to virtual methods in normal C++, i.e. it is possible to alter
 the behaviour of a class by overriding its event handling functions. In
 many cases this works even for changing the behaviour of native controls.
@@ -99,7 +99,7 @@ void MyTextCtrl::OnChar(wxKeyEvent& event)
     if ( isalpha( event.KeyCode() ) )
     {
        // key code is within legal range. we call event.Skip() so the
-       // event can be processed either in the base wxWindows class
+       // event can be processed either in the base wxWidgets class
        // or the native control.
 
        event.Skip();
@@ -134,7 +134,7 @@ recursively applied to the parent window's event handler. If this returns TRUE,
 \end{enumerate}
 
 {\bf Pay close attention to Step 5.}  People often overlook or get
-confused by this powerful feature of the wxWindows event processing
+confused by this powerful feature of the wxWidgets event processing
 system.  To put it a different way, events derived either directly or
 indirectly from wxCommandEvent will travel up the containment
 hierarchy from child to parent until an event handler is found that
@@ -142,7 +142,7 @@ doesn't call event.Skip().  Events not derived from wxCommandEvent are
 sent only to the window they occurred in and then stop.
 
 Finally, there is another additional complication (which, in fact, simplifies
-life of wxWindows programmers significantly): when propagating the command
+life of wxWidgets programmers significantly): when propagating the command
 events upwards to the parent window, the event propagation stops when it
 reaches the parent dialog, if any. This means that you don't risk to get
 unexpected events from the dialog controls (which might be left unprocessed by
@@ -152,7 +152,7 @@ for this choice is that there are only a few frames in a typical application
 and their parent-child relation are well understood by the programmer while it
 may be very difficult, if not impossible, to track down all the dialogs which
 may be popped up in a complex program (remember that some are created
-automatically by wxWindows). If you need to specify a different behaviour for
+automatically by wxWidgets). If you need to specify a different behaviour for
 some reason, you can use 
 \helpref{SetExtraStyle(wxWS\_EX\_BLOCK\_EVENTS)}{wxwindowsetextrastyle} 
 explicitly to prevent the events from being propagated beyond the given window
diff --git a/docs/latex/wx/texpr.tex b/docs/latex/wx/texpr.tex
index 0f915a823f..739d5facf4 100644
--- a/docs/latex/wx/texpr.tex
+++ b/docs/latex/wx/texpr.tex
@@ -4,7 +4,7 @@ wxExpr is a C++ class reading and writing a subset of Prolog-like syntax,
 supporting objects attribute/value pairs.
 
 wxExpr can be used to develop programs with readable and
-robust data files. Within wxWindows itself, it is used to parse
+robust data files. Within wxWidgets itself, it is used to parse
 the {\tt .wxr} dialog resource files.
 
 {\bf History of wxExpr}
diff --git a/docs/latex/wx/text.tex b/docs/latex/wx/text.tex
index 32527801c3..94f22b7d16 100644
--- a/docs/latex/wx/text.tex
+++ b/docs/latex/wx/text.tex
@@ -234,7 +234,7 @@ control. This could be done in the following way:
 \end{verbatim}
 }%
 
-But wxWindows provides a convenient class to make it even simpler so instead
+But wxWidgets provides a convenient class to make it even simpler so instead
 you may just do
 
 {\small%
@@ -431,7 +431,7 @@ Resets the internal `modified' flag as if the current edits had been saved.
 This functions inserts into the control the character which would have been
 inserted if the given key event had occured in the text control. The 
 {\it event} object should be the same as the one passed to {\tt EVT\_KEY\_DOWN}
-handler previously by wxWindows.
+handler previously by wxWidgets.
 
 \wxheading{Return value}
 
@@ -850,7 +850,7 @@ Note that this function may only be used with single line text controls.
 
 \wxheading{Compatibility}
 
-Only implemented in wxMSW/wxGTK starting with wxWindows 2.3.2.
+Only implemented in wxMSW/wxGTK starting with wxWidgets 2.3.2.
 
 \membersection{wxTextCtrl::SetSelection}\label{wxtextctrlsetselection}
 
diff --git a/docs/latex/wx/textdlg.tex b/docs/latex/wx/textdlg.tex
index 2cd79bfc80..b6e4b28d66 100644
--- a/docs/latex/wx/textdlg.tex
+++ b/docs/latex/wx/textdlg.tex
@@ -1,7 +1,7 @@
 \section{\class{wxTextEntryDialog}}\label{wxtextentrydialog}
 
 This class represents a dialog that requests a one-line text string from the user.
-It is implemented as a generic wxWindows dialog.
+It is implemented as a generic wxWidgets dialog.
 
 \wxheading{Derived from}
 
diff --git a/docs/latex/wx/textfile.tex b/docs/latex/wx/textfile.tex
index 002e5dd41d..3cf5c27b42 100644
--- a/docs/latex/wx/textfile.tex
+++ b/docs/latex/wx/textfile.tex
@@ -270,7 +270,7 @@ Open() opens the file with the given name or the name which was given in the
 success. It will fail if the file does not exist, 
 \helpref{Create}{wxtextfilecreate} should be used in this case.
 
-The {\it conv} argument is only meaningful in Unicode build of wxWindows when
+The {\it conv} argument is only meaningful in Unicode build of wxWidgets when
 it is used to convert the file to wide character representation.
 
 \membersection{wxTextFile::RemoveLine}\label{wxtextfileremoveline}
@@ -287,7 +287,7 @@ Change the file on disk. The {\it typeNew} parameter allows you to change the
 file format (default argument means "don't change type") and may be used to
 convert, for example, DOS files to Unix.
 
-The {\it conv} argument is only meaningful in Unicode build of wxWindows when
+The {\it conv} argument is only meaningful in Unicode build of wxWidgets when
 it is used to convert all lines to multibyte representation before writing them
 them to physical file.
 
diff --git a/docs/latex/wx/tfile.tex b/docs/latex/wx/tfile.tex
index 0d1b508a88..78dde1c7bc 100644
--- a/docs/latex/wx/tfile.tex
+++ b/docs/latex/wx/tfile.tex
@@ -5,7 +5,7 @@ Classes: \helpref{wxFile}{wxfile}, \helpref{wxDir}{wxdir}, \helpref{wxTempFile}{
 
 Functions: see \helpref{file functions}{filefunctions}.
 
-wxWindows provides some functions and classes to facilitate working with files.
+wxWidgets provides some functions and classes to facilitate working with files.
 As usual, the accent is put on cross-platform features which explains, for
 example, the \helpref{wxTextFile}{wxtextfile} class which may be used to convert
 between different types of text files (DOS/Unix/Mac).
diff --git a/docs/latex/wx/tfontenc.tex b/docs/latex/wx/tfontenc.tex
index b83964d8c2..7577de1d09 100644
--- a/docs/latex/wx/tfontenc.tex
+++ b/docs/latex/wx/tfontenc.tex
@@ -6,12 +6,12 @@
 %% Created:     03.11.99
 %% RCS-ID:      $Id$
 %% Copyright:   (c) Vadim Zeitlin
-%% License:     wxWindows license
+%% License:     wxWidgets license
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \section{Font encoding overview}\label{wxfontencodingoverview}
 
-wxWindows has support for multiple font encodings starting from release 2.2.
+wxWidgets has support for multiple font encodings starting from release 2.2.
 By encoding we mean here the mapping between the character codes and the
 letters. Probably the most well-known encoding is (7 bit) ASCII one which is
 used almost universally now to represent the letters of the English alphabet
diff --git a/docs/latex/wx/tglbtn.tex b/docs/latex/wx/tglbtn.tex
index 75184f5541..26f8e50a06 100644
--- a/docs/latex/wx/tglbtn.tex
+++ b/docs/latex/wx/tglbtn.tex
@@ -6,7 +6,7 @@
 %% Created:     20.11.01
 %% RCS-ID:      $Id$
 %% Copyright:   (c) 2001 Vadim Zeitlin
-%% License:     wxWindows license
+%% License:     wxWidgets license
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \section{\class{wxToggleButton}}\label{wxtogglebutton}
diff --git a/docs/latex/wx/tguide.tex b/docs/latex/wx/tguide.tex
index 66f12ccc00..885ef87aca 100644
--- a/docs/latex/wx/tguide.tex
+++ b/docs/latex/wx/tguide.tex
@@ -1,6 +1,6 @@
-\section{Writing a wxWindows application: a rough guide}\label{roughguide}
+\section{Writing a wxWidgets application: a rough guide}\label{roughguide}
 
-To set a wxWindows application going, you will need to derive a \helpref{wxApp}{wxapp} class and
+To set a wxWidgets application going, you will need to derive a \helpref{wxApp}{wxapp} class and
 override \helpref{wxApp::OnInit}{wxapponinit}.
 
 An application must have a top-level \helpref{wxFrame}{wxframe} or \helpref{wxDialog}{wxdialog} window.
diff --git a/docs/latex/wx/thread.tex b/docs/latex/wx/thread.tex
index 33328eef99..4347771d2c 100644
--- a/docs/latex/wx/thread.tex
+++ b/docs/latex/wx/thread.tex
@@ -8,7 +8,7 @@ much easier to share common data between several threads, it also makes much
 easier to shoot oneself in the foot, so careful use of synchronization objects
 such as \helpref{mutexes}{wxmutex} and/or \helpref{critical sections}{wxcriticalsection} is recommended.
 
-There are two types of threads in wxWindows: {\it detached} and {\it joinable}
+There are two types of threads in wxWidgets: {\it detached} and {\it joinable}
 ones, just as in the POSIX thread API (but unlike Win32 threads where all threads
 are joinable). The difference between the two is that only joinable threads
 can return a return code - this is returned by the Wait() function. Detached
@@ -134,7 +134,7 @@ be implemented by any derived class. The thread execution will start here.
 The returned value is the thread exit code which is only useful for
 joinable threads and is the value returned by \helpref{Wait}{wxthreadwait}.
 
-This function is called by wxWindows itself and should never be called
+This function is called by wxWidgets itself and should never be called
 directly.
 
 \membersection{wxThread::Exit}\label{wxthreadexit}
diff --git a/docs/latex/wx/ti18n.tex b/docs/latex/wx/ti18n.tex
index 7cfb9532c7..267b35c017 100644
--- a/docs/latex/wx/ti18n.tex
+++ b/docs/latex/wx/ti18n.tex
@@ -4,15 +4,15 @@ Although internationalization of an application (i18n for short) involves far
 more than just translating its text messages to another message -- date, time and
 currency formats need changing too, some languages are written left to right
 and others right to left, character encoding may differ and many other things
-may need changing too -- it is a necessary first step. wxWindows provides
+may need changing too -- it is a necessary first step. wxWidgets provides
 facilities for message translation with its 
 \helpref{wxLocale}{wxlocale} class and is itself fully translated into several
-languages. Please consult wxWindows home page for the most up-to-date
+languages. Please consult wxWidgets home page for the most up-to-date
 translations - and if you translate it into one of the languages not done
 yet, your translations would be gratefully accepted for inclusion into the
 future versions of the library!
 
-The wxWindows approach to i18n closely follows GNU gettext package. wxWindows uses the
+The wxWidgets approach to i18n closely follows GNU gettext package. wxWidgets uses the
 message catalogs which are binary compatible with gettext catalogs and this
 allows to use all of the programs in this package to work with them. But note
 that no additional libraries are needed during the run-time, however, so you
@@ -47,7 +47,7 @@ given language: see \helpref{wxLocale}{wxlocale}.
 \end{enumerate}
 
 See also the GNU gettext documentation linked from {\tt docs/html/index.htm} in
-your wxWindows distribution.
+your wxWidgets distribution.
 
 See also \helpref{Writing non-English applications}{nonenglishoverview}.
 It focuses on handling charsets related problems.
diff --git a/docs/latex/wx/time.tex b/docs/latex/wx/time.tex
index 2df4c34397..9a9838d445 100644
--- a/docs/latex/wx/time.tex
+++ b/docs/latex/wx/time.tex
@@ -4,7 +4,7 @@ Representation of time and date.
 
 {\bf NOTE:} this class is retained only for compatibility,
 and has been replaced by \helpref{wxDateTime}{wxdatetime}. wxTime
-may be withdrawn in future versions of wxWindows.
+may be withdrawn in future versions of wxWidgets.
 
 \wxheading{Derived from}
 
diff --git a/docs/latex/wx/timespan.tex b/docs/latex/wx/timespan.tex
index a46b716600..20b23c0ed3 100644
--- a/docs/latex/wx/timespan.tex
+++ b/docs/latex/wx/timespan.tex
@@ -6,7 +6,7 @@
 %% Created:     04.04.00
 %% RCS-ID:      $Id$
 %% Copyright:   (c) Vadim Zeitlin
-%% License:     wxWindows license
+%% License:     wxWidgets license
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \section{\class{wxTimeSpan}}\label{wxtimespan}
diff --git a/docs/latex/wx/tipc.tex b/docs/latex/wx/tipc.tex
index 4360c0d7ea..e282de20f2 100644
--- a/docs/latex/wx/tipc.tex
+++ b/docs/latex/wx/tipc.tex
@@ -6,7 +6,7 @@ Classes: \helpref{wxServer}{wxddeserver},
 %\helpref{wxTCPServer}{wxtcpserver}, \helpref{wxTCPConnection}{wxtcpconnection},
 %\helpref{wxTCPClient}{wxtcpclient}
 
-wxWindows has a number of different classes to help with
+wxWidgets has a number of different classes to help with
 interprocess communication and network programming. This section
 only discusses one family of classes -- the DDE-like protocol --
 but here's a list of other useful classes:
@@ -20,7 +20,7 @@ but here's a list of other useful classes:
 for programming popular Internet protocols.
 \end{itemize}
 
-wxWindows' DDE-like protocol is a high-level protocol based on
+wxWidgets' DDE-like protocol is a high-level protocol based on
 Windows DDE. There are two implementations of this DDE-like
 protocol: one using real DDE running on Windows only, and another
 using TCP/IP (sockets) that runs on most platforms. Since the API
@@ -220,5 +220,5 @@ where the server calls the client when data has changed).
 \end{verbatim}
 
 Note that it is no longer necessary to call wxDDEInitialize or wxDDECleanUp, since
-wxWindows will do this itself if necessary.
+wxWidgets will do this itself if necessary.
 
diff --git a/docs/latex/wx/tlog.tex b/docs/latex/wx/tlog.tex
index 2b2fab3e84..9b7448b88c 100644
--- a/docs/latex/wx/tlog.tex
+++ b/docs/latex/wx/tlog.tex
@@ -11,9 +11,9 @@ Classes: \helpref{wxLog}{wxlog},\\
 \helpref{wxLogPassThrough}{wxlogpassthrough},\\
 \helpref{wxStreamToTextRedirector}{wxstreamtotextredirector}
 
-This is a general overview of logging classes provided by wxWindows. The word
+This is a general overview of logging classes provided by wxWidgets. The word
 logging here has a broad sense, including all of the program output, not only
-non interactive messages. The logging facilities included in wxWindows provide
+non interactive messages. The logging facilities included in wxWidgets provide
 the base {\it wxLog} class which defines the standard interface for a {\it log
 target} as well as several standard implementations of it and a family of
 functions to use with them.
@@ -45,7 +45,7 @@ progress (another, but possibly confusing name for the same function is {\bf
 wxLogInfo}).
 \item{\bf wxLogStatus} is for status messages - they will go into the status
 bar of the active or specified (as the first argument) \helpref{wxFrame}{wxframe} if it has one.
-\item{\bf wxLogSysError} is mostly used by wxWindows itself, but might be
+\item{\bf wxLogSysError} is mostly used by wxWidgets itself, but might be
 handy for logging errors after system call (API function) failure. It logs the
 specified message text as well as the last system error
 code ({\it errno} or {\it ::GetLastError()} depending on the platform) and
@@ -68,8 +68,8 @@ to further restrict the amount of messages generated.
 The usage of these functions should be fairly straightforward, however it may
 be asked why not use the other logging facilities, such as C standard stdio
 functions or C++ streams. The short answer is that they're all very good
-generic mechanisms, but are not really adapted for wxWindows, while the log
-classes are. Some of advantages in using wxWindows log functions are:
+generic mechanisms, but are not really adapted for wxWidgets, while the log
+classes are. Some of advantages in using wxWidgets log functions are:
 
 \begin{itemize}\itemsep=0pt
 \item{\bf Portability} It is a common practice to use {\it printf()}
@@ -100,10 +100,10 @@ informational messages.
 \item{\bf Completeness} Usually, an error message should be presented to the user
 when some operation fails. Let's take a quite simple but common case of a file
 error: suppose that you're writing your data file on disk and there is not
-enough space. The actual error might have been detected inside wxWindows code
+enough space. The actual error might have been detected inside wxWidgets code
 (say, in {\it wxFile::Write}), so the calling function doesn't really know the
 exact reason of the failure, it only knows that the data file couldn't be
-written to the disk. However, as wxWindows uses {\it wxLogError()} in this
+written to the disk. However, as wxWidgets uses {\it wxLogError()} in this
 situation, the exact error code (and the corresponding error message) will be
 given to the user together with "high level" message about data file writing
 error.
@@ -113,7 +113,7 @@ After having enumerated all the functions which are normally used to log the
 messages, and why would you want to use them we now describe how all this
 works.
 
-wxWindows has the notion of a {\it log target}: it is just a class deriving
+wxWidgets has the notion of a {\it log target}: it is just a class deriving
 from \helpref{wxLog}{wxlog}. As such, it implements the virtual functions of
 the base class which are called when a message is logged. Only one log target
 is {\it active} at any moment, this is the one used by {\it wxLogXXX()}
@@ -139,7 +139,7 @@ also be used without any change. There are:
 stderr by default as its name suggests.
 \item{\bf wxLogStream} This class has the same functionality as wxLogStderr,
 but uses {\it ostream} and cerr instead of {\it FILE *} and stderr.
-\item{\bf wxLogGui} This is the standard log target for wxWindows
+\item{\bf wxLogGui} This is the standard log target for wxWidgets
 applications (it is used by default if you don't do anything) and provides the
 most reasonable handling of all types of messages for given platform.
 \item{\bf wxLogWindow} This log target provides a "log console" which
diff --git a/docs/latex/wx/tmbconv.tex b/docs/latex/wx/tmbconv.tex
index b7f5a95568..7c411f3132 100644
--- a/docs/latex/wx/tmbconv.tex
+++ b/docs/latex/wx/tmbconv.tex
@@ -1,12 +1,12 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Name:        tmbconv.tex
-%% Purpose:     Overview of the wxMBConv classes in wxWindows
+%% Purpose:     Overview of the wxMBConv classes in wxWidgets
 %% Author:      Ove Kaaven
 %% Modified by:
 %% Created:     25.03.00
 %% RCS-ID:      $Id$
 %% Copyright:   (c) 2000 Ove Kaaven
-%% Licence:     wxWindows license
+%% Licence:     wxWidgets license
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \section{wxMBConv classes overview}\label{mbconvclasses}
@@ -15,7 +15,7 @@ Classes: \helpref{wxMBConv}{wxmbconv}, \helpref{wxMBConvFile}{wxmbconvfile},
 \helpref{wxMBConvUTF7}{wxmbconvutf7}, \helpref{wxMBConvUTF8}{wxmbconvutf8}, 
 \helpref{wxCSConv}{wxcsconv}
 
-The wxMBConv classes in wxWindows enables an Unicode-aware application to
+The wxMBConv classes in wxWidgets enables an Unicode-aware application to
 easily convert between Unicode and the variety of 8-bit encoding systems still
 in use.
 
@@ -41,7 +41,7 @@ pass unhindered through any traditional transport channels.
 
 \subsection{Background: The wxString class}
 
-If you have compiled wxWindows in Unicode mode, the wxChar type will become
+If you have compiled wxWidgets in Unicode mode, the wxChar type will become
 identical to wchar\_t rather than char, and a wxString stores wxChars. Hence,
 all wxString manipulation in your application will then operate on Unicode
 strings, and almost as easily as working with ordinary char strings (you
@@ -65,7 +65,7 @@ override the MB2WC and WC2MB methods.
 \subsection{wxMBConv objects}
 
 In C++, for a class to be useful and possible to pass around, it needs to be
-instantiated. All of the wxWindows-provided wxMBConv classes have predefined
+instantiated. All of the wxWidgets-provided wxMBConv classes have predefined
 instances (wxConvLibc, wxConvFile, wxConvUTF7, wxConvUTF8, wxConvLocal).
 You can use these predefined objects directly, or you can instantiate your own
 objects.
@@ -90,7 +90,7 @@ it is better to go through wxConvCurrent.
 
 Once you have chosen which object you want to use to convert your text,
 here is how you would use them with wxString. These examples all assume
-that you are using a Unicode build of wxWindows, although they will still
+that you are using a Unicode build of wxWidgets, although they will still
 compile in a non-Unicode build (they just won't convert anything).
 
 Example 1: Constructing a wxString from input in current encoding.
@@ -134,7 +134,7 @@ it in a vararg context (like with printf).
 If you have specialized needs, or just don't want to use wxString, you
 can also use the conversion methods of the conversion objects directly.
 This can even be useful if you need to do conversion in a non-Unicode
-build of wxWindows; converting a string from UTF-8 to the current
+build of wxWidgets; converting a string from UTF-8 to the current
 encoding should be possible by doing this:
 
 \begin{verbatim}
@@ -144,7 +144,7 @@ wxString str(wxConvUTF8.cMB2WC(input_data), *wxConvCurrent);
 Here, cMB2WC of the UTF8 object returns a wxWCharBuffer containing a Unicode
 string. The wxString constructor then converts it back to an 8-bit character
 set using the passed conversion object, *wxConvCurrent. (In a Unicode build
-of wxWindows, the constructor ignores the passed conversion object and
+of wxWidgets, the constructor ignores the passed conversion object and
 retains the Unicode data.)
 
 This could also be done by first making a wxString of the original data:
diff --git a/docs/latex/wx/tnoneng.tex b/docs/latex/wx/tnoneng.tex
index a11bf9cc7b..6e26d578fe 100644
--- a/docs/latex/wx/tnoneng.tex
+++ b/docs/latex/wx/tnoneng.tex
@@ -6,7 +6,7 @@ different charsets under Unix and Windows (and other platforms, to make
 situation even more complicated). These charsets usually differ in so
 many characters it is impossible to use same texts under all platforms.
 
-wxWindows library provides mechanism that helps you avoid distributing many
+wxWidgets library provides mechanism that helps you avoid distributing many
 identical, only differently encoded, packages with your application 
 (e.g. help files and menu items in iso8859-13 and windows-1257). Thanks
 to this mechanism you can, for example, distribute only iso8859-13 data 
@@ -75,7 +75,7 @@ msgstr ""
 
 (Make sure that the header is {\bf not} marked as {\it fuzzy}.)
 
-wxWindows is able to use this catalog under any supported platform
+wxWidgets is able to use this catalog under any supported platform
 (although iso8859-2 is a Unix encoding and is normally not understood by
 Windows).
 
diff --git a/docs/latex/wx/toolbar.tex b/docs/latex/wx/toolbar.tex
index 43157378d2..7c97a8ce1a 100644
--- a/docs/latex/wx/toolbar.tex
+++ b/docs/latex/wx/toolbar.tex
@@ -25,7 +25,7 @@ wxToolBarBase\\
 
 \wxheading{Include files}
 
-<wx/toolbar.h> (to allow wxWindows to select an appropriate toolbar class)\\
+<wx/toolbar.h> (to allow wxWidgets to select an appropriate toolbar class)\\
 <wx/tbarbase.h> (the base class)\\
 <wx/tbarmsw.h> (the non-Windows 95 Windows toolbar class)\\
 <wx/tbar95.h> (the Windows 95/98 toolbar class)\\
@@ -124,11 +124,11 @@ Constructs a toolbar.
 
 \docparam{id}{Window identifier. If -1, will automatically create an identifier.}
 
-\docparam{pos}{Window position. wxDefaultPosition is (-1, -1) which indicates that wxWindows
+\docparam{pos}{Window position. wxDefaultPosition is (-1, -1) which indicates that wxWidgets
 should generate a default position for the window. If using the wxWindow class directly, supply
 an actual position.}
 
-\docparam{size}{Window size. wxDefaultSize is (-1, -1) which indicates that wxWindows
+\docparam{size}{Window size. wxDefaultSize is (-1, -1) which indicates that wxWidgets
 should generate a default size for the window.}
 
 \docparam{style}{Window style. See \helpref{wxToolBar}{wxtoolbar} for details.}
@@ -581,7 +581,7 @@ such as a short description on the status line.}
 
 \wxheading{Remarks}
 
-With some derived toolbar classes, if the mouse moves quickly out of the toolbar, wxWindows may not be able to
+With some derived toolbar classes, if the mouse moves quickly out of the toolbar, wxWidgets may not be able to
 detect it. Therefore this function may not always be called when expected.
 
 \membersection{wxToolBar::OnRightClick}\label{wxtoolbaronrightclick}
diff --git a/docs/latex/wx/tprint.tex b/docs/latex/wx/tprint.tex
index e6f672c936..ee76e633b5 100644
--- a/docs/latex/wx/tprint.tex
+++ b/docs/latex/wx/tprint.tex
@@ -13,7 +13,7 @@ Classes: \helpref{wxPrintout}{wxprintout},
 The printing framework relies on the application to provide classes
 whose member functions can respond to particular requests, such
 as `print this page' or `does this page exist in the document?'.
-This method allows wxWindows to take over the housekeeping duties of
+This method allows wxWidgets to take over the housekeeping duties of
 turning preview pages, calling the print dialog box, creating
 the printer device context, and so on: the application can concentrate
 on the rendering of the information onto a device context.
@@ -30,7 +30,7 @@ previewing. The following code (from the printing sample) shows how easy
 it is to initiate printing, previewing and the print setup dialog, once the wxPrintout
 functionality has been defined. Notice the use of MyPrintout for
 both printing and previewing. All the preview user interface functionality
-is taken care of by wxWindows. For details on how MyPrintout is defined,
+is taken care of by wxWidgets. For details on how MyPrintout is defined,
 please look at the printout sample code.
 
 \begin{verbatim}
diff --git a/docs/latex/wx/tresourc.tex b/docs/latex/wx/tresourc.tex
index 22b6c8933a..b7873c6d7b 100644
--- a/docs/latex/wx/tresourc.tex
+++ b/docs/latex/wx/tresourc.tex
@@ -1,6 +1,6 @@
-\section{The wxWindows resource system}\label{resourceformats}
+\section{The wxWidgets resource system}\label{resourceformats}
 
-wxWindows has an optional {\it resource file} facility,
+wxWidgets has an optional {\it resource file} facility,
 which allows separation of dialog, menu, bitmap and icon specifications
 from the application code.
 
@@ -8,25 +8,25 @@ from the application code.
 However it is still available if wxUSE\_RESOURCES is enabled.
 
 The format is similar in principle to the Windows resource file (whose ASCII form is
-suffixed .RC and whose binary form is suffixed .RES). The wxWindows resource
+suffixed .RC and whose binary form is suffixed .RES). The wxWidgets resource
 file is currently ASCII-only, suffixed .WXR. Note that under Windows,
 the .WXR file does not {\it replace} the native Windows resource file,
 it merely supplements it. There is no existing native resource format in X
 (except for the defaults file, which has limited expressive power).
 
 For details of functions for manipulating resource files and loading
-user interface elements, see \helpref{wxWindows resource functions}{resourcefuncs}.
+user interface elements, see \helpref{wxWidgets resource functions}{resourcefuncs}.
 
 You can use Dialog Editor to create resource files. Unfortunately neither
-Dialog Editor nor the .WXR format currently cover all wxWindows controls;
+Dialog Editor nor the .WXR format currently cover all wxWidgets controls;
 some are missing, such as wxSpinCtrl, wxSpinButton, wxListCtrl, wxTreeCtrl and others.
 
-Note that in later versions of wxWindows, this resource format will be replaced
+Note that in later versions of wxWidgets, this resource format will be replaced
 by XML specifications that can also include sizers.
 
 \subsection{The format of a .WXR file}
 
-A wxWindows resource file may look a little odd at first. It is C++
+A wxWidgets resource file may look a little odd at first. It is C++
 compatible, comprising mostly of static string variable declarations with
 wxExpr syntax within the string.
 
@@ -34,7 +34,7 @@ Here's a sample .WXR file:
 
 \begin{verbatim}
 /*
- * wxWindows Resource File
+ * wxWidgets Resource File
  *
  */
 
@@ -110,17 +110,17 @@ get all your resources into one variable if you want to.
 {\bf ::wxResourceParseData} parses the contents of the resource, ready for use
 by functions such as {\bf ::wxResourceCreateBitmap} and {\bf wxPanel::LoadFromResource}.
 
-If a wxWindows resource object (such as a bitmap resource) refers to a
+If a wxWidgets resource object (such as a bitmap resource) refers to a
 C++ data structure, such as static XPM data, a further call ({\bf ::wxResourceRegisterBitmapData}) needs
 to be made on initialization to tell
-wxWindows about this data. The wxWindows resource object will refer to a
+wxWidgets about this data. The wxWidgets resource object will refer to a
 string identifier, such as `project\_data' in the example file above.
 This identifier will be looked up in a table to get the C++ static data
 to use for the bitmap or icon.
 
 In the C++ fragment below, the WXR resource file is included,
 and appropriate resource initialization is carried out in {\bf OnInit}.
-Note that at this stage, no actual wxWindows dialogs, menus, bitmaps or
+Note that at this stage, no actual wxWidgets dialogs, menus, bitmaps or
 icons are created; their `templates' are merely being set up for later
 use.
 
@@ -165,7 +165,7 @@ The following code shows a dialog:
   {
     wxTextCtrl *text = (wxTextCtrl *)wxFindWindowByName("text3", dialog);
     if (text)
-      text->SetValue("wxWindows resource demo");
+      text->SetValue("wxWidgets resource demo");
     dialog->ShowModal();
   }
   dialog->Destroy();
@@ -253,14 +253,14 @@ item specification is itself a list comprising:
 
 If the menu item specification is the empty list ([]), this is interpreted as a menu separator.
 
-If further (optional) information is associated with each menu item in a future release of wxWindows,
+If further (optional) information is associated with each menu item in a future release of wxWidgets,
 it will be placed after the help string and before the optional pulldown menu specifications.
 
 Note that the menu item identifier must be an integer if the resource is being
 included as C++ code and then parsed on initialisation. Unfortunately,\rtfsp
 \#define substitution is not performed inside strings, and
 therefore the program cannot know the mapping. However, if the .WXR file
-is being loaded dynamically, wxWindows will attempt to replace string
+is being loaded dynamically, wxWidgets will attempt to replace string
 identifiers with \#defined integers, because it is able to parse
 the included \#defines.
 
@@ -306,8 +306,8 @@ choice has a number of advantages:
 \item Since it is C++ compatible, it can be included into an application's source code,
 eliminating the problems associated with distributing a separate resource file
 with the executable. However, it can also be loaded dynamically from a file, which will be required
-for non-C++ programs that use wxWindows.
-\item No extra binary file format and separate converter need be maintained for the wxWindows project
+for non-C++ programs that use wxWidgets.
+\item No extra binary file format and separate converter need be maintained for the wxWidgets project
 (although others are welcome to add the equivalent of the Windows `rc' resource
 parser and a binary format).
 \item It would be difficult to append a binary resource component onto an executable
@@ -322,7 +322,7 @@ The disadvantages of the approach include:
 \begin{itemize}\itemsep=0pt
 \item Parsing adds a small execution overhead to program initialization.
 \item Under 16-bit Windows especially, global data is at a premium.
-Using a .RC resource table for some wxWindows resource data may be a partial solution,
+Using a .RC resource table for some wxWidgets resource data may be a partial solution,
 although .RC strings are limited to 255 characters.
 \item Without a resource preprocessor, it is not possible to substitute integers
 for identifiers (so menu identifiers have to be written as integers in the resource
diff --git a/docs/latex/wx/truntime.tex b/docs/latex/wx/truntime.tex
index 32ce7c867e..00b9edadd9 100644
--- a/docs/latex/wx/truntime.tex
+++ b/docs/latex/wx/truntime.tex
@@ -9,15 +9,15 @@ just by knowing the name of a class, which makes facilities such as persistent
 storage hard to implement.
 
 Most C++ GUI frameworks overcome these limitations by means of a set of
-macros and functions and wxWindows is no exception. As it originated before the
+macros and functions and wxWidgets is no exception. As it originated before the
 addition of RTTI to the standard C++ and as support for it still missing from
-some (albeit old) compilers, wxWindows doesn't (yet) use it, but provides its
+some (albeit old) compilers, wxWidgets doesn't (yet) use it, but provides its
 own macro-based RTTI system.
 
 In the future, the standard C++ RTTI will be used though and you're encouraged
 to use whenever possible \helpref{wxDynamicCast()}{wxdynamiccast} macro which,
 for the implementations that support it, is defined just as dynamic\_cast<> and
-uses wxWindows RTTI for all the others. This macro is limited to wxWindows
+uses wxWidgets RTTI for all the others. This macro is limited to wxWidgets
 classes only and only works with pointers (unlike the real dynamic\_cast<> which
 also accepts references).
 
diff --git a/docs/latex/wx/tsamples.tex b/docs/latex/wx/tsamples.tex
index 588932885d..dc06ee1c5a 100644
--- a/docs/latex/wx/tsamples.tex
+++ b/docs/latex/wx/tsamples.tex
@@ -5,29 +5,29 @@
 %% Modified by:
 %% Created:     02.11.99
 %% RCS-ID:      $Id$
-%% Copyright:   (c) wxWindows team
-%% License:     wxWindows license
+%% Copyright:   (c) wxWidgets team
+%% License:     wxWidgets license
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % NB: please keep the subsections in alphabetic order!
 
-\section{wxWindows samples}\label{samples}
+\section{wxWidgets samples}\label{samples}
 
-Probably the best way to learn wxWindows is by reading the source of some 50+
-samples provided with it. Many aspects of wxWindows programming can be learnt
+Probably the best way to learn wxWidgets is by reading the source of some 50+
+samples provided with it. Many aspects of wxWidgets programming can be learnt
 from them, but sometimes it is not simple to just choose the right sample to
 look at. This overview aims at describing what each sample does/demonstrates to
 make it easier to find the relevant one if a simple grep through all sources
 didn't help. They also provide some notes about using the samples and what
-features of wxWindows are they supposed to test.
+features of wxWidgets are they supposed to test.
 
-There are currently more than 50 different samples as part of wxWindows and
-this list is not complete. You should start your tour of wxWindows with the 
-\helpref{minimal sample}{sampleminimal} which is the wxWindows version of
-"Hello, world!". It shows the basic structure of wxWindows program and is the
+There are currently more than 50 different samples as part of wxWidgets and
+this list is not complete. You should start your tour of wxWidgets with the 
+\helpref{minimal sample}{sampleminimal} which is the wxWidgets version of
+"Hello, world!". It shows the basic structure of wxWidgets program and is the
 most commented sample of all - looking at its source code is recommended.
 
 The next most useful sample is probably the \helpref{controls}{samplecontrols} 
-one which shows many of wxWindows standard controls, such as buttons,
+one which shows many of wxWidgets standard controls, such as buttons,
 listboxes, checkboxes, comboboxes etc.
 
 Other, more complicated controls, have their own samples. In this category you
@@ -42,19 +42,19 @@ may find the following samples showing the corresponding controls:
 
 Finally, it might be helpful to do a search in the entire sample directory if
 you can't find the sample you showing the control you are interested in by
-name. Most of wxWindows classes, occur in at least one of the samples.
+name. Most of wxWidgets classes, occur in at least one of the samples.
 
 \subsection{Minimal sample}\label{sampleminimal}
 
 The minimal sample is what most people will know under the term Hello World,
 i.e. a minimal program that doesn't demonstrate anything apart from what is
 needed to write a program that will display a "hello" dialog. This is usually
-a good starting point for learning how to use wxWindows.
+a good starting point for learning how to use wxWidgets.
 
 \subsection{Art provider sample}\label{sampleartprovider}
 
 The {\tt artprov} sample shows how you can customize the look of standard
-wxWindows dialogs by replacing default bitmaps/icons with your own versions.
+wxWidgets dialogs by replacing default bitmaps/icons with your own versions.
 It also shows how you can use wxArtProvider to
 get stock bitmaps for use in your application.
 
@@ -86,7 +86,7 @@ features of this class.
 \subsection{Controls sample}\label{samplecontrols}
 
 The controls sample is the main test program for most simple controls used in
-wxWindows. The sample tests their basic functionality, events, placement,
+wxWidgets. The sample tests their basic functionality, events, placement,
 modification in terms of colour and font as well as the possibility to change
 the controls programmatically, such as adding item to a list box etc. Apart
 from that, the sample uses a \helpref{wxNotebook}{wxnotebook} and tests most
@@ -123,7 +123,7 @@ database with ODBC support to be correctly installed on your system.
 
 \subsection{Dialogs sample}\label{sampledialogs}
 
-This sample shows how to use the common dialogs available from wxWindows. These
+This sample shows how to use the common dialogs available from wxWidgets. These
 dialogs are described in details in the \helpref{Common dialogs overview}{commondialogsoverview}.
 
 \subsection{Dialup sample}\label{sampledialup}
@@ -162,7 +162,7 @@ clipboard (or, in the case of Windows version, also a metafile) - it will be
 shown in a new frame.
 
 So far, everything we mentioned was implemented with minimal amount of code
-using standard wxWindows classes. The more advanced features are demonstrated
+using standard wxWidgets classes. The more advanced features are demonstrated
 if you create a shape frame from the main frame menu. A shape is a geometric
 object which has a position, size and color. It models some
 application-specific data in this sample. A shape object supports its own
@@ -184,14 +184,14 @@ This sample is a very small sample that demonstrates the use of the
 should be used whenever it is not known at compile time, which control
 will receive which event or which controls are actually going to be in
 a dialog or frame. This is most typically the case for any scripting
-language that would work as a wrapper for wxWindows or programs where
+language that would work as a wrapper for wxWidgets or programs where
 forms or similar datagrams can be created by the uses.
 
 See also the \helpref{event sample}{sampleevent}
 
 \subsection{Event sample}\label{sampleevent}
 
-The event sample demonstrates various features of the wxWindows events. It
+The event sample demonstrates various features of the wxWidgets events. It
 shows using dynamic events and connecting/disconnecting the event handlers
 during the run time and also using 
 \helpref{PushEventHandler()}{wxwindowpusheventhandler} and
@@ -216,7 +216,7 @@ synchronous and asynchronous cases and how to kill the processes with
 The font sample demonstrates \helpref{wxFont}{wxfont}, 
 \helpref{wxFontEnumerator}{wxfontenumerator} and 
 \helpref{wxFontMapper}{wxfontmapper} classes. It allows you to see the fonts
-available (to wxWindows) on the computer and shows all characters of the
+available (to wxWidgets) on the computer and shows all characters of the
 chosen font as well.
 
 \subsection{Grid sample}\label{samplegrid}
@@ -238,7 +238,7 @@ the library to work with unsupported tags.
 {\bf About} may give you an idea how to write good-looking about boxes.
 
 {\bf Zip} demonstrates use of virtual file systems in wxHTML. The zip archives
-handler (ships with wxWindows) allows you to access HTML pages stored 
+handler (ships with wxWidgets) allows you to access HTML pages stored 
 in compressed archive as if they were ordinary files.
 
 {\bf Virtual} is yet another virtual file systems demo. This one generates pages at run-time.
@@ -274,7 +274,7 @@ replaced with red using \helpref{wxImage::Replace}{wximagereplace}.
 
 \subsection{Internat(ionalization) sample}\label{sampleinternat}
 
-The not very clearly named internat sample demonstrates the wxWindows
+The not very clearly named internat sample demonstrates the wxWidgets
 internatationalization (i18n for short from now on) features. To be more
 precise, it only shows localization support, i.e. support for translating the
 program messages in another language while true i18n would also involve
@@ -286,7 +286,7 @@ its directory. Please see also \helpref{i18n overview}{internationalization}.
 \subsection{Layout sample}\label{samplelayout}
 
 The layout sample demonstrates the two different layout systems offered
-by wxWindows. When starting the program, you will see a frame with some
+by wxWidgets. When starting the program, you will see a frame with some
 controls and some graphics. The controls will change their size whenever
 you resize the entire frame and the exact behaviour of the size changes
 is determined using the \helpref{wxLayoutConstraints}{wxlayoutconstraints} 
@@ -324,7 +324,7 @@ class including placing subwindows into it and drawing simple graphics. It uses
 \helpref{SetTargetWindow}{wxscrolledwindowsettargetwindow} method and thus the effect
 of scrolling does not show in the scrolled window itself, but in one of its subwindows.
 
-Additionally, this samples demonstrates how to optimize drawing operations in wxWindows,
+Additionally, this samples demonstrates how to optimize drawing operations in wxWidgets,
 in particular using the \helpref{wxWindow::IsExposed}{wxwindowisexposed} method with 
 the aim to prevent unnecessary drawing in the window and thus reducing or removing 
 flicker on screen.
@@ -421,12 +421,12 @@ is not multi-threading safe, i.e. that it might crash if two threads try to
 access the GUI class simultaneously. One way to prevent that is have a normal
 GUI program in the main thread and some worker threads which work in the 
 background. In order to make communication between the main thread and the
-worker threads possible, wxWindows offers the \helpref{wxPostEvent}{wxpostevent} 
+worker threads possible, wxWidgets offers the \helpref{wxPostEvent}{wxpostevent} 
 function and this sample makes use of this function.
 
 The other way to use a so called Mutex (such as those offered in the \helpref{wxMutex}{wxmutex} 
 class) that prevent threads from accessing the GUI classes as long as any other
-thread accesses them. For this, wxWindows has the \helpref{wxMutexGuiEnter}{wxmutexguienter} 
+thread accesses them. For this, wxWidgets has the \helpref{wxMutexGuiEnter}{wxmutexguienter} 
 and \helpref{wxMutexGuiLeave}{wxmutexguileave} functions, both of which are
 used and tested in the sample as well.
 
diff --git a/docs/latex/wx/tscroll.tex b/docs/latex/wx/tscroll.tex
index 3649171abb..eb383d1200 100644
--- a/docs/latex/wx/tscroll.tex
+++ b/docs/latex/wx/tscroll.tex
@@ -2,7 +2,7 @@
 
 Classes: \helpref{wxWindow}{wxwindow}, \helpref{wxScrolledWindow}{wxscrolledwindow}, \helpref{wxIcon}{wxicon}, \helpref{wxScrollBar}{wxscrollbar}.
 
-Scrollbars come in various guises in wxWindows. All windows have the potential
+Scrollbars come in various guises in wxWidgets. All windows have the potential
 to show a vertical scrollbar and/or a horizontal scrollbar: it is a basic capability of a window.
 However, in practice, not all windows do make use of scrollbars, such as a single-line wxTextCtrl.
 
@@ -81,10 +81,10 @@ scrollbar calculations and SetScrollbar
 call into a function named AdjustScrollbars, which can be called initially and also
 from your \helpref{wxSizeEvent}{wxsizeevent} handler function.
 
-%\normalbox{{\bf For Windows programmers:} note that scrollbar range in wxWindows has a different meaning
+%\normalbox{{\bf For Windows programmers:} note that scrollbar range in wxWidgets has a different meaning
 %from that in Windows. In native Windows scrollbar calls, range is the number of positions that the scrollbar
 %can physically scroll through - in our example above, it would be 34. But it is easier
 %to think in terms of the number of units that the whole scrollbar represents - the virtual
-%window size - which is why wxWindows does it differently.}
+%window size - which is why wxWidgets does it differently.}
 
 
diff --git a/docs/latex/wx/tsizer.tex b/docs/latex/wx/tsizer.tex
index 618c9f7b04..e184c607e0 100644
--- a/docs/latex/wx/tsizer.tex
+++ b/docs/latex/wx/tsizer.tex
@@ -7,23 +7,23 @@ Classes: \helpref{wxSizer}{wxsizer}, \helpref{wxGridSizer}{wxgridsizer},
 \helpref{CreateButtonSizer}{createbuttonsizer}
 
 Sizers, as represented by the wxSizer class and its descendants in
-the wxWindows class hierarchy, have become the method of choice to
-define the layout of controls in dialogs in wxWindows because of
+the wxWidgets class hierarchy, have become the method of choice to
+define the layout of controls in dialogs in wxWidgets because of
 their ability to create visually appealing dialogs independent of the
 platform, taking into account the differences in size and style of
-the individual controls. Unlike the original wxWindows Dialog Editor,
+the individual controls. Unlike the original wxWidgets Dialog Editor,
 editors such as wxDesigner, wxrcedit, XRCed and wxWorkshop create dialogs based exclusively on sizers,
 practically forcing the user to create platform independent layouts without compromises.
 
 The next section describes and shows what can be done with sizers.
 The following sections briefly describe how to program with individual sizer classes.
 
-For information about the new wxWindows resource system, which can describe
+For information about the new wxWidgets resource system, which can describe
 sizer-based dialogs, see the \helpref{XML-based resource system overview}{xrcoverview}.
 
 \subsection{The idea behind sizers}\label{ideabehindsizers}
 
-The layout algorithm used by sizers in wxWindows is closely related to layout
+The layout algorithm used by sizers in wxWidgets is closely related to layout
 systems in other GUI toolkits, such as Java's AWT, the GTK toolkit or the Qt toolkit. It is
 based upon the idea of individual subwindows reporting their minimal required
 size and their ability to get stretched if the size of the parent window has changed.
@@ -35,13 +35,13 @@ a hierarchy of sizers can be constructed. Note that wxSizer does not derive from
 and thus does not interfere with tab ordering and requires very few resources compared
 to a real window on screen.
 
-What makes sizers so well fitted for use in wxWindows is the fact that every control
+What makes sizers so well fitted for use in wxWidgets is the fact that every control
 reports its own minimal size and the algorithm can handle differences in font sizes
 or different window (dialog item) sizes on different platforms without problems. For example, if
 the standard font as well as the overall design of Linux/GTK widgets requires more space than
 on Windows, the initial dialog size will automatically be bigger on Linux/GTK than on Windows.
 
-There are currently five different kinds of sizers available in wxWindows. Each represents
+There are currently five different kinds of sizers available in wxWidgets. Each represents
 either a certain way to lay out dialog items in a dialog or it fulfils a special task
 such as wrapping a static box around a dialog item (or another sizer). These sizers will
 be discussed one by one in the text below. For more detailed information on how to use sizers
@@ -56,7 +56,7 @@ have certain features in common:
 
 {\bf A minimal size:} This minimal size is usually identical to
 the initial size of the controls and may either be set explicitly in the wxSize field
-of the control constructor or may be calculated by wxWindows, typically by setting
+of the control constructor or may be calculated by wxWidgets, typically by setting
 the height and/or the width of the item to -1. Note that only some controls can
 calculate their size (such as a checkbox) whereas others (such as a listbox)
 don't have any natural width or height and thus require an explicit size. Some controls
diff --git a/docs/latex/wx/tstream.tex b/docs/latex/wx/tstream.tex
index a472c2f0e1..e3f3bb7215 100644
--- a/docs/latex/wx/tstream.tex
+++ b/docs/latex/wx/tstream.tex
@@ -14,7 +14,7 @@ they have many problems. Some Borland Compilers refuse to work at all
 with them and using iostreams on Linux makes writing programs, that are
 binary compatible across different Linux distributions, impossible.
 
-Therefore, wxStreams have been added to wxWindows because an application should 
+Therefore, wxStreams have been added to wxWidgets because an application should 
 compile and run on all supported platforms and we don't want users to depend on release
 X.XX of libg++ or some other compiler to run the program.
 
@@ -89,5 +89,5 @@ code:
 
 As I said previously, we could add a filter stream so it takes an istream
 argument and builds a wxInputStream from it: I don't think it should 
-be difficult to implement it and it may be available in the fix of wxWindows 2.0.
+be difficult to implement it and it may be available in the fix of wxWidgets 2.0.
 
diff --git a/docs/latex/wx/tstring.tex b/docs/latex/wx/tstring.tex
index d69304d57e..ceec197be9 100644
--- a/docs/latex/wx/tstring.tex
+++ b/docs/latex/wx/tstring.tex
@@ -40,7 +40,7 @@ It also provides performance \helpref{statistics gathering code}{wxstringtuning}
 which may be enabled to fine tune the memory allocation strategy for your
 particular application - and the gain might be quite big.
 \item {\bf Compatibility} This class tries to combine almost full compatibility
-with the old wxWindows 1.xx wxString class, some reminiscence to MFC CString
+with the old wxWidgets 1.xx wxString class, some reminiscence to MFC CString
 class and 90\% of the functionality of std::string class.
 \item {\bf Rich set of functions} Some of the functions present in wxString are
 very useful but don't exist in most of other string classes: for example, 
@@ -52,10 +52,10 @@ operations are supported as well.
 to and from ANSI and Unicode strings in any build mode (see the 
 \helpref{Unicode overview}{unicode} for more details) and maps to either
 {\tt string} or {\tt wstring} transparently depending on the current mode.
-\item {\bf Used by wxWindows} And, of course, this class is used everywhere
-inside wxWindows so there is no performance loss which would result from
+\item {\bf Used by wxWidgets} And, of course, this class is used everywhere
+inside wxWidgets so there is no performance loss which would result from
 conversions of objects of any other string class (including std::string) to
-wxString internally by wxWindows.
+wxString internally by wxWidgets.
 \end{enumerate}
 
 However, there are several problems as well. The most important one is probably
@@ -64,18 +64,18 @@ example, to get the length of the string either one of
 length(), \helpref{Len()}{wxstringlen} or 
 \helpref{Length()}{wxstringlength} may be used. The first function, as almost
 all the other functions in lowercase, is std::string compatible. The second one
-is "native" wxString version and the last one is wxWindows 1.xx way. So the
+is "native" wxString version and the last one is wxWidgets 1.xx way. So the
 question is: which one is better to use? And the answer is that:
 
 {\bf The usage of std::string compatible functions is strongly advised!} It will
 both make your code more familiar to other C++ programmers (who are supposed to
 have knowledge of std::string but not of wxString), let you reuse the same code
-in both wxWindows and other programs (by just typedefing wxString as std::string
-when used outside wxWindows) and by staying compatible with future versions of
-wxWindows which will probably start using std::string sooner or later too.
+in both wxWidgets and other programs (by just typedefing wxString as std::string
+when used outside wxWidgets) and by staying compatible with future versions of
+wxWidgets which will probably start using std::string sooner or later too.
 
 In the situations where there is no corresponding std::string function, please
-try to use the new wxString methods and not the old wxWindows 1.xx variants
+try to use the new wxString methods and not the old wxWidgets 1.xx variants
 which are deprecated and may disappear in future versions.
 
 \subsection{Some advice about using wxString}\label{wxstringadvices}
diff --git a/docs/latex/wx/tthreads.tex b/docs/latex/wx/tthreads.tex
index 26d769af94..b6162f24ee 100644
--- a/docs/latex/wx/tthreads.tex
+++ b/docs/latex/wx/tthreads.tex
@@ -4,11 +4,11 @@ Classes: \helpref{wxThread}{wxthread}, \helpref{wxMutex}{wxmutex},
 \helpref{wxCriticalSection}{wxcriticalsection}, 
 \helpref{wxCondition}{wxcondition}
 
-wxWindows provides a complete set of classes encapsulating objects necessary in
+wxWidgets provides a complete set of classes encapsulating objects necessary in
 multithreaded (MT) programs: the \helpref{thread}{wxthread} class itself and different
 synchronization objects: \helpref{mutexes}{wxmutex} and 
 \helpref{critical sections}{wxcriticalsection} with 
-\helpref{conditions}{wxcondition}. The thread API in wxWindows resembles to
+\helpref{conditions}{wxcondition}. The thread API in wxWidgets resembles to
 POSIX1.c threads API (a.k.a. pthreads), although several functions have
 different names and some features inspired by Win32 thread API are there as
 well.
diff --git a/docs/latex/wx/ttips.tex b/docs/latex/wx/ttips.tex
index 3548a7d56a..652639f961 100644
--- a/docs/latex/wx/ttips.tex
+++ b/docs/latex/wx/ttips.tex
@@ -5,7 +5,7 @@ presenting the user tips at program startup. While this is probably useless to
 the advanced users of the program, the experience shows that the tips may be
 quite helpful for the novices and so more and more programs now do this.
 
-For a wxWindows programmer, implementing this feature is extremely easy. To
+For a wxWidgets programmer, implementing this feature is extremely easy. To
 show a tip, it is enough to just call \helpref{wxShowTip}{wxshowtip} function
 like this:
 
diff --git a/docs/latex/wx/ttoolbar.tex b/docs/latex/wx/ttoolbar.tex
index 9879a96323..70abe84854 100644
--- a/docs/latex/wx/ttoolbar.tex
+++ b/docs/latex/wx/ttoolbar.tex
@@ -10,7 +10,7 @@ buttons or toggles. A toolbar gives faster access to an application's facilities
 menus, which have to be popped up and selected rather laboriously.
 
 Instead of supplying one toolbar class with a number
-of different implementations depending on platform, wxWindows separates
+of different implementations depending on platform, wxWidgets separates
 out the classes. This is because there are a number of different toolbar
 styles that you may wish to use simultaneously, and also, future
 toolbar implementations will emerge which
@@ -24,7 +24,7 @@ The following is a summary of the toolbar classes and their differences.
 \begin{itemize}\itemsep=0pt
 \item {\bf wxToolBarBase.} This is a base class with pure virtual functions,
 and should not be used directly.
-\item {\bf wxToolBarSimple.} A simple toolbar class written entirely with generic wxWindows
+\item {\bf wxToolBarSimple.} A simple toolbar class written entirely with generic wxWidgets
 functionality. A simple 3D effect for buttons is possible, but it is not consistent
 with the Windows look and feel. This toolbar can scroll, and you can have arbitrary
 numbers of rows and columns.
@@ -86,7 +86,7 @@ overriding OnLeftClick.
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// License:   	wxWindows license
+// License:   	wxWidgets license
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx/wx.h".
@@ -161,7 +161,7 @@ bool MyApp::OnInit(void)
   frame->OnSize(event);
   frame->Show(TRUE);
 
-  frame->SetStatusText("Hello, wxWindows");
+  frame->SetStatusText("Hello, wxWidgets");
   
   SetTopWindow(frame);
 
@@ -254,7 +254,7 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
-    (void)wxMessageBox("wxWindows toolbar sample", "About wxToolBar");
+    (void)wxMessageBox("wxWidgets toolbar sample", "About wxToolBar");
 }
 
 // Define the behaviour for the frame closing
diff --git a/docs/latex/wx/tunicode.tex b/docs/latex/wx/tunicode.tex
index 562fcf5834..b8cce3ef89 100644
--- a/docs/latex/wx/tunicode.tex
+++ b/docs/latex/wx/tunicode.tex
@@ -1,23 +1,23 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Name:        tunicode.tex
-%% Purpose:     Overview of the Unicode support in wxWindows
+%% Purpose:     Overview of the Unicode support in wxWidgets
 %% Author:      Vadim Zeitlin
 %% Modified by:
 %% Created:     22.09.99
 %% RCS-ID:      $Id$
 %% Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-%% Licence:     wxWindows license
+%% Licence:     wxWidgets license
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\section{Unicode support in wxWindows}\label{unicode}
+\section{Unicode support in wxWidgets}\label{unicode}
 
-This section briefly describes the state of the Unicode support in wxWindows.
+This section briefly describes the state of the Unicode support in wxWidgets.
 Read it if you want to know more about how to write programs able to work with
 characters from languages other than English.
 
 \subsection{What is Unicode?}
 
-Starting with release 2.1 wxWindows has support for compiling in Unicode mode
+Starting with release 2.1 wxWidgets has support for compiling in Unicode mode
 on the platforms which support it. Unicode is a standard for character
 encoding which addresses the shortcomings of the previous, 8 bit standards, by
 using at least 16 (and possibly 32) bits for encoding each character. This
@@ -42,12 +42,12 @@ each time a system call is made.
 
 \subsection{Unicode and ANSI modes}
 
-As not all platforms supported by wxWindows support Unicode (fully) yet, in
+As not all platforms supported by wxWidgets support Unicode (fully) yet, in
 many cases it is unwise to write a program which can only work in Unicode
 environment. A better solution is to write programs in such way that they may
 be compiled either in ANSI (traditional) mode or in the Unicode one.
 
-This can be achieved quite simply by using the means provided by wxWindows.
+This can be achieved quite simply by using the means provided by wxWidgets.
 Basically, there are only a few things to watch out for:
 
 \begin{itemize}
@@ -81,7 +81,7 @@ string").
 
 And finally, the standard preprocessor tokens enumerated above expand to ANSI
 strings but it is more likely that Unicode strings are wanted in the Unicode
-build. wxWindows provides the macros {\tt \_\_TFILE\_\_}, {\tt \_\_TDATE\_\_} 
+build. wxWidgets provides the macros {\tt \_\_TFILE\_\_}, {\tt \_\_TDATE\_\_} 
 and {\tt \_\_TTIME\_\_} which behave exactly as the standard ones except that
 they produce ANSI strings in ANSI build and Unicode ones in the Unicode build.
 
@@ -109,9 +109,9 @@ be done this way (try to imagine the number of {\tt \#ifdef UNICODE} an average
 program would have had!). Luckily, there is another way - see the next
 section.
 
-\subsection{Unicode support in wxWindows}
+\subsection{Unicode support in wxWidgets}
 
-In wxWindows, the code fragment from above should be written instead:
+In wxWidgets, the code fragment from above should be written instead:
 
 \begin{verbatim}
     wxChar ch = wxT('*');
@@ -146,7 +146,7 @@ Just let us state once again the rules:
 \item Always use {\tt wxChar} instead of {\tt char}
 \item Always enclose literal string constants in {\tt wxT()} macro unless
 they're already converted to the right representation (another standard
-wxWindows macro {\tt \_()} does it, so there is no need for {\tt wxT()} in this
+wxWidgets macro {\tt \_()} does it, so there is no need for {\tt wxT()} in this
 case) or you intend to pass the constant directly to an external function
 which doesn't accept wide-character strings.
 \item Use {\tt wxString} instead of C style strings.
@@ -154,7 +154,7 @@ which doesn't accept wide-character strings.
 
 \subsection{Unicode and the outside world}
 
-We have seen that it was easy to write Unicode programs using wxWindows types
+We have seen that it was easy to write Unicode programs using wxWidgets types
 and macros, but it has been also mentioned that it isn't quite enough.
 Although everything works fine inside the program, things can get nasty when
 it tries to communicate with the outside world which, sadly, often expects
@@ -177,7 +177,7 @@ the Unicode string.
 You should define {\tt wxUSE\_UNICODE} to $1$ to compile your program in
 Unicode mode. Note that it currently only works in Win32 and GTK 2.0 and
 that some parts of
-wxWindows are not Unicode-compliant yet (ODBC classes, for example). If you
+wxWidgets are not Unicode-compliant yet (ODBC classes, for example). If you
 compile your program in ANSI mode you can still define {\tt wxUSE\_WCHAR\_T} 
 to get some limited support for {\tt wchar\_t} type.
 
diff --git a/docs/latex/wx/tusage.tex b/docs/latex/wx/tusage.tex
index ba9d767ada..df65058a03 100644
--- a/docs/latex/wx/tusage.tex
+++ b/docs/latex/wx/tusage.tex
@@ -1,6 +1,6 @@
 \section{Notes on using the reference}\label{referencenotes}
 
-In the descriptions of the wxWindows classes and their member
+In the descriptions of the wxWidgets 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 wxScrolledWindow, be aware that wxWindow functions may be
@@ -8,14 +8,14 @@ relevant.
 
 Note also that arguments with default values may be omitted from a
 function call, for brevity. Size and position arguments may usually be
-given a value of -1 (the default), in which case wxWindows will choose a
+given a value of -1 (the default), in which case wxWidgets will choose a
 suitable value.
 
 Most strings are returned as wxString objects. However, for remaining
 char * return values, the strings are allocated and
-deallocated by wxWindows. Therefore, return values should always be
+deallocated by wxWidgets. Therefore, return values should always be
 copied for long-term use, especially since the same buffer is often
-used by wxWindows.
+used by wxWidgets.
 
 The member functions are given in alphabetical order except for
 constructors and destructors which appear first.
diff --git a/docs/latex/wx/tvalidat.tex b/docs/latex/wx/tvalidat.tex
index f1caca51e4..3254299f13 100644
--- a/docs/latex/wx/tvalidat.tex
+++ b/docs/latex/wx/tvalidat.tex
@@ -66,7 +66,7 @@ are passed by reference to window constructors, and must therefore be cloned int
 You can optionally define event handlers for the validator, to implement filtering. These handlers
 will capture events before the control itself does.
 
-For an example implementation, see the valtext.h and valtext.cpp files in the wxWindows library.
+For an example implementation, see the valtext.h and valtext.cpp files in the wxWidgets library.
 
 \wxheading{How validators interact with dialogs}
 
diff --git a/docs/latex/wx/txrc.tex b/docs/latex/wx/txrc.tex
index 3d6ae45c69..fb151822d3 100644
--- a/docs/latex/wx/txrc.tex
+++ b/docs/latex/wx/txrc.tex
@@ -2,7 +2,7 @@
 
 Classes: \helpref{wxXmlResource}{wxxmlresource}, \helpref{wxXmlResourceHandler}{wxxmlresourcehandler}
 
-{\bf IMPORTANT NOTE:} XRC is not yet a part of the core wxWindows library, so
+{\bf IMPORTANT NOTE:} XRC is not yet a part of the core wxWidgets library, so
 please see the next section for how to compile and link it. Otherwise if you
 try to use it, you will get link errors.
 
@@ -23,7 +23,7 @@ is a more elegant solution.
 \item You can choose between different alternative resource files at run time, if necessary.
 \item The XRC format uses sizers for flexibility, allowing dialogs to be resizable
 and highly portable.
-\item The XRC format is a wxWindows standard,
+\item The XRC format is a wxWidgets standard,
 and can be generated or postprocessed by any program that understands it. As it is based
 on the XML standard, existing XML editors can be used for simple editing purposes.
 \end{itemize}
@@ -49,10 +49,10 @@ To compile XRC:
 and compile. Also compile contrib/utils/wxrc using wxBase if you wish to compile
 resource files.
 \item Under Unix, XRC should be configured when you configured
-wxWindows. Make XRC by changing directory to contrib/src/xrc and
+wxWidgets. Make XRC by changing directory to contrib/src/xrc and
 type 'make'.  Similarly compile contrib/utils/wxrc using wxBase if you wish to compile
 resource files. {\bf Note:} there is currently a
-problem with the wxWindows build system that means that
+problem with the wxWidgets build system that means that
 only the static version of library can be built at present.
 \end{itemize}
 
@@ -86,14 +86,14 @@ To create an XRC file, use one of the following methods.
 \item use \urlref{wxDesigner}{http://www.roebling.de}, a commercial dialog designer/RAD tool;
 \item use \urlref{DialogBlocks}{http://www.anthemion.co.uk/dialogblocks}, a commercial dialog editor;
 \item use \urlref{XRCed}{http://xrced.sf.net}, a wxPython-based
-dialog editor that you can find in the {\tt wxPython/tools} subdirectory of the wxWindows
+dialog editor that you can find in the {\tt wxPython/tools} subdirectory of the wxWidgets
 CVS archive;
 \item use \urlref{Glade}{http://wxglade.sf.net}, a GUI designer written in wxPython. At the moment it can generate Python, C++ and XRC;
 \item use wxrcedit ({\tt utils/contrib/wxrcedit}) (under development);
 \item convert WIN32 RC files to XRC with the tool in {\tt contrib/utils/convertrc}.
 \end{itemize}
 
-A complete list of third-party tools that write to XRC can be found at \urlref{www.wxwindows.org/lnk_tool.htm}{http://www.wxwindows.org/lnk_tool.in}.
+A complete list of third-party tools that write to XRC can be found at \urlref{www.wxwidgets.org/lnk_tool.htm}{http://www.wxwidgets.org/lnk_tool.in}.
 
 It is highly recommended that you use a resource editing tool, since it's fiddly writing
 XRC files by hand.
@@ -203,12 +203,12 @@ public:
     void OnDlg2(wxCommandEvent& event);
 
 private:
-    // any class wishing to process wxWindows events must use this macro
+    // any class wishing to process wxWidgets events must use this macro
     DECLARE_EVENT_TABLE()
 };
 
 // ----------------------------------------------------------------------------
-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets
 // ----------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@ -445,7 +445,7 @@ This is the XML file (resource.xrc) for the XRC sample.
 
 \subsection{XRC file format}\label{xrcfileformat}
 
-Please see Technical Note 14 (docs/tech/tn0014.txt) in your wxWindows
+Please see Technical Note 14 (docs/tech/tn0014.txt) in your wxWidgets
 distribution.
 
 \subsection{Adding new resource handlers}\label{newresourcehandlers}
diff --git a/docs/latex/wx/txtdatob.tex b/docs/latex/wx/txtdatob.tex
index 2e39ee3cbd..0e45a97d66 100644
--- a/docs/latex/wx/txtdatob.tex
+++ b/docs/latex/wx/txtdatob.tex
@@ -67,7 +67,7 @@ strictly required.
 
 Returns the text associated with the data object. You may wish to override
 this method when offering data on-demand, but this is not required by
-wxWindows' internals. Use this method to get data in text form from
+wxWidgets' internals. Use this method to get data in text form from
 the \helpref{wxClipboard}{wxclipboard}.
 
 \membersection{wxTextDataObject::SetText}\label{wxtextdataobjectsettext}
diff --git a/docs/latex/wx/upduievt.tex b/docs/latex/wx/upduievt.tex
index ef4cd1fbb1..99775ef46d 100644
--- a/docs/latex/wx/upduievt.tex
+++ b/docs/latex/wx/upduievt.tex
@@ -1,6 +1,6 @@
 \section{\class{wxUpdateUIEvent}}\label{wxupdateuievent}
 
-This class is used for pseudo-events which are called by wxWindows
+This class is used for pseudo-events which are called by wxWidgets
 to give an application the chance to update various user interface elements.
 
 \wxheading{Derived from}
@@ -32,14 +32,14 @@ The code for doing this has to be mixed up with the code that is invoked when
 an action is invoked for a menu item or button.
 
 With update UI events, you define an event handler to look at the state of
-the application and change UI elements accordingly. wxWindows will call your
+the application and change UI elements accordingly. wxWidgets will call your
 member functions in idle time, so you don't have to worry where to call this code.
 In addition to being a clearer and more declarative method, it also means you
 don't have to worry whether you're updating a toolbar or menubar identifier.
 The same handler can update a menu item and toolbar button, if the identifier is the same.
 
 Instead of directly manipulating the menu or button, you call functions in the event
-object, such as \helpref{wxUpdateUIEvent::Check}{wxupdateuieventcheck}. wxWindows
+object, such as \helpref{wxUpdateUIEvent::Check}{wxupdateuieventcheck}. wxWidgets
 will determine whether such a call has been made, and which UI element to update.
 
 These events will work for popup menus as well as menubars. Just before a menu is popped
@@ -123,19 +123,19 @@ Returns TRUE if the UI element should be enabled.
 
 \constfunc{bool}{GetSetChecked}{\void}
 
-Returns TRUE if the application has called {\bf SetChecked}. For wxWindows internal use only.
+Returns TRUE if the application has called {\bf SetChecked}. For wxWidgets internal use only.
 
 \membersection{wxUpdateUIEvent::GetSetEnabled}\label{wxupdateuieventgetsetenabled}
 
 \constfunc{bool}{GetSetEnabled}{\void}
 
-Returns TRUE if the application has called {\bf SetEnabled}. For wxWindows internal use only.
+Returns TRUE if the application has called {\bf SetEnabled}. For wxWidgets internal use only.
 
 \membersection{wxUpdateUIEvent::GetSetText}\label{wxupdateuieventgetsettext}
 
 \constfunc{bool}{GetSetText}{\void}
 
-Returns TRUE if the application has called {\bf SetText}. For wxWindows internal use only.
+Returns TRUE if the application has called {\bf SetText}. For wxWidgets internal use only.
 
 \membersection{wxUpdateUIEvent::GetText}\label{wxupdateuieventgettext}
 
diff --git a/docs/latex/wx/view.tex b/docs/latex/wx/view.tex
index acb0fc4934..89a84013d6 100644
--- a/docs/latex/wx/view.tex
+++ b/docs/latex/wx/view.tex
@@ -1,7 +1,7 @@
 \section{\class{wxView}}\label{wxview}
 
 The view class can be used to model the viewing and editing component of
-an application's file-based data. It is part of the document/view framework supported by wxWindows,
+an application's file-based data. It is part of the document/view framework supported by wxWidgets,
 and cooperates with the \helpref{wxDocument}{wxdocument}, \helpref{wxDocTemplate}{wxdoctemplate} 
 and \helpref{wxDocManager}{wxdocmanager} classes.
 
diff --git a/docs/latex/wx/window.tex b/docs/latex/wx/window.tex
index 0c84f77760..b8588f4598 100644
--- a/docs/latex/wx/window.tex
+++ b/docs/latex/wx/window.tex
@@ -81,11 +81,11 @@ Constructs a window, which can be a child of a frame, dialog or any other non-co
 
 \docparam{id}{Window identifier. If -1, will automatically create an identifier.}
 
-\docparam{pos}{Window position. wxDefaultPosition is (-1, -1) which indicates that wxWindows
+\docparam{pos}{Window position. wxDefaultPosition is (-1, -1) which indicates that wxWidgets
 should generate a default position for the window. If using the wxWindow class directly, supply
 an actual position.}
 
-\docparam{size}{Window size. wxDefaultSize is (-1, -1) which indicates that wxWindows
+\docparam{size}{Window size. wxDefaultSize is (-1, -1) which indicates that wxWidgets
 should generate a default size for the window. If no suitable size can  be found, the
 window will be sized to 20x20 pixels so that the window is visible but obviously not
 correctly sized. }
@@ -100,7 +100,7 @@ correctly sized. }
 
 Destructor. Deletes all subwindows, then deletes itself. Instead of using
 the {\bf delete} operator explicitly, you should normally
-use \helpref{wxWindow::Destroy}{wxwindowdestroy} so that wxWindows
+use \helpref{wxWindow::Destroy}{wxwindowdestroy} so that wxWidgets
 can delete a window only when it is safe to do so, in idle time.
 
 \wxheading{See also}
@@ -127,7 +127,7 @@ functions so should not be required by the application programmer.
 Directs all mouse input to this window. Call \helpref{wxWindow::ReleaseMouse}{wxwindowreleasemouse} to
 release the capture.
 
-Note that wxWindows maintains the stack of windows having captured the mouse
+Note that wxWidgets maintains the stack of windows having captured the mouse
 and when the mouse is released the capture returns to the window which had had
 captured it previously and it is only really released if there were no previous
 window. In particular, this means that you must release the mouse as many times
@@ -543,7 +543,7 @@ be called to reenable window redrawing.
 This method is useful for visual appearance optimization (for example, it
 is a good idea to use it before inserting large amount of text into a
 wxTextCtrl under wxGTK) but is not implemented on all platforms nor for all
-controls so it is mostly just a hint to wxWindows and not a mandatory
+controls so it is mostly just a hint to wxWidgets and not a mandatory
 directive.
 
 \membersection{wxWindow::GetAcceleratorTable}\label{wxwindowgetacceleratortable}
@@ -1466,7 +1466,7 @@ implements the following methods:\par
 %% The default implementation for \helpref{wxFrame::OnMenuHighlight}{wxframeonmenuhighlight} displays help
 %% text in the first field of the status bar.
 %%
-%% This function was known as {\bf OnMenuSelect} in earlier versions of wxWindows, but this was confusing
+%% This function was known as {\bf OnMenuSelect} in earlier versions of wxWidgets, but this was confusing
 %% since a selection is normally a left-click action.
 %%
 %% \wxheading{See also}
@@ -2171,7 +2171,7 @@ window from being used as an implicit parent for the dialogs which were
 created without a parent. It is useful for the windows which can disappear at
 any moment as creating children of such windows results in fatal problems.}
 \twocolitem{\windowstyle{wxFRAME\_EX\_CONTEXTHELP}}{Under Windows, puts a query button on the
-caption. When pressed, Windows will go into a context-sensitive help mode and wxWindows will send
+caption. When pressed, Windows will go into a context-sensitive help mode and wxWidgets will send
 a wxEVT\_HELP event if the user clicked on an application window.
 This style cannot be used together with wxMAXIMIZE\_BOX or wxMINIMIZE\_BOX, so
 you should use the style of
@@ -2194,7 +2194,7 @@ This sets the window to receive keyboard input.
 
 \func{virtual void}{SetFocusFromKbd}{\void}
 
-This function is called by wxWindows keyboard navigation code when the user
+This function is called by wxWidgets keyboard navigation code when the user
 gives the focus to this window from keyboard (e.g. using {\tt TAB} key).
 By default this method simply calls \helpref{SetFocus}{wxwindowsetfocus} but
 can be overridden to do something in addition to this in the derived classes.
@@ -2472,11 +2472,11 @@ value should be used.}
 \docparam{sizeFlags}{Indicates the interpretation of other parameters. It is a bit list of the following:
 
 {\bf wxSIZE\_AUTO\_WIDTH}: a -1 width value is taken to indicate
-a wxWindows-supplied default width.\\
+a wxWidgets-supplied default width.\\
 {\bf wxSIZE\_AUTO\_HEIGHT}: a -1 height value is taken to indicate
-a wxWindows-supplied default width.\\
+a wxWidgets-supplied default width.\\
 {\bf wxSIZE\_AUTO}: -1 size values are taken to indicate
-a wxWindows-supplied default size.\\
+a wxWidgets-supplied default size.\\
 {\bf wxSIZE\_USE\_EXISTING}: existing dimensions should be used
 if -1 values are supplied.\\
 {\bf wxSIZE\_ALLOW\_MINUS\_ONE}: allow dimensions of -1 and less to be interpreted
@@ -2490,7 +2490,7 @@ x and y parameters, and must be used with non-default width and height values.
 
 The first form sets the position and optionally size, of the window.
 Parameters may be -1 to indicate either that a default should be supplied
-by wxWindows, or that the current value of the dimension should be used.
+by wxWidgets, or that the current value of the dimension should be used.
 
 \wxheading{See also}
 
@@ -2557,7 +2557,7 @@ Pass FALSE if you wish to handle deleting the old sizer yourself.}
 
 \wxheading{Remarks}
 
-SetSizer now enables and disables Layout automatically, but prior to wxWindows 2.3.3
+SetSizer now enables and disables Layout automatically, but prior to wxWidgets 2.3.3
 the following applied:
 
 You must call \helpref{wxWindow::SetAutoLayout}{wxwindowsetautolayout} to tell a window to use
diff --git a/docs/latex/wx/wizard.tex b/docs/latex/wx/wizard.tex
index e6b6c5af01..1afbbe2421 100644
--- a/docs/latex/wx/wizard.tex
+++ b/docs/latex/wx/wizard.tex
@@ -6,7 +6,7 @@
 %% Created:     02.04.00
 %% RCS-ID:      $Id$
 %% Copyright:   (c) Vadim Zeitlin
-%% License:     wxWindows license
+%% License:     wxWidgets license
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \section{\class{wxWizard}}\label{wxwizard}
@@ -90,7 +90,7 @@ calls.
 Constructor which really creates the wizard -- if you use this constructor, you
 shouldn't call \helpref{Create}{wxwizardcreate}.
 
-Notice that unlike almost all other wxWindows classes, there is no {\it size} 
+Notice that unlike almost all other wxWidgets classes, there is no {\it size} 
 parameter in wxWizard constructor because the wizard will have a predefined
 default size by default. If you want to change this, you should use the 
 \helpref{SetPageSize}{wxwizardsetpagesize} function.
@@ -116,7 +116,7 @@ by default.}
 Creates the wizard dialog. Must be called if the default constructor had been
 used to create the object.
 
-Notice that unlike almost all other wxWindows classes, there is no {\it size} 
+Notice that unlike almost all other wxWidgets classes, there is no {\it size} 
 parameter in wxWizard constructor because the wizard will have a predefined
 default size by default. If you want to change this, you should use the 
 \helpref{SetPageSize}{wxwizardsetpagesize} function.
diff --git a/docs/latex/wx/wizevt.tex b/docs/latex/wx/wizevt.tex
index 1d0ba404b5..d35a78a14b 100644
--- a/docs/latex/wx/wizevt.tex
+++ b/docs/latex/wx/wizevt.tex
@@ -6,7 +6,7 @@
 %% Created:     02.04.00
 %% RCS-ID:      $Id$
 %% Copyright:   (c) Vadim Zeitlin
-%% License:     wxWindows license
+%% License:     wxWidgets license
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \section{\class{wxWizardEvent}}\label{wxwizardevent}
diff --git a/docs/latex/wx/wizpage.tex b/docs/latex/wx/wizpage.tex
index 57cab97190..9a0fb4c41f 100644
--- a/docs/latex/wx/wizpage.tex
+++ b/docs/latex/wx/wizpage.tex
@@ -6,7 +6,7 @@
 %% Created:     02.04.00
 %% RCS-ID:      $Id$
 %% Copyright:   (c) Vadim Zeitlin
-%% License:     wxWindows license
+%% License:     wxWidgets license
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \section{\class{wxWizardPage}}\label{wxwizardpage}
diff --git a/docs/latex/wx/wnddisbl.tex b/docs/latex/wx/wnddisbl.tex
index 75965bf910..1c2bb44b16 100644
--- a/docs/latex/wx/wnddisbl.tex
+++ b/docs/latex/wx/wnddisbl.tex
@@ -6,7 +6,7 @@
 %% Created:     03.03.00
 %% RCS-ID:      $Id$
 %% Copyright:   (c) Vadim Zeitlin
-%% License:     wxWindows license
+%% License:     wxWidgets license
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \section{\class{wxWindowDisabler}}\label{wxwindowdisabler}
diff --git a/docs/latex/wx/wxPython.tex b/docs/latex/wx/wxPython.tex
index 7b0fd6b027..5f7deca83e 100644
--- a/docs/latex/wx/wxPython.tex
+++ b/docs/latex/wx/wxPython.tex
@@ -7,7 +7,7 @@ This topic was written by Robin Dunn, author of the wxPython wrapper.
 %----------------------------------------------------------------------
 \subsection{What is wxPython?}\label{wxpwhat}
 
-wxPython is a blending of the wxWindows GUI classes and the
+wxPython is a blending of the wxWidgets GUI classes and the
 \urlref{Python}{http://www.python.org/} programming language.
 
 \wxheading{Python}
@@ -33,8 +33,8 @@ commercial use.
 wxPython is a Python package that can be imported at runtime that
 includes a collection of Python modules and an extension module
 (native code). It provides a series of Python classes that mirror (or
-shadow) many of the wxWindows GUI classes. This extension module
-attempts to mirror the class hierarchy of wxWindows as closely as
+shadow) many of the wxWidgets GUI classes. This extension module
+attempts to mirror the class hierarchy of wxWidgets as closely as
 possible. This means that there is a wxFrame class in wxPython that
 looks, smells, tastes and acts almost the same as the wxFrame class in
 the C++ version.
@@ -51,18 +51,18 @@ details about getting wxPython working for you.
 %----------------------------------------------------------------------
 \subsection{Why use wxPython?}\label{wxpwhy}
 
-So why would you want to use wxPython over just C++ and wxWindows?
+So why would you want to use wxPython over just C++ and wxWidgets?
 Personally I prefer using Python for everything. I only use C++ when I
 absolutely have to eke more performance out of an algorithm, and even
 then I usually code it as an extension module and leave the majority
 of the program in Python.
 
 Another good thing to use wxPython for is quick prototyping of your
-wxWindows apps. With C++ you have to continuously go though the
+wxWidgets apps. With C++ you have to continuously go though the
 edit-compile-link-run cycle, which can be quite time consuming. With
 Python it is only an edit-run cycle. You can easily build an
 application in a few hours with Python that would normally take a few
-days or longer with C++. Converting a wxPython app to a C++/wxWindows app
+days or longer with C++. Converting a wxPython app to a C++/wxWidgets app
 should be a straight forward task.
 
 %----------------------------------------------------------------------
@@ -122,7 +122,7 @@ for a listing of a few of them.
 
 I'm not going to try and teach the Python language here. You can do
 that at the \urlref{Python Tutorial}{http://www.python.org/doc/tut/tut.html}.
-I'm also going to assume that you know a bit about wxWindows already,
+I'm also going to assume that you know a bit about wxWidgets already,
 enough to notice the similarities in the classes used.
 
 Take a look at the following wxPython program. You can find a similar
@@ -191,17 +191,17 @@ it by issuing this command:
 052:         self.posCtrl.SetValue("%s, %s" % (pos.x, pos.y))
 053:
 054:
-055: # Every wxWindows application must have a class derived from wxApp
+055: # Every wxWidgets application must have a class derived from wxApp
 056: class MyApp(wxApp):
 057:
-058:     # wxWindows calls this method to initialize the application
+058:     # wxWidgets calls this method to initialize the application
 059:     def OnInit(self):
 060:
 061:         # Create an instance of our customized Frame class
 062:         frame = MyFrame(NULL, -1, "This is a test")
 063:         frame.Show(true)
 064:
-065:         # Tell wxWindows that this is our main window
+065:         # Tell wxWidgets that this is our main window
 066:         self.SetTopWindow(frame)
 067:
 068:         # Return a success flag
@@ -224,7 +224,7 @@ then access all the wxPython identifiers through the wx module, for
 example, "{\tt wx.wxFrame}".
 \item At line 13 the frame's sizing and moving events are connected to
 methods of the class. These helper functions are intended to be like
-the event table macros that wxWindows employs. But since static event
+the event table macros that wxWidgets employs. But since static event
 tables are impossible with wxPython, we use helpers that are named the
 same to dynamically build the table. The only real difference is
 that the first argument to the event helpers is always the window that
@@ -251,11 +251,11 @@ when necessary. For this reason, most wxPython objects do not need to
 have a \_\_del\_\_ method that explicitly causes the C++ object to be
 deleted. If you ever have the need to forcibly delete a window, use
 the Destroy() method as shown on line 36.
-\item Just like wxWindows in C++, wxPython apps need to create a class
+\item Just like wxWidgets in C++, wxPython apps need to create a class
 derived from {\tt wxApp} (line 56) that implements a method named
 {\tt OnInit}, (line 59.) This method should create the application's
 main window (line 62) and use {\tt wxApp.SetTopWindow()} (line 66) to
-inform wxWindows about it.
+inform wxWidgets about it.
 \item And finally, at line 72 an instance of the application class is
 created. At this point wxPython finishes initializing itself, and calls
 the {\tt OnInit} method to get things started. (The zero parameter here is
@@ -266,7 +266,7 @@ level windows are closed.
 \end{enumerate}
 
 %----------------------------------------------------------------------
-\subsection{wxWindows classes implemented in wxPython}\label{wxpclasses}
+\subsection{wxWidgets classes implemented in wxPython}\label{wxpclasses}
 
 The following classes are supported in wxPython. Most provide nearly
 full implementations of the public interfaces specified in the C++
@@ -472,9 +472,9 @@ various sources of help, but probably the best source is the
 wxPython-users mail list. You can view the archive or subscribe by
 going to
 
-\urlref{http://lists.wxwindows.org/mailman/listinfo/wxpython-users}{http://lists.wxwindows.org/mailman/listinfo/wxpython-users}
+\urlref{http://lists.wxwidgets.org/mailman/listinfo/wxpython-users}{http://lists.wxwidgets.org/mailman/listinfo/wxpython-users}
 
 Or you can send mail directly to the list using this address:
 
-wxpython-users@lists.wxwindows.org
+wxpython-users@lists.wxwidgets.org
 
diff --git a/docs/latex/wx/wxgtk.tex b/docs/latex/wx/wxgtk.tex
index 2b2d8c176b..9a53594b2f 100644
--- a/docs/latex/wx/wxgtk.tex
+++ b/docs/latex/wx/wxgtk.tex
@@ -1,8 +1,8 @@
 \section{wxGTK port}\label{wxgtkport}
 
-wxGTK is a port of wxWindows using the GTK+ library available
+wxGTK is a port of wxWidgets using the GTK+ library available
 from www.gtk.org. It makes use of GTK+'s native widgets wherever
-possible and uses wxWindows' generic controls when needed. GTK+
+possible and uses wxWidgets' generic controls when needed. GTK+
 itself has been ported to a number of systems, but so far only the
 original X11 version is supported. Support for the recently released
 GTK+ 2.0 including Unicode support is work in progress.
@@ -11,7 +11,7 @@ You will need GTK+ 1.2.3 or higher which is available from:
 
 \urlref{http://www.gtk.org}{http://www.gtk.org}
 
-In order to configure wxWindows to compile wxGTK you will 
+In order to configure wxWidgets to compile wxGTK you will 
 need to type:
 
 \begin{verbatim}
diff --git a/docs/latex/wx/wxmac.tex b/docs/latex/wx/wxmac.tex
index c2eca2b718..cbe213edbd 100644
--- a/docs/latex/wx/wxmac.tex
+++ b/docs/latex/wx/wxmac.tex
@@ -1,6 +1,6 @@
 \section{wxMac port}\label{wxmacport}
 
-wxMac is a port of wxWindows for the Macintosh OS platform.
+wxMac is a port of wxWidgets for the Macintosh OS platform.
 Currently MacOS 8.6 or higher, MacOS 9.0 or higher and
 MacOS X 10.0 or higher are supported, although most development
 effort goes into MacOS X support. wxMac can be compiled both
@@ -8,7 +8,7 @@ using Apple's developer tools and MetroWerks CodeWarrior in
 different versions. Support for MacOS 8.X and MacOS 9.X is
 only available through CodeWarrior. wxMac uses the Carbon
 API (and optionally the Classic API under MacOS 8.X). You
-will need wxWindows version 2.3.3 or higher for a stable
+will need wxWidgets version 2.3.3 or higher for a stable
 version of wxMac.
 
 For further information, please see the files in docs/mac
diff --git a/docs/latex/wx/wxmgl.tex b/docs/latex/wx/wxmgl.tex
index 916dde737a..8c33c219fb 100644
--- a/docs/latex/wx/wxmgl.tex
+++ b/docs/latex/wx/wxmgl.tex
@@ -1,19 +1,19 @@
 \section{wxMGL port}\label{wxmglport}
 
-wxMGL is a port of wxWindows using the MGL library available
+wxMGL is a port of wxWidgets using the MGL library available
 from SciTech as the underlying graphics backend. wxMGL draws
 its widgets using the wxUniversal widget set which is now
-part of wxWindows. MGL itself runs on a variety of platforms
+part of wxWidgets. MGL itself runs on a variety of platforms
 including DOS, Linux hardware (similar to the Linux framebuffer)
 and various graphics systems such as Win32, X11 and OS/2.
 Note that currently MGL for Linux runs only on x86-based systems.
 
-You will need wxWindows 2.3.3 or higher and MGL 5.0 or higher.
+You will need wxWidgets 2.3.3 or higher and MGL 5.0 or higher.
 The latter is available from
 
 \urlref{http://www.scitechsoft.com/products/product\_download.html}{http://www.scitechsoft.com/products/product\_download.html}
 
-In order to configure wxWindows to compile wxMGL you will
+In order to configure wxWidgets to compile wxMGL you will
 need to type:
 
 \begin{verbatim}
diff --git a/docs/latex/wx/wxmsw.tex b/docs/latex/wx/wxmsw.tex
index 6335f07655..c52f9350d8 100644
--- a/docs/latex/wx/wxmsw.tex
+++ b/docs/latex/wx/wxmsw.tex
@@ -1,10 +1,10 @@
 \section{wxMSW port}\label{wxmswport}
 
-wxMSW is a port of wxWindows for the Windows platforms
+wxMSW is a port of wxWidgets for the Windows platforms
 including Windows 95, 98, ME, 2000, NT, XP in ANSI and
 Unicode mode (for Windows 95 through the MSLU extension
 library). wxMSW ensures native look and feel for XP
-as well when using wxWindows version 2.3.3 or higher.
+as well when using wxWidgets version 2.3.3 or higher.
 wxMSW can be compile with a great variety of compilers
 including MS VC++, Borland 5.5, MinGW32, Cygwin and
 Watcom as well as cross-compilation with a Linux hosted
diff --git a/docs/latex/wx/wxos2.tex b/docs/latex/wx/wxos2.tex
index ac302e3e86..20809fbbd9 100644
--- a/docs/latex/wx/wxos2.tex
+++ b/docs/latex/wx/wxos2.tex
@@ -1,5 +1,5 @@
 \section{wxOS2 port}\label{wxos2port}
 
-wxOS2 is a port of wxWindows for the IBM OS/2 platform.
+wxOS2 is a port of wxWidgets for the IBM OS/2 platform.
 It is currently under construction.
 
diff --git a/docs/latex/wx/wxstring.tex b/docs/latex/wx/wxstring.tex
index b0cf516b85..f281cc208a 100644
--- a/docs/latex/wx/wxstring.tex
+++ b/docs/latex/wx/wxstring.tex
@@ -203,9 +203,9 @@ Other string functions.
 \helpref{Pad}{wxstringpad}\\
 \helpref{Truncate}{wxstringtruncate}
 
-\membersection{wxWindows 1.xx compatibility functions}
+\membersection{wxWidgets 1.xx compatibility functions}
 
-These functions are deprecated, please consider using new wxWindows 2.0
+These functions are deprecated, please consider using new wxWidgets 2.0
 functions instead of them (or, even better, std::string compatible variants).
 
 \helpref{SubString}{wxstringsubstring}\\
@@ -623,7 +623,7 @@ Returns the number of occurrences of {\it ch} in the string.
 
 Converts the string or character from an ASCII, 7-bit form
 to the native wxString representation. Most useful when using
-a Unicode build of wxWindows.
+a Unicode build of wxWidgets.
 
 \membersection{wxString::GetChar}\label{wxstringgetchar}
 
@@ -635,7 +635,7 @@ Returns the character at position {\it n} (read-only).
 
 \constfunc{const char*}{GetData}{\void}
 
-wxWindows compatibility conversion. Returns a constant pointer to the data in the string.
+wxWidgets compatibility conversion. Returns a constant pointer to the data in the string.
 
 \membersection{wxString::GetWritableChar}\label{wxstringgetwritablechar}
 
diff --git a/docs/latex/wx/wxx11.tex b/docs/latex/wx/wxx11.tex
index 97234ea824..376e1ca422 100644
--- a/docs/latex/wx/wxx11.tex
+++ b/docs/latex/wx/wxx11.tex
@@ -1,14 +1,14 @@
 \section{wxX11 port}\label{wxx11port}
 
-wxX11 is a port of wxWindows using X11 (The X Window System)
+wxX11 is a port of wxWidgets using X11 (The X Window System)
 as the underlying graphics backend. wxX11 draws its widgets
-using the wxUniversal widget set which is now part of wxWindows.
+using the wxUniversal widget set which is now part of wxWidgets.
 wxX11 is well-suited for a number of special applications such
 as those running on systems with few resources (PDAs) or for
 applications which need to use a special themed look. You will need
-wxWindows 2.3.2 or higher.
+wxWidgets 2.3.2 or higher.
 
-In order to configure wxWindows to compile wxX11 you will 
+In order to configure wxWidgets to compile wxX11 you will 
 need to type:
 
 \begin{verbatim}
@@ -17,5 +17,5 @@ configure --with-x11 --with-universal
 
 For further information, please see the files in docs/x11
 in the distribution. There is also a page on the use of
-wxWindows for embedded applications on the wxWindows web site.
+wxWidgets for embedded applications on the wxWidgets web site.
 
diff --git a/docs/latex/wx/xmlres.tex b/docs/latex/wx/xmlres.tex
index 1b5974706a..c3850abe0a 100644
--- a/docs/latex/wx/xmlres.tex
+++ b/docs/latex/wx/xmlres.tex
@@ -11,7 +11,7 @@ The class holds XML resources from one or more .xml files, binary files or zip a
 
 See \helpref{XML-based resource system overview}{xrcoverview} for details.
 
-{\bf NOTE:} XRC is not yet a part of the core wxWindows library, so
+{\bf NOTE:} XRC is not yet a part of the core wxWidgets library, so
 please see the overview for how to compile and link it. Otherwise if you
 try to use it, you will get link errors.
 
@@ -142,7 +142,7 @@ The macro {\tt XRCID(name)} is provided for convenience.
 
 Initializes handlers for all supported controls/windows. This will
 make the executable quite big because it forces linking against
-most of the wxWindows library.
+most of the wxWidgets library.
 
 \membersection{wxXmlResource::Load}\label{wxxmlresourceload}
 
diff --git a/docs/latex/wx/xmlresh.tex b/docs/latex/wx/xmlresh.tex
index eb6e2ba273..91ff38c39a 100644
--- a/docs/latex/wx/xmlresh.tex
+++ b/docs/latex/wx/xmlresh.tex
@@ -10,7 +10,7 @@ capable of creating a control from an XML node.
 
 See \helpref{XML-based resource system overview}{xrcoverview} for details.
 
-{\bf NOTE:} XRC is not yet a part of the core wxWindows library, so
+{\bf NOTE:} XRC is not yet a part of the core wxWidgets library, so
 please see the overview for how to compile and link it. Otherwise if you
 try to use it, you will get link errors.
 
diff --git a/docs/licence.txt b/docs/licence.txt
index c91deed0bc..c48bfe6c9c 100644
--- a/docs/licence.txt
+++ b/docs/licence.txt
@@ -1,4 +1,4 @@
-                wxWindows Library Licence, Version 3
+                wxWidgets Library Licence, Version 3
                 ====================================
 
   Copyright (c) 1998 Julian Smart, Robert Roebling et al
@@ -28,7 +28,7 @@
 
   1. As a special exception, the copyright holders of this library give
   permission for additional uses of the text contained in this release of
-  the library as licenced under the wxWindows Library Licence, applying
+  the library as licenced under the wxWidgets Library Licence, applying
   either version 3 of the Licence, or (at your option) any later version of
   the Licence as published by the copyright holders of version 3 of the
   Licence document.
diff --git a/docs/licendoc.txt b/docs/licendoc.txt
index 5bfa143812..57464d40e6 100644
--- a/docs/licendoc.txt
+++ b/docs/licendoc.txt
@@ -1,4 +1,4 @@
-                wxWindows Free Documentation Licence, Version 3
+                wxWidgets Free Documentation Licence, Version 3
                 ===============================================
 
   Copyright (c) 1998 Julian Smart, Robert Roebling et al
@@ -22,7 +22,7 @@
   manual or piece of documentation under the conditions for verbatim
   copying, provided also that any sections describing licensing conditions
   for this manual, such as, in particular, the GNU General Public Licence,
-  the GNU Library General Public Licence, and any wxWindows Licence are
+  the GNU Library General Public Licence, and any wxWidgets Licence are
   included exactly as in the original, and provided that the entire
   resulting derived work is distributed under the terms of a permission
   notice identical to this one.
diff --git a/docs/preamble.txt b/docs/preamble.txt
index f2f16439b5..076a1277a5 100644
--- a/docs/preamble.txt
+++ b/docs/preamble.txt
@@ -1,23 +1,23 @@
 Preamble
 ========
 
-The licensing of the wxWindows library is intended to protect the wxWindows
+The licensing of the wxWidgets library is intended to protect the wxWidgets
 library, its developers, and its users, so that the considerable investment
 it represents is not abused.
 
-Under the terms of the wxWindows Licence, you as a user are not
-obliged to distribute wxWindows source code with your products, if you
+Under the terms of the wxWidgets Licence, you as a user are not
+obliged to distribute wxWidgets source code with your products, if you
 distribute these products in binary form. However, you are prevented from
 restricting use of the library in source code form, or denying others the
-rights to use or distribute wxWindows library source code in the way
+rights to use or distribute wxWidgets library source code in the way
 intended.
 
-The wxWindows Licence establishes the copyright for the code and related
+The wxWidgets Licence establishes the copyright for the code and related
 material, and it gives you legal permission to copy, distribute and/or
 modify the library. It also asserts that no warranty is given by the authors
 for this or derived code.
 
-The core distribution of the wxWindows library contains files
+The core distribution of the wxWidgets library contains files
 under two different licences:
 
 - Most files are distributed under the GNU Library General Public
@@ -27,7 +27,7 @@ under two different licences:
   different licence), and distribute such binaries under your own
   terms.
 
-- Most core wxWindows manuals are made available under the "wxWindows
+- Most core wxWidgets manuals are made available under the "wxWidgets
   Free Documentation Licence", which allows you to distribute modified
   versions of the manuals, such as versions documenting any modifications
   made by you in your version of the library. However, you may not restrict
@@ -36,11 +36,11 @@ under two different licences:
 
 Other relevant files:
 
-- licence.txt: a statement that the wxWindows library is
+- licence.txt: a statement that the wxWidgets library is
   covered by the GNU Library General Public Licence, with an
   exception notice for binary distribution.
 
-- licendoc.txt: the wxWindows Documentation Licence.
+- licendoc.txt: the wxWidgets Documentation Licence.
 
 - lgpl.txt: the text of the GNU Library General Public Licence.
 
diff --git a/docs/readme.txt b/docs/readme.txt
index 775ccf957c..ebc8469cc7 100644
--- a/docs/readme.txt
+++ b/docs/readme.txt
@@ -1,7 +1,7 @@
-wxWindows 2.4.2
+wxWidgets 2.4.2
 ---------------
 
-Welcome to wxWindows, a sophisticated cross-platform C++
+Welcome to wxWidgets, a sophisticated cross-platform C++
 framework for writing advanced GUI applications using (where
 possible) the native controls.
 
@@ -27,7 +27,7 @@ Please see changes.txt for details.
 Platforms supported
 -------------------
 
-wxWindows currently supports the following platforms:
+wxWidgets currently supports the following platforms:
 
 - Windows 95/98/ME, Windows NT, Windows 2000, Windows XP
 - Most Unix variants with GTK+
@@ -38,7 +38,7 @@ wxWindows currently supports the following platforms:
 
 Most popular C++ compilers are supported; see the install.txt
 file for each platform (available via docs/html/index.htm) for details.
-See also http://www.wxwindows.org/platform.htm.
+See also http://www.wxwidgets.org/platform.htm.
 
 Files
 -----
@@ -47,7 +47,7 @@ The distribution is available in archive formats appropriate to the
 target system. Documentation is available mainly in zip format.
 In the following, x.y.z represents the current version number.
 
-wxWindows for GTK+ distribution
+wxWidgets for GTK+ distribution
 -------------------------------
 
 wxGTK-x.y.z.tar.gz                 wxGTK source distribution. You will
@@ -60,13 +60,13 @@ wxGTK-x.y.z-0.i386.rpm             wxGTK Linux binaries as an RPM, without manua
 wxGTK-devel-x.y.z-0.i386.rpm       wxGTK Linux minimum development system as an RPM
 wxGTK-gl-x.y.z-0.i386.rpm          Add-on OpenGL binary as an RPM
 
-wxWindows for X11 and Motif distribution
+wxWidgets for X11 and Motif distribution
 ----------------------------------------
 
 wxX11-x.y.z.tar.gz                 wxX11 and wxMotif source distribution, without
                                    documentation.
 
-wxWindows for MS Windows distribution
+wxWidgets for MS Windows distribution
 -------------------------------------
 
 setup.exe, setup-*.bin             Setup files in floppy-disk-sized chunks
@@ -82,7 +82,7 @@ As well as the core source, the wxMSW distribution contains:
 - a Tex2RTF binary;
 - Life! sample binary.
 
-wxWindows for MacOS distribution
+wxWidgets for MacOS distribution
 --------------------------------
 
 wxMac-x.y.z.zip                    Zip archive containing all
@@ -92,7 +92,7 @@ wxMac-x.y.z.tar.gz                 Gzipped tar archive containing all
                                    You might prefer this format if building on
                                    MacOS X, since it preserves file permissions.
 
-wxWindows for OS/2 distribution
+wxWidgets for OS/2 distribution
 -------------------------------
 
 wxOS2-x.y.z.zip                    Zip archive containing all source files
@@ -101,17 +101,17 @@ wxOS2-x.y.z.zip                    Zip archive containing all source files
 Documentation files
 -------------------
 
-wxWindows-x.y.z-WinHelp.zip        WinHelp documentation
-wxWindows-x.y.z-PDF.zip            Acrobat PDF documentation
-wxWindows-x.y.z-HTML.zip           HTML documentation
-wxWindows-x.y.z-HTMLHelp.zip       Windows HTML Help documentation
-wxWindows-x.y.z-HTB.zip            wxHTML documentation (for
+wxWidgets-x.y.z-WinHelp.zip        WinHelp documentation
+wxWidgets-x.y.z-PDF.zip            Acrobat PDF documentation
+wxWidgets-x.y.z-HTML.zip           HTML documentation
+wxWidgets-x.y.z-HTMLHelp.zip       Windows HTML Help documentation
+wxWidgets-x.y.z-HTB.zip            wxHTML documentation (for
                                    use with the helpview utility)
 
 Installation
 ------------
 
-wxWindows 2 needs to be compiled before you can test out
+wxWidgets 2 needs to be compiled before you can test out
 the samples or write your own applications.
 For installation information, please see the install.txt file
 in the individual directories:
@@ -136,12 +136,12 @@ For licensing information, please see the files:
   docs/lgpl.txt
 
 Although this may seem complex, it is there to allow authors of
-proprietary/commercial applications to use wxWindows in
+proprietary/commercial applications to use wxWidgets in
 addition to those writing GPL'ed applications. In summary,
 the licence is LGPL plus a clause allowing unrestricted
 distribution of application binaries. To answer a FAQ, you
 don't have to distribute any source if you wish to write
-commercial applications using wxWindows. 
+commercial applications using wxWidgets. 
 
 However, if you distribute wxGTK or wxMotif (with Lesstif) version
 of your application, don't forget that it is linked against
@@ -152,7 +152,7 @@ which describes conditions for distribution of closed source applications
 linked against LGPL library. Basically you should link dynamically and
 include source code of LGPL libraries with your product (unless it is
 already present in user's system - like glibc usually is).
-If compiled with --enable-odbc (Unix only), wxWindows library will 
+If compiled with --enable-odbc (Unix only), wxWidgets library will 
 contain iODBC library which is covered by LGPL.
 
 If you use TIFF image handler, please see src/tiff/COPYRIGHT
@@ -171,11 +171,11 @@ Documentation
 
 See docs/html/index.htm for an HTML index of the major documents.
 
-See docs/changes.txt for a summary of changes to wxWindows 2.
+See docs/changes.txt for a summary of changes to wxWidgets 2.
 
 See docs/tech for an archive of technical notes.
 
-The wxWindows bug database can be browsed at:
+The wxWidgets bug database can be browsed at:
 
   http://sourceforge.net/bugs/?group_id=9863
 
@@ -185,20 +185,20 @@ The PDF help files are located in docs/pdf.
 Further information
 -------------------
 
-The wxWindows Web site is located at:
+The wxWidgets Web site is located at:
 
-  http://www.wxwindows.org
+  http://www.wxwidgets.org
 
-The main wxWindows ftp site is at:
+The main wxWidgets ftp site is at:
 
   ftp://biolpc22.york.ac.uk/pub
 
-A wxWindows CD-ROM with the latest distribution plus an HTML
+A wxWidgets CD-ROM with the latest distribution plus an HTML
 front-end and hundreds of MB of compilers, utilities and other
-material may be ordered from the CD-ROM page: see the wxWindows
+material may be ordered from the CD-ROM page: see the wxWidgets
 web site.
 
 Have fun!
 
-The wxWindows Team, September 2003
+The wxWidgets Team, September 2003
 
diff --git a/docs/readme_vms.txt b/docs/readme_vms.txt
index 15468f3a91..c44a38a7f1 100644
--- a/docs/readme_vms.txt
+++ b/docs/readme_vms.txt
@@ -9,7 +9,7 @@ The compilation was tested with
     -GTK1.2.8 (for wxGTK)
     
 To get everything compiled you'll need to have installed prior to compiling
-wxWindows:
+wxWidgets:
     -Bison
       get it from http://www.openvms.digital.com/freeware/
       You' have to fix the following bug:
@@ -102,7 +102,7 @@ $  ass $disk2:[joukj.public.gtk.gtk.glib],-
       versions of VMS. If you get lib$get_current_invo_context undefined
       while linking you'll have to add
          "lib$get_current_invo_context"="LIB$GET_CURR_INVO_CONTEXT"
-      in [.src.unix]descrip.mms to CXX_DEFINE. and recompile wxWindows.
+      in [.src.unix]descrip.mms to CXX_DEFINE. and recompile wxWidgets.
 
     -Some versions of the CC compiler give warnings like
        %CC-W-CXXKEYWORD, "bool" is a keyword in C++ .... when compiling
@@ -120,7 +120,7 @@ $  ass $disk2:[joukj.public.gtk.gtk.glib],-
   -I think in general wxGTK is better maintained, so that version is my
     first choice.
   
-  -Note that only a few people have used wxWindows on VMS so many problems are
+  -Note that only a few people have used wxWidgets on VMS so many problems are
    to be expected.
 
 
diff --git a/docs/tech/index.txt b/docs/tech/index.txt
index 603a59d424..d67ca7e6e2 100644
--- a/docs/tech/index.txt
+++ b/docs/tech/index.txt
@@ -1,21 +1,21 @@
-		All wxWindows techincal notes at a glance
+		All wxWidgets techincal notes at a glance
 		=========================================
 
 tn0001.txt   How to add a new sample
-tn0002.txt   wxWindows translator guide
-tn0003.txt   Adding wxWindows class documentation
+tn0002.txt   wxWidgets translator guide
+tn0003.txt   Adding wxWidgets class documentation
 tn0004.htm   Compiling a sample in the C++Builder IDE
-tn0005.txt   Adding a wxWindows contribution
+tn0005.txt   Adding a wxWidgets contribution
 tn0006.txt   *** REMOVED *** (obsoleted by tn0013.txt)
 tn0007.txt   Using and modifying the BC++ IDE files
-tn0008.htm   How to learn wxWindows programming
+tn0008.htm   How to learn wxWidgets programming
 tn0009.htm   Creating and converting icons
-tn0010.htm   Compiling wxWindows applications in the VC++ IDE
+tn0010.htm   Compiling wxWidgets applications in the VC++ IDE
 tn0011.txt   All about version numbers
-tn0012.txt   wxWindows platform, toolkit and library names
+tn0012.txt   wxWidgets platform, toolkit and library names
 tn0013.txt   how to make a wxGTK distribution
 tn0014.txt   XRC resources format specification
-tn0015.txt   how to add new bitmaps to wxWindows UI elements
+tn0015.txt   how to add new bitmaps to wxWidgets UI elements
 
 
 Version: $Id$
diff --git a/docs/tech/tn0001.txt b/docs/tech/tn0001.txt
index 4de7f2dc39..d47509a45f 100644
--- a/docs/tech/tn0001.txt
+++ b/docs/tech/tn0001.txt
@@ -1,4 +1,4 @@
-                    How to add a new sample to wxWindows.
+                    How to add a new sample to wxWidgets.
                     =====================================
 
 To add a new sample "foo" under directory "samples/foo" you need to do
@@ -30,7 +30,7 @@ samples/ with demos/ where needed).
    by running "autoconf" on a Unix system in the corresponding directory.
 
 5. Add a short description of what the sample does and how does it work
-   to the "samples overview" section in the wxWindows manual. That section
+   to the "samples overview" section in the wxWidgets manual. That section
    lives in docs/latex/wx/tsamples.tex; look at the descriptions for other
    samples, if you are not familiar with LaTeX.
 
diff --git a/docs/tech/tn0002.txt b/docs/tech/tn0002.txt
index 29ef40af71..e5cf1e23f4 100644
--- a/docs/tech/tn0002.txt
+++ b/docs/tech/tn0002.txt
@@ -1,7 +1,7 @@
-                          wxWindows translator guide
+                          wxWidgets translator guide
                           ==========================
 
-This note is addressed to wxWindows translators.
+This note is addressed to wxWidgets translators.
 
 First of all, here is what you will need:
 
@@ -12,7 +12,7 @@ First of all, here is what you will need:
       mirror (RPMs and DEBs are also available from the usual places)
 
    b) for Windows you can download the precompiled binaries from
-      www.wxwindows.org
+      www.wxwidgets.org
 
 2. A way to run a program recursively on an entire directory from the command
    line:
@@ -37,7 +37,7 @@ gettext documentation for more details). It happens in several steps:
    program into a wxstd.po file which is a "text message catalog"
 
 2. this new wxstd.po file (recreated each time some new text messages are added
-   to wxWindows) is merged with existing translations in another .po file (for
+   to wxWidgets) is merged with existing translations in another .po file (for
    example, de.po) and replaces this file (this is done using the program
    msgmerge)
 
@@ -63,6 +63,9 @@ Author:  VZ
 Version: $Id$
 
 $Log$
+Revision 1.2.2.1  2004/05/04 08:52:32  JS
+Name change replacements
+
 Revision 1.2  2002/07/03 15:01:26  VZ
 typos and other doc corrections from Olly Betts (patch 573738)
 
diff --git a/docs/tech/tn0003.txt b/docs/tech/tn0003.txt
index a1fa46e997..e39d14253e 100644
--- a/docs/tech/tn0003.txt
+++ b/docs/tech/tn0003.txt
@@ -1,15 +1,15 @@
-                     Adding wxWindows class documentation
+                     Adding wxWidgets class documentation
                      ====================================
 
 This note is aimed at people wishing to add documentation for a
-class to either the main wxWindows manual, or to their own
+class to either the main wxWidgets manual, or to their own
 manual.
 
-wxWindows uses Tex2RTF to process Latex-like input files (.tex)
+wxWidgets uses Tex2RTF to process Latex-like input files (.tex)
 and output in HTML, WinHelp RTF and Word RTF. Tex2RTF is provided
-in the wxWindows distribution and in the CVS archive, under
+in the wxWidgets distribution and in the CVS archive, under
 utils/tex2rtf. Please start by perusing the Tex2RTF manual.
-See http://www.wxwindows.org/tex2rtf/index.htm for a browseable
+See http://www.wxwidgets.org/tex2rtf/index.htm for a browseable
 manual and binaries for specific platforms.
 
 If adding to the existing manual in docs/latex/wx, you need to
@@ -20,7 +20,7 @@ and add the entry to topics.tex.  If applicable, also add an entry
 to category.tex.
 
 If compiling a separate manual, copy an existing set of files from the
-wxWindows manual or a contribution. Contribution documentation
+wxWidgets manual or a contribution. Contribution documentation
 normally goes in the contrib/docs hierarchy, with the source
 going in a latex/mycontrib subdirectory.
 
@@ -55,12 +55,12 @@ parameter, and then choose FILE|GO from the menu.  For example:
    tex2rtf manual.tex manual.rtf -rtf -twice -interactive
 
 NOTE: You must be using the latest tex2rtf which was released with
-v2.2.0 of wxWindows to use the -interactive switch
+v2.2.0 of wxWidgets to use the -interactive switch
 
 If you wish to generate documentation for wxHTML Help Viewer
 (or Windows HTML Help), set htmlWorkshopFiles to true in your
 tex2rtf.ini file. See also the wxHTML Notes section in the
-wxWindows manual. To further speed-up HTML help books loading
+wxWidgets manual. To further speed-up HTML help books loading
 in your application, you may use hhp2cached (utils/hhp2cached).
 
 src/msw/makefile.vc contains targets for generating various
diff --git a/docs/tech/tn0004.htm b/docs/tech/tn0004.htm
index ea58c4fd56..8fb77dae5b 100644
--- a/docs/tech/tn0004.htm
+++ b/docs/tech/tn0004.htm
@@ -9,13 +9,13 @@
 <body>
 
 <h2>
-Compiling wxWindows samples with the Borland CBuilder</h2>
+Compiling wxWidgets samples with the Borland CBuilder</h2>
 
 This document is available online <a href="http://biolpc22.york.ac.uk/wx/bc/ide.html">here</a>.<P>
 
 <h2>
 Before you begin</h2>
-This refers to the <b>2.1.16</b> and 2.1.15 wxWindows distribution. It
+This refers to the <b>2.1.16</b> and 2.1.15 wxWidgets distribution. It
 is my account of trying to compile the samples so I can use the Borland
 IDE to edit/compile/debug. I have used CBuilder 1.00 (2 patches, nice and
 fast), CBuilder 3 (slower), and CBuilder 4 (more recently).
@@ -169,7 +169,7 @@ Solution 3</h3>
 
 <ul>
 <li>
-download the wxWindows-2.1.16-bcb.zip file,</li>
+download the wxWidgets-2.1.16-bcb.zip file,</li>
 
 <li>
 extract it</li>
diff --git a/docs/tech/tn0005.txt b/docs/tech/tn0005.txt
index db4a67275d..5c54bbed96 100644
--- a/docs/tech/tn0005.txt
+++ b/docs/tech/tn0005.txt
@@ -1,4 +1,4 @@
-                     Adding a wxWindows contribution
+                     Adding a wxWidgets contribution
                      ===============================
 
 Here are some different kinds of contribution:
@@ -6,15 +6,15 @@ Here are some different kinds of contribution:
 1. Bug fixes. You can send these to the wx-devel list.
 2. New classes. New classes normally go in the contrib hierarchy:
    please see below for more details. They may be promoted to
-   the main wxWindows hierarchy if they are deemed to be 'core'.
+   the main wxWidgets hierarchy if they are deemed to be 'core'.
 3. A utility application, such as a new dialog editor or
    file format conversion utility. If adding to the CVS
    archive, you may put it under the utils hierarchy,
    preferably with further src and docs directories.
 
-You may or may not wish to add your code to the main wxWindows CVS
+You may or may not wish to add your code to the main wxWidgets CVS
 archive. Whether your code is appropriate for this archive
-should first be ascertained by discussing it on wx-devel@wxwindows.org.
+should first be ascertained by discussing it on wx-devel@wxwidgets.org.
 
 The contrib hierarchy
 ---------------------
@@ -23,7 +23,7 @@ When contributing a new class or set of classes, please
 organise your files in the following hierarchy, so that
 when a user unarchives your contribution, it
 slots neatly into the existing source hierarchy.
-It also simplifies compilation for users, since wxWindows
+It also simplifies compilation for users, since wxWidgets
 makefiles and project files are set up to search in
 contrib/include/wx and contrib/lib. For example, to
 include yourclass.h, the following directive is used:
@@ -57,8 +57,8 @@ site in the 'Backroom' section. Include as many makefiles as
 possible for different compilers.
 
 Your archive can be in .tgz or .zip format. For inclusion on
-the wxWindows ftp site and CD-ROM, please send your submission to
-Julian Smart <julian@wxwindows.org> as a binary attachment.
+the wxWidgets ftp site and CD-ROM, please send your submission to
+Julian Smart <julian@wxwidgets.org> as a binary attachment.
 An entry will be added to the Contributions web page.
 
 Author:  Julian Smart
diff --git a/docs/tech/tn0007.txt b/docs/tech/tn0007.txt
index 763c2afcaa..9188e871fa 100644
--- a/docs/tech/tn0007.txt
+++ b/docs/tech/tn0007.txt
@@ -1,19 +1,19 @@
 Using and modifying the BC++ IDE files
 ======================================
 
-Readme for wxWindows 2.0 Ide-files
+Readme for wxWidgets 2.0 Ide-files
 First release Feb. 1999, detlev@reymann-online.de
 
 1. What you can do with the BC++ IDE files
 2. Where to install the files
 3. How to modify them for your own needs
-4. How to create IDE files for your own wxWindows-programs
+4. How to create IDE files for your own wxWidgets-programs
 
 1. What you can do with the IDE files
 =====================================
 
 There are two IDE files. src\bc32.ide should help you to
-create the wxWindows libraries from within the Ide of Borland's
+create the wxWidgets libraries from within the Ide of Borland's
 C++, v. 5.x. Note that this doesn't include debugging code: you
 need to change the settings if you wish to include debug
 information. Previously, bc32d.ide was supplied with debug
@@ -23,7 +23,7 @@ settings, but this proved to time-consuming to maintain.
 =============================
 
 You should copy the files for the libraries into the
-src-directory of your wxWindows-Installation (e.g. C:\wxwin\src).
+src-directory of your wxWidgets-Installation (e.g. C:\wxwin\src).
 And the other file for the samples should be copied into the
 samples-directory (e.g. C:\wxwin\samples).
 
@@ -34,7 +34,7 @@ automatically).
 3. How to modify them for your own needs
 ========================================
 
-If your wxWindows-Installation resides on the same drive as your
+If your wxWidgets-Installation resides on the same drive as your
 Borland-Compiler and additionally the Borland-Installation is
 the default (e.g. C:\BC5) then there should be no need to change
 anything. Otherwise please change the path from within the ide
@@ -59,10 +59,10 @@ To add a new sample to samples\bc32.ide, follow these steps:
    Intermediate: .\newsample
    Final: .\newsample
 
-4. How to create IDE files for your own wxWindows-programs
+4. How to create IDE files for your own wxWidgets-programs
 ==========================================================
 
-If you want to create an IDE file for your own wxWindows program,
+If you want to create an IDE file for your own wxWidgets program,
 please follow these steps.
 
 1. Create a new project from the menu file->new->project.
@@ -71,12 +71,12 @@ please follow these steps.
    the checkbox OLE (you can leave this checkbox unchecked,
    but then you have to add the library \bc5\lib\ole2w32.lib
    to your project), and the Multithread checkbox.
-3. Add the include-path of wxWindows to the include-path in the
+3. Add the include-path of wxWidgets to the include-path in the
    options-dialog (options->project->directories->include). The
    result should be something like:
    path_of_my_program;\bc5\include;\wxwin2\include;
 4. Add the libraries to the project. Open the project-view and
    activate your program. Then right-click and choose "add" and
-   select the wxWindows library (e.g. \wxwin\lib\wx32.lib). Also
+   select the wxWidgets library (e.g. \wxwin\lib\wx32.lib). Also
    add the xpm library.
 
diff --git a/docs/tech/tn0008.htm b/docs/tech/tn0008.htm
index 3f267dba0f..f5abd740a0 100644
--- a/docs/tech/tn0008.htm
+++ b/docs/tech/tn0008.htm
@@ -1,7 +1,7 @@
 <HTML>
 
 <HEAD>
-<TITLE>How to learn wxWindows programming</TITLE>
+<TITLE>How to learn wxWidgets programming</TITLE>
 </HEAD>
 
 <BODY BGCOLOR=#FFFFFF TEXT=#000000 LINK=#FF0000 VLINK=#000000>
@@ -14,7 +14,7 @@
 <tr>
 <td bgcolor="#660000" align=left colspan=2>
 <font size=+1 face="Arial, Lucida Sans, Helvetica" color="#FFFFFF">
-How to learn wxWindows programming
+How to learn wxWidgets programming
 </font>
 </td>
 </tr>
@@ -23,13 +23,13 @@ How to learn wxWindows programming
 <P>
 
 The following is a response by Edward Ream to a common question,
-"What's the best way to learn wxWindows [and C++]?".<P>
+"What's the best way to learn wxWidgets [and C++]?".<P>
 
 Date: Sun, 04 Jun 2000 14:37:06 -0500<BR>
 From: "Edward K. Ream" <edream@tds.net> <BR>
-To: wx-users@wxwindows.org<BR>
+To: wx-users@wxwidgets.org<BR>
 Subject: Re: [wx-users] How to learn using wx-windows <BR>
-Reply-To: wx-users@wxwindows.org<P>
+Reply-To: wx-users@wxwidgets.org<P>
 
 &gt; Reading the Linux Journal article on wxpython, and having used wxclips<BR>
 &gt; I got interested in wxwindows as a development interface. However, the<BR>
@@ -37,7 +37,7 @@ Reply-To: wx-users@wxwindows.org<P>
 &gt; tran). I'd like to refresh my experience and start in C++.  Will<BR>
 &gt; wx-windows be a very high step to take?<P>
 
-I'm new to wxWindows myself, but I'd like to answer this question
+I'm new to wxWidgets myself, but I'd like to answer this question
 anyway. In the past two years I've learned two similar frameworks
 (Apple's Yellow Box, aka NextStep/OpenStep and Borland's C++
 Builder/Delphi) and last year I became a C++ enthusiast after 20 years
@@ -47,7 +47,7 @@ of using C.<P>
 
 The major Aha for me was that the complexity of C++ doesn't matter in
 practice.  What _does_ matter is that C++ allows you to do simple things
-simply, more simply than C.  With a system like wxWindows you will be
+simply, more simply than C.  With a system like wxWidgets you will be
 creating objects and then using those objects to call methods.  So don't
 be afraid of C++: you'll only be using the easy tip of the
 iceberg.<P>
@@ -61,7 +61,7 @@ Lippman's book is the cure.<P>
 
 <B>About applications frameworks.</B><P>
 
-Application frameworks such as wxWindows are organized around a set of
+Application frameworks such as wxWidgets are organized around a set of
 cooperating classes.  Take a look at the main application class, wxApp,
 some frame and panel classes, graphics classes, menu classes, control
 classes, etc.  In general, to do anything in a framework involves
@@ -117,7 +117,7 @@ and then calling methods using those objects.<P>
 
 Learn as much as you can about the String class; after using a good
 String class you'll never want to use C's string functions again. 
-wxWindows contains other nifty utility classes as well.<P>
+wxWidgets contains other nifty utility classes as well.<P>
 
 The application class, wxApp, contains the main event loop.  Learn about
 event handling and event tables (reading sample code will help). Almost
@@ -127,8 +127,8 @@ events.  Having the event loop written for you is a major, major
 benefit.<P>
 
 I hope this helps. Perhaps we can work together in learning about
-wxWindows.  Please feel free to ask me any questions you might have.  If
-I've made any blunders in this posting I hope the wxWindows experts will
+wxWidgets.  Please feel free to ask me any questions you might have.  If
+I've made any blunders in this posting I hope the wxWidgets experts will
 correct me gently.<P>
 
 Edward<BR>
diff --git a/docs/tech/tn0009.htm b/docs/tech/tn0009.htm
index 948aff1f53..60765e4795 100644
--- a/docs/tech/tn0009.htm
+++ b/docs/tech/tn0009.htm
@@ -40,7 +40,7 @@ is no icon editor so you must obtain one separately, such as <a href="http://hot
 To convert from XPM to BMP (which can be loaded or pasted into an icon editor to save as an ICO file),
 you can use Vadim Zeitlin's <a href="ftp://biolpc22.york.ac.uk/pub/support/xpm2bmp.exe">xpm2bmp.exe</a> utility.
 To convert from BMP to XPM, you can use <a href="ftp://biolpc22.york.ac.uk/pub/support/bmp2xpm.exe">bmp2xpm.exe</a>
-which is actually the old wxWindows 1.68 utility, xpmshow. You will have to edit the resulting
+which is actually the old wxWidgets 1.68 utility, xpmshow. You will have to edit the resulting
 file since the full path is used as the variable name, plus you may wish to specify a transparent colour e.g.:<P>
 
 <pre>
diff --git a/docs/tech/tn0010.htm b/docs/tech/tn0010.htm
index 8476f9a079..eac9381e8e 100644
--- a/docs/tech/tn0010.htm
+++ b/docs/tech/tn0010.htm
@@ -1,7 +1,7 @@
 <HTML>
 
 <HEAD>
-<TITLE>Compiling wxWindows applications in the VC++ IDE</TITLE>
+<TITLE>Compiling wxWidgets applications in the VC++ IDE</TITLE>
 
 </HEAD>
 
@@ -15,7 +15,7 @@
 <tr>
 <td bgcolor="#C4ECF9">
 <font size=+1 face="Arial, Lucida Sans, Helvetica" color="#000000">
-Compiling wxWindows applications in the VC++ IDE
+Compiling wxWidgets applications in the VC++ IDE
 </font>
 </td>
 </tr>
@@ -24,12 +24,12 @@ Compiling wxWindows applications in the VC++ IDE
 <P>
 
 <CENTER>
-<a href="#wxwin2">Settings for wxWindows 2.2</a> / <a href="#wxwin1">Settings for wxWindows 1.68</a>
+<a href="#wxwin2">Settings for wxWidgets 2.2</a> / <a href="#wxwin1">Settings for wxWidgets 1.68</a>
 </CENTER>
 
 <P>
 
-To compile wxWindows samples and applications using the VC++ 5.0 or 6.0 IDE (having compiled wxWindows
+To compile wxWidgets samples and applications using the VC++ 5.0 or 6.0 IDE (having compiled wxWidgets
 using the makefile or project file provided), the following
 steps and settings should be used.<P>
 
@@ -38,16 +38,16 @@ steps and settings should be used.<P>
 <ol>
 <li>Create a new WIN32 Application project.
 <li>Add the .cpp and .rc files for your project.
-<li>Apply the settings listed below to the project, replacing c:\wx2 with your wxWindows
+<li>Apply the settings listed below to the project, replacing c:\wx2 with your wxWidgets
 installation path.
 </ol>
 
 <P>
 
-<H2><a name="wxwin2">Settings for wxWindows 2.2</a></H2>
+<H2><a name="wxwin2">Settings for wxWidgets 2.2</a></H2>
 
-These settings apply to wxWindows 2.1.14 and above but most of them are not
-necessary any longer for wxWindows 2.3+.<P>
+These settings apply to wxWidgets 2.1.14 and above but most of them are not
+necessary any longer for wxWidgets 2.3+.<P>
 
 <DL>
 <DT><B>General</B><DD>
@@ -95,7 +95,7 @@ The <B>Object/library modules</B> field should contain:
 <PRE>
 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib
 ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib
-winmm.lib wxd.lib xpmd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib
+winmm.lib wxmswd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib
 </PRE>
 
 for the Debug configuration and
@@ -103,7 +103,7 @@ for the Debug configuration and
 <PRE>
 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib
 ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib
-winmm.lib wx.lib xpm.lib png.lib zlib.lib jpeg.lib tiff.lib
+winmm.lib wxmsw.lib png.lib zlib.lib jpeg.lib tiff.lib
 </PRE>
 
 for the Release configuration.<P>
@@ -144,7 +144,7 @@ c:\wx2\include;c:\wx2\contrib\include
 
 <HR>
 
-<H2><a name="wxwin1">Settings for wxWindows 1.68</a></H2>
+<H2><a name="wxwin1">Settings for wxWidgets 1.68</a></H2>
 
 Note: these have not yet been checked.<P>
 
@@ -172,12 +172,12 @@ The <B>Additional include directories</B> field should contain the following:<P>
 <DT><B>C/C++: Precompiled Headers</B><DD>
 
 The <B>Not using precompiled headers</B> or <B>Automatic use of precompiled headers</B>
-button should be selected (I can't find a way of using the wxWindows PCH file).<P>
+button should be selected (I can't find a way of using the wxWidgets PCH file).<P>
 
 <DT><B>C/C++: Code Generation</B><DD>
 
 The <B>Use run-time library</B> control should be set to <B>Multithreaded DLL</B>. This
-sets the compiler switch to /MD to match the wxWindows makefile.<P>
+sets the compiler switch to /MD to match the wxWidgets makefile.<P>
 
 <DT><B>Link: Input</B><DD>
 
diff --git a/docs/tech/tn0011.txt b/docs/tech/tn0011.txt
index 6511a60dca..dcdb124d83 100644
--- a/docs/tech/tn0011.txt
+++ b/docs/tech/tn0011.txt
@@ -1,9 +1,9 @@
-All about wxWindows Version Numbers
+All about wxWidgets Version Numbers
 ===================================
 
 1. Where to update the version numbers:
 
-   There are several places in the wxWindows source tree that
+   There are several places in the wxWidgets source tree that
    define the version number for the library.  When updating the
    version number all of these places need edited:
 
@@ -30,6 +30,9 @@ All about wxWindows Version Numbers
 Version: $Id$
 
 $Log$
+Revision 1.1.2.1  2004/05/04 08:52:33  JS
+Name change replacements
+
 Revision 1.1  2001/06/08 04:26:35  RD
 move the tech note to a correctly named file
 
diff --git a/docs/tech/tn0012.txt b/docs/tech/tn0012.txt
index 7084f48122..f478996fde 100644
--- a/docs/tech/tn0012.txt
+++ b/docs/tech/tn0012.txt
@@ -1,14 +1,14 @@
-wxWindows naming conventions
+wxWidgets naming conventions
 ============================
 
 Being a cross platform development library, it is naturally desirable
-(at least to me ;) for wxWindows to be exploited in a fully cross
+(at least to me ;) for wxWidgets to be exploited in a fully cross
 platform development environment -- a single invocation of make should
 be sufficient to build target executables for a variety of host platforms
 when desired.
 
 Since this is now in fact possible for at least the most commonly used
-platforms, wxWindows has been structured to allow multiple, simultaneous
+platforms, wxWidgets has been structured to allow multiple, simultaneous
 installations of the library.  Common files are shared, platform and port
 specific files and libraries are arranged so as to be unambiguous when
 installed together.
@@ -18,7 +18,7 @@ labelling convention for file and install path names -- this document (at
 least at its time of writing) describes the system we have adopted.
 
 It is not fine grained enough to include every possible build configuration
-for wxWindows, but is encompassing enough to maintain a relatively complete
+for wxWidgets, but is encompassing enough to maintain a relatively complete
 set of cross platform build tools on a single machine and to provide an
 obvious slot for new ports to slip into.
 
@@ -61,7 +61,7 @@ or empty if the widget set is the same as the toolkit.
 $version is a string encoding the full version (major, minor, release)
 for MSW, or just the major and minor number for UNIX.
 
-eg. for wxWindows 2.3.2, $version = 232 for MSW or 2.3 for UNIX.
+eg. for wxWidgets 2.3.2, $version = 232 for MSW or 2.3 for UNIX.
 
 The rationale for this is that under UNIX-like systems it is desirable
 that differently 'minor numbered' releases can be installed together,
diff --git a/docs/tech/tn0013.txt b/docs/tech/tn0013.txt
index 070b5deac3..c0c4c33cb6 100644
--- a/docs/tech/tn0013.txt
+++ b/docs/tech/tn0013.txt
@@ -13,17 +13,17 @@ the other Unix-based ports including wxMotif, wxX11 and wxBase.
 
 a) Do a fresh checkout using the command
 
-        cvs -d :pserver:anoncvs@cvs.wxwindows.org:/packs/cvsroots/wxwindows co wxGTK
+        cvs -d :pserver:anoncvs@cvs.wxwidgets.org:/packs/cvsroots/wxwindows co wxGTK
 
    NB: if you realize later that some needed files were not checked out
        by this command, please modify CVSROOT/modules to include the missing
        files so that it works for the next release!
 
    You also need the samples, demos and contrib directories, so change to
-   wxWindows directory created by the first cvs command and do "cvs up -d"
+   wxWidgets directory created by the first cvs command and do "cvs up -d"
    for each of them.
 
-b) Create a build directory under wxWindows, e.g. I use "gtk-release",
+b) Create a build directory under wxWidgets, e.g. I use "gtk-release",
    "cd" to it and run configure: the options don't really matter, you can use
    something like
 
@@ -129,15 +129,15 @@ a) FreshMeat:
    - hit "new release" at the top
    - follow the step by step
 
-b) wx-announce mailing list: mailto:wx-announce@lists.wxwindows.org
+b) wx-announce mailing list: mailto:wx-announce@lists.wxwidgets.org
 
    [where is the announcement text? TODO]
 
-c) update www.wxwindows.org
+c) update www.wxwidgets.org
 
 d) GNOME (very effective, stays on front page for days):
     - http://www.gnome.org/applist
-    - Search for wxWindows
+    - Search for wxWidgets
     - Update the version number
     - Ignore the error message
 
diff --git a/docs/tech/tn0014.txt b/docs/tech/tn0014.txt
index 933209a78e..9c37b4ff89 100644
--- a/docs/tech/tn0014.txt
+++ b/docs/tech/tn0014.txt
@@ -36,7 +36,7 @@ In the example bellow, <pos>, <label> and <style> are attributes, while neither
 <resource> nor either of <object>s is:
 
     <?xml version="1.0" encoding="utf-8">
-    <resource xmlns="http://www.wxwindows.org/wxxrc" version="2.3.0.1">
+    <resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.3.0.1">
         <object class="wxPanel">
             <style>wxSUNKEN_BORDER</style>             <!-- attr -->
             <object class="wxStaticText">
@@ -57,7 +57,7 @@ can think of it as attribute value syntax definition).
 =========================
 
 XRC resource file is a well-formed XML 1.0 document. All elements of XRC file are
-from the http://www.wxwindows.org/wxxrc namespace. 
+from the http://www.wxwidgets.org/wxxrc namespace. 
 
 The root node of XRC document must be <resource>. The <resource> node has 
 optional "version" property. Default version  (in absence of the version 
@@ -65,9 +65,9 @@ property) is "0.0.0.0". The version consists of four integers separated by
 periods. Version of XRC format changes only if there was an incompatible 
 change introduced (i.e. either the library cannot understand old resource 
 files or older versions of the library wouldn't understand the new format).
-The first three integers are major, minor and release number of the wxWindows 
+The first three integers are major, minor and release number of the wxWidgets 
 release when the change was introduced, the last one is revision number and 
-is 0 for the first incompatible change in given wxWindows release, 1 for 
+is 0 for the first incompatible change in given wxWidgets release, 1 for 
 the second etc.
 
 Differences between versions are described within this document in paragraphs
@@ -75,14 +75,14 @@ entitled "Version Note".
 
 The <resource> node contains namespace declaration, too:
 
-    <resource xmlns="http://www.wxwindows.org/wxxrc" version="2.3.0.1">
+    <resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.3.0.1">
 
 The <resource> node is only allowed to have <object> and <object_ref>
 subnodes, all of which must have the "name" property.
 
 The <object> node represents a single object (GUI element) and it usually maps
-directly to a wxWindows class instance. It three properties: "name", "class"
-and "subclass". "class" must always be present, it tells XRC what wxWindows
+directly to a wxWidgets class instance. It three properties: "name", "class"
+and "subclass". "class" must always be present, it tells XRC what wxWidgets
 object should be created in this place. The other two are optional. 
 "name" is ID used to identify the object. It is the value passed to the XRCID() macro
 and is also used to construct wxWindow's id and name attributes and must be unique
@@ -91,7 +91,7 @@ wxNotebook) upside from the object in XML nodes hiearchy (two distinct container
 may contain objects with same "name", though). "subclass" is
 optional name of class whose constructor will be called instead of the constructor
 for "class". Subclass must be available in the program that loads the resource,
-must be derived from "class" and must be registered within wxWindows' RTTI system.
+must be derived from "class" and must be registered within wxWidgets' RTTI system.
 
 Example:
 
@@ -145,7 +145,7 @@ String
 ------
 Any text. Some characters have special interpretation and are translated
 by XRC parser according to this table:
-    "_"    -> "&"  ('&' is used to underline e.g. menu items in wxWindows)
+    "_"    -> "&"  ('&' is used to underline e.g. menu items in wxWidgets)
     "__"   -> "_"
     "\n"   -> line break (C character '\n')
     "\r"   -> carriage return (C character '\r')
@@ -190,9 +190,9 @@ Style[wxSomeClass]
 List of style flags that can be passed to wxSomeClass' constructor. Flags are
 written in same way as in C++ code (e.g. "wxSUNKEN_BORDER", "wxHW_SCROLLBAR_NEVER")
 and are delimined with any combination of whitespaces and '|'. Possible flags
-are class-dependent and are not described in this technote. Please refer to wxWindows
+are class-dependent and are not described in this technote. Please refer to wxWidgets
 manual for all styles that given class can accept; if XRC does not accept a flag
-listed in wxWindows documentation, it is a bug.
+listed in wxWidgets documentation, it is a bug.
 
 
 Bitmap
diff --git a/docs/tech/tn0015.txt b/docs/tech/tn0015.txt
index 2279894bce..a44cba9b8e 100644
--- a/docs/tech/tn0015.txt
+++ b/docs/tech/tn0015.txt
@@ -1,4 +1,4 @@
-                How to add new bitmaps to wxWindows UI elements
+                How to add new bitmaps to wxWidgets UI elements
                 ===============================================
 
 0. Introduction
@@ -10,7 +10,7 @@ code. This was previously done either by including the bitmap in win32
 resource file (include/wx/msw/wx.rc) or by including XPM files in the code.
 
 wxArtProvider should be used instead, to allow users to customize the look of
-their wxWindows app. This technote is a detailed description of steps needed
+their wxWidgets app. This technote is a detailed description of steps needed
 when adding new bitmap/icon.
 
 1. Adding new resource
@@ -78,7 +78,7 @@ client is wxART_OTHER you may write only
 -------------------
 
 It is highly desirable to let the users know what stock bitmaps are available
-in wxWindows. The "artprov" sample serves this purpose: it contains a browser
+in wxWidgets. The "artprov" sample serves this purpose: it contains a browser
 dialog that displays all available art resources.
 
 It has to be updated to accomodate for new bitmaps. Fortunately, this is