From be5a51fb592f3fa2ba38ac6cd1e488d6d806058c Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Tue, 25 May 2004 11:20:37 +0000
Subject: [PATCH] More name changes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27429 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 contrib/include/wx/deprecated/tbarsmpl.h      |  2 +-
 contrib/include/wx/mmedia/vidbase.h           |  2 +-
 contrib/include/wx/mmedia/vidwin.h            |  2 +-
 contrib/include/wx/mmedia/vidxanm.h           |  2 +-
 contrib/include/wx/net/email.h                |  2 +-
 contrib/include/wx/stc/stc.h                  |  2 +-
 contrib/include/wx/xrc/xmlres.h               | 10 +++----
 contrib/samples/animate/anitest.cpp           |  2 +-
 .../samples/deprecated/resource/resource.cpp  | 10 +++----
 .../samples/deprecated/treelay/treelay.cpp    |  2 +-
 contrib/samples/fl/fl_demo1.cpp               |  2 +-
 contrib/samples/fl/fl_demo2.cpp               |  8 ++---
 contrib/samples/fl/fl_sample1.cpp             |  2 +-
 contrib/samples/fl/fl_sample2.cpp             |  2 +-
 contrib/samples/fl/fl_sample3.cpp             |  2 +-
 contrib/samples/gizmos/dynsash/dynsash.cpp    |  2 +-
 .../gizmos/dynsash_switch/dynsash_switch.cpp  |  2 +-
 contrib/samples/gizmos/editlbox/test.cpp      |  2 +-
 contrib/samples/gizmos/led/led.cpp            | 10 +++----
 contrib/samples/gizmos/splittree/tree.cpp     | 10 +++----
 contrib/samples/gizmos/splittree/tree.h       |  2 +-
 contrib/samples/mmedia/mmbman.cpp             |  2 +-
 contrib/samples/mmedia/mmboard.cpp            | 12 ++++----
 contrib/samples/ogl/studio/mainfrm.cpp        |  2 +-
 contrib/samples/ogl/studio/studio.cpp         |  6 ++--
 contrib/samples/stc/defsext.h                 |  2 +-
 contrib/samples/stc/edit.cpp                  |  4 +--
 contrib/samples/stc/edit.h                    |  4 +--
 contrib/samples/stc/prefs.cpp                 |  6 ++--
 contrib/samples/stc/prefs.h                   |  4 +--
 contrib/samples/stc/stctest.cpp               | 12 ++++----
 contrib/samples/svg/svgtest.cpp               |  2 +-
 contrib/samples/xrc/custclas.cpp              |  6 ++--
 contrib/samples/xrc/custclas.h                | 14 ++++-----
 contrib/samples/xrc/derivdlg.cpp              |  4 +--
 contrib/samples/xrc/derivdlg.h                |  2 +-
 contrib/samples/xrc/myframe.cpp               |  8 ++---
 contrib/samples/xrc/myframe.h                 |  2 +-
 contrib/samples/xrc/rc/artprov.xrc            |  2 +-
 contrib/samples/xrc/rc/basicdlg.xrc           |  2 +-
 contrib/samples/xrc/rc/controls.xrc           |  2 +-
 contrib/samples/xrc/rc/custclas.xrc           |  4 +--
 contrib/samples/xrc/rc/derivdlg.xrc           |  2 +-
 contrib/samples/xrc/rc/frame.xrc              |  4 +--
 contrib/samples/xrc/rc/menu.xrc               |  4 +--
 contrib/samples/xrc/rc/platform.xrc           |  2 +-
 contrib/samples/xrc/rc/resource.xrc           |  2 +-
 contrib/samples/xrc/rc/toolbar.xrc            |  4 +--
 contrib/samples/xrc/rc/uncenter.xrc           |  2 +-
 contrib/samples/xrc/rc/variable.xrc           |  2 +-
 contrib/samples/xrc/xrcdemo.cpp               |  8 ++---
 contrib/src/deprecated/resource.cpp           |  6 ++--
 contrib/src/gizmos/dynamicsash.cpp            |  2 +-
 contrib/src/gizmos/editlbox.cpp               |  2 +-
 contrib/src/gizmos/splittree.cpp              |  2 +-
 contrib/src/mmedia/sndesd.cpp                 |  2 +-
 contrib/src/mmedia/sndoss.cpp                 |  2 +-
 contrib/src/net/email.cpp                     |  2 +-
 contrib/src/stc/PlatWX.cpp                    |  2 +-
 contrib/src/stc/ScintillaWX.cpp               |  2 +-
 contrib/src/stc/ScintillaWX.h                 |  2 +-
 contrib/src/stc/scintilla/include/Platform.h  |  4 +--
 contrib/src/stc/stc.cpp                       |  2 +-
 contrib/src/stc/stc.cpp.in                    |  2 +-
 contrib/utils/convertrc/convert.cpp           |  2 +-
 contrib/utils/convertrc/rc2wxr.cpp            |  2 +-
 contrib/utils/convertrc/rc2xml.cpp            |  4 +--
 contrib/utils/wxrcedit/edapp.cpp              |  4 +--
 contrib/utils/wxrcedit/editor.cpp             |  2 +-
 contrib/utils/wxrcedit/splittree.cpp          |  2 +-
 demos/dbbrowse/dummy.cpp                      |  2 +-
 demos/dbbrowse/std.h                          |  2 +-
 demos/forty/canvas.cpp                        |  2 +-
 demos/forty/canvas.h                          |  2 +-
 demos/forty/card.cpp                          |  2 +-
 demos/forty/card.h                            |  2 +-
 demos/forty/forty.cpp                         |  2 +-
 demos/forty/forty.h                           |  2 +-
 demos/forty/game.cpp                          |  2 +-
 demos/forty/game.h                            |  2 +-
 demos/forty/pile.cpp                          |  2 +-
 demos/forty/pile.h                            |  2 +-
 demos/forty/playerdg.cpp                      |  2 +-
 demos/forty/playerdg.h                        |  2 +-
 demos/forty/scoredg.cpp                       |  2 +-
 demos/forty/scoredg.h                         |  2 +-
 demos/forty/scorefil.cpp                      |  4 +--
 demos/forty/scorefil.h                        |  2 +-
 demos/fractal/fractal.cpp                     |  4 +--
 demos/life/dialogs.cpp                        |  4 +--
 demos/life/dialogs.h                          |  2 +-
 demos/life/life.cpp                           |  4 +--
 demos/life/life.h                             |  6 ++--
 distrib/msw/makefile.rsp                      |  1 +
 distrib/msw/vc.rsp                            |  2 ++
 include/wx/stc/stc.h                          |  2 +-
 include/wx/xrc/xmlres.h                       | 10 +++----
 samples/access/accesstest.cpp                 | 20 ++++++-------
 samples/artprov/arttest.cpp                   |  2 +-
 samples/calendar/calendar.cpp                 | 12 ++++----
 samples/caret/caret.cpp                       | 16 +++++-----
 samples/checklst/checklst.cpp                 |  2 +-
 samples/config/conftest.cpp                   |  2 +-
 samples/console/console.cpp                   | 14 ++++-----
 samples/controls/controls.cpp                 |  4 +--
 samples/db/dbtest.cpp                         |  6 ++--
 samples/db/dbtest.h                           |  6 ++--
 samples/db/listdb.h                           |  2 +-
 samples/dialogs/dialogs.cpp                   |  4 +--
 samples/dialup/nettest.cpp                    | 14 ++++-----
 samples/display/display.cpp                   | 14 ++++-----
 samples/dnd/dnd.cpp                           |  6 ++--
 samples/docview/docview.cpp                   |  2 +-
 samples/docvwmdi/docview.cpp                  |  2 +-
 samples/drawing/drawing.cpp                   | 14 ++++-----
 samples/dynamic/dynamic.cpp                   |  4 +--
 samples/erase/erase.cpp                       |  6 ++--
 samples/event/event.cpp                       | 16 +++++-----
 samples/except/except.cpp                     | 16 +++++-----
 samples/exec/exec.cpp                         | 16 +++++-----
 samples/font/font.cpp                         | 24 +++++++--------
 samples/grid/griddemo.cpp                     |  4 +--
 samples/grid/griddemo.h                       |  2 +-
 samples/help/demo.cpp                         | 20 ++++++-------
 samples/htlbox/htlbox.cpp                     | 12 ++++----
 samples/html/about/about.cpp                  | 10 +++----
 samples/html/help/help.cpp                    | 12 ++++----
 samples/html/helpview/helpview.cpp            |  4 +--
 samples/html/htmlctrl/htmlctrl.cpp            | 10 +++----
 samples/html/printing/printing.cpp            | 10 +++----
 samples/html/test/test.cpp                    |  8 ++---
 samples/html/virtual/virtual.cpp              | 10 +++----
 samples/html/widget/widget.cpp                | 10 +++----
 samples/html/zip/zip.cpp                      | 10 +++----
 samples/internat/internat.cpp                 |  4 +--
 samples/ipc/server.cpp                        |  2 +-
 samples/keyboard/keyboard.cpp                 | 18 +++++------
 samples/layout/layout.cpp                     |  6 ++--
 samples/listbox/lboxtest.cpp                  |  2 +-
 samples/mdi/mdi.cpp                           |  2 +-
 samples/memcheck/memcheck.cpp                 |  4 +--
 samples/menu/menu.cpp                         |  8 ++---
 samples/mfc/mfctest.cpp                       | 30 +++++++++----------
 samples/mfc/mfctest.h                         |  4 +--
 samples/minifram/minifram.cpp                 |  2 +-
 samples/minimal/minimal.cpp                   | 16 +++++-----
 samples/mobile/styles/styles.h                |  2 +-
 samples/mobile/wxedit/wxedit.h                |  2 +-
 samples/multimon/multimon_test.cpp            |  2 +-
 samples/nativdlg/nativdlg.cpp                 |  2 +-
 samples/notebook/notebook.cpp                 |  2 +-
 samples/notebook/notebook.h                   |  2 +-
 samples/oleauto/oleauto.cpp                   | 20 ++++++-------
 samples/opengl/cube/cube.cpp                  |  4 +--
 samples/opengl/isosurf/isosurf.cpp            |  4 +--
 samples/opengl/penguin/penguin.cpp            |  2 +-
 samples/ownerdrw/ownerdrw.cpp                 |  2 +-
 samples/png/pngdemo.cpp                       |  2 +-
 samples/printing/printing.cpp                 |  8 ++---
 samples/printing/printing.h                   |  2 +-
 samples/propsize/propsize.cpp                 | 12 ++++----
 samples/regtest/regtest.cpp                   |  2 +-
 samples/render/renddll.cpp                    |  2 +-
 samples/render/render.cpp                     | 22 +++++++-------
 samples/richedit/wxLayout.cpp                 |  4 +--
 samples/richedit/wxllist.cpp                  |  2 +-
 samples/richedit/wxllist.h                    | 10 +++----
 samples/rotate/rotate.cpp                     |  4 +--
 samples/sashtest/sashtest.cpp                 |  2 +-
 samples/shaped/shaped.cpp                     |  8 ++---
 samples/sockets/client.cpp                    |  6 ++--
 samples/sockets/server.cpp                    |  4 +--
 samples/sound/sound.cpp                       | 14 ++++-----
 samples/statbar/statbar.cpp                   | 14 ++++-----
 samples/stc/defsext.h                         |  2 +-
 samples/stc/edit.cpp                          |  4 +--
 samples/stc/edit.h                            |  4 +--
 samples/stc/prefs.cpp                         |  6 ++--
 samples/stc/prefs.h                           |  4 +--
 samples/stc/stctest.cpp                       | 12 ++++----
 samples/svg/svgtest.cpp                       |  2 +-
 samples/taskbar/tbtest.cpp                    |  2 +-
 samples/text/text.cpp                         |  4 +--
 samples/thread/thread.cpp                     |  8 ++---
 samples/toolbar/toolbar.cpp                   |  4 +--
 samples/typetest/typetest.cpp                 |  6 ++--
 samples/typetest/typetest.h                   |  2 +-
 samples/validate/validate.cpp                 |  2 +-
 samples/validate/validate.h                   |  2 +-
 samples/vscroll/vstest.cpp                    | 18 +++++------
 samples/widgets/button.cpp                    |  2 +-
 samples/widgets/checkbox.cpp                  |  2 +-
 samples/widgets/combobox.cpp                  |  2 +-
 samples/widgets/gauge.cpp                     |  2 +-
 samples/widgets/listbox.cpp                   |  2 +-
 samples/widgets/notebook.cpp                  |  4 +--
 samples/widgets/radiobox.cpp                  |  2 +-
 samples/widgets/slider.cpp                    |  2 +-
 samples/widgets/spinbtn.cpp                   |  2 +-
 samples/widgets/static.cpp                    |  2 +-
 samples/widgets/textctrl.cpp                  |  4 +--
 samples/widgets/widgets.cpp                   |  8 ++---
 samples/widgets/widgets.h                     |  2 +-
 samples/wizard/wizard.cpp                     |  4 +--
 samples/wxtest/test.h                         |  2 +-
 samples/wxtest/test_wdr.h                     |  2 +-
 samples/xrc/custclas.cpp                      |  6 ++--
 samples/xrc/custclas.h                        | 14 ++++-----
 samples/xrc/derivdlg.cpp                      |  4 +--
 samples/xrc/derivdlg.h                        |  2 +-
 samples/xrc/myframe.cpp                       |  8 ++---
 samples/xrc/myframe.h                         |  2 +-
 samples/xrc/rc/artprov.xrc                    |  2 +-
 samples/xrc/rc/basicdlg.xrc                   |  2 +-
 samples/xrc/rc/controls.xrc                   |  2 +-
 samples/xrc/rc/custclas.xrc                   |  4 +--
 samples/xrc/rc/derivdlg.xrc                   |  2 +-
 samples/xrc/rc/frame.xrc                      |  4 +--
 samples/xrc/rc/menu.xrc                       |  4 +--
 samples/xrc/rc/platform.xrc                   |  2 +-
 samples/xrc/rc/resource.xrc                   |  2 +-
 samples/xrc/rc/toolbar.xrc                    |  4 +--
 samples/xrc/rc/uncenter.xrc                   |  2 +-
 samples/xrc/rc/variable.xrc                   |  2 +-
 samples/xrc/xrcdemo.cpp                       |  8 ++---
 src/stc/PlatWX.cpp                            |  2 +-
 src/stc/ScintillaWX.cpp                       |  2 +-
 src/stc/ScintillaWX.h                         |  2 +-
 src/stc/scintilla/include/Platform.h          |  4 +--
 src/stc/stc.cpp                               |  2 +-
 src/stc/stc.cpp.in                            |  2 +-
 utils/HelpGen/src/HelpGen.cpp                 | 13 ++++----
 utils/configtool/docs/manual/configtool.tex   | 24 +++++++--------
 utils/configtool/docs/readme-after.txt        |  6 ++--
 utils/configtool/docs/readme.txt              | 26 ++++++++--------
 utils/configtool/docs/todo.txt                |  2 +-
 utils/configtool/scripts/innobott.txt         |  2 +-
 utils/configtool/src/appsettings.cpp          |  6 ++--
 utils/configtool/src/configitem.cpp           |  4 +--
 utils/configtool/src/configitem.h             |  2 +-
 utils/configtool/src/configtooldoc.cpp        |  2 +-
 utils/configtool/src/configtooldoc.h          |  2 +-
 utils/configtool/src/configtree.cpp           |  2 +-
 utils/configtool/src/configtree.h             |  2 +-
 utils/configtool/src/mainframe.cpp            |  4 +--
 utils/configtool/src/propeditor.cpp           |  2 +-
 utils/configtool/src/propeditor.h             |  2 +-
 utils/configtool/src/settingsdialog.cpp       | 12 ++++----
 utils/configtool/src/symbols.h                |  2 +-
 utils/configtool/src/wxconfigtool.h           |  4 +--
 utils/emulator/docs/readme.txt                |  6 ++--
 utils/emulator/src/emulator.cpp               | 14 ++++-----
 utils/emulator/src/emulator.h                 |  4 +--
 utils/helpview/src/client.cpp                 |  2 +-
 utils/helpview/src/helpview.cpp               |  6 ++--
 utils/helpview/src/readme.txt                 |  2 +-
 utils/nplugin/samples/gui/gui.cpp             |  2 +-
 utils/nplugin/samples/gui/gui.h               |  2 +-
 utils/nplugin/samples/simple/simple.cpp       |  2 +-
 utils/nplugin/src/npapp.cpp                   |  2 +-
 utils/nplugin/src/npframe.cpp                 |  2 +-
 utils/tex2rtf/distrib/innobott.txt            |  2 +-
 utils/tex2rtf/distrib/innotop.txt             |  8 ++---
 utils/tex2rtf/docs/install.txt                |  4 +--
 utils/tex2rtf/docs/readme.txt                 | 10 +++----
 utils/wxOLE/gtk/wxole.cpp                     |  2 +-
 utils/wxOLE/samples/servlet/servlet.cpp       |  2 +-
 267 files changed, 676 insertions(+), 670 deletions(-)

diff --git a/contrib/include/wx/deprecated/tbarsmpl.h b/contrib/include/wx/deprecated/tbarsmpl.h
index 4e54cf25c0..67fa1871e1 100644
--- a/contrib/include/wx/deprecated/tbarsmpl.h
+++ b/contrib/include/wx/deprecated/tbarsmpl.h
@@ -25,7 +25,7 @@
 class WXDLLEXPORT wxMemoryDC;
 
 // ----------------------------------------------------------------------------
-// wxToolBarSimple is a generic toolbar implementation in pure wxWindows
+// wxToolBarSimple is a generic toolbar implementation in pure wxWidgets
 // ----------------------------------------------------------------------------
 
 class WXDLLIMPEXP_DEPRECATED wxToolBarSimple : public wxToolBarBase
diff --git a/contrib/include/wx/mmedia/vidbase.h b/contrib/include/wx/mmedia/vidbase.h
index 7cb64bea69..8d7810f37b 100644
--- a/contrib/include/wx/mmedia/vidbase.h
+++ b/contrib/include/wx/mmedia/vidbase.h
@@ -27,7 +27,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers
+// need because it includes almost all "standard" wxWidgets headers
 #ifndef WX_PRECOMP
     #include "wx/defs.h"
     #include "wx/stream.h"
diff --git a/contrib/include/wx/mmedia/vidwin.h b/contrib/include/wx/mmedia/vidwin.h
index f92e5f02a6..08b7a104e2 100644
--- a/contrib/include/wx/mmedia/vidwin.h
+++ b/contrib/include/wx/mmedia/vidwin.h
@@ -30,7 +30,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers
+// need because it includes almost all "standard" wxWidgets headers
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/stream.h"
diff --git a/contrib/include/wx/mmedia/vidxanm.h b/contrib/include/wx/mmedia/vidxanm.h
index c3dac3d82e..5fca2f5779 100644
--- a/contrib/include/wx/mmedia/vidxanm.h
+++ b/contrib/include/wx/mmedia/vidxanm.h
@@ -26,7 +26,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers
+// need because it includes almost all "standard" wxWidgets headers
 #ifndef WX_PRECOMP
     #include "wx/defs.h"
     #include "wx/string.h"
diff --git a/contrib/include/wx/net/email.h b/contrib/include/wx/net/email.h
index 50573d8014..173e5e1847 100644
--- a/contrib/include/wx/net/email.h
+++ b/contrib/include/wx/net/email.h
@@ -32,7 +32,7 @@ public:
 //// Operations
 
     // Send a message.
-    // Specify profile, or leave it to wxWindows to find the current user name
+    // Specify profile, or leave it to wxWidgets to find the current user name
     static bool Send(wxMailMessage& message, const wxString& profileName = wxEmptyString,
         const wxString& sendMail = wxT("/usr/lib/sendmail -t"));
     
diff --git a/contrib/include/wx/stc/stc.h b/contrib/include/wx/stc/stc.h
index 051f37035e..235a1c85ba 100644
--- a/contrib/include/wx/stc/stc.h
+++ b/contrib/include/wx/stc/stc.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////
 // Name:        stc.h
-// Purpose:     A wxWindows implementation of Scintilla.  This class is the
+// Purpose:     A wxWidgets implementation of Scintilla.  This class is the
 //              one meant to be used directly by wx applications.  It does not
 //              derive directly from the Scintilla classes, and in fact there
 //              is no mention of Scintilla classes at all in this header.
diff --git a/contrib/include/wx/xrc/xmlres.h b/contrib/include/wx/xrc/xmlres.h
index bf3f3c9d76..dd62160169 100644
--- a/contrib/include/wx/xrc/xmlres.h
+++ b/contrib/include/wx/xrc/xmlres.h
@@ -59,7 +59,7 @@ class wxXmlResourceModule;
 //     older versions of the library may ignore it.
 //   - if you change version number, follow these steps:
 //       - set major, minor and release numbers to respective version numbers of
-//         the wxWindows library (see wx/version.h)
+//         the wxWidgets library (see wx/version.h)
 //       - reset revision to 0 unless the first three are same as before,
 //         in which case you should increase revision by one
 #define WX_XMLRES_CURRENT_VERSION_MAJOR            2
@@ -127,7 +127,7 @@ public:
 
     // Initialize 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.
     void InitAllHandlers();
 
     // Initialize only a specific handler (or custom handler). Convention says
@@ -274,7 +274,7 @@ private:
 
 // This macro translates string identifier (as used in XML resource,
 // e.g. <menuitem id="my_menu">...</menuitem>) to integer id that is needed by
-// wxWindows event tables.
+// wxWidgets event tables.
 // Example:
 //    BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 //       EVT_MENU(XRCID("quit"), MyFrame::OnQuit)
@@ -463,9 +463,9 @@ WXDLLIMPEXP_XRC void wxXmlInitResourceModule();
 
 // This class is used to create instances of XRC "object" nodes with "subclass"
 // property. It is _not_ supposed to be used by XRC users, you should instead
-// register your subclasses via wxWindows' RTTI mechanism. This class is useful
+// register your subclasses via wxWidgets' RTTI mechanism. This class is useful
 // only for language bindings developer who need a way to implement subclassing
-// in wxWindows ports that don't support wxRTTI (e.g. wxPython).
+// in wxWidgets ports that don't support wxRTTI (e.g. wxPython).
 class WXDLLIMPEXP_XRC wxXmlSubclassFactory
 {
 public:
diff --git a/contrib/samples/animate/anitest.cpp b/contrib/samples/animate/anitest.cpp
index acf5eae9ee..f03f8875b1 100644
--- a/contrib/samples/animate/anitest.cpp
+++ b/contrib/samples/animate/anitest.cpp
@@ -139,7 +139,7 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
 {
-    (void)wxMessageBox(_T("wxWindows 2 Animation Demo\n")
+    (void)wxMessageBox(_T("wxWidgets 2 Animation Demo\n")
                        _T("Author: Julian Smart (c) 2001\n"),
                        _T("About Animation Demo"));
 }
diff --git a/contrib/samples/deprecated/resource/resource.cpp b/contrib/samples/deprecated/resource/resource.cpp
index 548f4ae8ac..4aaf51eca0 100644
--- a/contrib/samples/deprecated/resource/resource.cpp
+++ b/contrib/samples/deprecated/resource/resource.cpp
@@ -41,7 +41,7 @@
 
 // If we wanted to demonstrate total platform independence,
 // then we'd use the dynamic file loading form for all platforms.
-// But this shows how to embed the wxWindows resources
+// But this shows how to embed the wxWidgets resources
 // in the program code/executable for UNIX and Windows
 // platforms.
 
@@ -104,7 +104,7 @@ bool MyApp::OnInit(void)
 
     // Create the main frame window
     frame = new MyFrame( (wxFrame *) NULL, -1,
-                         wxT("wxWindows Resource Sample"),
+                         wxT("wxWidgets Resource Sample"),
                          wxPoint(-1, -1), wxSize(300, 250) );
 
     // Give it a status line
@@ -172,8 +172,8 @@ MyFrame::MyFrame
 
 void MyFrame::OnAbout( wxCommandEvent& WXUNUSED(event) )
 {
-    wxMessageBox(wxT("wxWindows resource sample.\n")
-                 wxT("(c) Julian Smart"), wxT("About wxWindows sample"),
+    wxMessageBox(wxT("wxWidgets resource sample.\n")
+                 wxT("(c) Julian Smart"), wxT("About wxWidgets sample"),
                  wxICON_INFORMATION | wxOK);
 }
 
@@ -191,7 +191,7 @@ void MyFrame::OnTestDialog(wxCommandEvent& WXUNUSED(event) )
         wxTextCtrl *text = (wxTextCtrl *)wxFindWindowByName(wxT("multitext3"), dialog);
         if (text)
         {
-            text->SetValue(wxT("wxWindows resource demo"));
+            text->SetValue(wxT("wxWidgets resource demo"));
         }
 
         dialog->ShowModal();
diff --git a/contrib/samples/deprecated/treelay/treelay.cpp b/contrib/samples/deprecated/treelay/treelay.cpp
index ba469e45ca..fd8213832e 100644
--- a/contrib/samples/deprecated/treelay/treelay.cpp
+++ b/contrib/samples/deprecated/treelay/treelay.cpp
@@ -185,7 +185,7 @@ void MyFrame::OnTopBottom(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
-      (void)wxMessageBox(_T("wxWindows tree library demo Vsn 2.0\nAuthor: Julian Smart (c) 1998"), _T("About tree test"));
+      (void)wxMessageBox(_T("wxWidgets tree library demo Vsn 2.0\nAuthor: Julian Smart (c) 1998"), _T("About tree test"));
 }
 
 void MyFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
diff --git a/contrib/samples/fl/fl_demo1.cpp b/contrib/samples/fl/fl_demo1.cpp
index 0146cf2b05..6de4a66379 100644
--- a/contrib/samples/fl/fl_demo1.cpp
+++ b/contrib/samples/fl/fl_demo1.cpp
@@ -124,7 +124,7 @@ wxTextCtrl* MyFrame::CreateTextCtrl( const wxString& value )
 }
 
 MyFrame::MyFrame(wxFrame *frame)
-    : wxFrame( frame, -1, _("wxWindows 2.0 wxFrameLayout Test Application"), wxDefaultPosition, 
+    : wxFrame( frame, -1, _("wxWidgets 2.0 wxFrameLayout Test Application"), wxDefaultPosition, 
           wxSize( 700, 500 ), 
           wxCLIP_CHILDREN | wxMINIMIZE_BOX | wxMAXIMIZE_BOX | 
           wxTHICK_FRAME   | wxSYSTEM_MENU  | wxCAPTION, 
diff --git a/contrib/samples/fl/fl_demo2.cpp b/contrib/samples/fl/fl_demo2.cpp
index 08c67c86db..e84a6a97c7 100644
--- a/contrib/samples/fl/fl_demo2.cpp
+++ b/contrib/samples/fl/fl_demo2.cpp
@@ -24,7 +24,7 @@
 #include "wx/wx.h"
 #endif
 
-// wxWindows headers.
+// wxWidgets headers.
 #include "wx/treectrl.h"
 #include "wx/imaglist.h"
 #include "wx/notebook.h" 
@@ -55,7 +55,7 @@ IMPLEMENT_APP    (MyApp)
 bool MyApp::OnInit(void)
 {
     // Create the main frame window
-    MyFrame *frame = new MyFrame(NULL, _("wxWindows 2.0 wxFrameLayout demo"), 50, 50, 650, 540);
+    MyFrame *frame = new MyFrame(NULL, _("wxWidgets 2.0 wxFrameLayout demo"), 50, 50, 650, 540);
     
     // Give it an icon
 #ifdef __WINDOWS__
@@ -170,7 +170,7 @@ MyFrame::MyFrame(wxFrame *frame, const wxChar *title, int x, int y, int w, int h
 
     mpInternalFrm = (wxPanel*)this;
     
-    mAboutBox.Create( this, -1,  _T("About box in wxWindows style..."),
+    mAboutBox.Create( this, -1,  _T("About box in wxWidgets style..."),
                       wxDefaultPosition,
                       wxSize( 385,220),
                       wxDIALOG_MODAL | wxDEFAULT_DIALOG_STYLE | wxTAB_TRAVERSAL );
@@ -665,7 +665,7 @@ wxWindow* MyFrame::CreateDevLayout( wxFrameLayout& layout, wxWindow* pParent )
     
     pClassView->SetImageList( &mImageList );
     
-    wxTreeItemId rootId = pClassView->AddRoot( wxT("wxWindows 2.0 classes"), 0 );
+    wxTreeItemId rootId = pClassView->AddRoot( wxT("wxWidgets 2.0 classes"), 0 );
     
     pClassView->AppendItem( rootId, _("wxWin Dynamic classes (grabbed at run-time)"), 0 );
     pClassView->AppendItem( rootId, _("serializer-classes (grabbed at run-time)"),    0 );
diff --git a/contrib/samples/fl/fl_sample1.cpp b/contrib/samples/fl/fl_sample1.cpp
index d873fe3328..55f9a158bb 100644
--- a/contrib/samples/fl/fl_sample1.cpp
+++ b/contrib/samples/fl/fl_sample1.cpp
@@ -67,7 +67,7 @@ IMPLEMENT_APP    (MyApp)
 
 bool MyApp::OnInit(void)
 {
-    // wxWindows boiler-plate:
+    // wxWidgets boiler-plate:
     
     MyFrame *frame = new MyFrame(NULL, _("wxFrameLayout sample"));
     
diff --git a/contrib/samples/fl/fl_sample2.cpp b/contrib/samples/fl/fl_sample2.cpp
index dd389f7002..40623bb1e4 100644
--- a/contrib/samples/fl/fl_sample2.cpp
+++ b/contrib/samples/fl/fl_sample2.cpp
@@ -68,7 +68,7 @@ IMPLEMENT_APP    (MyApp)
 
 bool MyApp::OnInit(void)
 {
-    // wxWindows boiler-plate:
+    // wxWidgets boiler-plate:
     
     MyFrame *frame = new MyFrame(NULL, _("wxFrameLayout sample"));
     
diff --git a/contrib/samples/fl/fl_sample3.cpp b/contrib/samples/fl/fl_sample3.cpp
index 2e42b69ba1..e85494be9d 100644
--- a/contrib/samples/fl/fl_sample3.cpp
+++ b/contrib/samples/fl/fl_sample3.cpp
@@ -72,7 +72,7 @@ IMPLEMENT_APP    (MyApp)
 
 bool MyApp::OnInit(void)
 {
-    // wxWindows boiler-plate:
+    // wxWidgets boiler-plate:
     
     MyFrame *frame = new MyFrame(NULL, _("wxFrameLayout sample"));
     
diff --git a/contrib/samples/gizmos/dynsash/dynsash.cpp b/contrib/samples/gizmos/dynsash/dynsash.cpp
index 8c38649dc7..ccc2b4b021 100644
--- a/contrib/samples/gizmos/dynsash/dynsash.cpp
+++ b/contrib/samples/gizmos/dynsash/dynsash.cpp
@@ -18,7 +18,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers)
+// need because it includes almost all "standard" wxWidgets headers)
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
diff --git a/contrib/samples/gizmos/dynsash_switch/dynsash_switch.cpp b/contrib/samples/gizmos/dynsash_switch/dynsash_switch.cpp
index 50db96f4ac..0910f46caf 100644
--- a/contrib/samples/gizmos/dynsash_switch/dynsash_switch.cpp
+++ b/contrib/samples/gizmos/dynsash_switch/dynsash_switch.cpp
@@ -20,7 +20,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers)
+// need because it includes almost all "standard" wxWidgets headers)
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
diff --git a/contrib/samples/gizmos/editlbox/test.cpp b/contrib/samples/gizmos/editlbox/test.cpp
index d1976f6c6b..10fb0f3839 100644
--- a/contrib/samples/gizmos/editlbox/test.cpp
+++ b/contrib/samples/gizmos/editlbox/test.cpp
@@ -6,7 +6,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers)
+// need because it includes almost all "standard" wxWidgets headers)
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
diff --git a/contrib/samples/gizmos/led/led.cpp b/contrib/samples/gizmos/led/led.cpp
index d1651fb0f3..6aab5cce46 100644
--- a/contrib/samples/gizmos/led/led.cpp
+++ b/contrib/samples/gizmos/led/led.cpp
@@ -25,7 +25,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers)
+// need because it includes almost all "standard" wxWidgets headers)
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
@@ -91,7 +91,7 @@ public:
 private:
     MyPanel  *m_panel;
 
-    // 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()
 };
 
@@ -123,10 +123,10 @@ enum
 };
 
 // ----------------------------------------------------------------------------
-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets
 // ----------------------------------------------------------------------------
 
-// the event tables connect the wxWindows events with the functions (event
+// the event tables connect the wxWidgets events with the functions (event
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@ -141,7 +141,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(LED_About, MyFrame::OnAbout)
 END_EVENT_TABLE()
 
-// Create a new application object: this macro will allow wxWindows to create
+// Create a new application object: this macro will allow wxWidgets to create
 // the application object during program execution (it's better than using a
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
diff --git a/contrib/samples/gizmos/splittree/tree.cpp b/contrib/samples/gizmos/splittree/tree.cpp
index 19658b520c..10aff3c601 100644
--- a/contrib/samples/gizmos/splittree/tree.cpp
+++ b/contrib/samples/gizmos/splittree/tree.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        tree.cpp
-// Purpose:     Minimal wxWindows sample
+// Purpose:     Minimal wxWidgets sample
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
@@ -29,7 +29,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers)
+// need because it includes almost all "standard" wxWidgets headers)
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
@@ -103,10 +103,10 @@ static char * icon2_xpm[] = {
 #endif
 
 // ----------------------------------------------------------------------------
-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets
 // ----------------------------------------------------------------------------
 
-// the event tables connect the wxWindows events with the functions (event
+// the event tables connect the wxWidgets events with the functions (event
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@ -114,7 +114,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Minimal_About, MyFrame::OnAbout)
 END_EVENT_TABLE()
 
-// Create a new application object: this macro will allow wxWindows to create
+// Create a new application object: this macro will allow wxWidgets to create
 // the application object during program execution (it's better than using a
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
diff --git a/contrib/samples/gizmos/splittree/tree.h b/contrib/samples/gizmos/splittree/tree.h
index c799a1309a..ab02e6dd2f 100644
--- a/contrib/samples/gizmos/splittree/tree.h
+++ b/contrib/samples/gizmos/splittree/tree.h
@@ -49,7 +49,7 @@ protected:
     TestValueWindow*		m_valueWindow;
 
 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()
 };
 
diff --git a/contrib/samples/mmedia/mmbman.cpp b/contrib/samples/mmedia/mmbman.cpp
index e930e07a88..85728e9ec1 100644
--- a/contrib/samples/mmedia/mmbman.cpp
+++ b/contrib/samples/mmedia/mmbman.cpp
@@ -25,7 +25,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers
+// need because it includes almost all "standard" wxWidgets headers
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
diff --git a/contrib/samples/mmedia/mmboard.cpp b/contrib/samples/mmedia/mmboard.cpp
index 8d4df27c0b..3064f67c24 100644
--- a/contrib/samples/mmedia/mmboard.cpp
+++ b/contrib/samples/mmedia/mmboard.cpp
@@ -28,7 +28,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers
+// need because it includes almost all "standard" wxWidgets headers
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
@@ -91,7 +91,7 @@ public:
     void CloseVideoWindow();
     
 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()
 
 private:
@@ -132,7 +132,7 @@ enum
 };
 
 // ----------------------------------------------------------------------------
-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets
 // ----------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(MMBoardFrame, wxFrame)
@@ -274,7 +274,7 @@ MMBoardFrame::MMBoardFrame(const wxString& title, const wxPoint& pos, const wxSi
 #if wxUSE_STATUSBAR
     // create a status bar just for fun (by default with 1 pane only)
     CreateStatusBar(3);
-    SetStatusText(wxT("Welcome to wxWindows!"));
+    SetStatusText(wxT("Welcome to wxWidgets!"));
 #endif // wxUSE_STATUSBAR
 
     // Misc variables
@@ -398,8 +398,8 @@ void MMBoardFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 void MMBoardFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
     wxString msg;
-    msg.Printf( wxT("wxWindows Multimedia board v1.0a, wxMMedia v2.0a:\n")
-                wxT("an example of the capabilities of the wxWindows multimedia classes.\n")
+    msg.Printf( wxT("wxWidgets Multimedia board v1.0a, wxMMedia v2.0a:\n")
+                wxT("an example of the capabilities of the wxWidgets multimedia classes.\n")
 		wxT("Copyright 1999, 2000, Guilhem Lavaux.\n"));
  
     wxMessageBox(msg, _T("About MMBoard"), wxOK | wxICON_INFORMATION, this);
diff --git a/contrib/samples/ogl/studio/mainfrm.cpp b/contrib/samples/ogl/studio/mainfrm.cpp
index 3f4ab32ae5..0214664a50 100644
--- a/contrib/samples/ogl/studio/mainfrm.cpp
+++ b/contrib/samples/ogl/studio/mainfrm.cpp
@@ -186,7 +186,7 @@ void csFrame::OnIdle(wxIdleEvent& event)
         // window doesn't cause the proper refresh. Just refreshing the
         // client doesn't work (presumably because it's clipping the
         // children).
-        // FIXED in wxWindows, by intercepting wxMDIClientWindow::DoSetSize
+        // FIXED in wxWidgets, by intercepting wxMDIClientWindow::DoSetSize
         // and checking if the position has changed, before redrawing the
         // child windows.
 #if 0
diff --git a/contrib/samples/ogl/studio/studio.cpp b/contrib/samples/ogl/studio/studio.cpp
index f3d414eeee..b1f6d8b12a 100644
--- a/contrib/samples/ogl/studio/studio.cpp
+++ b/contrib/samples/ogl/studio/studio.cpp
@@ -161,7 +161,7 @@ bool csApp::OnInit(void)
   frame->SetMenuBar(menuBar);
 
   // Load the file history
-  wxConfig config(_T("OGL Studio"), _T("wxWindows"));
+  wxConfig config(_T("OGL Studio"), _T("wxWidgets"));
   m_docManager->FileHistoryLoad(config);
 
   frame->CreateStatusBar();
@@ -491,7 +491,7 @@ void csApp::CreateDiagramToolBar(wxFrame* parent)
 // Read/write configuration information
 bool csApp::ReadOptions()
 {
-    wxConfig config(_T("OGL Studio"), _T("wxWindows"));
+    wxConfig config(_T("OGL Studio"), _T("wxWidgets"));
 
     config.Read(_T("mainX"), & m_mainFramePos.x);
     config.Read(_T("mainY"), & m_mainFramePos.y);
@@ -505,7 +505,7 @@ bool csApp::ReadOptions()
 
 bool csApp::WriteOptions()
 {
-    wxConfig config(_T("OGL Studio"), _T("wxWindows"));
+    wxConfig config(_T("OGL Studio"), _T("wxWidgets"));
 
     config.Write(_T("mainX"), (long) m_mainFramePos.x);
     config.Write(_T("mainY"), (long) m_mainFramePos.y);
diff --git a/contrib/samples/stc/defsext.h b/contrib/samples/stc/defsext.h
index eb55caf94a..70d53c8213 100644
--- a/contrib/samples/stc/defsext.h
+++ b/contrib/samples/stc/defsext.h
@@ -15,7 +15,7 @@
 // headers
 //----------------------------------------------------------------------------
 
-//! wxWindows headers
+//! wxWidgets headers
 #include <wx/print.h>    // printing support
 #include <wx/printdlg.h> // printing dialog
 
diff --git a/contrib/samples/stc/edit.cpp b/contrib/samples/stc/edit.cpp
index 8c5393cd87..5a233bf158 100644
--- a/contrib/samples/stc/edit.cpp
+++ b/contrib/samples/stc/edit.cpp
@@ -25,12 +25,12 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all 'standard' wxWindows headers)
+// need because it includes almost all 'standard' wxWidgets headers)
 #ifndef WX_PRECOMP
     #include <wx/wx.h>
 #endif
 
-//! wxWindows headers
+//! wxWidgets headers
 #include <wx/file.h>     // raw file io support
 #include <wx/filename.h> // filename support
 
diff --git a/contrib/samples/stc/edit.h b/contrib/samples/stc/edit.h
index 0a4cbf4aba..22d5c8cac3 100644
--- a/contrib/samples/stc/edit.h
+++ b/contrib/samples/stc/edit.h
@@ -20,9 +20,9 @@
 // headers
 //----------------------------------------------------------------------------
 
-//! wxWindows headers
+//! wxWidgets headers
 
-//! wxWindows/contrib headers
+//! wxWidgets/contrib headers
 #include <wx/stc/stc.h>  // styled text control
 
 //! application headers
diff --git a/contrib/samples/stc/prefs.cpp b/contrib/samples/stc/prefs.cpp
index 2ef7735318..15f8c0b46c 100644
--- a/contrib/samples/stc/prefs.cpp
+++ b/contrib/samples/stc/prefs.cpp
@@ -20,14 +20,14 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all 'standard' wxWindows headers)
+// need because it includes almost all 'standard' wxWidgets headers)
 #ifndef WX_PRECOMP
     #include <wx/wx.h>
 #endif
 
-//! wxWindows headers
+//! wxWidgets headers
 
-//! wxWindows/contrib headers
+//! wxWidgets/contrib headers
 
 //! application headers
 #include "defsext.h"     // Additional definitions
diff --git a/contrib/samples/stc/prefs.h b/contrib/samples/stc/prefs.h
index 523362545c..b17ad6de7e 100644
--- a/contrib/samples/stc/prefs.h
+++ b/contrib/samples/stc/prefs.h
@@ -20,9 +20,9 @@
 // headers
 //----------------------------------------------------------------------------
 
-//! wxWindows headers
+//! wxWidgets headers
 
-//! wxWindows/contrib headers
+//! wxWidgets/contrib headers
 #include <wx/stc/stc.h>  // styled text control
 
 //! application headers
diff --git a/contrib/samples/stc/stctest.cpp b/contrib/samples/stc/stctest.cpp
index 9cc5cc88fa..636934d79c 100644
--- a/contrib/samples/stc/stctest.cpp
+++ b/contrib/samples/stc/stctest.cpp
@@ -20,12 +20,12 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all 'standard' wxWindows headers)
+// need because it includes almost all 'standard' wxWidgets headers)
 #ifndef WX_PRECOMP
     #include <wx/wx.h>
 #endif
 
-//! wxWindows headers
+//! wxWidgets headers
 #include <wx/config.h>   // configuration support
 #include <wx/filedlg.h>  // file dialog support
 #include <wx/filename.h> // filename support
@@ -57,14 +57,14 @@
 #define APP_DESCR _("See http://wxguide.sourceforge.net/")
 
 #define APP_MAINT _T("Otto Wyss")
-#define APP_VENDOR _T("wxWindows")
+#define APP_VENDOR _T("wxWidgets")
 #define APP_COPYRIGTH _T("(C) 2003 Otto Wyss")
-#define APP_LICENCE _T("wxWindows")
+#define APP_LICENCE _T("wxWidgets")
 
 #define APP_VERSION _T("0.1.alpha")
 #define APP_BUILD __DATE__
 
-#define APP_WEBSITE _T("http://www.wxWindows.org")
+#define APP_WEBSITE _T("http://www.wxWidgets.org")
 #define APP_MAIL _T("mailto://???")
 
 #define NONAME _("<untitled>")
@@ -99,7 +99,7 @@ private:
 
 };
 
-// created dynamically by wxWindows
+// created dynamically by wxWidgets
 DECLARE_APP (App);
 
 //----------------------------------------------------------------------------
diff --git a/contrib/samples/svg/svgtest.cpp b/contrib/samples/svg/svgtest.cpp
index 56882fb677..45de9ffca6 100644
--- a/contrib/samples/svg/svgtest.cpp
+++ b/contrib/samples/svg/svgtest.cpp
@@ -252,7 +252,7 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
 {
-    (void)wxMessageBox(wxT("wxWindows 2.0 SVG 1.0 Test\n")
+    (void)wxMessageBox(wxT("wxWidgets 2.0 SVG 1.0 Test\n")
         wxT("Author: Chris Elliott (c) 2002\n")
         wxT("Usage: svg.exe \nClick File | New to show tests\n\n"), wxT("About SVG Test"));
 }
diff --git a/contrib/samples/xrc/custclas.cpp b/contrib/samples/xrc/custclas.cpp
index ba30c5f7f7..6735dc3bce 100644
--- a/contrib/samples/xrc/custclas.cpp
+++ b/contrib/samples/xrc/custclas.cpp
@@ -16,7 +16,7 @@
 #endif
 
 //-----------------------------------------------------------------------------
-// Standard wxWindows headers
+// Standard wxWidgets headers
 //-----------------------------------------------------------------------------
 
 // For compilers that support precompilation, includes "wx/wx.h".
@@ -27,7 +27,7 @@
 #endif
 
 // For all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers)
+// need because it includes almost all "standard" wxWidgets headers)
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
@@ -62,7 +62,7 @@ enum {
 };
 
 //-----------------------------------------------------------------------------
-// wxWindows macro: implement dynamic class
+// wxWidgets macro: implement dynamic class
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS( MyResizableListCtrl, wxListCtrl )
diff --git a/contrib/samples/xrc/custclas.h b/contrib/samples/xrc/custclas.h
index e34efa01b7..69b01d4387 100644
--- a/contrib/samples/xrc/custclas.h
+++ b/contrib/samples/xrc/custclas.h
@@ -35,8 +35,8 @@
 //! A custom listctrl that resizes itself and pops up a context-sensitive menu.
 class MyResizableListCtrl : public wxListCtrl
 {
-    // Very helpful wxWindows macro required for wxWindows-RTTI tracing: By using this
-    // you will see "Leaked one object of type myResizeableListCtrl" in the debug log, 
+    // Very helpful wxWidgets macro required for wxWidgets-RTTI tracing: By using this
+    // you will see "Leaked one object of type myResizeableListCtrl" in the debug log,
     // along with which line you if was created, but you forget to free the memory.
     // NOTE: Using this REQUIRES a default constructor: that means either: giving a 
     // default value for all parameters in your constructor, or else having a dummy
@@ -47,14 +47,14 @@ public:
 
     // Constructor.        
     /*
-        These parameters are the same as a wxWindows constructor.
+        These parameters are the same as a wxWidgets constructor.
         \param parent The parent window.
         \param id The id of the progress_listbox. Will usually be -1 unless multiple
             of them on the same dialog.
         \param pos The pixel position of the listctrl on its parent window
         \param size The pixel size of the listctrl
-        \param style Style of the listbox. See wxWindows wxListBox docs for details.
-        \param validator Window validator. See wxWindows docs for details.
+        \param style Style of the listbox. See wxWidgets wxListBox docs for details.
+        \param validator Window validator. See wxWidgets docs for details.
         \param name Windows name (rarely used).
         \param exclusion_column_caption The label of header of listctrl's exclusion
             column.
@@ -76,7 +76,7 @@ protected:
     // A custom function for a context sensitive menu. 
     void ContextSensitiveMenu( wxMouseEvent& event );       
     
-    // This is a wxWindows function that we are going to override with our own behaviour.
+    // This is a wxWidgets function that we are going to override with our own behaviour.
     void OnSize( wxSizeEvent &event );
     
     // A custom function. What is called in the constructor, and in an OnSize()
@@ -84,7 +84,7 @@ protected:
     
 private:
 
-    // wxWindows macro, required to be able to use Event tables in the .cpp file.
+    // wxWidgets macro, required to be able to use Event tables in the .cpp file.
     DECLARE_EVENT_TABLE()
     
 };
diff --git a/contrib/samples/xrc/derivdlg.cpp b/contrib/samples/xrc/derivdlg.cpp
index b784e322b4..ed6c1cd613 100644
--- a/contrib/samples/xrc/derivdlg.cpp
+++ b/contrib/samples/xrc/derivdlg.cpp
@@ -16,7 +16,7 @@
 #endif
 
 //-----------------------------------------------------------------------------
-// Standard wxWindows headers
+// Standard wxWidgets headers
 //-----------------------------------------------------------------------------
 
 // For compilers that support precompilation, includes "wx/wx.h".
@@ -27,7 +27,7 @@
 #endif
 
 // For all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers)
+// need because it includes almost all "standard" wxWidgets headers)
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
diff --git a/contrib/samples/xrc/derivdlg.h b/contrib/samples/xrc/derivdlg.h
index 2bea8e39ea..1e82f6f5b0 100644
--- a/contrib/samples/xrc/derivdlg.h
+++ b/contrib/samples/xrc/derivdlg.h
@@ -59,7 +59,7 @@ private:
     // Override base class functions of a wxDialog.
     void OnOK( wxCommandEvent &event );
 
-    // 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()
 
 };
diff --git a/contrib/samples/xrc/myframe.cpp b/contrib/samples/xrc/myframe.cpp
index 594d8769e1..a740c29bda 100644
--- a/contrib/samples/xrc/myframe.cpp
+++ b/contrib/samples/xrc/myframe.cpp
@@ -16,7 +16,7 @@
 #endif
 
 //-----------------------------------------------------------------------------
-// Standard wxWindows headers
+// Standard wxWidgets headers
 //-----------------------------------------------------------------------------
 
 // For compilers that support precompilation, includes "wx/wx.h".
@@ -27,7 +27,7 @@
 #endif
 
 // For all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers)
+// need because it includes almost all "standard" wxWidgets headers)
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
@@ -73,14 +73,14 @@
 // Event table: connect the events to the handler functions to process them
 //-----------------------------------------------------------------------------
 
-// The event tables connect the wxWindows events with the functions (event
+// The event tables connect the wxWidgets events with the functions (event
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 // The reason why the menuitems and tools are given the same name in the 
 // XRC file, is that both a tool (a toolbar item) and a menuitem are designed
 // to fire the same kind of event (an EVT_MENU) and thus I give them the same 
 // ID name to help new users emphasize this point which is often overlooked 
-// when starting out with wxWindows.
+// when starting out with wxWidgets.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(XRCID("exit_tool_or_menuitem"),  MyFrame::OnExitToolOrMenuCommand)
     EVT_MENU(XRCID("non_derived_dialog_tool_or_menuitem"), MyFrame::OnNonDerivedDialogToolOrMenuCommand) 
diff --git a/contrib/samples/xrc/myframe.h b/contrib/samples/xrc/myframe.h
index 33ee6bd4bb..a773adc30d 100644
--- a/contrib/samples/xrc/myframe.h
+++ b/contrib/samples/xrc/myframe.h
@@ -55,7 +55,7 @@ private:
     void OnArtProviderToolOrMenuCommand(wxCommandEvent& event);
     void OnVariableExpansionToolOrMenuCommand(wxCommandEvent& event);
 
-    // 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()
 
 };
diff --git a/contrib/samples/xrc/rc/artprov.xrc b/contrib/samples/xrc/rc/artprov.xrc
index 629c86bcd3..2256b73ebf 100644
--- a/contrib/samples/xrc/rc/artprov.xrc
+++ b/contrib/samples/xrc/rc/artprov.xrc
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<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="wxDialog" name="art_provider_dialog">
     <title>wxArtProvider Example</title>
diff --git a/contrib/samples/xrc/rc/basicdlg.xrc b/contrib/samples/xrc/rc/basicdlg.xrc
index 9cea321aa7..95e211a53b 100644
--- a/contrib/samples/xrc/rc/basicdlg.xrc
+++ b/contrib/samples/xrc/rc/basicdlg.xrc
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<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="wxDialog" name="non_derived_dialog">
     <title>Non-Derived Dialog Example</title>
diff --git a/contrib/samples/xrc/rc/controls.xrc b/contrib/samples/xrc/rc/controls.xrc
index e441962fb9..8826f43fde 100644
--- a/contrib/samples/xrc/rc/controls.xrc
+++ b/contrib/samples/xrc/rc/controls.xrc
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<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="wxDialog" name="controls_dialog">
     <title>Controls Example</title>
diff --git a/contrib/samples/xrc/rc/custclas.xrc b/contrib/samples/xrc/rc/custclas.xrc
index 1d7b21134e..4f0109a992 100644
--- a/contrib/samples/xrc/rc/custclas.xrc
+++ b/contrib/samples/xrc/rc/custclas.xrc
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<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="wxDialog" name="custom_class_dialog">
     <title>Custom Class Example</title>
@@ -19,7 +19,7 @@
             <object class="wxTextCtrl" name="message_textctrl">
                 <size>500,150</size>
                 <style>wxTE_MULTILINE</style>
-                <value>You can embed your own custom classes into an XRC file. This is referred to as attaching an unknown control.\n\nThere are 3 main cases when you would want to do this:\n\n(A) Most commonly: you have derived a class from one of the main wxWindows controls, so that it can manage its own state and look after its own events, because it is better management to have a portable class with all the code for that control in there with the class, instead of being having many event handlers for that control scattered up in its parent dialog (which is allowed, but gets messy if a control has alot of methods). For example, if you require a wxListCtrl that popups a menu when right-clicked on an item, and you want the wxListCtrl to resize its columns in response to an OnSize(), and a few more methods, it makes better sourcecode logic to package all these methods into by a standalone derived wxListCtrl class, instead of having the parent dialog manage all these events and other functions. This is what the example below shows: it does a custom behaviour of resizing its first column to appropriately fill up the width of the control on a resize event, and it pops up a context-menu in response to a left click (and shades out popup menu item appropriately if there is no item currenty selected in the listctrl).\n\n(B)You have an utterly new widget that has no equivalent in the wxWindows class heirarchy, so you thus need to embed your class to get the needed functionality.\n\n(C) You are using one of the rarely used wxWindows controls that doesn't have an XRC handler in the XRC library. However, all of the major controls: wxButton, wxTextCtrl, etc have an XRC handler, so this is pretty rare, and you could always write your own XRC handler for that control if you wanted. You can choose the "Controls example" from the XRC demo menu to see all the controls that have an XRC handler.\n\nThe typical formula for attaching an unknown control is:\n\n(1) If you are deriving your own custom class to be embedded into the XRC, describe that class with its own .cpp and .h file. In this example it is custclass.cpp and custclass.h\n\n(2)Specify an "unknown" tag in the XRC file that you want to embed it into (see the unknown tag in custclass.xrc). This will be the placeholder of the new class.\n\n(3) Load the XRC dialog as usual, but before you show the dialog to the user, construct an instance of your custom control, and then use wxXmlResource::Get()-&gt;AttachUnknownControl() to put the custom class into its "unknown" placeholder in the XRC file.\n\nThe result is what you see below, a custom class control that fits in seemlessly with the whole dialog, the same as if it was read from XRC directly. Try out resizing this dialog, and watch the listctrl column resize, and right-click to call up its popup menu. By the way, if you look at the source of this XRC dialog, you will that this dialog node has a set of style flags that includes wxRESIZE__BORDER--that is why this dialog is resizable, whereas most of the rest of the dialogs in the XRC sample that don't include this tag, are not resizable.</value>
+                <value>You can embed your own custom classes into an XRC file. This is referred to as attaching an unknown control.\n\nThere are 3 main cases when you would want to do this:\n\n(A) Most commonly: you have derived a class from one of the main wxWidgets controls, so that it can manage its own state and look after its own events, because it is better management to have a portable class with all the code for that control in there with the class, instead of being having many event handlers for that control scattered up in its parent dialog (which is allowed, but gets messy if a control has alot of methods). For example, if you require a wxListCtrl that popups a menu when right-clicked on an item, and you want the wxListCtrl to resize its columns in response to an OnSize(), and a few more methods, it makes better sourcecode logic to package all these methods into by a standalone derived wxListCtrl class, instead of having the parent dialog manage all these events and other functions. This is what the example below shows: it does a custom behaviour of resizing its first column to appropriately fill up the width of the control on a resize event, and it pops up a context-menu in response to a left click (and shades out popup menu item appropriately if there is no item currenty selected in the listctrl).\n\n(B)You have an utterly new widget that has no equivalent in the wxWindows class heirarchy, so you thus need to embed your class to get the needed functionality.\n\n(C) You are using one of the rarely used wxWindows controls that doesn't have an XRC handler in the XRC library. However, all of the major controls: wxButton, wxTextCtrl, etc have an XRC handler, so this is pretty rare, and you could always write your own XRC handler for that control if you wanted. You can choose the "Controls example" from the XRC demo menu to see all the controls that have an XRC handler.\n\nThe typical formula for attaching an unknown control is:\n\n(1) If you are deriving your own custom class to be embedded into the XRC, describe that class with its own .cpp and .h file. In this example it is custclass.cpp and custclass.h\n\n(2)Specify an "unknown" tag in the XRC file that you want to embed it into (see the unknown tag in custclass.xrc). This will be the placeholder of the new class.\n\n(3) Load the XRC dialog as usual, but before you show the dialog to the user, construct an instance of your custom control, and then use wxXmlResource::Get()-&gt;AttachUnknownControl() to put the custom class into its "unknown" placeholder in the XRC file.\n\nThe result is what you see below, a custom class control that fits in seemlessly with the whole dialog, the same as if it was read from XRC directly. Try out resizing this dialog, and watch the listctrl column resize, and right-click to call up its popup menu. By the way, if you look at the source of this XRC dialog, you will that this dialog node has a set of style flags that includes wxRESIZE__BORDER--that is why this dialog is resizable, whereas most of the rest of the dialogs in the XRC sample that don't include this tag, are not resizable.</value>
             </object>
         </object>
         <object class="sizeritem">
diff --git a/contrib/samples/xrc/rc/derivdlg.xrc b/contrib/samples/xrc/rc/derivdlg.xrc
index cbf8318c7a..b7230d4229 100644
--- a/contrib/samples/xrc/rc/derivdlg.xrc
+++ b/contrib/samples/xrc/rc/derivdlg.xrc
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<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="wxDialog" name="derived_dialog">
     <title>Derived Dialog Example</title>
diff --git a/contrib/samples/xrc/rc/frame.xrc b/contrib/samples/xrc/rc/frame.xrc
index 8b9c8ca5b8..ad7b03f7d6 100644
--- a/contrib/samples/xrc/rc/frame.xrc
+++ b/contrib/samples/xrc/rc/frame.xrc
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<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="wxFrame" name="main_frame">
     <title>XML Resources Demo</title>
@@ -18,7 +18,7 @@
             <object class="wxTextCtrl" name="message_textctrl">
                 <size>500,280</size>
                 <style>wxTE_MULTILINE</style>
-                <value>Welcome to the wxWindows XmlResource (XRC) sample! Using wxWindows XML resources makes your GUI C++ programming much faster and easier.\n\nView the examples under the "Basic" menu to learn how to get up and running with XRC quickly, and later have a look at the examples under the "Advanced" menu for advanced techniques.\n\nThe XML file that described this frame is the sample's frame.xrc file, with the menu in menu.xrc, and the toolbar in toolbar.xrc. The frame XRC file structure is exactly the same as the XRC files for the dialogs, except that the top level node is a wxFrame, not a wxDialog. Each of the other dialog in this example is a separate XRC file, each of which can be examined for how they work.</value>
+                <value>Welcome to the wxWidgets XmlResource (XRC) sample! Using wxWidgets XML resources makes your GUI C++ programming much faster and easier.\n\nView the examples under the "Basic" menu to learn how to get up and running with XRC quickly, and later have a look at the examples under the "Advanced" menu for advanced techniques.\n\nThe XML file that described this frame is the sample's frame.xrc file, with the menu in menu.xrc, and the toolbar in toolbar.xrc. The frame XRC file structure is exactly the same as the XRC files for the dialogs, except that the top level node is a wxFrame, not a wxDialog. Each of the other dialog in this example is a separate XRC file, each of which can be examined for how they work.</value>
             </object>
         </object>
     </object>
diff --git a/contrib/samples/xrc/rc/menu.xrc b/contrib/samples/xrc/rc/menu.xrc
index 64d3ccbf04..1257cc72a0 100644
--- a/contrib/samples/xrc/rc/menu.xrc
+++ b/contrib/samples/xrc/rc/menu.xrc
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<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="wxMenuBar" name="main_menu">
 <style>wxMB_DOCKABLE</style>
@@ -28,7 +28,7 @@
         <object class="wxMenuItem" name="controls_tool_or_menuitem">
             <label>_Controls Example</label>
             <bitmap>controls.xpm</bitmap>
-            <help>A notebook displaying all the wxWindows controls</help>
+            <help>A notebook displaying all the wxWidgets controls</help>
         </object>        
         <object class="wxMenuItem" name="uncentered_tool_or_menuitem">
             <label>_Uncentered Example</label>
diff --git a/contrib/samples/xrc/rc/platform.xrc b/contrib/samples/xrc/rc/platform.xrc
index 9f143bf5a8..43313cb853 100644
--- a/contrib/samples/xrc/rc/platform.xrc
+++ b/contrib/samples/xrc/rc/platform.xrc
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<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="wxDialog" name="platform_property_dialog">
     <title>Platform Property Example</title>
diff --git a/contrib/samples/xrc/rc/resource.xrc b/contrib/samples/xrc/rc/resource.xrc
index 3498b44977..6673e0e8f2 100644
--- a/contrib/samples/xrc/rc/resource.xrc
+++ b/contrib/samples/xrc/rc/resource.xrc
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<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="wxMenuBar" name="mainmenu">
     <style>wxMB_DOCKABLE</style>
     <object class="wxMenu" name="menu_file">
diff --git a/contrib/samples/xrc/rc/toolbar.xrc b/contrib/samples/xrc/rc/toolbar.xrc
index 9bc8082182..f33a423048 100644
--- a/contrib/samples/xrc/rc/toolbar.xrc
+++ b/contrib/samples/xrc/rc/toolbar.xrc
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<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="wxToolBar" name="main_toolbar">
     <style>wxTB_FLAT|wxTB_DOCKABLE</style>
@@ -18,7 +18,7 @@
     <object class="tool" name="controls_tool_or_menuitem">
         <tooltip>Controls Example</tooltip>
         <bitmap>controls.xpm</bitmap>
-        <longhelp>A notebook displaying all the wxWindows controls</longhelp>
+        <longhelp>A notebook displaying all the wxWidgets controls</longhelp>
     </object>        
     <object class="tool" name="uncentered_tool_or_menuitem">
         <tooltip>Uncentered Example</tooltip>
diff --git a/contrib/samples/xrc/rc/uncenter.xrc b/contrib/samples/xrc/rc/uncenter.xrc
index b1613d8ef5..4f6f6ce532 100644
--- a/contrib/samples/xrc/rc/uncenter.xrc
+++ b/contrib/samples/xrc/rc/uncenter.xrc
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<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="wxDialog" name="uncentered_dialog">
     <title>Uncentered Example</title>
diff --git a/contrib/samples/xrc/rc/variable.xrc b/contrib/samples/xrc/rc/variable.xrc
index b2d54bf4e9..91d7d5cc24 100644
--- a/contrib/samples/xrc/rc/variable.xrc
+++ b/contrib/samples/xrc/rc/variable.xrc
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<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="wxDialog" name="variable_expansion_dialog">
     <title>Variable Expansion Example</title>
diff --git a/contrib/samples/xrc/xrcdemo.cpp b/contrib/samples/xrc/xrcdemo.cpp
index c904f52e28..824477921d 100644
--- a/contrib/samples/xrc/xrcdemo.cpp
+++ b/contrib/samples/xrc/xrcdemo.cpp
@@ -16,7 +16,7 @@
 #endif
 
 //-----------------------------------------------------------------------------
-// Standard wxWindows headers
+// Standard wxWidgets headers
 //-----------------------------------------------------------------------------
 
 // For compilers that support precompilation, includes "wx/wx.h".
@@ -27,7 +27,7 @@
 #endif
 
 // For all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers)
+// need because it includes almost all "standard" wxWidgets headers)
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
@@ -53,10 +53,10 @@
 #include "myframe.h"
 
 //-----------------------------------------------------------------------------
-// wxWindows macro: Declare the application.
+// wxWidgets macro: Declare the application.
 //-----------------------------------------------------------------------------
 
-// Create a new application object: this macro will allow wxWindows to create
+// Create a new application object: this macro will allow wxWidgets to create
 // the application object during program execution (it's better than using a
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. the_app and
diff --git a/contrib/src/deprecated/resource.cpp b/contrib/src/deprecated/resource.cpp
index 7816f83566..1e06240920 100644
--- a/contrib/src/deprecated/resource.cpp
+++ b/contrib/src/deprecated/resource.cpp
@@ -2373,7 +2373,7 @@ long wxParseWindowStyle(const wxString& bitListString)
 }
 
 /*
-* Load a bitmap from a wxWindows resource, choosing an optimum
+* Load a bitmap from a wxWidgets resource, choosing an optimum
 * depth and appropriate type.
 */
 
@@ -2527,7 +2527,7 @@ wxBitmap wxResourceCreateBitmap(const wxString& resource, wxResourceTable *table
 }
 
 /*
-* Load an icon from a wxWindows resource, choosing an optimum
+* Load an icon from a wxWidgets resource, choosing an optimum
 * depth and appropriate type.
 */
 
@@ -2652,7 +2652,7 @@ wxIcon wxResourceCreateIcon(const wxString& resource, wxResourceTable *table)
             }
         case wxBITMAP_TYPE_XPM_DATA:
             {
-                // *** XPM ICON NOT YET IMPLEMENTED IN WXWINDOWS ***
+                // *** XPM ICON NOT YET IMPLEMENTED IN wxWidgets ***
                 /*
                 wxItemResource *item = table->FindResource(name);
                 if (!item)
diff --git a/contrib/src/gizmos/dynamicsash.cpp b/contrib/src/gizmos/dynamicsash.cpp
index 32d3e93822..1d508f2825 100644
--- a/contrib/src/gizmos/dynamicsash.cpp
+++ b/contrib/src/gizmos/dynamicsash.cpp
@@ -22,7 +22,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers)
+// need because it includes almost all "standard" wxWidgets headers)
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
diff --git a/contrib/src/gizmos/editlbox.cpp b/contrib/src/gizmos/editlbox.cpp
index 038579adbd..656b11ae3e 100644
--- a/contrib/src/gizmos/editlbox.cpp
+++ b/contrib/src/gizmos/editlbox.cpp
@@ -19,7 +19,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers)
+// need because it includes almost all "standard" wxWidgets headers)
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
diff --git a/contrib/src/gizmos/splittree.cpp b/contrib/src/gizmos/splittree.cpp
index b1ac80d820..6ce95b5552 100644
--- a/contrib/src/gizmos/splittree.cpp
+++ b/contrib/src/gizmos/splittree.cpp
@@ -30,7 +30,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers)
+// need because it includes almost all "standard" wxWidgets headers)
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
diff --git a/contrib/src/mmedia/sndesd.cpp b/contrib/src/mmedia/sndesd.cpp
index f149f43051..dab5f28897 100644
--- a/contrib/src/mmedia/sndesd.cpp
+++ b/contrib/src/mmedia/sndesd.cpp
@@ -44,7 +44,7 @@
 
 // --------------------------------------------------------------------------
 
-#define MY_ESD_NAME "wxWindows/wxSoundStreamESD"
+#define MY_ESD_NAME "wxWidgets/wxSoundStreamESD"
 
 // --------------------------------------------------------------------------
 // wxSoundStreamESD: ESD sound driver
diff --git a/contrib/src/mmedia/sndoss.cpp b/contrib/src/mmedia/sndoss.cpp
index 48b35e8017..51253c92e0 100644
--- a/contrib/src/mmedia/sndoss.cpp
+++ b/contrib/src/mmedia/sndoss.cpp
@@ -24,7 +24,7 @@
 #endif
 
 // --------------------------------------------------------------------------
-// wxWindows headers
+// wxWidgets headers
 // --------------------------------------------------------------------------
 #include "wx/defs.h"
 #include "wx/string.h"
diff --git a/contrib/src/net/email.cpp b/contrib/src/net/email.cpp
index 8fe6fa98f9..2d4c857115 100644
--- a/contrib/src/net/email.cpp
+++ b/contrib/src/net/email.cpp
@@ -40,7 +40,7 @@
 #endif
 
 // Send a message.
-// Specify profile, or leave it to wxWindows to find the current user name
+// Specify profile, or leave it to wxWidgets to find the current user name
 
 #ifdef __WXMSW__
 bool wxEmail::Send(wxMailMessage& message, const wxString& profileName, const wxString& WXUNUSED(sendMail))
diff --git a/contrib/src/stc/PlatWX.cpp b/contrib/src/stc/PlatWX.cpp
index 46d478e701..ab3e95c9d5 100644
--- a/contrib/src/stc/PlatWX.cpp
+++ b/contrib/src/stc/PlatWX.cpp
@@ -1,5 +1,5 @@
 // Scintilla source code edit control
-// PlatWX.cxx - implementation of platform facilities on wxWindows
+// PlatWX.cxx - implementation of platform facilities on wxWidgets
 // Copyright 1998-1999 by Neil Hodgson <neilh@scintilla.org>
 //                        Robin Dunn <robin@aldunn.com>
 // The License.txt file describes the conditions under which this software may be distributed.
diff --git a/contrib/src/stc/ScintillaWX.cpp b/contrib/src/stc/ScintillaWX.cpp
index 485b612cc9..6fd051521e 100644
--- a/contrib/src/stc/ScintillaWX.cpp
+++ b/contrib/src/stc/ScintillaWX.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////
 // Name:        ScintillaWX.cxx
-// Purpose:     A wxWindows implementation of Scintilla.  A class derived
+// Purpose:     A wxWidgets implementation of Scintilla.  A class derived
 //              from ScintillaBase that uses the "wx platform" defined in
 //              PlatformWX.cxx  This class is one end of a bridge between
 //              the wx world and the Scintilla world.  It needs a peer
diff --git a/contrib/src/stc/ScintillaWX.h b/contrib/src/stc/ScintillaWX.h
index bb09a482bf..d5a0127b7c 100644
--- a/contrib/src/stc/ScintillaWX.h
+++ b/contrib/src/stc/ScintillaWX.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////
 // Name:        ScintillaWX.h
-// Purpose:     A wxWindows implementation of Scintilla.  A class derived
+// Purpose:     A wxWidgets implementation of Scintilla.  A class derived
 //              from ScintillaBase that uses the "wx platform" defined in
 //              PlatWX.cpp.  This class is one end of a bridge between
 //              the wx world and the Scintilla world.  It needs a peer
diff --git a/contrib/src/stc/scintilla/include/Platform.h b/contrib/src/stc/scintilla/include/Platform.h
index 279a3df3ed..1058242fb3 100644
--- a/contrib/src/stc/scintilla/include/Platform.h
+++ b/contrib/src/stc/scintilla/include/Platform.h
@@ -1,7 +1,7 @@
 // Scintilla source code edit control
 /** @file Platform.h
  ** Interface to platform facilities. Also includes some basic utilities.
- ** Implemented in PlatGTK.cxx for GTK+/Linux, PlatWin.cxx for Windows, and PlatWX.cxx for wxWindows.
+ ** Implemented in PlatGTK.cxx for GTK+/Linux, PlatWin.cxx for Windows, and PlatWX.cxx for wxWidgets.
  **/
 // Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
 // The License.txt file describes the conditions under which this software may be distributed.
@@ -12,7 +12,7 @@
 // PLAT_GTK = GTK+ on Linux or Win32
 // PLAT_GTK_WIN32 is defined additionally when running PLAT_GTK under Win32
 // PLAT_WIN = Win32 API on Win32 OS
-// PLAT_WX is wxWindows on any supported platform
+// PLAT_WX is wxWidgets on any supported platform
 
 #define PLAT_GTK 0
 #define PLAT_GTK_WIN32 0
diff --git a/contrib/src/stc/stc.cpp b/contrib/src/stc/stc.cpp
index c3a5c5a725..e3dace9d0a 100644
--- a/contrib/src/stc/stc.cpp
+++ b/contrib/src/stc/stc.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////
 // Name:        stc.cpp
-// Purpose:     A wxWindows implementation of Scintilla.  This class is the
+// Purpose:     A wxWidgets implementation of Scintilla.  This class is the
 //              one meant to be used directly by wx applications.  It does not
 //              derive directly from the Scintilla classes, but instead
 //              delegates most things to the real Scintilla class.
diff --git a/contrib/src/stc/stc.cpp.in b/contrib/src/stc/stc.cpp.in
index a859ec1a47..e49f56ef4a 100644
--- a/contrib/src/stc/stc.cpp.in
+++ b/contrib/src/stc/stc.cpp.in
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////
 // Name:        stc.cpp
-// Purpose:     A wxWindows implementation of Scintilla.  This class is the
+// Purpose:     A wxWidgets implementation of Scintilla.  This class is the
 //              one meant to be used directly by wx applications.  It does not
 //              derive directly from the Scintilla classes, but instead
 //              delegates most things to the real Scintilla class.
diff --git a/contrib/utils/convertrc/convert.cpp b/contrib/utils/convertrc/convert.cpp
index b2d17962ef..93d3626de0 100644
--- a/contrib/utils/convertrc/convert.cpp
+++ b/contrib/utils/convertrc/convert.cpp
@@ -18,7 +18,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers
+// need because it includes almost all "standard" wxWidgets headers
 #ifndef WX_PRECOMP
 #include <wx/wx.h>
 #endif
diff --git a/contrib/utils/convertrc/rc2wxr.cpp b/contrib/utils/convertrc/rc2wxr.cpp
index 13b4b8406a..9eb0b430ff 100644
--- a/contrib/utils/convertrc/rc2wxr.cpp
+++ b/contrib/utils/convertrc/rc2wxr.cpp
@@ -46,7 +46,7 @@ This code was used as a starting point for my rc2xml converter
 
 // for all others, include the necessary headers (this file is usually all you
 
-// need because it includes almost all "standard" wxWindows headers
+// need because it includes almost all "standard" wxWidgets headers
 
 #ifndef WX_PRECOMP
 
diff --git a/contrib/utils/convertrc/rc2xml.cpp b/contrib/utils/convertrc/rc2xml.cpp
index 371f4aa489..fdc82ee0f3 100644
--- a/contrib/utils/convertrc/rc2xml.cpp
+++ b/contrib/utils/convertrc/rc2xml.cpp
@@ -28,7 +28,7 @@ cross platform (wxGTK,etc)
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers
+// need because it includes almost all "standard" wxWidgets headers
 #ifndef WX_PRECOMP
 #include <wx/wx.h>
 #endif
@@ -730,7 +730,7 @@ void rc2xml::WriteName(wxString name)
 
 //Try to convert any number ids into names
 name=LookUpId(name);
-//Replace common MS ids with wxWindows ids
+//Replace common MS ids with wxWidgets ids
 //I didn't do everyone of them
     if (name==_T("IDOK"))
         name=_T("wxID_OK");
diff --git a/contrib/utils/wxrcedit/edapp.cpp b/contrib/utils/wxrcedit/edapp.cpp
index ffce6a4fe5..e5771edf69 100644
--- a/contrib/utils/wxrcedit/edapp.cpp
+++ b/contrib/utils/wxrcedit/edapp.cpp
@@ -20,7 +20,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers
+// need because it includes almost all "standard" wxWidgets headers
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
@@ -47,7 +47,7 @@ IMPLEMENT_APP(MyApp)
 
 bool MyApp::OnInit()
 {
-    SetVendorName(wxT("wxWindows"));
+    SetVendorName(wxT("wxWidgets"));
     SetAppName(wxT("wxrcedit"));
     wxString arg = (argc >= 1) ? argv[1] : _T("");
     wxInitAllImageHandlers();
diff --git a/contrib/utils/wxrcedit/editor.cpp b/contrib/utils/wxrcedit/editor.cpp
index 7afb2b2377..0f66fa1ec4 100644
--- a/contrib/utils/wxrcedit/editor.cpp
+++ b/contrib/utils/wxrcedit/editor.cpp
@@ -183,7 +183,7 @@ END_EVENT_TABLE()
 EditorFrame *EditorFrame::ms_Instance = NULL;
 
 EditorFrame::EditorFrame(wxFrame *parent, const wxString& filename)
-    : wxFrame(parent, -1, filename + _("- wxWindows resources editor"))
+    : wxFrame(parent, -1, filename + _("- wxWidgets resources editor"))
 {
     ms_Instance = this;
 
diff --git a/contrib/utils/wxrcedit/splittree.cpp b/contrib/utils/wxrcedit/splittree.cpp
index e5eedeec2c..1a32486541 100644
--- a/contrib/utils/wxrcedit/splittree.cpp
+++ b/contrib/utils/wxrcedit/splittree.cpp
@@ -30,7 +30,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers)
+// need because it includes almost all "standard" wxWidgets headers)
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
diff --git a/demos/dbbrowse/dummy.cpp b/demos/dbbrowse/dummy.cpp
index 5d4ce56ab0..dadde97db9 100644
--- a/demos/dbbrowse/dummy.cpp
+++ b/demos/dbbrowse/dummy.cpp
@@ -11,7 +11,7 @@
  * always start by compiling this and producing the PCH file.
  * Then subsequent source files use the PCH file.
  *
- * If precompiling wx.h for wxWindows and derived apps,
+ * If precompiling wx.h for wxWidgets and derived apps,
  * link dummy.obj with your program (the MSC 7 linker complains otherwise).
  *
  * This is the only convenient way I found to use precompiled headers
diff --git a/demos/dbbrowse/std.h b/demos/dbbrowse/std.h
index b1bf58b4b4..7f15c825e6 100644
--- a/demos/dbbrowse/std.h
+++ b/demos/dbbrowse/std.h
@@ -3,7 +3,7 @@
 //---------------------------------------------------------------------------
 //-- all #includes that the whole Project needs. ----------------------------
 //---------------------------------------------------------------------------
-#include <wx/config.h>      // to let wxWindows choose a wxConfig class for your platform
+#include <wx/config.h>      // to let wxWidgets choose a wxConfig class for your platform
 #include <wx/confbase.h>    // base config class
 #include <wx/dbtable.h>
 #include <wx/generic/grid.h>
diff --git a/demos/forty/canvas.cpp b/demos/forty/canvas.cpp
index 8a5257d54c..6d498d531c 100644
--- a/demos/forty/canvas.cpp
+++ b/demos/forty/canvas.cpp
@@ -8,7 +8,7 @@
 // Copyright:   (c) 1993-1998 Chris Breeze
 // Licence:   	wxWindows licence
 //---------------------------------------------------------------------------
-// Last modified: 22nd July 1998 - ported to wxWindows 2.0
+// Last modified: 22nd July 1998 - ported to wxWidgets 2.0
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/demos/forty/canvas.h b/demos/forty/canvas.h
index b7ea7d5459..b507518f5e 100644
--- a/demos/forty/canvas.h
+++ b/demos/forty/canvas.h
@@ -8,7 +8,7 @@
 // Copyright:   (c) 1993-1998 Chris Breeze
 // Licence:   	wxWindows licence
 //---------------------------------------------------------------------------
-// Last modified: 22nd July 1998 - ported to wxWindows 2.0
+// Last modified: 22nd July 1998 - ported to wxWidgets 2.0
 /////////////////////////////////////////////////////////////////////////////
 #ifndef _CANVAS_H_
 #define _CANVAS_H_
diff --git a/demos/forty/card.cpp b/demos/forty/card.cpp
index 6681cb691e..e51723b4a8 100644
--- a/demos/forty/card.cpp
+++ b/demos/forty/card.cpp
@@ -8,7 +8,7 @@
 // Copyright:   (c) 1993-1998 Chris Breeze
 // Licence:   	wxWindows licence
 //---------------------------------------------------------------------------
-// Last modified: 22nd July 1998 - ported to wxWindows 2.0
+// Last modified: 22nd July 1998 - ported to wxWidgets 2.0
 /////////////////////////////////////////////////////////////////////////////
 //+-------------------------------------------------------------+
 //| Description
diff --git a/demos/forty/card.h b/demos/forty/card.h
index aab8df9d71..7137c1a05b 100644
--- a/demos/forty/card.h
+++ b/demos/forty/card.h
@@ -8,7 +8,7 @@
 // Copyright:   (c) 1993-1998 Chris Breeze
 // Licence:   	wxWindows licence
 //---------------------------------------------------------------------------
-// Last modified: 22nd July 1998 - ported to wxWindows 2.0
+// Last modified: 22nd July 1998 - ported to wxWidgets 2.0
 /////////////////////////////////////////////////////////////////////////////
 //+-------------------------------------------------------------+
 //| Description:												|
diff --git a/demos/forty/forty.cpp b/demos/forty/forty.cpp
index d809a743a5..e5eb287fe5 100644
--- a/demos/forty/forty.cpp
+++ b/demos/forty/forty.cpp
@@ -8,7 +8,7 @@
 // Copyright:   (c) 1993-1998 Chris Breeze
 // Licence:   	wxWindows licence
 //---------------------------------------------------------------------------
-// Last modified: 22nd July 1998 - ported to wxWindows 2.0
+// Last modified: 22nd July 1998 - ported to wxWidgets 2.0
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/demos/forty/forty.h b/demos/forty/forty.h
index 09750b2b58..2d2a40eb77 100644
--- a/demos/forty/forty.h
+++ b/demos/forty/forty.h
@@ -8,7 +8,7 @@
 // Copyright:   (c) 1993-1998 Chris Breeze
 // Licence:   	wxWindows licence
 //---------------------------------------------------------------------------
-// Last modified: 22nd July 1998 - ported to wxWindows 2.0
+// Last modified: 22nd July 1998 - ported to wxWidgets 2.0
 /////////////////////////////////////////////////////////////////////////////
 #ifndef _FORTY_H_
 #define _FORTY_H_
diff --git a/demos/forty/game.cpp b/demos/forty/game.cpp
index d1d38e9d48..9aeee91e8e 100644
--- a/demos/forty/game.cpp
+++ b/demos/forty/game.cpp
@@ -8,7 +8,7 @@
 // Copyright:   (c) 1993-1998 Chris Breeze
 // Licence:   	wxWindows licence
 //---------------------------------------------------------------------------
-// Last modified: 22nd July 1998 - ported to wxWindows 2.0
+// Last modified: 22nd July 1998 - ported to wxWidgets 2.0
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/demos/forty/game.h b/demos/forty/game.h
index 8ec14f9c2f..a8fb4e5aaf 100644
--- a/demos/forty/game.h
+++ b/demos/forty/game.h
@@ -8,7 +8,7 @@
 // Copyright:   (c) 1993-1998 Chris Breeze
 // Licence:   	wxWindows licence
 //---------------------------------------------------------------------------
-// Last modified: 22nd July 1998 - ported to wxWindows 2.0
+// Last modified: 22nd July 1998 - ported to wxWidgets 2.0
 /////////////////////////////////////////////////////////////////////////////
 #ifndef _GAME_H_
 #define _GAME_H_
diff --git a/demos/forty/pile.cpp b/demos/forty/pile.cpp
index e8b5296f05..b2fc9d18f4 100644
--- a/demos/forty/pile.cpp
+++ b/demos/forty/pile.cpp
@@ -8,7 +8,7 @@
 // Copyright:   (c) 1993-1998 Chris Breeze
 // Licence:   	wxWindows licence
 //---------------------------------------------------------------------------
-// Last modified: 22nd July 1998 - ported to wxWindows 2.0
+// Last modified: 22nd July 1998 - ported to wxWidgets 2.0
 /////////////////////////////////////////////////////////////////////////////
 //+-------------------------------------------------------------+
 //| Description:												|
diff --git a/demos/forty/pile.h b/demos/forty/pile.h
index 372fb9d1ce..aa7aa42e3a 100644
--- a/demos/forty/pile.h
+++ b/demos/forty/pile.h
@@ -8,7 +8,7 @@
 // Copyright:   (c) 1993-1998 Chris Breeze
 // Licence:   	wxWindows licence
 //---------------------------------------------------------------------------
-// Last modified: 22nd July 1998 - ported to wxWindows 2.0
+// Last modified: 22nd July 1998 - ported to wxWidgets 2.0
 /////////////////////////////////////////////////////////////////////////////
 //+-------------------------------------------------------------+
 //| Description:												|
diff --git a/demos/forty/playerdg.cpp b/demos/forty/playerdg.cpp
index 1daa8905dd..62ca583370 100644
--- a/demos/forty/playerdg.cpp
+++ b/demos/forty/playerdg.cpp
@@ -8,7 +8,7 @@
 // Copyright:   (c) 1993-1998 Chris Breeze
 // Licence:   	wxWindows licence
 //---------------------------------------------------------------------------
-// Last modified: 22nd July 1998 - ported to wxWindows 2.0
+// Last modified: 22nd July 1998 - ported to wxWidgets 2.0
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/demos/forty/playerdg.h b/demos/forty/playerdg.h
index 70d9cfb6cb..856b9d5fb4 100644
--- a/demos/forty/playerdg.h
+++ b/demos/forty/playerdg.h
@@ -8,7 +8,7 @@
 // Copyright:   (c) 1993-1998 Chris Breeze
 // Licence:   	wxWindows licence
 //---------------------------------------------------------------------------
-// Last modified: 22nd July 1998 - ported to wxWindows 2.0
+// Last modified: 22nd July 1998 - ported to wxWidgets 2.0
 /////////////////////////////////////////////////////////////////////////////
 #ifndef _PLAYERDG_H_
 #define _PLAYERDG_H_
diff --git a/demos/forty/scoredg.cpp b/demos/forty/scoredg.cpp
index 84d278412b..c241cff5a7 100644
--- a/demos/forty/scoredg.cpp
+++ b/demos/forty/scoredg.cpp
@@ -8,7 +8,7 @@
 // Copyright:   (c) 1993-1998 Chris Breeze
 // Licence:   	wxWindows licence
 //---------------------------------------------------------------------------
-// Last modified: 22nd July 1998 - ported to wxWindows 2.0
+// Last modified: 22nd July 1998 - ported to wxWidgets 2.0
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(__APPLE__)
diff --git a/demos/forty/scoredg.h b/demos/forty/scoredg.h
index 8ce7a7274d..2b69ad0588 100644
--- a/demos/forty/scoredg.h
+++ b/demos/forty/scoredg.h
@@ -8,7 +8,7 @@
 // Copyright:   (c) 1993-1998 Chris Breeze
 // Licence:   	wxWindows licence
 //---------------------------------------------------------------------------
-// Last modified: 22nd July 1998 - ported to wxWindows 2.0
+// Last modified: 22nd July 1998 - ported to wxWidgets 2.0
 /////////////////////////////////////////////////////////////////////////////
 #ifndef _SCOREDG_H_
 #define _SCOREDG_H_
diff --git a/demos/forty/scorefil.cpp b/demos/forty/scorefil.cpp
index a060944705..534b11e996 100644
--- a/demos/forty/scorefil.cpp
+++ b/demos/forty/scorefil.cpp
@@ -8,7 +8,7 @@
 // Copyright:   (c) 1993-1998 Chris Breeze
 // Licence:   	wxWindows licence
 //---------------------------------------------------------------------------
-// Last modified: 14th May 1998 - ported to wxWindows 2.0
+// Last modified: 14th May 1998 - ported to wxWidgets 2.0
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -68,7 +68,7 @@ ScoreFile::ScoreFile(const wxString& appName)
 	}
 #endif
 
-	m_config = new wxConfig(appName, _T("wxWindows"), appName, _T(""),
+	m_config = new wxConfig(appName, _T("wxWidgets"), appName, _T(""),
                                 wxCONFIG_USE_LOCAL_FILE);  // only local
 }
 
diff --git a/demos/forty/scorefil.h b/demos/forty/scorefil.h
index 9e91de438e..755688a245 100644
--- a/demos/forty/scorefil.h
+++ b/demos/forty/scorefil.h
@@ -8,7 +8,7 @@
 // Copyright:   (c) 1993-1998 Chris Breeze
 // Licence:   	wxWindows licence
 //---------------------------------------------------------------------------
-// Last modified: 22nd July 1998 - ported to wxWindows 2.0
+// Last modified: 22nd July 1998 - ported to wxWidgets 2.0
 /////////////////////////////////////////////////////////////////////////////
 #ifndef _SCOREFILE_H_
 #define _SCOREFILE_H_
diff --git a/demos/fractal/fractal.cpp b/demos/fractal/fractal.cpp
index 37e8a6fdea..6d4b327a69 100644
--- a/demos/fractal/fractal.cpp
+++ b/demos/fractal/fractal.cpp
@@ -23,7 +23,7 @@ done for MS-Windows. On a Sun the colours look a little washed
 out and there is not as much snow or high mountains (maybe the
 random number generators fault). The viewing plane is not
 quite right as the original code used SetViewportOrg() which there
-doesn't seem to be an equivalent of under wxWindows, and my quick
+doesn't seem to be an equivalent of under wxWidgets, and my quick
 hack doesn't fix. 
 */
 
@@ -94,7 +94,7 @@ DECLARE_EVENT_TABLE()
 bool MyApp::OnInit()
 {
   // Create the main frame window
-  MyFrame *frame = new MyFrame(NULL, _T("Fractal Mountains for wxWindows"), wxPoint(-1, -1), wxSize(640, 480));
+  MyFrame *frame = new MyFrame(NULL, _T("Fractal Mountains for wxWidgets"), wxPoint(-1, -1), wxSize(640, 480));
 
   // Make a menubar
   wxMenu *file_menu = new wxMenu;
diff --git a/demos/life/dialogs.cpp b/demos/life/dialogs.cpp
index f995c62e24..fa02787fcb 100644
--- a/demos/life/dialogs.cpp
+++ b/demos/life/dialogs.cpp
@@ -60,7 +60,7 @@ enum
 };
 
 // --------------------------------------------------------------------------
-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets
 // --------------------------------------------------------------------------
 
 // Event tables
@@ -181,7 +181,7 @@ LifeAboutDialog::LifeAboutDialog(wxWindow *parent)
     wxBoxSizer *sizer = new wxBoxSizer( wxVERTICAL );
     sizer->Add( sbmp, 0, wxCENTRE | wxALL, 10 );
     sizer->Add( new wxStaticLine(this, -1), 0, wxGROW | wxLEFT | wxRIGHT, 5 );
-    sizer->Add( CreateTextSizer(_("Life! version 2.2 for wxWindows\n\n\
+    sizer->Add( CreateTextSizer(_("Life! version 2.2 for wxWidgets\n\n\
 (c) 2000 Guillermo Rodriguez Garcia\n\n\
 <guille@iies.es>\n\n\
 Portions of the code are based in XLife;\n\
diff --git a/demos/life/dialogs.h b/demos/life/dialogs.h
index f5ebd0a32c..723ff1c81d 100644
--- a/demos/life/dialogs.h
+++ b/demos/life/dialogs.h
@@ -50,7 +50,7 @@ public:
     void OnListBox(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()
 
     int         m_value;
diff --git a/demos/life/life.cpp b/demos/life/life.cpp
index cd6c32d693..a32936d705 100644
--- a/demos/life/life.cpp
+++ b/demos/life/life.cpp
@@ -67,7 +67,7 @@
 // --------------------------------------------------------------------------
 
 // IDs for the controls and the menu commands. Exluding those already defined
-// by wxWindows, such as wxID_NEW.
+// by wxWidgets, such as wxID_NEW.
 enum
 {
     // timer
@@ -99,7 +99,7 @@ enum
 };
 
 // --------------------------------------------------------------------------
-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets
 // --------------------------------------------------------------------------
 
 // Event tables
diff --git a/demos/life/life.h b/demos/life/life.h
index f23d162a93..7e7777bd15 100644
--- a/demos/life/life.h
+++ b/demos/life/life.h
@@ -57,7 +57,7 @@ public:
     void DrawCell(wxInt32 i, wxInt32 j, bool alive);
 
 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()
 
     // draw a cell (parametrized by DC)
@@ -109,7 +109,7 @@ public:
     LifeNavigator(wxWindow *parent);
 
 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 handlers
@@ -133,7 +133,7 @@ public:
     void UpdateUI();
 
 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 handlers
diff --git a/distrib/msw/makefile.rsp b/distrib/msw/makefile.rsp
index b9ecf9fccb..743e03e70e 100644
--- a/distrib/msw/makefile.rsp
+++ b/distrib/msw/makefile.rsp
@@ -38,6 +38,7 @@ samples/html/test/Makefile.in
 samples/html/virtual/Makefile.in
 samples/html/widget/Makefile.in
 samples/html/zip/Makefile.in
+samples/html/htmlctrl/Makefile.in
 samples/image/Makefile.in
 samples/joytest/Makefile.in
 samples/layout/Makefile.in
diff --git a/distrib/msw/vc.rsp b/distrib/msw/vc.rsp
index e9a40cae97..39d28a9ce6 100644
--- a/distrib/msw/vc.rsp
+++ b/distrib/msw/vc.rsp
@@ -119,6 +119,8 @@ samples/html/widget/widget.dsp
 samples/html/widget/widget.dsw
 samples/html/zip/zip.dsp
 samples/html/zip/zip.dsw
+samples/html/htmlctrl/htmlctrl.dsw
+samples/html/htmlctrl/htmlctrl.dsp
 
 samples/image/image.dsp
 samples/image/image.dsw
diff --git a/include/wx/stc/stc.h b/include/wx/stc/stc.h
index 051f37035e..235a1c85ba 100644
--- a/include/wx/stc/stc.h
+++ b/include/wx/stc/stc.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////
 // Name:        stc.h
-// Purpose:     A wxWindows implementation of Scintilla.  This class is the
+// Purpose:     A wxWidgets implementation of Scintilla.  This class is the
 //              one meant to be used directly by wx applications.  It does not
 //              derive directly from the Scintilla classes, and in fact there
 //              is no mention of Scintilla classes at all in this header.
diff --git a/include/wx/xrc/xmlres.h b/include/wx/xrc/xmlres.h
index bf3f3c9d76..dd62160169 100644
--- a/include/wx/xrc/xmlres.h
+++ b/include/wx/xrc/xmlres.h
@@ -59,7 +59,7 @@ class wxXmlResourceModule;
 //     older versions of the library may ignore it.
 //   - if you change version number, follow these steps:
 //       - set major, minor and release numbers to respective version numbers of
-//         the wxWindows library (see wx/version.h)
+//         the wxWidgets library (see wx/version.h)
 //       - reset revision to 0 unless the first three are same as before,
 //         in which case you should increase revision by one
 #define WX_XMLRES_CURRENT_VERSION_MAJOR            2
@@ -127,7 +127,7 @@ public:
 
     // Initialize 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.
     void InitAllHandlers();
 
     // Initialize only a specific handler (or custom handler). Convention says
@@ -274,7 +274,7 @@ private:
 
 // This macro translates string identifier (as used in XML resource,
 // e.g. <menuitem id="my_menu">...</menuitem>) to integer id that is needed by
-// wxWindows event tables.
+// wxWidgets event tables.
 // Example:
 //    BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 //       EVT_MENU(XRCID("quit"), MyFrame::OnQuit)
@@ -463,9 +463,9 @@ WXDLLIMPEXP_XRC void wxXmlInitResourceModule();
 
 // This class is used to create instances of XRC "object" nodes with "subclass"
 // property. It is _not_ supposed to be used by XRC users, you should instead
-// register your subclasses via wxWindows' RTTI mechanism. This class is useful
+// register your subclasses via wxWidgets' RTTI mechanism. This class is useful
 // only for language bindings developer who need a way to implement subclassing
-// in wxWindows ports that don't support wxRTTI (e.g. wxPython).
+// in wxWidgets ports that don't support wxRTTI (e.g. wxPython).
 class WXDLLIMPEXP_XRC wxXmlSubclassFactory
 {
 public:
diff --git a/samples/access/accesstest.cpp b/samples/access/accesstest.cpp
index 550f043104..22dfabad93 100644
--- a/samples/access/accesstest.cpp
+++ b/samples/access/accesstest.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        accesstest.cpp
-// Purpose:     wxWindows accessibility sample
+// Purpose:     wxWidgets accessibility sample
 // Author:      Julian Smart
 // Modified by:
 // Created:     2002-02-12
@@ -25,7 +25,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers)
+// need because it includes almost all "standard" wxWidgets headers)
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
@@ -107,7 +107,7 @@ public:
 private:
     wxTextCtrl* m_textCtrl;
 
-    // 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()
 };
 
@@ -131,10 +131,10 @@ enum
 };
 
 // ----------------------------------------------------------------------------
-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets
 // ----------------------------------------------------------------------------
 
-// the event tables connect the wxWindows events with the functions (event
+// the event tables connect the wxWidgets events with the functions (event
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@ -145,7 +145,7 @@ END_EVENT_TABLE()
 
 #endif // wxUSE_ACCESSIBILITY
 
-// Create a new application object: this macro will allow wxWindows to create
+// Create a new application object: this macro will allow wxWidgets to create
 // the application object during program execution (it's better than using a
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
@@ -172,7 +172,7 @@ bool MyApp::OnInit()
     wxHelpProvider::Set(new wxSimpleHelpProvider());
 
     // create the main application window
-    MyFrame *frame = new MyFrame(_T("AccessTest wxWindows App"),
+    MyFrame *frame = new MyFrame(_T("AccessTest wxWidgets App"),
                                  wxPoint(50, 50), wxSize(450, 340));
 
     // and show it (the frames, unlike simple controls, are not shown when
@@ -352,7 +352,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
 #if 0 // wxUSE_STATUSBAR
     // create a status bar just for fun (by default with 1 pane only)
     CreateStatusBar(2);
-    SetStatusText(_T("Welcome to wxWindows!"));
+    SetStatusText(_T("Welcome to wxWidgets!"));
 #endif // wxUSE_STATUSBAR
 
 
@@ -365,12 +365,12 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
     listBox->Append(wxT("Sealing wax"));
     listBox->Append(wxT("Strings"));
     listBox->CreateAccessible();
-    listBox->SetHelpText(wxT("This is a sample wxWindows listbox, with a number of items in it."));
+    listBox->SetHelpText(wxT("This is a sample wxWidgets listbox, with a number of items in it."));
 
     m_textCtrl = new wxTextCtrl(splitter, -1, wxT(""), wxDefaultPosition,
         wxDefaultSize, wxTE_MULTILINE);
     m_textCtrl->CreateAccessible();
-    m_textCtrl->SetHelpText(wxT("This is a sample wxWindows multiline text control."));
+    m_textCtrl->SetHelpText(wxT("This is a sample wxWidgets multiline text control."));
 
     splitter->SplitHorizontally(listBox, m_textCtrl, 150);
 
diff --git a/samples/artprov/arttest.cpp b/samples/artprov/arttest.cpp
index 57730cfb11..f30d42c691 100644
--- a/samples/artprov/arttest.cpp
+++ b/samples/artprov/arttest.cpp
@@ -68,7 +68,7 @@ enum
 };
 
 // ----------------------------------------------------------------------------
-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets
 // ----------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
diff --git a/samples/calendar/calendar.cpp b/samples/calendar/calendar.cpp
index b3c275c946..4d66af136c 100644
--- a/samples/calendar/calendar.cpp
+++ b/samples/calendar/calendar.cpp
@@ -118,7 +118,7 @@ public:
 private:
     MyPanel *m_panel;
 
-    // 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()
 };
 
@@ -145,10 +145,10 @@ enum
 };
 
 // ----------------------------------------------------------------------------
-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets
 // ----------------------------------------------------------------------------
 
-// the event tables connect the wxWindows events with the functions (event
+// the event tables connect the wxWidgets events with the functions (event
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@ -180,7 +180,7 @@ BEGIN_EVENT_TABLE(MyPanel, wxPanel)
     EVT_CALENDAR_WEEKDAY_CLICKED(Calendar_CalCtrl, MyPanel::OnCalendarWeekDayClick)
 END_EVENT_TABLE()
 
-// Create a new application object: this macro will allow wxWindows to create
+// Create a new application object: this macro will allow wxWidgets to create
 // the application object during program execution (it's better than using a
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
@@ -199,7 +199,7 @@ IMPLEMENT_APP(MyApp)
 bool MyApp::OnInit()
 {
     // Create the main application window
-    MyFrame *frame = new MyFrame(_T("Calendar wxWindows sample"),
+    MyFrame *frame = new MyFrame(_T("Calendar wxWidgets sample"),
                                  wxPoint(50, 50), wxSize(450, 340));
 
     frame->Show(true);
@@ -273,7 +273,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 #if wxUSE_STATUSBAR
     // create a status bar just for fun (by default with 1 pane only)
     CreateStatusBar(2);
-    SetStatusText(_T("Welcome to wxWindows!"));
+    SetStatusText(_T("Welcome to wxWidgets!"));
 #endif // wxUSE_STATUSBAR
 }
 
diff --git a/samples/caret/caret.cpp b/samples/caret/caret.cpp
index 9180908c65..5dbfe74c9d 100644
--- a/samples/caret/caret.cpp
+++ b/samples/caret/caret.cpp
@@ -17,7 +17,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all <standard< wxWindows headers
+// need because it includes almost all <standard< wxWidgets headers
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
     #include "wx/log.h"
@@ -127,7 +127,7 @@ public:
 private:
     MyCanvas *m_canvas;
 
-    // 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()
 };
 
@@ -150,10 +150,10 @@ enum
 };
 
 // ----------------------------------------------------------------------------
-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets
 // ----------------------------------------------------------------------------
 
-// the event tables connect the wxWindows events with the functions (event
+// the event tables connect the wxWidgets events with the functions (event
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@ -164,7 +164,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Caret_Move, MyFrame::OnCaretMove)
 END_EVENT_TABLE()
 
-// Create a new application object: this macro will allow wxWindows to create
+// Create a new application object: this macro will allow wxWidgets to create
 // the application object during program execution (it's better than using a
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
@@ -183,7 +183,7 @@ IMPLEMENT_APP(MyApp)
 bool MyApp::OnInit()
 {
     // create and show the main application window
-    MyFrame *frame = new MyFrame(_T("Caret wxWindows sample"),
+    MyFrame *frame = new MyFrame(_T("Caret wxWidgets sample"),
                                  wxPoint(50, 50), wxSize(450, 340));
 
     frame->Show(TRUE);
@@ -227,7 +227,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 
     // create a status bar just for fun (by default with 1 pane only)
     CreateStatusBar(2);
-    SetStatusText(_T("Welcome to wxWindows!"));
+    SetStatusText(_T("Welcome to wxWidgets!"));
 }
 
 
@@ -241,7 +241,7 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
-    wxMessageBox(_T("The caret wxWindows sample.\n© 1999 Vadim Zeitlin"),
+    wxMessageBox(_T("The caret wxWidgets sample.\n© 1999 Vadim Zeitlin"),
                  _T("About Caret"), wxOK | wxICON_INFORMATION, this);
 }
 
diff --git a/samples/checklst/checklst.cpp b/samples/checklst/checklst.cpp
index 07fef62c3a..bd844baa04 100644
--- a/samples/checklst/checklst.cpp
+++ b/samples/checklst/checklst.cpp
@@ -124,7 +124,7 @@ bool CheckListBoxApp::OnInit(void)
     CheckListBoxFrame *pFrame = new CheckListBoxFrame
                                     (
                                      NULL,
-                                     _T("wxWindows Checklistbox Sample"),
+                                     _T("wxWidgets Checklistbox Sample"),
                                      50, 50, 480, 320
                                     );
     SetTopWindow(pFrame);
diff --git a/samples/config/conftest.cpp b/samples/config/conftest.cpp
index 0b8679bade..3a8f0ae114 100644
--- a/samples/config/conftest.cpp
+++ b/samples/config/conftest.cpp
@@ -95,7 +95,7 @@ bool MyApp::OnInit()
   // of the config file/registry key and must be set before the first call
   // to Get() if you want to override the default values (the application
   // name is the name of the executable and the vendor name is the same)
-  SetVendorName(_T("wxWindows"));
+  SetVendorName(_T("wxWidgets"));
   SetAppName(_T("conftest")); // not needed, it's the default value
 
   wxConfigBase *pConfig = wxConfigBase::Get();
diff --git a/samples/console/console.cpp b/samples/console/console.cpp
index bee4be2bf2..43669bf593 100644
--- a/samples/console/console.cpp
+++ b/samples/console/console.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        samples/console/console.cpp
-// Purpose:     a sample console (as opposed to GUI) progam using wxWindows
+// Purpose:     a sample console (as opposed to GUI) progam using wxWidgets
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     04.10.99
@@ -38,7 +38,7 @@
 
 /*
    A note about all these conditional compilation macros: this file is used
-   both as a test suite for various non-GUI wxWindows classes and as a
+   both as a test suite for various non-GUI wxWidgets classes and as a
    scratchpad for quick tests. So there are two compilation modes: if you
    define TEST_ALL all tests are run, otherwise you may enable the individual
    tests individually in the "#else" branch below.
@@ -2138,7 +2138,7 @@ static void TestDbOpen()
 
 /*
    NB: this stuff was taken from the glibc test suite and modified to build
-       in wxWindows: if I read the copyright below properly, this shouldn't
+       in wxWidgets: if I read the copyright below properly, this shouldn't
        be a problem
  */
 
@@ -2804,7 +2804,7 @@ static void TestSocketClient()
 {
     wxPuts(_T("*** Testing wxSocketClient ***\n"));
 
-    static const wxChar *hostname = _T("www.wxwindows.org");
+    static const wxChar *hostname = _T("www.wxwidgets.org");
 
     wxIPV4address addr;
     addr.Hostname(hostname);
@@ -2862,7 +2862,7 @@ static bool TestFtpConnect()
     wxPuts(_T("*** Testing FTP connect ***"));
 
 #ifdef FTP_ANONYMOUS
-    static const wxChar *hostname = _T("ftp.wxwindows.org");
+    static const wxChar *hostname = _T("ftp.wxwidgets.org");
 
     wxPrintf(_T("--- Attempting to connect to %s:21 anonymously...\n"), hostname);
 #else // !FTP_ANONYMOUS
@@ -3521,7 +3521,7 @@ static void TestVCardWrite()
         // set some fields
         vcard.SetName("Zeitlin", "Vadim");
         vcard.SetFullName("Vadim Zeitlin");
-        vcard.SetOrganization("wxWindows", "R&D");
+        vcard.SetOrganization("wxWidgets", "R&D");
 
         // just dump the vCard back
         wxPuts(_T("Entire vCard follows:\n"));
@@ -5285,7 +5285,7 @@ int main(int argc, char **argv)
     wxInitializer initializer;
     if ( !initializer )
     {
-        fprintf(stderr, "Failed to initialize the wxWindows library, aborting.");
+        fprintf(stderr, "Failed to initialize the wxWidgets library, aborting.");
 
         return -1;
     }
diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp
index f85667d24b..54f732373c 100644
--- a/samples/controls/controls.cpp
+++ b/samples/controls/controls.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        controls.cpp
-// Purpose:     Controls wxWindows sample
+// Purpose:     Controls wxWidgets sample
 // Author:      Robert Roebling
 // Modified by:
 // RCS-ID:      $Id$
@@ -341,7 +341,7 @@ bool MyApp::OnInit()
     }
 
     // Create the main frame window
-    MyFrame *frame = new MyFrame(_T("Controls wxWindows App"), x, y);
+    MyFrame *frame = new MyFrame(_T("Controls wxWidgets App"), x, y);
     frame->Show(true);
 
     return true;
diff --git a/samples/db/dbtest.cpp b/samples/db/dbtest.cpp
index 9e18fef709..e9778481a1 100644
--- a/samples/db/dbtest.cpp
+++ b/samples/db/dbtest.cpp
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        dbtest.cpp
-// Purpose:     wxWindows database demo app
+// Purpose:     wxWidgets database demo app
 // Author:      George Tasker
 // Modified by:
 // Created:     1998
@@ -612,7 +612,7 @@ bool DatabaseDemoApp::OnInit()
     Contact         = NULL;
 
     // Create the main frame window
-    DemoFrame = new DatabaseDemoFrame(NULL, wxT("wxWindows Database Demo"), wxPoint(50, 50), wxSize(537, 480));
+    DemoFrame = new DatabaseDemoFrame(NULL, wxT("wxWidgets Database Demo"), wxPoint(50, 50), wxSize(537, 480));
 
     // Give it an icon
     DemoFrame->SetIcon(wxICON(db));
@@ -909,7 +909,7 @@ void DatabaseDemoFrame::OnEditParameters(wxCommandEvent& WXUNUSED(event))
 
 void DatabaseDemoFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
-    wxMessageBox(wxT("wxWindows sample program for database classes\n\nContributed on 27 July 1998"),wxT("About..."),wxOK | wxICON_INFORMATION);
+    wxMessageBox(wxT("wxWidgets sample program for database classes\n\nContributed on 27 July 1998"),wxT("About..."),wxOK | wxICON_INFORMATION);
 }  // DatabaseDemoFrame::OnAbout()
 
 
diff --git a/samples/db/dbtest.h b/samples/db/dbtest.h
index 9abe3346f2..91ffdf60f0 100644
--- a/samples/db/dbtest.h
+++ b/samples/db/dbtest.h
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        dbtest.h
-// Purpose:     wxWindows database demo app
+// Purpose:     wxWidgets database demo app
 // Author:      George Tasker
 // Modified by:
 // Created:     1998
@@ -83,10 +83,10 @@ class CstructContact : public wxObject
         wxChar             State[25+1];
         wxChar             PostalCode[15+1];
         wxChar             Country[20+1];
-        TIMESTAMP_STRUCT   JoinDate;            // Date on which this person joined the wxWindows project
+        TIMESTAMP_STRUCT   JoinDate;            // Date on which this person joined the wxWidgets project
         Language           NativeLanguage;      // Enumerated type indicating person's native language
         wxChar             Picture[50000];
-        bool               IsDeveloper;         // Is this person a developer for wxWindows, or just a subscriber
+        bool               IsDeveloper;         // Is this person a developer for wxWidgets, or just a subscriber
         UCHAR              Contributions;       // Something to show off an integer field
         ULONG              LinesOfCode;         // Something to show off a 'long' field
 };  // CstructContact
diff --git a/samples/db/listdb.h b/samples/db/listdb.h
index 866ea8a5df..0a680eb4a2 100644
--- a/samples/db/listdb.h
+++ b/samples/db/listdb.h
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        listdb.h
-// Purpose:     wxWindows database demo app
+// Purpose:     wxWidgets database demo app
 // Author:      George Tasker
 // Modified by:
 // Created:     1996
diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp
index d1bb2254d6..a2fd69d7ac 100644
--- a/samples/dialogs/dialogs.cpp
+++ b/samples/dialogs/dialogs.cpp
@@ -137,7 +137,7 @@ bool MyApp::OnInit()
   m_canvasFont = *wxNORMAL_FONT;
 
   // Create the main frame window
-  MyFrame *frame = new MyFrame((wxFrame *) NULL, _T("wxWindows dialogs example"), wxPoint(20, 20), wxSize(400, 300));
+  MyFrame *frame = new MyFrame((wxFrame *) NULL, _T("wxWidgets dialogs example"), wxPoint(20, 20), wxSize(400, 300));
 
   // Make a menubar
   wxMenu *file_menu = new wxMenu;
@@ -889,7 +889,7 @@ void MyCanvas::OnPaint(wxPaintEvent& WXUNUSED(event) )
     dc.SetFont(wxGetApp().m_canvasFont);
     dc.SetTextForeground(wxGetApp().m_canvasTextColour);
     dc.SetBackgroundMode(wxTRANSPARENT);
-    dc.DrawText(_T("wxWindows common dialogs test application"), 10, 10);
+    dc.DrawText(_T("wxWidgets common dialogs test application"), 10, 10);
 }
 
 // ----------------------------------------------------------------------------
diff --git a/samples/dialup/nettest.cpp b/samples/dialup/nettest.cpp
index 1816214cc8..8613901499 100644
--- a/samples/dialup/nettest.cpp
+++ b/samples/dialup/nettest.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        net.cpp
-// Purpose:     wxWindows sample demonstrating network-related functions
+// Purpose:     wxWidgets sample demonstrating network-related functions
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     07.07.99
@@ -30,7 +30,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers
+// need because it includes almost all "standard" wxWidgets headers
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
@@ -91,7 +91,7 @@ public:
     void OnIdle(wxIdleEvent& 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()
 };
 
@@ -113,7 +113,7 @@ enum
 };
 
 // ----------------------------------------------------------------------------
-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets
 // ----------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(MyApp, wxApp)
@@ -121,7 +121,7 @@ BEGIN_EVENT_TABLE(MyApp, wxApp)
     EVT_DIALUP_DISCONNECTED(MyApp::OnConnected)
 END_EVENT_TABLE()
 
-// the event tables connect the wxWindows events with the functions (event
+// the event tables connect the wxWidgets events with the functions (event
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@ -137,7 +137,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_IDLE(MyFrame::OnIdle)
 END_EVENT_TABLE()
 
-// Create a new application object: this macro will allow wxWindows to create
+// Create a new application object: this macro will allow wxWidgets to create
 // the application object during program execution (it's better than using a
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
@@ -156,7 +156,7 @@ IMPLEMENT_APP(MyApp)
 bool MyApp::OnInit()
 {
     // Create the main application window
-    MyFrame *frame = new MyFrame(_T("Dial-up wxWindows demo"),
+    MyFrame *frame = new MyFrame(_T("Dial-up wxWidgets demo"),
                                  wxPoint(50, 50), wxSize(450, 340));
 
     // Show it and tell the application that it's our main window
diff --git a/samples/display/display.cpp b/samples/display/display.cpp
index 75e35c4dd9..c497f25a23 100644
--- a/samples/display/display.cpp
+++ b/samples/display/display.cpp
@@ -1,11 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        display.cpp
-// Purpose:     wxWindows sample showing the features of wxDisplay class
+// Purpose:     wxWidgets sample showing the features of wxDisplay class
 // Author:      Vadim Zeitlin
 // Modified by: Ryan Norton & Brian Victor
 // Created:     23.02.03
 // RCS-ID:      $Id$
-// Copyright:   (c) Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -88,7 +88,7 @@ private:
     // GUI controls
     wxNotebook *m_notebook;
 
-    // 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()
 };
 
@@ -127,10 +127,10 @@ enum
 };
 
 // ----------------------------------------------------------------------------
-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets
 // ----------------------------------------------------------------------------
 
-// the event tables connect the wxWindows events with the functions (event
+// the event tables connect the wxWidgets events with the functions (event
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@ -148,7 +148,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_DISPLAY_CHANGED(MyFrame::OnDisplayChanged)
 END_EVENT_TABLE()
 
-// Create a new application object: this macro will allow wxWindows to create
+// Create a new application object: this macro will allow wxWidgets to create
 // the application object during program execution (it's better than using a
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
@@ -174,7 +174,7 @@ bool MyApp::OnInit()
 #endif // __WXMSW__
 
     // create the main application window
-    MyFrame *frame = new MyFrame(_("Display wxWindows Sample"),
+    MyFrame *frame = new MyFrame(_("Display wxWidgets Sample"),
                                  wxDefaultPosition, wxDefaultSize);
 
     // and show it (the frames, unlike simple controls, are not shown when
diff --git a/samples/dnd/dnd.cpp b/samples/dnd/dnd.cpp
index 7c707d4928..9ca61d3964 100644
--- a/samples/dnd/dnd.cpp
+++ b/samples/dnd/dnd.cpp
@@ -893,7 +893,7 @@ bool DnDApp::OnInit()
 
     // create the main frame window
     DnDFrame *frame = new DnDFrame((wxFrame  *) NULL,
-                                   _T("Drag-and-Drop/Clipboard wxWindows Sample"),
+                                   _T("Drag-and-Drop/Clipboard wxWidgets Sample"),
                                    10, 100, 650, 340);
 
     // activate it
@@ -912,7 +912,7 @@ bool DnDApp::OnInit()
 
 DnDFrame::DnDFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h)
         : wxFrame(frame, wxID_ANY, title, wxPoint(x, y), wxSize(w, h)),
-          m_strText(_T("wxWindows drag & drop works :-)"))
+          m_strText(_T("wxWidgets drag & drop works :-)"))
 
 {
     // frame icon and status bar
@@ -1099,7 +1099,7 @@ void DnDFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 void DnDFrame::OnHelp(wxCommandEvent& /* event */)
 {
     wxMessageDialog dialog(this,
-                           _T("This small program demonstrates drag & drop support in wxWindows. The program window\n")
+                           _T("This small program demonstrates drag & drop support in wxWidgets. The program window\n")
                            _T("consists of 3 parts: the bottom pane is for debug messages, so that you can see what's\n")
                            _T("going on inside. The top part is split into 2 listboxes, the left one accepts files\n")
                            _T("and the right one accepts text.\n")
diff --git a/samples/docview/docview.cpp b/samples/docview/docview.cpp
index e68dd48d7c..6f1a381317 100644
--- a/samples/docview/docview.cpp
+++ b/samples/docview/docview.cpp
@@ -14,7 +14,7 @@
 #endif
 
 /*
-* Purpose:  Document/view architecture demo for wxWindows class library
+* Purpose:  Document/view architecture demo for wxWidgets class library
 *           Run with no arguments for multiple top-level windows, -single
 *           for a single window.
 */
diff --git a/samples/docvwmdi/docview.cpp b/samples/docvwmdi/docview.cpp
index 936aa65504..652281b675 100644
--- a/samples/docvwmdi/docview.cpp
+++ b/samples/docvwmdi/docview.cpp
@@ -14,7 +14,7 @@
 #endif
 
 /*
- * Purpose:  Document/view architecture demo for wxWindows class library - MDI
+ * Purpose:  Document/view architecture demo for wxWidgets class library - MDI
  */
 
 
diff --git a/samples/drawing/drawing.cpp b/samples/drawing/drawing.cpp
index 0af06101ab..8e3ae49a16 100644
--- a/samples/drawing/drawing.cpp
+++ b/samples/drawing/drawing.cpp
@@ -30,7 +30,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers
+// need because it includes almost all "standard" wxWidgets headers
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
@@ -137,7 +137,7 @@ public:
     MyCanvas   *m_canvas;
 
 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()
 };
 
@@ -238,11 +238,11 @@ enum
 };
 
 // ----------------------------------------------------------------------------
-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets
 // ----------------------------------------------------------------------------
 
 
-// Create a new application object: this macro will allow wxWindows to create
+// Create a new application object: this macro will allow wxWidgets to create
 // the application object during program execution (it's better than using a
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
@@ -360,7 +360,7 @@ void MyApp::DeleteBitmaps()
 // MyCanvas
 // ----------------------------------------------------------------------------
 
-// the event tables connect the wxWindows events with the functions (event
+// the event tables connect the wxWidgets events with the functions (event
 // handlers) which process them.
 BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
     EVT_PAINT  (MyCanvas::OnPaint)
@@ -1025,7 +1025,7 @@ void MyCanvas::OnMouseMove(wxMouseEvent &event)
 // MyFrame
 // ----------------------------------------------------------------------------
 
-// the event tables connect the wxWindows events with the functions (event
+// the event tables connect the wxWidgets events with the functions (event
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@ -1112,7 +1112,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 
     // create a status bar just for fun (by default with 1 pane only)
     CreateStatusBar(2);
-    SetStatusText(_T("Welcome to wxWindows!"));
+    SetStatusText(_T("Welcome to wxWidgets!"));
 
     m_mapMode = wxMM_TEXT;
     m_xUserScale = 1.0;
diff --git a/samples/dynamic/dynamic.cpp b/samples/dynamic/dynamic.cpp
index 56eb23a1e0..a3a6dbdd52 100644
--- a/samples/dynamic/dynamic.cpp
+++ b/samples/dynamic/dynamic.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        dynamic.cpp
-// Purpose:     Dynamic events wxWindows sample
+// Purpose:     Dynamic events wxWidgets sample
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
@@ -57,7 +57,7 @@ IMPLEMENT_APP  (MyApp)
 bool MyApp::OnInit(void)
 {
   // Create the main frame window
-  MyFrame *frame = new MyFrame(NULL, _T("Dynamic wxWindows App"), 50, 50, 450, 340);
+  MyFrame *frame = new MyFrame(NULL, _T("Dynamic wxWidgets App"), 50, 50, 450, 340);
 
   frame->Connect( DYNAMIC_QUIT,  -1, wxEVT_COMMAND_MENU_SELECTED,
                   (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction)
diff --git a/samples/erase/erase.cpp b/samples/erase/erase.cpp
index 6e87821b5e..9a36be354b 100644
--- a/samples/erase/erase.cpp
+++ b/samples/erase/erase.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        erase.cpp
-// Purpose:     Erase wxWindows sample
+// Purpose:     Erase wxWidgets sample
 // Author:      Robert Roebling
 // Modified by:
 // Created:     04/01/98
@@ -30,7 +30,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers)
+// need because it includes almost all "standard" wxWidgets headers)
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
@@ -141,7 +141,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 #if wxUSE_STATUSBAR
     // create a status bar just for fun (by default with 1 pane only)
     CreateStatusBar(2);
-    SetStatusText(_T("Welcome to wxWindows erase sample!"));
+    SetStatusText(_T("Welcome to wxWidgets erase sample!"));
 #endif // wxUSE_STATUSBAR
 
     (void)new MyCanvas( this );
diff --git a/samples/event/event.cpp b/samples/event/event.cpp
index 4fd024abb8..3604d6e296 100644
--- a/samples/event/event.cpp
+++ b/samples/event/event.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        event.cpp
-// Purpose:     wxWindows sample demonstrating different event usage
+// Purpose:     wxWidgets sample demonstrating different event usage
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     31.01.01
@@ -32,7 +32,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers)
+// need because it includes almost all "standard" wxWidgets headers)
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
@@ -107,7 +107,7 @@ protected:
     size_t m_nPush;
 
 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()
 };
 
@@ -159,10 +159,10 @@ enum
 };
 
 // ----------------------------------------------------------------------------
-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets
 // ----------------------------------------------------------------------------
 
-// the event tables connect the wxWindows events with the functions (event
+// the event tables connect the wxWidgets events with the functions (event
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@ -188,7 +188,7 @@ BEGIN_EVENT_TABLE(MyEvtHandler, wxEvtHandler)
     EVT_MENU(Event_Test, MyEvtHandler::OnTest)
 END_EVENT_TABLE()
 
-// Create a new application object: this macro will allow wxWindows to create
+// Create a new application object: this macro will allow wxWidgets to create
 // the application object during program execution (it's better than using a
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
@@ -207,7 +207,7 @@ IMPLEMENT_APP(MyApp)
 bool MyApp::OnInit()
 {
     // create the main application window
-    MyFrame *frame = new MyFrame(_T("Event wxWindows Sample"),
+    MyFrame *frame = new MyFrame(_T("Event wxWidgets Sample"),
                                  wxPoint(50, 50), wxSize(600, 340));
 
     // and show it (the frames, unlike simple controls, are not shown when
@@ -265,7 +265,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 
 #if wxUSE_STATUSBAR
     CreateStatusBar(3);
-    SetStatusText(_T("Welcome to wxWindows event sample"));
+    SetStatusText(_T("Welcome to wxWidgets event sample"));
     SetStatusText(_T("Dynamic: off"), Status_Dynamic);
     SetStatusText(_T("Push count: 0"), Status_Push);
 #endif // wxUSE_STATUSBAR
diff --git a/samples/except/except.cpp b/samples/except/except.cpp
index a7f2d7ad94..04a13cff97 100644
--- a/samples/except/except.cpp
+++ b/samples/except/except.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        except.cpp
-// Purpose:     Except wxWindows sample
+// Purpose:     Except wxWidgets sample
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
@@ -25,7 +25,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers)
+// need because it includes almost all "standard" wxWidgets headers)
 #ifndef WX_PRECOMP
     #include "wx/log.h"
 
@@ -93,7 +93,7 @@ public:
     virtual bool ProcessEvent(wxEvent& 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()
 };
 
@@ -143,10 +143,10 @@ enum
 };
 
 // ----------------------------------------------------------------------------
-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets
 // ----------------------------------------------------------------------------
 
-// the event tables connect the wxWindows events with the functions (event
+// the event tables connect the wxWidgets events with the functions (event
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@ -161,7 +161,7 @@ BEGIN_EVENT_TABLE(MyDialog, wxDialog)
     EVT_BUTTON(Except_ThrowObject, MyDialog::OnThrowObject)
 END_EVENT_TABLE()
 
-// Create a new application object: this macro will allow wxWindows to create
+// Create a new application object: this macro will allow wxWidgets to create
 // the application object during program execution (it's better than using a
 // static object for many reasons) and also implements the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
@@ -176,7 +176,7 @@ IMPLEMENT_APP(MyApp)
 bool MyApp::OnInit()
 {
     // create the main application window
-    MyFrame *frame = new MyFrame(_T("Except wxWindows App"),
+    MyFrame *frame = new MyFrame(_T("Except wxWidgets App"),
                                  wxPoint(50, 50), wxSize(450, 340));
 
     // and show it (the frames, unlike simple controls, are not shown when
@@ -244,7 +244,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
 #if wxUSE_STATUSBAR && !defined(__WXWINCE__)
     // create a status bar just for fun (by default with 1 pane only)
     CreateStatusBar(2);
-    SetStatusText(_T("Welcome to wxWindows!"));
+    SetStatusText(_T("Welcome to wxWidgets!"));
 #endif // wxUSE_STATUSBAR
 }
 
diff --git a/samples/exec/exec.cpp b/samples/exec/exec.cpp
index 8878122415..eaeb0b15b9 100644
--- a/samples/exec/exec.cpp
+++ b/samples/exec/exec.cpp
@@ -30,7 +30,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers
+// need because it includes almost all "standard" wxWidgets headers
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/log.h"
@@ -177,7 +177,7 @@ private:
     // the idle event wake up timer
     wxTimer m_timerIdleWakeUp;
 
-    // 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()
 };
 
@@ -308,10 +308,10 @@ enum
 static const wxChar *DIALOG_TITLE = _T("Exec sample");
 
 // ----------------------------------------------------------------------------
-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets
 // ----------------------------------------------------------------------------
 
-// the event tables connect the wxWindows events with the functions (event
+// the event tables connect the wxWidgets events with the functions (event
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@ -352,7 +352,7 @@ BEGIN_EVENT_TABLE(MyPipeFrame, wxFrame)
     EVT_END_PROCESS(-1, MyPipeFrame::OnProcessTerm)
 END_EVENT_TABLE()
 
-// Create a new application object: this macro will allow wxWindows to create
+// Create a new application object: this macro will allow wxWidgets to create
 // the application object during program execution (it's better than using a
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
@@ -371,7 +371,7 @@ IMPLEMENT_APP(MyApp)
 bool MyApp::OnInit()
 {
     // Create the main application window
-    MyFrame *frame = new MyFrame(_T("Exec wxWindows sample"),
+    MyFrame *frame = new MyFrame(_T("Exec wxWidgets sample"),
                                  wxDefaultPosition, wxSize(500, 140));
 
     // Show it and tell the application that it's our main window
@@ -461,7 +461,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 #if wxUSE_STATUSBAR
     // create a status bar just for fun (by default with 1 pane only)
     CreateStatusBar();
-    SetStatusText(_T("Welcome to wxWindows exec sample!"));
+    SetStatusText(_T("Welcome to wxWidgets exec sample!"));
 #endif // wxUSE_STATUSBAR
 }
 
@@ -482,7 +482,7 @@ void MyFrame::OnClear(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
-    wxMessageBox(_T("Exec wxWindows Sample\n© 2000-2002 Vadim Zeitlin"),
+    wxMessageBox(_T("Exec wxWidgets Sample\n© 2000-2002 Vadim Zeitlin"),
                  _T("About Exec"), wxOK | wxICON_INFORMATION, this);
 }
 
diff --git a/samples/font/font.cpp b/samples/font/font.cpp
index 68a5231b64..61eeecb067 100644
--- a/samples/font/font.cpp
+++ b/samples/font/font.cpp
@@ -17,7 +17,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all standard wxWindows headers
+// need because it includes almost all standard wxWidgets headers
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 
@@ -120,7 +120,7 @@ protected:
     MyCanvas   *m_canvas;
 
 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()
 };
 
@@ -156,10 +156,10 @@ enum
 };
 
 // ----------------------------------------------------------------------------
-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets
 // ----------------------------------------------------------------------------
 
-// the event tables connect the wxWindows events with the functions (event
+// the event tables connect the wxWidgets events with the functions (event
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@ -187,7 +187,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Font_EnumEncodings, MyFrame::OnEnumerateEncodings)
 END_EVENT_TABLE()
 
-// Create a new application object: this macro will allow wxWindows to create
+// Create a new application object: this macro will allow wxWidgets to create
 // the application object during program execution (it's better than using a
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
@@ -206,7 +206,7 @@ IMPLEMENT_APP(MyApp)
 bool MyApp::OnInit()
 {
     // Create the main application window
-    MyFrame *frame = new MyFrame(wxT("Font wxWindows demo"),
+    MyFrame *frame = new MyFrame(wxT("Font wxWidgets demo"),
                                  wxPoint(50, 50), wxSize(600, 400));
 
     // Show it and tell the application that it's our main window
@@ -257,10 +257,10 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
                      wxT("Select a standard font"));
 
     wxMenu *menuStdFonts = new wxMenu;
-    menuStdFonts->Append(Font_wxNORMAL_FONT, wxT("wxNORMAL_FONT"), wxT("Normal font used by wxWindows"));
-    menuStdFonts->Append(Font_wxSMALL_FONT,  wxT("wxSMALL_FONT"),  wxT("Small font used by wxWindows"));
-    menuStdFonts->Append(Font_wxITALIC_FONT, wxT("wxITALIC_FONT"), wxT("Italic font used by wxWindows"));
-    menuStdFonts->Append(Font_wxSWISS_FONT,  wxT("wxSWISS_FONT"),  wxT("Swiss font used by wxWindows"));
+    menuStdFonts->Append(Font_wxNORMAL_FONT, wxT("wxNORMAL_FONT"), wxT("Normal font used by wxWidgets"));
+    menuStdFonts->Append(Font_wxSMALL_FONT,  wxT("wxSMALL_FONT"),  wxT("Small font used by wxWidgets"));
+    menuStdFonts->Append(Font_wxITALIC_FONT, wxT("wxITALIC_FONT"), wxT("Italic font used by wxWidgets"));
+    menuStdFonts->Append(Font_wxSWISS_FONT,  wxT("wxSWISS_FONT"),  wxT("Swiss font used by wxWidgets"));
     menuSelect->Append(Font_Standard, wxT("Standar&d fonts"), menuStdFonts);
 
     menuSelect->AppendSeparator();
@@ -295,7 +295,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 
     // create a status bar just for fun (by default with 1 pane only)
     CreateStatusBar();
-    SetStatusText(wxT("Welcome to wxWindows font demo!"));
+    SetStatusText(wxT("Welcome to wxWidgets font demo!"));
 }
 
 // --------------------------------------------------------
@@ -689,7 +689,7 @@ void MyFrame::OnViewMsg(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
-    wxMessageBox(wxT("wxWindows font demo\n")
+    wxMessageBox(wxT("wxWidgets font demo\n")
                  wxT("(c) 1999 Vadim Zeitlin"),
                  wxT("About Font"),
                  wxOK | wxICON_INFORMATION, this);
diff --git a/samples/grid/griddemo.cpp b/samples/grid/griddemo.cpp
index 9db8fa6f9d..fd656d15fb 100644
--- a/samples/grid/griddemo.cpp
+++ b/samples/grid/griddemo.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        griddemo.cpp
-// Purpose:     Grid control wxWindows sample
+// Purpose:     Grid control wxWidgets sample
 // Author:      Michael Bedward
 // Modified by:
 // RCS-ID:      $Id$
@@ -130,7 +130,7 @@ END_EVENT_TABLE()
 
 
 GridFrame::GridFrame()
-        : wxFrame( (wxFrame *)NULL, -1, _T("wxWindows grid class demo"),
+        : wxFrame( (wxFrame *)NULL, -1, _T("wxWidgets grid class demo"),
                    wxDefaultPosition,
                    wxDefaultSize )
 {
diff --git a/samples/grid/griddemo.h b/samples/grid/griddemo.h
index 94d923e417..a06464e232 100644
--- a/samples/grid/griddemo.h
+++ b/samples/grid/griddemo.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        griddemo.h
-// Purpose:     Grid control wxWindows sample
+// Purpose:     Grid control wxWidgets sample
 // Author:      Michael Bedward
 // Modified by:
 // RCS-ID:      $Id$
diff --git a/samples/help/demo.cpp b/samples/help/demo.cpp
index 48fa9210e2..57e2cda5a8 100644
--- a/samples/help/demo.cpp
+++ b/samples/help/demo.cpp
@@ -25,7 +25,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers
+// need because it includes almost all "standard" wxWidgets headers
 #ifndef WX_PRECOMP
 #   include "wx/wx.h"
 #endif
@@ -143,7 +143,7 @@ private:
     wxBestHelpController    m_bestHelp;
 #endif
 
-    // 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()
 };
 
@@ -207,10 +207,10 @@ enum
 };
 
 // ----------------------------------------------------------------------------
-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets
 // ----------------------------------------------------------------------------
 
-// the event tables connect the wxWindows events with the functions (event
+// the event tables connect the wxWidgets events with the functions (event
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@ -242,7 +242,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(HelpDemo_Help_Netscape, MyFrame::OnHelp)
 END_EVENT_TABLE()
 
-// Create a new application object: this macro will allow wxWindows to create
+// Create a new application object: this macro will allow wxWidgets to create
 // the application object during program execution (it's better than using a
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
@@ -283,7 +283,7 @@ bool MyApp::OnInit()
 #endif
 
     // Create the main application window
-    MyFrame *frame = new MyFrame(_T("HelpDemo wxWindows App"),
+    MyFrame *frame = new MyFrame(_T("HelpDemo wxWidgets App"),
                                  wxPoint(50, 50), wxSize(450, 340));
 
 #if !USE_SIMPLE_HELP_PROVIDER
@@ -419,7 +419,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 
     // create a status bar just for fun (by default with 1 pane only)
     CreateStatusBar();
-    SetStatusText(_T("Welcome to wxWindows!"));
+    SetStatusText(_T("Welcome to wxWidgets!"));
 
     // now create some controls
 
@@ -524,9 +524,9 @@ void MyFrame::OnBestHelp(wxCommandEvent& event)
 
    A wxhelp.map file is used, for example:
 
-   0 wx.htm             ; wxWindows: Help index; additional keywords like overview
-   1 wx204.htm          ; wxWindows Function Reference
-   2 wx34.htm           ; wxWindows Class Reference
+   0 wx.htm             ; wxWidgets: Help index; additional keywords like overview
+   1 wx204.htm          ; wxWidgets Function Reference
+   2 wx34.htm           ; wxWidgets Class Reference
 
    Note that Tex2RTF doesn't currently generate the MAP section automatically.
 
diff --git a/samples/htlbox/htlbox.cpp b/samples/htlbox/htlbox.cpp
index 2e3b116dc1..162fce3ef2 100644
--- a/samples/htlbox/htlbox.cpp
+++ b/samples/htlbox/htlbox.cpp
@@ -1,11 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        htmllbox.cpp
-// Purpose:     HtmlLbox wxWindows sample
+// Purpose:     HtmlLbox wxWidgets sample
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     31.05.03
 // RCS-ID:      $Id$
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -120,7 +120,7 @@ public:
 private:
     MyHtmlListBox *m_hlbox;
 
-    // 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()
 };
 
@@ -156,7 +156,7 @@ enum
 };
 
 // ----------------------------------------------------------------------------
-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets
 // ----------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@ -192,7 +192,7 @@ IMPLEMENT_APP(MyApp)
 
 // frame constructor
 MyFrame::MyFrame()
-       : wxFrame(NULL, -1, _T("HtmlLbox wxWindows Sample"),
+       : wxFrame(NULL, -1, _T("HtmlLbox wxWidgets Sample"),
                  wxDefaultPosition, wxSize(400, 500))
 {
     // set the frame icon
@@ -243,7 +243,7 @@ MyFrame::MyFrame()
 #if wxUSE_STATUSBAR
     // create a status bar just for fun (by default with 1 pane only)
     CreateStatusBar(2);
-    SetStatusText(_T("Welcome to wxWindows!"));
+    SetStatusText(_T("Welcome to wxWidgets!"));
 #endif // wxUSE_STATUSBAR
 
     // create the child controls
diff --git a/samples/html/about/about.cpp b/samples/html/about/about.cpp
index e5e0c7645c..9f93a98019 100644
--- a/samples/html/about/about.cpp
+++ b/samples/html/about/about.cpp
@@ -16,7 +16,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers
+// need because it includes almost all "standard" wxWidgets headers
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
@@ -56,7 +56,7 @@
       void OnAbout(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()
    };
 
@@ -78,10 +78,10 @@
    };
 
 // ----------------------------------------------------------------------------
-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets
 // ----------------------------------------------------------------------------
 
-// the event tables connect the wxWindows events with the functions (event
+// the event tables connect the wxWidgets events with the functions (event
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
    BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@ -89,7 +89,7 @@
    EVT_MENU(Minimal_About, MyFrame::OnAbout)
    END_EVENT_TABLE()
 
-   // Create a new application object: this macro will allow wxWindows to create
+   // Create a new application object: this macro will allow wxWidgets to create
    // the application object during program execution (it's better than using a
    // static object for many reasons) and also declares the accessor function
    // wxGetApp() which will return the reference of the right type (i.e. MyApp and
diff --git a/samples/html/help/help.cpp b/samples/html/help/help.cpp
index 1f6448b31d..1c998979ce 100644
--- a/samples/html/help/help.cpp
+++ b/samples/html/help/help.cpp
@@ -16,7 +16,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers
+// need because it includes almost all "standard" wxWidgets headers
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
@@ -61,7 +61,7 @@
    private:
       wxHtmlHelpController help;
    
-    // 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()
    };
 
@@ -78,10 +78,10 @@
    };
 
 // ----------------------------------------------------------------------------
-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets
 // ----------------------------------------------------------------------------
 
-// the event tables connect the wxWindows events with the functions (event
+// the event tables connect the wxWidgets events with the functions (event
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
    BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@ -90,7 +90,7 @@
    EVT_CLOSE(MyFrame::OnClose)
    END_EVENT_TABLE()
 
-   // Create a new application object: this macro will allow wxWindows to create
+   // Create a new application object: this macro will allow wxWidgets to create
    // the application object during program execution (it's better than using a
    // static object for many reasons) and also declares the accessor function
    // wxGetApp() which will return the reference of the right type (i.e. MyApp and
@@ -111,7 +111,7 @@
 #if wxUSE_STREAMS && wxUSE_ZIPSTREAM && wxUSE_ZLIB 
       wxFileSystem::AddHandler(new wxZipFSHandler);
 #endif
-      SetVendorName(wxT("wxWindows"));
+      SetVendorName(wxT("wxWidgets"));
       SetAppName(wxT("wxHTMLHelp")); 
 
     // Create the main application window
diff --git a/samples/html/helpview/helpview.cpp b/samples/html/helpview/helpview.cpp
index 24224c7d6e..7a01bbf561 100644
--- a/samples/html/helpview/helpview.cpp
+++ b/samples/html/helpview/helpview.cpp
@@ -18,7 +18,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers
+// need because it includes almost all "standard" wxWidgets headers
 #ifndef WX_PRECOMP
 #include "wx/wx.h"
 #endif
@@ -65,7 +65,7 @@ bool MyApp::OnInit()
     wxInitAllImageHandlers();
     wxFileSystem::AddHandler(new wxZipFSHandler);
 
-    SetVendorName(wxT("wxWindows"));
+    SetVendorName(wxT("wxWidgets"));
     SetAppName(wxT("wxHTMLHelp")); 
     wxConfig::Get(); // create an instance
 
diff --git a/samples/html/htmlctrl/htmlctrl.cpp b/samples/html/htmlctrl/htmlctrl.cpp
index 5ca80e47e4..83687c029f 100755
--- a/samples/html/htmlctrl/htmlctrl.cpp
+++ b/samples/html/htmlctrl/htmlctrl.cpp
@@ -25,7 +25,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers)
+// need because it includes almost all "standard" wxWidgets headers)
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
@@ -89,15 +89,15 @@ public:
     wxWebKitCtrl* mySafari;
     wxTextCtrl* urlText;
 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
 // ----------------------------------------------------------------------------
 
-// the event tables connect the wxWindows events with the functions (event
+// the event tables connect the wxWidgets events with the functions (event
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@ -113,7 +113,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     //EVT_MENU(Minimal_About, MyFrame::OnAbout)
 END_EVENT_TABLE()
 
-// Create a new application object: this macro will allow wxWindows to create
+// Create a new application object: this macro will allow wxWidgets to create
 // the application object during program execution (it's better than using a
 // static object for many reasons) and also implements the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
diff --git a/samples/html/printing/printing.cpp b/samples/html/printing/printing.cpp
index c230fe2aa6..588e62ade4 100644
--- a/samples/html/printing/printing.cpp
+++ b/samples/html/printing/printing.cpp
@@ -12,7 +12,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers
+// need because it includes almost all "standard" wxWidgets headers
 #ifndef WX_PRECOMP
 #include "wx/wx.h"
 #endif
@@ -68,7 +68,7 @@ class MyFrame : public wxFrame
         wxHtmlWindow *m_Html;
         wxHtmlEasyPrinting *m_Prn;
         wxString m_Name;
-        // 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()
 };
 
@@ -93,10 +93,10 @@ enum
 };
 
 // ----------------------------------------------------------------------------
-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets
 // ----------------------------------------------------------------------------
 
-// the event tables connect the wxWindows events with the functions (event
+// the event tables connect the wxWidgets events with the functions (event
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@ -112,7 +112,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Minimal_PrintHuge, MyFrame::OnPrintHuge)
 END_EVENT_TABLE()
 
-// Create a new application object: this macro will allow wxWindows to create
+// Create a new application object: this macro will allow wxWidgets to create
 // the application object during program execution (it's better than using a
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
diff --git a/samples/html/test/test.cpp b/samples/html/test/test.cpp
index d9e8cd3c22..d514ddc7ba 100644
--- a/samples/html/test/test.cpp
+++ b/samples/html/test/test.cpp
@@ -21,7 +21,7 @@
 #endif
 
 // For all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers
+// need because it includes almost all "standard" wxWidgets headers
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
@@ -62,7 +62,7 @@ private:
     wxHtmlWindow *m_Html;
     wxHtmlProcessor *m_Processor;
 
-    // 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()
 };
 
@@ -97,7 +97,7 @@ enum
 };
 
 // ----------------------------------------------------------------------------
-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets
 // ----------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@ -130,7 +130,7 @@ bool MyApp::OnInit()
     wxFileSystem::AddHandler(new wxInternetFSHandler);
 #endif
 
-    SetVendorName(wxT("wxWindows"));
+    SetVendorName(wxT("wxWidgets"));
     SetAppName(wxT("wxHtmlTest"));
     // the following call to wxConfig::Get will use it to create an object...
 
diff --git a/samples/html/virtual/virtual.cpp b/samples/html/virtual/virtual.cpp
index c4d21b9431..7ac3a57d5f 100644
--- a/samples/html/virtual/virtual.cpp
+++ b/samples/html/virtual/virtual.cpp
@@ -17,7 +17,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers
+// need because it includes almost all "standard" wxWidgets headers
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
@@ -109,7 +109,7 @@ wxFSFile* MyVFS::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)
       void OnForward(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()
    };
 
@@ -130,10 +130,10 @@ wxFSFile* MyVFS::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)
    };
 
 // ----------------------------------------------------------------------------
-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets
 // ----------------------------------------------------------------------------
 
-// the event tables connect the wxWindows events with the functions (event
+// the event tables connect the wxWidgets events with the functions (event
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
    BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@ -142,7 +142,7 @@ wxFSFile* MyVFS::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)
    EVT_MENU(Minimal_Forward, MyFrame::OnForward)
    END_EVENT_TABLE()
    
-   // Create a new application object: this macro will allow wxWindows to create
+   // Create a new application object: this macro will allow wxWidgets to create
    // the application object during program execution (it's better than using a
    // static object for many reasons) and also declares the accessor function
    // wxGetApp() which will return the reference of the right type (i.e. MyApp and
diff --git a/samples/html/widget/widget.cpp b/samples/html/widget/widget.cpp
index b567e193f4..54489fd12c 100644
--- a/samples/html/widget/widget.cpp
+++ b/samples/html/widget/widget.cpp
@@ -17,7 +17,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers
+// need because it includes almost all "standard" wxWidgets headers
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
@@ -101,7 +101,7 @@ public:
     void OnForward(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()
 };
 
@@ -122,10 +122,10 @@ enum
 };
 
 // ----------------------------------------------------------------------------
-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets
 // ----------------------------------------------------------------------------
 
-// the event tables connect the wxWindows events with the functions (event
+// the event tables connect the wxWidgets events with the functions (event
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@ -134,7 +134,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Minimal_Forward, MyFrame::OnForward)
 END_EVENT_TABLE()
 
-// Create a new application object: this macro will allow wxWindows to create
+// Create a new application object: this macro will allow wxWidgets to create
 // the application object during program execution (it's better than using a
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
diff --git a/samples/html/zip/zip.cpp b/samples/html/zip/zip.cpp
index 937f48bd93..00e50693c6 100644
--- a/samples/html/zip/zip.cpp
+++ b/samples/html/zip/zip.cpp
@@ -16,7 +16,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers
+// need because it includes almost all "standard" wxWidgets headers
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
@@ -55,7 +55,7 @@ public:
     void OnForward(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()
 };
 
@@ -73,10 +73,10 @@ enum
 };
 
 // ----------------------------------------------------------------------------
-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets
 // ----------------------------------------------------------------------------
 
-// the event tables connect the wxWindows events with the functions (event
+// the event tables connect the wxWidgets events with the functions (event
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@ -85,7 +85,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Minimal_Forward, MyFrame::OnForward)
 END_EVENT_TABLE()
 
-// Create a new application object: this macro will allow wxWindows to create
+// Create a new application object: this macro will allow wxWidgets to create
 // the application object during program execution (it's better than using a
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
diff --git a/samples/internat/internat.cpp b/samples/internat/internat.cpp
index ba105e911c..0a931caccd 100644
--- a/samples/internat/internat.cpp
+++ b/samples/internat/internat.cpp
@@ -87,7 +87,7 @@ enum
 };
 
 // ----------------------------------------------------------------------------
-// wxWindows macros
+// wxWidgets macros
 // ----------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@ -229,7 +229,7 @@ bool MyApp::OnInit()
 MyFrame::MyFrame(wxLocale& locale)
        : wxFrame(NULL,
                  -1,
-                 _("International wxWindows App"),
+                 _("International wxWidgets App"),
                  wxPoint(50, 50),
                  wxSize(350, 60)),
          m_locale(locale)
diff --git a/samples/ipc/server.cpp b/samples/ipc/server.cpp
index 3e3361041e..18ca3e07d9 100644
--- a/samples/ipc/server.cpp
+++ b/samples/ipc/server.cpp
@@ -165,7 +165,7 @@ IPCDialogBox::IPCDialogBox(wxWindow *parent, const wxString& title,
 
 IPCDialogBox::~IPCDialogBox( )
 {
-    // wxWindows exit code destroys dialog before destroying the connection in
+    // wxWidgets exit code destroys dialog before destroying the connection in
     // OnExit, so make sure connection won't try to delete the dialog later.
     if (m_connection)
         m_connection->dialog = NULL;
diff --git a/samples/keyboard/keyboard.cpp b/samples/keyboard/keyboard.cpp
index d1cb5cf0f5..3b7a8060aa 100644
--- a/samples/keyboard/keyboard.cpp
+++ b/samples/keyboard/keyboard.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        keyboard.cpp
-// Purpose:     Keyboard wxWindows sample
+// Purpose:     Keyboard wxWidgets sample
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     07.04.02
@@ -25,7 +25,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers)
+// need because it includes almost all "standard" wxWidgets headers)
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
@@ -72,7 +72,7 @@ private:
     class TextWindow *m_winText;
     wxListBox *m_lboxLog;
 
-    // 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()
 };
 
@@ -201,10 +201,10 @@ enum
 };
 
 // ----------------------------------------------------------------------------
-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets
 // ----------------------------------------------------------------------------
 
-// the event tables connect the wxWindows events with the functions (event
+// the event tables connect the wxWidgets events with the functions (event
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@ -218,7 +218,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_SIZE(MyFrame::OnSize)
 END_EVENT_TABLE()
 
-// Create a new application object: this macro will allow wxWindows to create
+// Create a new application object: this macro will allow wxWidgets to create
 // the application object during program execution (it's better than using a
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
@@ -237,7 +237,7 @@ IMPLEMENT_APP(MyApp)
 bool MyApp::OnInit()
 {
     // create the main application window
-    MyFrame *frame = new MyFrame(_T("Keyboard wxWindows App"),
+    MyFrame *frame = new MyFrame(_T("Keyboard wxWidgets App"),
                                  wxPoint(50, 50), wxSize(450, 340));
 
     // and show it (the frames, unlike simple controls, are not shown when
@@ -300,7 +300,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
 #if wxUSE_STATUSBAR
     // create a status bar just for fun (by default with 1 pane only)
     CreateStatusBar(2);
-    SetStatusText(_T("Welcome to wxWindows!"));
+    SetStatusText(_T("Welcome to wxWidgets!"));
 #endif // wxUSE_STATUSBAR
 }
 
@@ -314,7 +314,7 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
-    wxString msg = _T("Demonstrates keyboard event processing in wxWindows\n")
+    wxString msg = _T("Demonstrates keyboard event processing in wxWidgets\n")
                    _T("© 2002 Vadim Zeitlin");
 
     wxMessageBox(msg, _T("About wxKeyboard"), wxOK | wxICON_INFORMATION, this);
diff --git a/samples/layout/layout.cpp b/samples/layout/layout.cpp
index ce576a3c1d..ad7d19a860 100644
--- a/samples/layout/layout.cpp
+++ b/samples/layout/layout.cpp
@@ -66,7 +66,7 @@ END_EVENT_TABLE()
 
 // Define my frame constructor
 MyFrame::MyFrame()
-       : wxFrame(NULL, wxID_ANY, _T("wxWindows Layout Demo"),
+       : wxFrame(NULL, wxID_ANY, _T("wxWidgets Layout Demo"),
                  wxDefaultPosition, wxDefaultSize,
                  wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE)
 {
@@ -92,7 +92,7 @@ MyFrame::MyFrame()
   SetMenuBar(menu_bar);
 
   CreateStatusBar(2);
-  SetStatusText(_T("wxWindows layout demo"));
+  SetStatusText(_T("wxWidgets layout demo"));
 
 
   // we want to get a dialog that is stretchable because it
@@ -201,7 +201,7 @@ void MyFrame::TestNotebookSizers(wxCommandEvent& WXUNUSED(event) )
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
 {
-    (void)wxMessageBox(_T("wxWindows GUI library layout demo\n"),
+    (void)wxMessageBox(_T("wxWidgets GUI library layout demo\n"),
             _T("About Layout Demo"), wxOK|wxICON_INFORMATION);
 }
 
diff --git a/samples/listbox/lboxtest.cpp b/samples/listbox/lboxtest.cpp
index 4234791166..751a5a18ce 100644
--- a/samples/listbox/lboxtest.cpp
+++ b/samples/listbox/lboxtest.cpp
@@ -188,7 +188,7 @@ private:
     // the log target we use to redirect messages to the listbox
     wxLog *m_logTarget;
 
-    // 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()
 };
 
diff --git a/samples/mdi/mdi.cpp b/samples/mdi/mdi.cpp
index 203f6f9898..2494bb8234 100644
--- a/samples/mdi/mdi.cpp
+++ b/samples/mdi/mdi.cpp
@@ -211,7 +211,7 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
 {
-    (void)wxMessageBox(_T("wxWindows 2.0 MDI Demo\n")
+    (void)wxMessageBox(_T("wxWidgets 2.0 MDI Demo\n")
                        _T("Author: Julian Smart (c) 1997\n")
                        _T("Usage: mdi.exe"), _T("About MDI Demo"));
 }
diff --git a/samples/memcheck/memcheck.cpp b/samples/memcheck/memcheck.cpp
index 3d4fe1f16b..f27341e8e1 100644
--- a/samples/memcheck/memcheck.cpp
+++ b/samples/memcheck/memcheck.cpp
@@ -78,7 +78,7 @@ bool MyApp::OnInit(void)
   // Make a panel with a message
   wxPanel *panel = new wxPanel(frame);
 
-  (void)new wxStaticText(panel, -1, "Hello, this is a minimal debugging wxWindows program!", wxPoint(10, 10));
+  (void)new wxStaticText(panel, -1, "Hello, this is a minimal debugging wxWidgets program!", wxPoint(10, 10));
 
   // Show the frame
   frame->Show(TRUE);
@@ -121,7 +121,7 @@ END_EVENT_TABLE()
 
 // My frame constructor
 MyFrame::MyFrame(wxFrame *parent):
-  wxFrame(parent, -1, "MemCheck wxWindows Sample", wxPoint(-1, -1), wxSize(400, 200))
+  wxFrame(parent, -1, "MemCheck wxWidgets Sample", wxPoint(-1, -1), wxSize(400, 200))
 {}
 
 // Intercept menu commands
diff --git a/samples/menu/menu.cpp b/samples/menu/menu.cpp
index 16a3b1913d..7d043f321e 100644
--- a/samples/menu/menu.cpp
+++ b/samples/menu/menu.cpp
@@ -347,7 +347,7 @@ bool MyApp::OnInit()
     frame->Show(true);
 
 #if wxUSE_STATUSBAR
-    frame->SetStatusText(_T("Welcome to wxWindows menu sample"));
+    frame->SetStatusText(_T("Welcome to wxWidgets menu sample"));
 #endif // wxUSE_STATUSBAR
 
     SetTopWindow(frame);
@@ -361,7 +361,7 @@ bool MyApp::OnInit()
 
 // Define my frame constructor
 MyFrame::MyFrame()
-       : wxFrame((wxFrame *)NULL, wxID_ANY, _T("wxWindows menu sample"))
+       : wxFrame((wxFrame *)NULL, wxID_ANY, _T("wxWidgets menu sample"))
 {
 #if USE_LOG_WINDOW
     m_textctrl = NULL;
@@ -573,8 +573,8 @@ void MyFrame::OnClearLog(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
-    (void)wxMessageBox(_T("wxWindows menu sample\n© 1999-2001 Vadim Zeitlin"),
-                       _T("About wxWindows menu sample"),
+    (void)wxMessageBox(_T("wxWidgets menu sample\n© 1999-2001 Vadim Zeitlin"),
+                       _T("About wxWidgets menu sample"),
                        wxICON_INFORMATION);
 }
 
diff --git a/samples/mfc/mfctest.cpp b/samples/mfc/mfctest.cpp
index dfeb7b65c1..21cf44f819 100644
--- a/samples/mfc/mfctest.cpp
+++ b/samples/mfc/mfctest.cpp
@@ -1,20 +1,20 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        mfctest.cpp
-// Purpose:     Sample to demonstrate mixing MFC and wxWindows code
+// Purpose:     Sample to demonstrate mixing MFC and wxWidgets code
 // Author:      Julian Smart
 // Id:          $Id$
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-// This sample pops up an initial wxWindows frame, with a menu item
+// This sample pops up an initial wxWidgets frame, with a menu item
 // that allows a new MFC window to be created. Note that CDummyWindow
-// is a class that allows a wxWindows window to be seen as a CWnd
+// is a class that allows a wxWidgets window to be seen as a CWnd
 // for the purposes of specifying a valid main window to the
 // MFC initialisation.
 //
 // You can easily modify this code so that an MFC window pops up
-// initially as the main frame, and allows wxWindows frames to be
+// initially as the main frame, and allows wxWidgets frames to be
 // created subsequently.
 //
 // (1) Make MyApp::OnInit not create a main window.
@@ -32,15 +32,15 @@
 // off some debugging features and also removes the windows.h inclusion
 // in wxprec.h (MFC headers don't like this to have been included previously).
 // Set to 'Use MFC in a shared DLL' or add _AFXDLL to preprocessor settings.
-// Then recompile wxWindows and this sample.
+// Then recompile wxWidgets and this sample.
 //
 // (2) I can't get the sample to link and run using a static MFC library, only the DLL
 // version. Perhaps someone else is a wizard at working out the required settings
 // in the wxWin library and the sample; then debugging the assert problem may be
 // easier.
 //
-// (3) Compiling wxWindows in DLL mode currently includes windows.h, so you must only
-// try linking wxWindows statically.
+// (3) Compiling wxWidgets in DLL mode currently includes windows.h, so you must only
+// try linking wxWidgets statically.
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
@@ -76,7 +76,7 @@
 //
 CTheApp theApp;
 
-// wxWindows elements
+// wxWidgets elements
 
 // Define a new application type
 class MyApp: public wxApp
@@ -168,7 +168,7 @@ void CMainWindow::OnAbout()
 
 void CMainWindow::OnTest()
 {
-    wxMessageBox("This is a wxWindows message box.\nWe're about to create a new wxWindows frame.", "wxWindows", wxOK);
+    wxMessageBox("This is a wxWidgets message box.\nWe're about to create a new wxWidgets frame.", "wxWidgets", wxOK);
     wxGetApp().CreateFrame();
 }
 
@@ -211,8 +211,8 @@ BOOL CTheApp::InitInstance()
     m_pMainWnd->ShowWindow( m_nCmdShow );
     m_pMainWnd->UpdateWindow();
 #else    
-    // Demonstrate creation of an initial wxWindows main window.
-    // Wrap wxWindows window in a dummy MFC window and
+    // Demonstrate creation of an initial wxWidgets main window.
+    // Wrap wxWidgets window in a dummy MFC window and
     // make the main window.
     if (wxTheApp && wxTheApp->GetTopWindow())
     {
@@ -232,7 +232,7 @@ int CTheApp::ExitInstance()
     return CWinApp::ExitInstance();
 }
 
-// Override this to provide wxWindows message loop
+// Override this to provide wxWidgets message loop
 // compatibility
 
 BOOL CTheApp::PreTranslateMessage(MSG *msg)
@@ -252,7 +252,7 @@ BOOL CTheApp::OnIdle(LONG lCount)
 }
 
 /*********************************************************************
-* wxWindows elements
+* wxWidgets elements
 ********************************************************************/
 
 bool MyApp::OnInit(void)
@@ -273,7 +273,7 @@ wxFrame *MyApp::CreateFrame(void)
     MyChild *subframe = new MyChild(NULL, "Canvas Frame", wxPoint(10, 10), wxSize(300, 300),
         wxDEFAULT_FRAME_STYLE);
     
-    subframe->SetTitle("wxWindows canvas frame");
+    subframe->SetTitle("wxWidgets canvas frame");
     
     // Give it a status line
     subframe->CreateStatusBar();
@@ -385,7 +385,7 @@ void MyChild::OnActivate(wxActivateEvent& event)
 }
 
 // Dummy MFC window for specifying a valid main window to MFC, using
-// a wxWindows HWND.
+// a wxWidgets HWND.
 CDummyWindow::CDummyWindow(HWND hWnd):CWnd()
 {
     Attach(hWnd);
diff --git a/samples/mfc/mfctest.h b/samples/mfc/mfctest.h
index dec030d4f9..6bfd7b5269 100644
--- a/samples/mfc/mfctest.h
+++ b/samples/mfc/mfctest.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        mfctest.h
-// Purpose:     Sample to demonstrate mixing MFC and wxWindows code
+// Purpose:     Sample to demonstrate mixing MFC and wxWidgets code
 // Author:      Julian Smart
 // Id:          $Id$
 // Copyright:   (c) Julian Smart
@@ -48,7 +48,7 @@ public:
     BOOL InitInstance();
     int ExitInstance();
 
-    // Override this to provide wxWindows message loop
+    // Override this to provide wxWidgets message loop
     // compatibility
     BOOL PreTranslateMessage(MSG *msg);
     BOOL OnIdle(LONG lCount);
diff --git a/samples/minifram/minifram.cpp b/samples/minifram/minifram.cpp
index e99b132d58..e7a32ad0e6 100644
--- a/samples/minifram/minifram.cpp
+++ b/samples/minifram/minifram.cpp
@@ -37,7 +37,7 @@
 #include "bitmaps/help.xpm"
 
 
-// start wxWindows
+// start wxWidgets
 
 IMPLEMENT_APP(MyApp)
 
diff --git a/samples/minimal/minimal.cpp b/samples/minimal/minimal.cpp
index d78ed2c267..fa6a0067f6 100644
--- a/samples/minimal/minimal.cpp
+++ b/samples/minimal/minimal.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        minimal.cpp
-// Purpose:     Minimal wxWindows sample
+// Purpose:     Minimal wxWidgets sample
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
@@ -25,7 +25,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers)
+// need because it includes almost all "standard" wxWidgets headers)
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
@@ -69,7 +69,7 @@ public:
     void OnAbout(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()
 };
 
@@ -90,10 +90,10 @@ enum
 };
 
 // ----------------------------------------------------------------------------
-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets
 // ----------------------------------------------------------------------------
 
-// the event tables connect the wxWindows events with the functions (event
+// the event tables connect the wxWidgets events with the functions (event
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@ -101,7 +101,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Minimal_About, MyFrame::OnAbout)
 END_EVENT_TABLE()
 
-// Create a new application object: this macro will allow wxWindows to create
+// Create a new application object: this macro will allow wxWidgets to create
 // the application object during program execution (it's better than using a
 // static object for many reasons) and also implements the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
@@ -120,7 +120,7 @@ IMPLEMENT_APP(MyApp)
 bool MyApp::OnInit()
 {
     // create the main application window
-    MyFrame *frame = new MyFrame(_T("Minimal wxWindows App"));
+    MyFrame *frame = new MyFrame(_T("Minimal wxWidgets App"));
 
     // and show it (the frames, unlike simple controls, are not shown when
     // created initially)
@@ -165,7 +165,7 @@ MyFrame::MyFrame(const wxString& title)
 #if wxUSE_STATUSBAR
     // create a status bar just for fun (by default with 1 pane only)
     CreateStatusBar(2);
-    SetStatusText(_T("Welcome to wxWindows!"));
+    SetStatusText(_T("Welcome to wxWidgets!"));
 #endif // wxUSE_STATUSBAR
 }
 
diff --git a/samples/mobile/styles/styles.h b/samples/mobile/styles/styles.h
index b3c5dfafb1..4dbc634360 100644
--- a/samples/mobile/styles/styles.h
+++ b/samples/mobile/styles/styles.h
@@ -11,7 +11,7 @@
     #pragma interface "styles.cpp"
 #endif
 
-// Include wxWindows' headers
+// Include wxWidgets' headers
 
 #ifndef WX_PRECOMP
     #include <wx/wx.h>
diff --git a/samples/mobile/wxedit/wxedit.h b/samples/mobile/wxedit/wxedit.h
index 0f98fcf0f1..de364747d7 100644
--- a/samples/mobile/wxedit/wxedit.h
+++ b/samples/mobile/wxedit/wxedit.h
@@ -11,7 +11,7 @@
     #pragma interface "wxedit.cpp"
 #endif
 
-// Include wxWindows' headers
+// Include wxWidgets' headers
 
 #ifndef WX_PRECOMP
     #include <wx/wx.h>
diff --git a/samples/multimon/multimon_test.cpp b/samples/multimon/multimon_test.cpp
index a3fb1f938b..abd36929a7 100644
--- a/samples/multimon/multimon_test.cpp
+++ b/samples/multimon/multimon_test.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     06/21/02
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
+// Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/samples/nativdlg/nativdlg.cpp b/samples/nativdlg/nativdlg.cpp
index 1ab4ea4940..b8690da633 100644
--- a/samples/nativdlg/nativdlg.cpp
+++ b/samples/nativdlg/nativdlg.cpp
@@ -42,7 +42,7 @@ MyApp::MyApp()
 bool MyApp::OnInit(void)
 {
   // Create the main frame window
-  MyFrame   *frame = new MyFrame(NULL, wxID_ANY, _T("wxWindows Native Dialog Sample"), wxPoint(0, 0), wxSize(300, 250));
+  MyFrame   *frame = new MyFrame(NULL, wxID_ANY, _T("wxWidgets Native Dialog Sample"), wxPoint(0, 0), wxSize(300, 250));
 
   // Give it a status line
   frame->CreateStatusBar(2);
diff --git a/samples/notebook/notebook.cpp b/samples/notebook/notebook.cpp
index 71caa697f2..251b694278 100644
--- a/samples/notebook/notebook.cpp
+++ b/samples/notebook/notebook.cpp
@@ -5,7 +5,7 @@
 // Modified by: Dimitri Schoolwerth
 // Created:     26/10/98
 // RCS-ID:      $Id$
-// Copyright:   (c) 1998-2002 wxWindows team
+// Copyright:   (c) 1998-2002 wxWidgets team
 // License:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/samples/notebook/notebook.h b/samples/notebook/notebook.h
index 59e67f49f1..c79f79f980 100644
--- a/samples/notebook/notebook.h
+++ b/samples/notebook/notebook.h
@@ -5,7 +5,7 @@
 // Modified by: Dimitri Schoolwerth
 // Created:     25/10/98
 // RCS-ID:      $Id$
-// Copyright:   (c) 1998-2002 wxWindows team
+// Copyright:   (c) 1998-2002 wxWidgets team
 // License:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/samples/oleauto/oleauto.cpp b/samples/oleauto/oleauto.cpp
index 1297437a4b..43e7fedd58 100644
--- a/samples/oleauto/oleauto.cpp
+++ b/samples/oleauto/oleauto.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        oleauto.cpp
-// Purpose:     OLE Automation wxWindows sample
+// Purpose:     OLE Automation wxWidgets sample
 // Author:      Julian Smart
 // Modified by:
 // Created:     08/12/98
@@ -29,7 +29,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers
+// need because it includes almost all "standard" wxWidgets headers
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
@@ -82,7 +82,7 @@ public:
     void OnTest(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()
 };
 
@@ -103,10 +103,10 @@ enum
 };
 
 // ----------------------------------------------------------------------------
-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets
 // ----------------------------------------------------------------------------
 
-// the event tables connect the wxWindows events with the functions (event
+// the event tables connect the wxWidgets events with the functions (event
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@ -115,7 +115,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(OleAuto_Test, MyFrame::OnTest)
 END_EVENT_TABLE()
 
-// Create a new application object: this macro will allow wxWindows to create
+// Create a new application object: this macro will allow wxWidgets to create
 // the application object during program execution (it's better than using a
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
@@ -134,7 +134,7 @@ IMPLEMENT_APP(MyApp)
 bool MyApp::OnInit()
 {
     // Create the main application window
-    MyFrame *frame = new MyFrame(_T("OleAuto wxWindows App"),
+    MyFrame *frame = new MyFrame(_T("OleAuto wxWidgets App"),
                                  wxPoint(50, 50), wxSize(450, 340));
 
     // Show it and tell the application that it's our main window
@@ -176,7 +176,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 
     // create a status bar just for fun (by default with 1 pane only)
     CreateStatusBar(2);
-    SetStatusText(_T("Welcome to wxWindows!"));
+    SetStatusText(_T("Welcome to wxWidgets!"));
 }
 
 
@@ -199,7 +199,7 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
  */
 void MyFrame::OnTest(wxCommandEvent& WXUNUSED(event))
 {
-    wxMessageBox(_T("Please ensure Excel is running, then press OK.\nThe active cell should then say 'wxWindows automation test!' in bold."));
+    wxMessageBox(_T("Please ensure Excel is running, then press OK.\nThe active cell should then say 'wxWidgets automation test!' in bold."));
 
     wxAutomationObject excelObject, rangeObject;
     if (!excelObject.GetInstance(_T("Excel.Application")))
@@ -210,7 +210,7 @@ void MyFrame::OnTest(wxCommandEvent& WXUNUSED(event))
             return;
         }
     }
-    if (!excelObject.PutProperty(_T("ActiveCell.Value"), _T("wxWindows automation test!")))
+    if (!excelObject.PutProperty(_T("ActiveCell.Value"), _T("wxWidgets automation test!")))
     {
         wxMessageBox(_T("Could not set active cell value."));
         return;
diff --git a/samples/opengl/cube/cube.cpp b/samples/opengl/cube/cube.cpp
index 41ef971a99..19a3bfa236 100644
--- a/samples/opengl/cube/cube.cpp
+++ b/samples/opengl/cube/cube.cpp
@@ -61,7 +61,7 @@ public:
 
 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()
 };
 
@@ -451,7 +451,7 @@ void MyFrame::OnExit( wxCommandEvent& WXUNUSED(event) )
 
 /*static*/ MyFrame *MyFrame::Create(MyFrame *parentFrame, bool isCloneWindow)
 {
-    wxString str = wxT("wxWindows OpenGL Cube Sample");
+    wxString str = wxT("wxWidgets OpenGL Cube Sample");
     if (isCloneWindow) str += wxT(" - Clone");
 
     MyFrame *frame = new MyFrame(NULL, str, wxDefaultPosition,
diff --git a/samples/opengl/isosurf/isosurf.cpp b/samples/opengl/isosurf/isosurf.cpp
index 3eda7123bb..1489b7f958 100644
--- a/samples/opengl/isosurf/isosurf.cpp
+++ b/samples/opengl/isosurf/isosurf.cpp
@@ -238,7 +238,7 @@ static GLenum Args(int argc, wxChar **argv)
     return GL_TRUE;
 }
 
-// The following part was written for wxWindows 1.66
+// The following part was written for wxWidgets 1.66
 MyFrame *frame = NULL;
 
 IMPLEMENT_APP(MyApp)
@@ -249,7 +249,7 @@ bool MyApp::OnInit()
     Args(argc, argv);
 
     // Create the main frame window
-    frame = new MyFrame(NULL, wxT("wxWindows OpenGL Isosurf Sample"),
+    frame = new MyFrame(NULL, wxT("wxWidgets OpenGL Isosurf Sample"),
         wxDefaultPosition, wxDefaultSize);
 
     // Give it an icon
diff --git a/samples/opengl/penguin/penguin.cpp b/samples/opengl/penguin/penguin.cpp
index 21e8b28c25..9fbdd65761 100644
--- a/samples/opengl/penguin/penguin.cpp
+++ b/samples/opengl/penguin/penguin.cpp
@@ -43,7 +43,7 @@ bool MyApp::OnInit()
 {
 
     // Create the main frame window
-    MyFrame *frame = new MyFrame(NULL, wxT("wxWindows OpenGL Penguin Sample"),
+    MyFrame *frame = new MyFrame(NULL, wxT("wxWidgets OpenGL Penguin Sample"),
         wxDefaultPosition, wxDefaultSize);
 
     /* Make a menubar */
diff --git a/samples/ownerdrw/ownerdrw.cpp b/samples/ownerdrw/ownerdrw.cpp
index 79aa7c65e4..a4e4f3b24c 100644
--- a/samples/ownerdrw/ownerdrw.cpp
+++ b/samples/ownerdrw/ownerdrw.cpp
@@ -89,7 +89,7 @@ IMPLEMENT_APP(OwnerDrawnApp);
 bool OwnerDrawnApp::OnInit(void)
 {
     OwnerDrawnFrame *pFrame
-        = new OwnerDrawnFrame(NULL, _T("wxWindows Ownerdraw Sample"),
+        = new OwnerDrawnFrame(NULL, _T("wxWidgets Ownerdraw Sample"),
                               50, 50, 450, 340);
 
     SetTopWindow(pFrame);
diff --git a/samples/png/pngdemo.cpp b/samples/png/pngdemo.cpp
index 989b005dc1..8c5113de13 100644
--- a/samples/png/pngdemo.cpp
+++ b/samples/png/pngdemo.cpp
@@ -68,7 +68,7 @@ bool MyApp::OnInit(void)
 
   frame->Show(TRUE);
 
-  frame->SetStatusText(_T("Hello, wxWindows"));
+  frame->SetStatusText(_T("Hello, wxWidgets"));
 
   return TRUE;
 }
diff --git a/samples/printing/printing.cpp b/samples/printing/printing.cpp
index 8e5477c0af..8e5d2f0526 100644
--- a/samples/printing/printing.cpp
+++ b/samples/printing/printing.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        printing.cpp
-// Purpose:     Printing demo for wxWindows
+// Purpose:     Printing demo for wxWidgets
 // Author:      Julian Smart
 // Modified by:
 // Created:     1995
@@ -80,7 +80,7 @@ bool MyApp::OnInit(void)
     g_pageSetupData = new wxPageSetupDialogData;
 
     // Create the main frame window
-    frame = new MyFrame((wxFrame *) NULL, _T("wxWindows Printing Demo"), wxPoint(0, 0), wxSize(400, 400));
+    frame = new MyFrame((wxFrame *) NULL, _T("wxWidgets Printing Demo"), wxPoint(0, 0), wxSize(400, 400));
 
     // Give it a status line
     frame->CreateStatusBar(2);
@@ -282,8 +282,8 @@ void MyFrame::OnPageSetupPS(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnPrintAbout(wxCommandEvent& WXUNUSED(event))
 {
-    (void)wxMessageBox(_T("wxWindows printing demo\nAuthor: Julian Smart"),
-        _T("About wxWindows printing demo"), wxOK|wxCENTRE);
+    (void)wxMessageBox(_T("wxWidgets printing demo\nAuthor: Julian Smart"),
+        _T("About wxWidgets printing demo"), wxOK|wxCENTRE);
 }
 
 void MyFrame::Draw(wxDC& dc)
diff --git a/samples/printing/printing.h b/samples/printing/printing.h
index 88eabd66fb..8361d5a882 100644
--- a/samples/printing/printing.h
+++ b/samples/printing/printing.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        printing.h
-// Purpose:     Printing demo for wxWindows
+// Purpose:     Printing demo for wxWidgets
 // Author:      Julian Smart
 // Modified by:
 // Created:     1995
diff --git a/samples/propsize/propsize.cpp b/samples/propsize/propsize.cpp
index ac01949d32..8d514444ca 100644
--- a/samples/propsize/propsize.cpp
+++ b/samples/propsize/propsize.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        propsize.cpp
-// Purpose:     wxWindows propsize sample
+// Purpose:     wxWidgets propsize sample
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
@@ -29,7 +29,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers
+// need because it includes almost all "standard" wxWidgets headers
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
@@ -73,7 +73,7 @@ public:
     void OnAbout(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()
 };
 
@@ -89,10 +89,10 @@ enum
 };
 
 // ----------------------------------------------------------------------------
-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets
 // ----------------------------------------------------------------------------
 
-// the event tables connect the wxWindows events with the functions (event
+// the event tables connect the wxWidgets events with the functions (event
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@ -100,7 +100,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(wxID_ABOUT, MyFrame::OnAbout)
 END_EVENT_TABLE()
 
-// Create a new application object: this macro will allow wxWindows to create
+// Create a new application object: this macro will allow wxWidgets to create
 // the application object during program execution (it's better than using a
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
diff --git a/samples/regtest/regtest.cpp b/samples/regtest/regtest.cpp
index d584c7b05a..d420cd8c47 100644
--- a/samples/regtest/regtest.cpp
+++ b/samples/regtest/regtest.cpp
@@ -398,7 +398,7 @@ void RegFrame::OnTest(wxCommandEvent& WXUNUSED(event))
 
 void RegFrame::OnGoTo(wxCommandEvent& WXUNUSED(event))
 {
-    static wxString s_location = _T("HKEY_CURRENT_USER\\Software\\wxWindows");
+    static wxString s_location = _T("HKEY_CURRENT_USER\\Software\\wxWidgets");
 
     wxString location = wxGetTextFromUser(
         _T("Enter the location to go to:"),
diff --git a/samples/render/renddll.cpp b/samples/render/renddll.cpp
index b0dbd69400..3a611ab099 100644
--- a/samples/render/renddll.cpp
+++ b/samples/render/renddll.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     04.08.03
 // RCS-ID:      $Id$
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/samples/render/render.cpp b/samples/render/render.cpp
index b14b0ffc18..5d8a38081f 100644
--- a/samples/render/render.cpp
+++ b/samples/render/render.cpp
@@ -1,11 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        render.cpp
-// Purpose:     Render wxWindows sample
+// Purpose:     Render wxWidgets sample
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     04.08.03
 // RCS-ID:      $Id$
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -78,7 +78,7 @@ class MyTraits : public wxGUIAppTraits
 {
     virtual wxRendererNative *CreateRenderer()
     {
-        // it will be deleted on program shutdown by wxWindows itself
+        // it will be deleted on program shutdown by wxWidgets itself
         return new MyRenderer;
     }
 };
@@ -110,7 +110,7 @@ public:
 private:
     wxPanel *m_panel;
 
-    // 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()
 };
 
@@ -159,10 +159,10 @@ enum
 };
 
 // ----------------------------------------------------------------------------
-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets
 // ----------------------------------------------------------------------------
 
-// the event tables connect the wxWindows events with the functions (event
+// the event tables connect the wxWidgets events with the functions (event
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@ -173,7 +173,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Render_About, MyFrame::OnAbout)
 END_EVENT_TABLE()
 
-// Create a new application object: this macro will allow wxWindows to create
+// Create a new application object: this macro will allow wxWidgets to create
 // the application object during program execution (it's better than using a
 // static object for many reasons) and also implements the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
@@ -205,7 +205,7 @@ bool MyApp::OnInit()
 MyFrame::MyFrame()
        : wxFrame(NULL,
                  -1,
-                 _T("Render wxWindows Sample"),
+                 _T("Render wxWidgets Sample"),
                  wxPoint(50, 50),
                  wxSize(450, 340))
 {
@@ -237,7 +237,7 @@ MyFrame::MyFrame()
 #if wxUSE_STATUSBAR
     // create a status bar just for fun (by default with 1 pane only)
     CreateStatusBar(2);
-    SetStatusText(_T("Welcome to wxWindows!"));
+    SetStatusText(_T("Welcome to wxWidgets!"));
 #endif // wxUSE_STATUSBAR
 
     Show();
@@ -258,7 +258,7 @@ void MyFrame::OnLoad(wxCommandEvent& WXUNUSED(event))
     wxString name = wxGetTextFromUser
                     (
                         _T("Name of the renderer to load:"),
-                        _T("Render wxWindows Sample"),
+                        _T("Render wxWidgets Sample"),
                         s_name,
                         this
                     );
@@ -314,7 +314,7 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
     wxMessageBox(_T("Render sample shows how to use custom renderers.\n")
                  _T("\n")
                  _T("© 2003 Vadim Zeitlin"),
-                 _T("About Render wxWindows Sample"),
+                 _T("About Render wxWidgets Sample"),
                  wxOK | wxICON_INFORMATION, this);
 }
 
diff --git a/samples/richedit/wxLayout.cpp b/samples/richedit/wxLayout.cpp
index 5ed2b19b31..a709885965 100644
--- a/samples/richedit/wxLayout.cpp
+++ b/samples/richedit/wxLayout.cpp
@@ -434,7 +434,7 @@ void MyFrame::OnCommand( wxCommandEvent &event )
         // VZ: this doesn't work, of course, but I think it should -
         //     wxLayoutWindow should have a flag m_highlightUrls and do it itself
         //     (instead of doing it manually like M does now)
-        m_lwin->GetLayoutList()->Insert(_T("http://www.wxwindows.org/"));
+        m_lwin->GetLayoutList()->Insert(_T("http://www.wxwidgets.org/"));
         m_lwin->Refresh();
     }
 };
@@ -577,7 +577,7 @@ bool MyApp::OnInit()
    wxFrame *frame = new MyFrame();
    wxInitAllImageHandlers();
    frame->Show( true );
-//   wxSetAFMPath("/usr/local/src/wxWindows/misc/afm/");
+//   wxSetAFMPath("/usr/local/src/wxWidgets/misc/afm/");
    return true;
 };
 
diff --git a/samples/richedit/wxllist.cpp b/samples/richedit/wxllist.cpp
index bc00fa710e..89d04ce7f9 100644
--- a/samples/richedit/wxllist.cpp
+++ b/samples/richedit/wxllist.cpp
@@ -3341,7 +3341,7 @@ bool wxLayoutPrintout::HasPage(int pageNum)
 }
 
 /*
-  Stupid wxWindows doesn't draw proper ellipses, so we comment this
+  Stupid wxWidgets doesn't draw proper ellipses, so we comment this
   out. It's a waste of paper anyway.
 */
 #if 0
diff --git a/samples/richedit/wxllist.h b/samples/richedit/wxllist.h
index 5263acd334..ff7990cbc0 100644
--- a/samples/richedit/wxllist.h
+++ b/samples/richedit/wxllist.h
@@ -1,5 +1,5 @@
 /*-*- c++ -*-********************************************************
- * wxLayoutList.h - a formatted text rendering engine for wxWindows *
+ * wxLayoutList.h - a formatted text rendering engine for wxWidgets *
  *                                                                  *
  * (C) 1999-2000 by Karsten Ballüder (ballueder@gmx.net)            *
  *                                                                  *
@@ -32,7 +32,7 @@
 #   include "MObject.h"
 #endif
 
-// use the wxWindows caret class instead of home grown cursor whenever possible
+// use the wxWidgets caret class instead of home grown cursor whenever possible
 #ifdef __WXMSW__
 #   undef WXLAYOUT_USE_CARET
 #   define WXLAYOUT_USE_CARET 1
@@ -1393,12 +1393,12 @@ public:
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 
-   The wxLayoutPrintout object for printing within the wxWindows print
+   The wxLayoutPrintout object for printing within the wxWidgets print
    framework.
 
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /** This class implements a wxPrintout for printing a wxLayoutList within
-    the wxWindows printing framework.
+    the wxWidgets printing framework.
  */
 class wxLayoutPrintout: public wxPrintout
 {
@@ -1425,7 +1425,7 @@ public:
     */
     bool HasPage(int page);
 
-    /** Gets called from wxWindows to find out which pages are existing.
+    /** Gets called from wxWidgets to find out which pages are existing.
         I'm not totally sure about the parameters though.
         @param minPage the first page in the document
         @param maxPage the last page in the document
diff --git a/samples/rotate/rotate.cpp b/samples/rotate/rotate.cpp
index 3a11213e83..7322687973 100644
--- a/samples/rotate/rotate.cpp
+++ b/samples/rotate/rotate.cpp
@@ -102,7 +102,7 @@ bool MyApp::OnInit()
         return FALSE;
     }
 
-    MyFrame *frame = new MyFrame (_T("wxWindows rotate sample"),
+    MyFrame *frame = new MyFrame (_T("wxWidgets rotate sample"),
                                   wxPoint(20,20), wxSize(600,450));
 
     frame->Show (TRUE);
@@ -133,7 +133,7 @@ void MyFrame::OnAngle (wxCommandEvent &)
     long degrees = (long)((180*m_angle)/M_PI);
     degrees = wxGetNumberFromUser(_T("Change the image rotation angle"),
                                   _T("Angle in degrees:"),
-                                  _T("wxWindows rotate sample"),
+                                  _T("wxWidgets rotate sample"),
                                   degrees,
                                   -180, +180,
                                   this);
diff --git a/samples/sashtest/sashtest.cpp b/samples/sashtest/sashtest.cpp
index e25e124b3f..2ae188a8aa 100644
--- a/samples/sashtest/sashtest.cpp
+++ b/samples/sashtest/sashtest.cpp
@@ -160,7 +160,7 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
-      (void)wxMessageBox(_T("wxWindows 2.0 Sash Demo\nAuthor: Julian Smart (c) 1998"), _T("About Sash Demo"));
+      (void)wxMessageBox(_T("wxWidgets 2.0 Sash Demo\nAuthor: Julian Smart (c) 1998"), _T("About Sash Demo"));
 }
 
 void MyFrame::OnToggleWindow(wxCommandEvent& WXUNUSED(event))
diff --git a/samples/shaped/shaped.cpp b/samples/shaped/shaped.cpp
index a79b97abbf..ceebc8c6f0 100644
--- a/samples/shaped/shaped.cpp
+++ b/samples/shaped/shaped.cpp
@@ -85,16 +85,16 @@ private:
     wxBitmap m_bmp;
     wxPoint  m_delta;
 
-    // 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
 // ----------------------------------------------------------------------------
 
-// the event tables connect the wxWindows events with the functions (event
+// the event tables connect the wxWidgets events with the functions (event
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(ShapedFrame, wxFrame)
@@ -112,7 +112,7 @@ BEGIN_EVENT_TABLE(ShapedFrame, wxFrame)
 END_EVENT_TABLE()
 
 
-// Create a new application object: this macro will allow wxWindows to create
+// Create a new application object: this macro will allow wxWidgets to create
 // the application object during program execution (it's better than using a
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
diff --git a/samples/sockets/client.cpp b/samples/sockets/client.cpp
index 17781498d8..e450f4fd9d 100644
--- a/samples/sockets/client.cpp
+++ b/samples/sockets/client.cpp
@@ -98,7 +98,7 @@ private:
   wxMenuBar      *m_menuBar;
   bool            m_busy;
 
-  // 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()
 };
 
@@ -125,7 +125,7 @@ enum
 };
 
 // --------------------------------------------------------------------------
-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets
 // --------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@ -419,7 +419,7 @@ void MyFrame::OnTest2(wxCommandEvent& WXUNUSED(event))
   wxString s = wxGetTextFromUser(
     _("Enter an arbitrary string to send to the server:"),
     _("Test 2 ..."),
-    _("Yes I like wxWindows!"));
+    _("Yes I like wxWidgets!"));
 
   msg1 = s.c_str();
   len  = (wxStrlen(msg1) + 1) * sizeof(wxChar);
diff --git a/samples/sockets/server.cpp b/samples/sockets/server.cpp
index ac8a2dd3f0..39245c3e6d 100644
--- a/samples/sockets/server.cpp
+++ b/samples/sockets/server.cpp
@@ -84,7 +84,7 @@ private:
   bool            m_busy;
   int             m_numClients;
 
-  // 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()
 };
 
@@ -105,7 +105,7 @@ enum
 };
 
 // --------------------------------------------------------------------------
-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets
 // --------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
diff --git a/samples/sound/sound.cpp b/samples/sound/sound.cpp
index 985db5ee52..6c50b7c3f9 100644
--- a/samples/sound/sound.cpp
+++ b/samples/sound/sound.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        sound.cpp
-// Purpose:     Example of sound playing in wxWindows
+// Purpose:     Example of sound playing in wxWidgets
 // Author:      Vaclav Slavik
 // Modified by:
 // Created:     2004/01/29
@@ -16,7 +16,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers)
+// need because it includes almost all "standard" wxWidgets headers)
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/frame.h"
@@ -77,7 +77,7 @@ private:
     wxString    m_soundFile;
     wxTextCtrl* m_tc;
     
-    // 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()
 };
 
@@ -99,10 +99,10 @@ enum
 };
 
 // ----------------------------------------------------------------------------
-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets
 // ----------------------------------------------------------------------------
 
-// the event tables connect the wxWindows events with the functions (event
+// the event tables connect the wxWidgets events with the functions (event
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@ -115,7 +115,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Sound_PlayLoop,         MyFrame::OnPlayLoop)
 END_EVENT_TABLE()
 
-// Create a new application object: this macro will allow wxWindows to create
+// Create a new application object: this macro will allow wxWidgets to create
 // the application object during program execution (it's better than using a
 // static object for many reasons) and also implements the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
@@ -134,7 +134,7 @@ IMPLEMENT_APP(MyApp)
 bool MyApp::OnInit()
 {
     // create the main application window
-    MyFrame *frame = new MyFrame(_T("wxWindows Sound Sample"));
+    MyFrame *frame = new MyFrame(_T("wxWidgets Sound Sample"));
 
     // and show it (the frames, unlike simple controls, are not shown when
     // created initially)
diff --git a/samples/statbar/statbar.cpp b/samples/statbar/statbar.cpp
index df98791d5f..c6c1ddb2be 100644
--- a/samples/statbar/statbar.cpp
+++ b/samples/statbar/statbar.cpp
@@ -162,7 +162,7 @@ private:
     wxStatusBar *m_statbarDefault;
     MyStatusBar *m_statbarCustom;
 
-    // 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()
 };
 
@@ -193,10 +193,10 @@ static const int BITMAP_SIZE_X = 32;
 static const int BITMAP_SIZE_Y = 15;
 
 // ----------------------------------------------------------------------------
-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets
 // ----------------------------------------------------------------------------
 
-// the event tables connect the wxWindows events with the functions (event
+// the event tables connect the wxWidgets events with the functions (event
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 #ifdef USE_MDI_PARENT_FRAME
@@ -220,7 +220,7 @@ BEGIN_EVENT_TABLE(MyStatusBar, wxStatusBar)
     EVT_TIMER(wxID_ANY, MyStatusBar::OnTimer)
 END_EVENT_TABLE()
 
-// Create a new application object: this macro will allow wxWindows to create
+// Create a new application object: this macro will allow wxWidgets to create
 // the application object during program execution (it's better than using a
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
@@ -300,7 +300,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     // create default status bar to start with
     CreateStatusBar(2);
     m_statbarKind = StatBar_Default;
-    SetStatusText(_T("Welcome to wxWindows!"));
+    SetStatusText(_T("Welcome to wxWidgets!"));
 
     m_statbarDefault = GetStatusBar();
 }
@@ -363,7 +363,7 @@ void MyFrame::OnSetStatusFields(wxCommandEvent& WXUNUSED(event))
                    (
                     _T("Select the number of fields in the status bar"),
                     _T("Fields:"),
-                    _T("wxWindows statusbar sample"),
+                    _T("wxWidgets statusbar sample"),
                     sb->GetFieldsCount(),
                     1, 5,
                     this
@@ -431,7 +431,7 @@ void MyFrame::OnStatusBarToggle(wxCommandEvent& WXUNUSED(event))
         DoCreateStatusBar(m_statbarKind);
     }
 #ifdef __WXMSW__
-    // The following is a kludge suggested by Vadim Zeitlin (one of the wxWindows
+    // The following is a kludge suggested by Vadim Zeitlin (one of the wxWidgets
     // authors) while we look for a proper fix..
 //    SendSizeEvent();
 #endif
diff --git a/samples/stc/defsext.h b/samples/stc/defsext.h
index eb55caf94a..70d53c8213 100644
--- a/samples/stc/defsext.h
+++ b/samples/stc/defsext.h
@@ -15,7 +15,7 @@
 // headers
 //----------------------------------------------------------------------------
 
-//! wxWindows headers
+//! wxWidgets headers
 #include <wx/print.h>    // printing support
 #include <wx/printdlg.h> // printing dialog
 
diff --git a/samples/stc/edit.cpp b/samples/stc/edit.cpp
index 8c5393cd87..5a233bf158 100644
--- a/samples/stc/edit.cpp
+++ b/samples/stc/edit.cpp
@@ -25,12 +25,12 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all 'standard' wxWindows headers)
+// need because it includes almost all 'standard' wxWidgets headers)
 #ifndef WX_PRECOMP
     #include <wx/wx.h>
 #endif
 
-//! wxWindows headers
+//! wxWidgets headers
 #include <wx/file.h>     // raw file io support
 #include <wx/filename.h> // filename support
 
diff --git a/samples/stc/edit.h b/samples/stc/edit.h
index 0a4cbf4aba..22d5c8cac3 100644
--- a/samples/stc/edit.h
+++ b/samples/stc/edit.h
@@ -20,9 +20,9 @@
 // headers
 //----------------------------------------------------------------------------
 
-//! wxWindows headers
+//! wxWidgets headers
 
-//! wxWindows/contrib headers
+//! wxWidgets/contrib headers
 #include <wx/stc/stc.h>  // styled text control
 
 //! application headers
diff --git a/samples/stc/prefs.cpp b/samples/stc/prefs.cpp
index 2ef7735318..15f8c0b46c 100644
--- a/samples/stc/prefs.cpp
+++ b/samples/stc/prefs.cpp
@@ -20,14 +20,14 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all 'standard' wxWindows headers)
+// need because it includes almost all 'standard' wxWidgets headers)
 #ifndef WX_PRECOMP
     #include <wx/wx.h>
 #endif
 
-//! wxWindows headers
+//! wxWidgets headers
 
-//! wxWindows/contrib headers
+//! wxWidgets/contrib headers
 
 //! application headers
 #include "defsext.h"     // Additional definitions
diff --git a/samples/stc/prefs.h b/samples/stc/prefs.h
index 523362545c..b17ad6de7e 100644
--- a/samples/stc/prefs.h
+++ b/samples/stc/prefs.h
@@ -20,9 +20,9 @@
 // headers
 //----------------------------------------------------------------------------
 
-//! wxWindows headers
+//! wxWidgets headers
 
-//! wxWindows/contrib headers
+//! wxWidgets/contrib headers
 #include <wx/stc/stc.h>  // styled text control
 
 //! application headers
diff --git a/samples/stc/stctest.cpp b/samples/stc/stctest.cpp
index 9cc5cc88fa..636934d79c 100644
--- a/samples/stc/stctest.cpp
+++ b/samples/stc/stctest.cpp
@@ -20,12 +20,12 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all 'standard' wxWindows headers)
+// need because it includes almost all 'standard' wxWidgets headers)
 #ifndef WX_PRECOMP
     #include <wx/wx.h>
 #endif
 
-//! wxWindows headers
+//! wxWidgets headers
 #include <wx/config.h>   // configuration support
 #include <wx/filedlg.h>  // file dialog support
 #include <wx/filename.h> // filename support
@@ -57,14 +57,14 @@
 #define APP_DESCR _("See http://wxguide.sourceforge.net/")
 
 #define APP_MAINT _T("Otto Wyss")
-#define APP_VENDOR _T("wxWindows")
+#define APP_VENDOR _T("wxWidgets")
 #define APP_COPYRIGTH _T("(C) 2003 Otto Wyss")
-#define APP_LICENCE _T("wxWindows")
+#define APP_LICENCE _T("wxWidgets")
 
 #define APP_VERSION _T("0.1.alpha")
 #define APP_BUILD __DATE__
 
-#define APP_WEBSITE _T("http://www.wxWindows.org")
+#define APP_WEBSITE _T("http://www.wxWidgets.org")
 #define APP_MAIL _T("mailto://???")
 
 #define NONAME _("<untitled>")
@@ -99,7 +99,7 @@ private:
 
 };
 
-// created dynamically by wxWindows
+// created dynamically by wxWidgets
 DECLARE_APP (App);
 
 //----------------------------------------------------------------------------
diff --git a/samples/svg/svgtest.cpp b/samples/svg/svgtest.cpp
index 56882fb677..45de9ffca6 100644
--- a/samples/svg/svgtest.cpp
+++ b/samples/svg/svgtest.cpp
@@ -252,7 +252,7 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
 {
-    (void)wxMessageBox(wxT("wxWindows 2.0 SVG 1.0 Test\n")
+    (void)wxMessageBox(wxT("wxWidgets 2.0 SVG 1.0 Test\n")
         wxT("Author: Chris Elliott (c) 2002\n")
         wxT("Usage: svg.exe \nClick File | New to show tests\n\n"), wxT("About SVG Test"));
 }
diff --git a/samples/taskbar/tbtest.cpp b/samples/taskbar/tbtest.cpp
index e7be15d9b3..131f17b38e 100644
--- a/samples/taskbar/tbtest.cpp
+++ b/samples/taskbar/tbtest.cpp
@@ -122,7 +122,7 @@ void MyTaskBarIcon::OnMenuExit(wxCommandEvent& )
 {
     dialog->Close(true);
 
-    // Nudge wxWindows into destroying the dialog, since
+    // Nudge wxWidgets into destroying the dialog, since
     // with a hidden window no messages will get sent to put
     // it into idle processing.
     wxGetApp().ProcessIdle();
diff --git a/samples/text/text.cpp b/samples/text/text.cpp
index 3f69987957..880995866e 100644
--- a/samples/text/text.cpp
+++ b/samples/text/text.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        text.cpp
-// Purpose:     TextCtrl wxWindows sample
+// Purpose:     TextCtrl wxWidgets sample
 // Author:      Robert Roebling
 // Modified by:
 // RCS-ID:      $Id$
@@ -347,7 +347,7 @@ bool MyApp::OnInit()
 {
     // Create the main frame window
     MyFrame *frame = new MyFrame((wxFrame *) NULL,
-            _T("Text wxWindows sample"), 50, 50, 700, 420);
+            _T("Text wxWidgets sample"), 50, 50, 700, 420);
     frame->SetSizeHints( 500, 400 );
 
     wxMenu *file_menu = new wxMenu;
diff --git a/samples/thread/thread.cpp b/samples/thread/thread.cpp
index 61006e25a4..76965a7664 100644
--- a/samples/thread/thread.cpp
+++ b/samples/thread/thread.cpp
@@ -1,11 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        thread.cpp
-// Purpose:     wxWindows thread sample
+// Purpose:     wxWidgets thread sample
 // Author:      Guilhem Lavaux, Vadim Zeitlin
 // Modified by:
 // Created:     06/16/98
 // RCS-ID:      $Id$
-// Copyright:   (c) 1998-2002 wxWindows team
+// Copyright:   (c) 1998-2002 wxWidgets team
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
@@ -370,7 +370,7 @@ bool MyApp::OnInit()
     //wxLog::AddTraceMask("thread");
 
     // Create the main frame window
-    MyFrame *frame = new MyFrame((wxFrame *)NULL, _T("wxWindows threads sample"),
+    MyFrame *frame = new MyFrame((wxFrame *)NULL, _T("wxWidgets threads sample"),
                                  50, 50, 450, 340);
 
     // Make a menubar
@@ -691,7 +691,7 @@ void MyFrame::OnShowCPUs(wxCommandEvent& WXUNUSED(event))
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
 {
     wxMessageDialog dialog(this,
-                           _T("wxWindows multithreaded application sample\n")
+                           _T("wxWidgets multithreaded application sample\n")
                            _T("(c) 1998 Julian Smart, Guilhem Lavaux\n")
                            _T("(c) 1999 Vadim Zeitlin\n")
                            _T("(c) 2000 Robert Roebling"),
diff --git a/samples/toolbar/toolbar.cpp b/samples/toolbar/toolbar.cpp
index 4699c18703..6915f9828e 100644
--- a/samples/toolbar/toolbar.cpp
+++ b/samples/toolbar/toolbar.cpp
@@ -265,7 +265,7 @@ bool MyApp::OnInit()
 
     frame->Show(TRUE);
 
-    frame->SetStatusText(_T("Hello, wxWindows"));
+    frame->SetStatusText(_T("Hello, wxWidgets"));
 
     SetTopWindow(frame);
 
@@ -596,7 +596,7 @@ void MyFrame::OnAbout(wxCommandEvent& event)
     else
         m_textWindow->WriteText( _T("Help button up now.\n") );
 
-    (void)wxMessageBox(_T("wxWindows toolbar sample"), _T("About wxToolBar"));
+    (void)wxMessageBox(_T("wxWidgets toolbar sample"), _T("About wxToolBar"));
 }
 
 void MyFrame::OnToolLeftClick(wxCommandEvent& event)
diff --git a/samples/typetest/typetest.cpp b/samples/typetest/typetest.cpp
index 695f8fec2b..c239c2946b 100644
--- a/samples/typetest/typetest.cpp
+++ b/samples/typetest/typetest.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        typetest.cpp
-// Purpose:     Types wxWindows sample
+// Purpose:     Types wxWidgets sample
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
@@ -74,7 +74,7 @@ END_EVENT_TABLE()
 bool MyApp::OnInit()
 {
     // Create the main frame window
-    MyFrame *frame = new MyFrame((wxFrame *) NULL, _T("wxWindows Types Demo"),
+    MyFrame *frame = new MyFrame((wxFrame *) NULL, _T("wxWidgets Types Demo"),
                                  wxPoint(50, 50), wxSize(450, 340));
 
     // Give it an icon
@@ -1077,7 +1077,7 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) )
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
 {
-    wxMessageDialog dialog(this, _T("Tests various wxWindows types"),
+    wxMessageDialog dialog(this, _T("Tests various wxWidgets types"),
         _T("About Types"), wxYES_NO|wxCANCEL);
 
     dialog.ShowModal();
diff --git a/samples/typetest/typetest.h b/samples/typetest/typetest.h
index 6c315508cf..f5bab25a77 100644
--- a/samples/typetest/typetest.h
+++ b/samples/typetest/typetest.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        typetest.h
-// Purpose:     Types wxWindows sample
+// Purpose:     Types wxWidgets sample
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
diff --git a/samples/validate/validate.cpp b/samples/validate/validate.cpp
index c5a188234a..98126e603d 100644
--- a/samples/validate/validate.cpp
+++ b/samples/validate/validate.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        validate.cpp
-// Purpose:     wxWindows validator sample
+// Purpose:     wxWidgets validator sample
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
diff --git a/samples/validate/validate.h b/samples/validate/validate.h
index 546cfb254f..e8b8a60182 100644
--- a/samples/validate/validate.h
+++ b/samples/validate/validate.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        validate.h
-// Purpose:     wxWindows validation sample
+// Purpose:     wxWidgets validation sample
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
diff --git a/samples/vscroll/vstest.cpp b/samples/vscroll/vstest.cpp
index d5e9b9a263..eb44a21680 100644
--- a/samples/vscroll/vstest.cpp
+++ b/samples/vscroll/vstest.cpp
@@ -1,11 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        vscroll.cpp
-// Purpose:     VScroll wxWindows sample
+// Purpose:     VScroll wxWidgets sample
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -25,7 +25,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers)
+// need because it includes almost all "standard" wxWidgets headers)
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
     #include "wx/app.h"
@@ -82,7 +82,7 @@ public:
     }
 
 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()
 };
 
@@ -181,10 +181,10 @@ enum
 };
 
 // ----------------------------------------------------------------------------
-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets
 // ----------------------------------------------------------------------------
 
-// the event tables connect the wxWindows events with the functions (event
+// the event tables connect the wxWidgets events with the functions (event
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(VScrollFrame, wxFrame)
@@ -193,7 +193,7 @@ BEGIN_EVENT_TABLE(VScrollFrame, wxFrame)
     EVT_SIZE(VScrollFrame::OnSize)
 END_EVENT_TABLE()
 
-// Create a new application object: this macro will allow wxWindows to create
+// Create a new application object: this macro will allow wxWidgets to create
 // the application object during program execution (it's better than using a
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. VScrollApp and
@@ -230,7 +230,7 @@ bool VScrollApp::OnInit()
 VScrollFrame::VScrollFrame()
             : wxFrame(NULL,
                       -1,
-                      _T("VScroll wxWindows Sample"),
+                      _T("VScroll wxWidgets Sample"),
                       wxDefaultPosition,
                       wxSize(400, 350))
 {
@@ -259,7 +259,7 @@ VScrollFrame::VScrollFrame()
 #if wxUSE_STATUSBAR
     // create a status bar just for fun (by default with 1 pane only)
     CreateStatusBar(2);
-    SetStatusText(_T("Welcome to wxWindows!"));
+    SetStatusText(_T("Welcome to wxWidgets!"));
 #endif // wxUSE_STATUSBAR
 
     // create our one and only child -- it will take our entire client area
diff --git a/samples/widgets/button.cpp b/samples/widgets/button.cpp
index 2f1b3c721a..1fd14bf6a3 100644
--- a/samples/widgets/button.cpp
+++ b/samples/widgets/button.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Program:     wxWindows Widgets Sample
+// Program:     wxWidgets Widgets Sample
 // Name:        button.cpp
 // Purpose:     Part of the widgets sample showing wxButton
 // Author:      Vadim Zeitlin
diff --git a/samples/widgets/checkbox.cpp b/samples/widgets/checkbox.cpp
index 4cd2da6f66..34295c7ee8 100644
--- a/samples/widgets/checkbox.cpp
+++ b/samples/widgets/checkbox.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Program:     wxWindows Widgets Sample
+// Program:     wxWidgets Widgets Sample
 // Name:        checkbox.cpp
 // Purpose:     Part of the widgets sample showing wxCheckBox
 // Author:      Dimitri Schoolwerth
diff --git a/samples/widgets/combobox.cpp b/samples/widgets/combobox.cpp
index 09547692bd..6938293e61 100644
--- a/samples/widgets/combobox.cpp
+++ b/samples/widgets/combobox.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Program:     wxWindows Widgets Sample
+// Program:     wxWidgets Widgets Sample
 // Name:        combobox.cpp
 // Purpose:     Part of the widgets sample showing wxComboBox
 // Author:      Vadim Zeitlin
diff --git a/samples/widgets/gauge.cpp b/samples/widgets/gauge.cpp
index d887d13754..f20aac08ef 100644
--- a/samples/widgets/gauge.cpp
+++ b/samples/widgets/gauge.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Program:     wxWindows Widgets Sample
+// Program:     wxWidgets Widgets Sample
 // Name:        gauge.cpp
 // Purpose:     Part of the widgets sample showing wxGauge
 // Author:      Vadim Zeitlin
diff --git a/samples/widgets/listbox.cpp b/samples/widgets/listbox.cpp
index ccb48ec29f..b717ecb097 100644
--- a/samples/widgets/listbox.cpp
+++ b/samples/widgets/listbox.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Program:     wxWindows Widgets Sample
+// Program:     wxWidgets Widgets Sample
 // Name:        listbox.cpp
 // Purpose:     Part of the widgets sample showing wxListbox
 // Author:      Vadim Zeitlin
diff --git a/samples/widgets/notebook.cpp b/samples/widgets/notebook.cpp
index 5c6d1bac04..adfbb5ad2e 100644
--- a/samples/widgets/notebook.cpp
+++ b/samples/widgets/notebook.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Program:     wxWindows Widgets Sample
+// Program:     wxWidgets Widgets Sample
 // Name:        notebook.cpp
 // Purpose:     Part of the widgets sample showing wxNotebook
 // Author:      Vadim Zeitlin
@@ -78,7 +78,7 @@ enum Orient
     Orient_Max
 };
 
-// old versions of wxWindows don't define this style
+// old versions of wxWidgets don't define this style
 #ifndef wxNB_TOP
     #define wxNB_TOP (0)
 #endif
diff --git a/samples/widgets/radiobox.cpp b/samples/widgets/radiobox.cpp
index 4967b10661..3dbd14cb53 100644
--- a/samples/widgets/radiobox.cpp
+++ b/samples/widgets/radiobox.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Program:     wxWindows Widgets Sample
+// Program:     wxWidgets Widgets Sample
 // Name:        radiobox.cpp
 // Purpose:     Part of the widgets sample showing wxRadioBox
 // Author:      Vadim Zeitlin
diff --git a/samples/widgets/slider.cpp b/samples/widgets/slider.cpp
index b1ee9b4005..21ea9e1ff2 100644
--- a/samples/widgets/slider.cpp
+++ b/samples/widgets/slider.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Program:     wxWindows Widgets Sample
+// Program:     wxWidgets Widgets Sample
 // Name:        slider.cpp
 // Purpose:     Part of the widgets sample showing wxSlider
 // Author:      Vadim Zeitlin
diff --git a/samples/widgets/spinbtn.cpp b/samples/widgets/spinbtn.cpp
index 0b886d7c88..10a3ae1904 100644
--- a/samples/widgets/spinbtn.cpp
+++ b/samples/widgets/spinbtn.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Program:     wxWindows Widgets Sample
+// Program:     wxWidgets Widgets Sample
 // Name:        spinbtn.cpp
 // Purpose:     Part of the widgets sample showing wxSpinButton
 // Author:      Vadim Zeitlin
diff --git a/samples/widgets/static.cpp b/samples/widgets/static.cpp
index b841ed19f8..f8872d648d 100644
--- a/samples/widgets/static.cpp
+++ b/samples/widgets/static.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Program:     wxWindows Widgets Sample
+// Program:     wxWidgets Widgets Sample
 // Name:        static.cpp
 // Purpose:     Part of the widgets sample showing various static controls
 // Author:      Vadim Zeitlin
diff --git a/samples/widgets/textctrl.cpp b/samples/widgets/textctrl.cpp
index a30268abdd..31e3c9c15a 100644
--- a/samples/widgets/textctrl.cpp
+++ b/samples/widgets/textctrl.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Program:     wxWindows Widgets Sample
+// Program:     wxWidgets Widgets Sample
 // Name:        textctrl.cpp
 // Purpose:     part of the widgets sample showing wxTextCtrl
 // Author:      Vadim Zeitlin
@@ -203,7 +203,7 @@ protected:
     wxString m_range10_20;
 
 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()
     DECLARE_WIDGETS_PAGE(TextWidgetsPage)
 };
diff --git a/samples/widgets/widgets.cpp b/samples/widgets/widgets.cpp
index 6f51626845..27ff78f92c 100644
--- a/samples/widgets/widgets.cpp
+++ b/samples/widgets/widgets.cpp
@@ -1,7 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
-// Program:     wxWindows Widgets Sample
+// Program:     wxWidgets Widgets Sample
 // Name:        widgets.cpp
-// Purpose:     Sample showing most of the simple wxWindows widgets
+// Purpose:     Sample showing most of the simple wxWidgets widgets
 // Author:      Vadim Zeitlin
 // Created:     27.03.01
 // Id:          $Id$
@@ -102,7 +102,7 @@ private:
     // and the image list for it
     wxImageList *m_imaglist;
 
-    // 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()
 };
 
@@ -210,7 +210,7 @@ bool WidgetsApp::OnInit()
 #elif defined(__WXMOTIF__)
     title += _T("wxMOTIF");
 #else
-    title += _T("wxWindows");
+    title += _T("wxWidgets");
 #endif
 
     wxFrame *frame = new WidgetsFrame(title + _T(" widgets demo"));
diff --git a/samples/widgets/widgets.h b/samples/widgets/widgets.h
index 679b8b369a..f9e2e6d432 100644
--- a/samples/widgets/widgets.h
+++ b/samples/widgets/widgets.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Program:     wxWindows Widgets Sample
+// Program:     wxWidgets Widgets Sample
 // Name:        widgets.h
 // Purpose:     Common stuff for all widgets project files
 // Author:      Vadim Zeitlin
diff --git a/samples/wizard/wizard.cpp b/samples/wizard/wizard.cpp
index c5a517ecbf..8bec65db10 100644
--- a/samples/wizard/wizard.cpp
+++ b/samples/wizard/wizard.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wizard.cpp
-// Purpose:     wxWindows sample demonstrating wxWizard control
+// Purpose:     wxWidgets sample demonstrating wxWizard control
 // Author:      Vadim Zeitlin
 // Modified by: Robert Vazan (sizers)
 // Created:     15.08.99
@@ -81,7 +81,7 @@ public:
     void OnWizardFinished(wxWizardEvent& 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()
 };
 
diff --git a/samples/wxtest/test.h b/samples/wxtest/test.h
index 09e2f3d63c..8b28d5ae94 100644
--- a/samples/wxtest/test.h
+++ b/samples/wxtest/test.h
@@ -12,7 +12,7 @@
     #pragma interface "test.cpp"
 #endif
 
-// Include wxWindows' headers
+// Include wxWidgets' headers
 
 #ifndef WX_PRECOMP
     #include <wx/wx.h>
diff --git a/samples/wxtest/test_wdr.h b/samples/wxtest/test_wdr.h
index f45b301ca1..8c93d207f3 100644
--- a/samples/wxtest/test_wdr.h
+++ b/samples/wxtest/test_wdr.h
@@ -10,7 +10,7 @@
     #pragma interface "test_wdr.cpp"
 #endif
 
-// Include wxWindows' headers
+// Include wxWidgets' headers
 
 #ifndef WX_PRECOMP
     #include <wx/wx.h>
diff --git a/samples/xrc/custclas.cpp b/samples/xrc/custclas.cpp
index ba30c5f7f7..6735dc3bce 100644
--- a/samples/xrc/custclas.cpp
+++ b/samples/xrc/custclas.cpp
@@ -16,7 +16,7 @@
 #endif
 
 //-----------------------------------------------------------------------------
-// Standard wxWindows headers
+// Standard wxWidgets headers
 //-----------------------------------------------------------------------------
 
 // For compilers that support precompilation, includes "wx/wx.h".
@@ -27,7 +27,7 @@
 #endif
 
 // For all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers)
+// need because it includes almost all "standard" wxWidgets headers)
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
@@ -62,7 +62,7 @@ enum {
 };
 
 //-----------------------------------------------------------------------------
-// wxWindows macro: implement dynamic class
+// wxWidgets macro: implement dynamic class
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS( MyResizableListCtrl, wxListCtrl )
diff --git a/samples/xrc/custclas.h b/samples/xrc/custclas.h
index e34efa01b7..69b01d4387 100644
--- a/samples/xrc/custclas.h
+++ b/samples/xrc/custclas.h
@@ -35,8 +35,8 @@
 //! A custom listctrl that resizes itself and pops up a context-sensitive menu.
 class MyResizableListCtrl : public wxListCtrl
 {
-    // Very helpful wxWindows macro required for wxWindows-RTTI tracing: By using this
-    // you will see "Leaked one object of type myResizeableListCtrl" in the debug log, 
+    // Very helpful wxWidgets macro required for wxWidgets-RTTI tracing: By using this
+    // you will see "Leaked one object of type myResizeableListCtrl" in the debug log,
     // along with which line you if was created, but you forget to free the memory.
     // NOTE: Using this REQUIRES a default constructor: that means either: giving a 
     // default value for all parameters in your constructor, or else having a dummy
@@ -47,14 +47,14 @@ public:
 
     // Constructor.        
     /*
-        These parameters are the same as a wxWindows constructor.
+        These parameters are the same as a wxWidgets constructor.
         \param parent The parent window.
         \param id The id of the progress_listbox. Will usually be -1 unless multiple
             of them on the same dialog.
         \param pos The pixel position of the listctrl on its parent window
         \param size The pixel size of the listctrl
-        \param style Style of the listbox. See wxWindows wxListBox docs for details.
-        \param validator Window validator. See wxWindows docs for details.
+        \param style Style of the listbox. See wxWidgets wxListBox docs for details.
+        \param validator Window validator. See wxWidgets docs for details.
         \param name Windows name (rarely used).
         \param exclusion_column_caption The label of header of listctrl's exclusion
             column.
@@ -76,7 +76,7 @@ protected:
     // A custom function for a context sensitive menu. 
     void ContextSensitiveMenu( wxMouseEvent& event );       
     
-    // This is a wxWindows function that we are going to override with our own behaviour.
+    // This is a wxWidgets function that we are going to override with our own behaviour.
     void OnSize( wxSizeEvent &event );
     
     // A custom function. What is called in the constructor, and in an OnSize()
@@ -84,7 +84,7 @@ protected:
     
 private:
 
-    // wxWindows macro, required to be able to use Event tables in the .cpp file.
+    // wxWidgets macro, required to be able to use Event tables in the .cpp file.
     DECLARE_EVENT_TABLE()
     
 };
diff --git a/samples/xrc/derivdlg.cpp b/samples/xrc/derivdlg.cpp
index b784e322b4..ed6c1cd613 100644
--- a/samples/xrc/derivdlg.cpp
+++ b/samples/xrc/derivdlg.cpp
@@ -16,7 +16,7 @@
 #endif
 
 //-----------------------------------------------------------------------------
-// Standard wxWindows headers
+// Standard wxWidgets headers
 //-----------------------------------------------------------------------------
 
 // For compilers that support precompilation, includes "wx/wx.h".
@@ -27,7 +27,7 @@
 #endif
 
 // For all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers)
+// need because it includes almost all "standard" wxWidgets headers)
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
diff --git a/samples/xrc/derivdlg.h b/samples/xrc/derivdlg.h
index 2bea8e39ea..1e82f6f5b0 100644
--- a/samples/xrc/derivdlg.h
+++ b/samples/xrc/derivdlg.h
@@ -59,7 +59,7 @@ private:
     // Override base class functions of a wxDialog.
     void OnOK( wxCommandEvent &event );
 
-    // 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()
 
 };
diff --git a/samples/xrc/myframe.cpp b/samples/xrc/myframe.cpp
index 594d8769e1..a740c29bda 100644
--- a/samples/xrc/myframe.cpp
+++ b/samples/xrc/myframe.cpp
@@ -16,7 +16,7 @@
 #endif
 
 //-----------------------------------------------------------------------------
-// Standard wxWindows headers
+// Standard wxWidgets headers
 //-----------------------------------------------------------------------------
 
 // For compilers that support precompilation, includes "wx/wx.h".
@@ -27,7 +27,7 @@
 #endif
 
 // For all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers)
+// need because it includes almost all "standard" wxWidgets headers)
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
@@ -73,14 +73,14 @@
 // Event table: connect the events to the handler functions to process them
 //-----------------------------------------------------------------------------
 
-// The event tables connect the wxWindows events with the functions (event
+// The event tables connect the wxWidgets events with the functions (event
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 // The reason why the menuitems and tools are given the same name in the 
 // XRC file, is that both a tool (a toolbar item) and a menuitem are designed
 // to fire the same kind of event (an EVT_MENU) and thus I give them the same 
 // ID name to help new users emphasize this point which is often overlooked 
-// when starting out with wxWindows.
+// when starting out with wxWidgets.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(XRCID("exit_tool_or_menuitem"),  MyFrame::OnExitToolOrMenuCommand)
     EVT_MENU(XRCID("non_derived_dialog_tool_or_menuitem"), MyFrame::OnNonDerivedDialogToolOrMenuCommand) 
diff --git a/samples/xrc/myframe.h b/samples/xrc/myframe.h
index 33ee6bd4bb..a773adc30d 100644
--- a/samples/xrc/myframe.h
+++ b/samples/xrc/myframe.h
@@ -55,7 +55,7 @@ private:
     void OnArtProviderToolOrMenuCommand(wxCommandEvent& event);
     void OnVariableExpansionToolOrMenuCommand(wxCommandEvent& event);
 
-    // 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()
 
 };
diff --git a/samples/xrc/rc/artprov.xrc b/samples/xrc/rc/artprov.xrc
index 629c86bcd3..2256b73ebf 100644
--- a/samples/xrc/rc/artprov.xrc
+++ b/samples/xrc/rc/artprov.xrc
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<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="wxDialog" name="art_provider_dialog">
     <title>wxArtProvider Example</title>
diff --git a/samples/xrc/rc/basicdlg.xrc b/samples/xrc/rc/basicdlg.xrc
index 9cea321aa7..95e211a53b 100644
--- a/samples/xrc/rc/basicdlg.xrc
+++ b/samples/xrc/rc/basicdlg.xrc
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<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="wxDialog" name="non_derived_dialog">
     <title>Non-Derived Dialog Example</title>
diff --git a/samples/xrc/rc/controls.xrc b/samples/xrc/rc/controls.xrc
index e441962fb9..8826f43fde 100644
--- a/samples/xrc/rc/controls.xrc
+++ b/samples/xrc/rc/controls.xrc
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<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="wxDialog" name="controls_dialog">
     <title>Controls Example</title>
diff --git a/samples/xrc/rc/custclas.xrc b/samples/xrc/rc/custclas.xrc
index 1d7b21134e..4f0109a992 100644
--- a/samples/xrc/rc/custclas.xrc
+++ b/samples/xrc/rc/custclas.xrc
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<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="wxDialog" name="custom_class_dialog">
     <title>Custom Class Example</title>
@@ -19,7 +19,7 @@
             <object class="wxTextCtrl" name="message_textctrl">
                 <size>500,150</size>
                 <style>wxTE_MULTILINE</style>
-                <value>You can embed your own custom classes into an XRC file. This is referred to as attaching an unknown control.\n\nThere are 3 main cases when you would want to do this:\n\n(A) Most commonly: you have derived a class from one of the main wxWindows controls, so that it can manage its own state and look after its own events, because it is better management to have a portable class with all the code for that control in there with the class, instead of being having many event handlers for that control scattered up in its parent dialog (which is allowed, but gets messy if a control has alot of methods). For example, if you require a wxListCtrl that popups a menu when right-clicked on an item, and you want the wxListCtrl to resize its columns in response to an OnSize(), and a few more methods, it makes better sourcecode logic to package all these methods into by a standalone derived wxListCtrl class, instead of having the parent dialog manage all these events and other functions. This is what the example below shows: it does a custom behaviour of resizing its first column to appropriately fill up the width of the control on a resize event, and it pops up a context-menu in response to a left click (and shades out popup menu item appropriately if there is no item currenty selected in the listctrl).\n\n(B)You have an utterly new widget that has no equivalent in the wxWindows class heirarchy, so you thus need to embed your class to get the needed functionality.\n\n(C) You are using one of the rarely used wxWindows controls that doesn't have an XRC handler in the XRC library. However, all of the major controls: wxButton, wxTextCtrl, etc have an XRC handler, so this is pretty rare, and you could always write your own XRC handler for that control if you wanted. You can choose the "Controls example" from the XRC demo menu to see all the controls that have an XRC handler.\n\nThe typical formula for attaching an unknown control is:\n\n(1) If you are deriving your own custom class to be embedded into the XRC, describe that class with its own .cpp and .h file. In this example it is custclass.cpp and custclass.h\n\n(2)Specify an "unknown" tag in the XRC file that you want to embed it into (see the unknown tag in custclass.xrc). This will be the placeholder of the new class.\n\n(3) Load the XRC dialog as usual, but before you show the dialog to the user, construct an instance of your custom control, and then use wxXmlResource::Get()-&gt;AttachUnknownControl() to put the custom class into its "unknown" placeholder in the XRC file.\n\nThe result is what you see below, a custom class control that fits in seemlessly with the whole dialog, the same as if it was read from XRC directly. Try out resizing this dialog, and watch the listctrl column resize, and right-click to call up its popup menu. By the way, if you look at the source of this XRC dialog, you will that this dialog node has a set of style flags that includes wxRESIZE__BORDER--that is why this dialog is resizable, whereas most of the rest of the dialogs in the XRC sample that don't include this tag, are not resizable.</value>
+                <value>You can embed your own custom classes into an XRC file. This is referred to as attaching an unknown control.\n\nThere are 3 main cases when you would want to do this:\n\n(A) Most commonly: you have derived a class from one of the main wxWidgets controls, so that it can manage its own state and look after its own events, because it is better management to have a portable class with all the code for that control in there with the class, instead of being having many event handlers for that control scattered up in its parent dialog (which is allowed, but gets messy if a control has alot of methods). For example, if you require a wxListCtrl that popups a menu when right-clicked on an item, and you want the wxListCtrl to resize its columns in response to an OnSize(), and a few more methods, it makes better sourcecode logic to package all these methods into by a standalone derived wxListCtrl class, instead of having the parent dialog manage all these events and other functions. This is what the example below shows: it does a custom behaviour of resizing its first column to appropriately fill up the width of the control on a resize event, and it pops up a context-menu in response to a left click (and shades out popup menu item appropriately if there is no item currenty selected in the listctrl).\n\n(B)You have an utterly new widget that has no equivalent in the wxWindows class heirarchy, so you thus need to embed your class to get the needed functionality.\n\n(C) You are using one of the rarely used wxWindows controls that doesn't have an XRC handler in the XRC library. However, all of the major controls: wxButton, wxTextCtrl, etc have an XRC handler, so this is pretty rare, and you could always write your own XRC handler for that control if you wanted. You can choose the "Controls example" from the XRC demo menu to see all the controls that have an XRC handler.\n\nThe typical formula for attaching an unknown control is:\n\n(1) If you are deriving your own custom class to be embedded into the XRC, describe that class with its own .cpp and .h file. In this example it is custclass.cpp and custclass.h\n\n(2)Specify an "unknown" tag in the XRC file that you want to embed it into (see the unknown tag in custclass.xrc). This will be the placeholder of the new class.\n\n(3) Load the XRC dialog as usual, but before you show the dialog to the user, construct an instance of your custom control, and then use wxXmlResource::Get()-&gt;AttachUnknownControl() to put the custom class into its "unknown" placeholder in the XRC file.\n\nThe result is what you see below, a custom class control that fits in seemlessly with the whole dialog, the same as if it was read from XRC directly. Try out resizing this dialog, and watch the listctrl column resize, and right-click to call up its popup menu. By the way, if you look at the source of this XRC dialog, you will that this dialog node has a set of style flags that includes wxRESIZE__BORDER--that is why this dialog is resizable, whereas most of the rest of the dialogs in the XRC sample that don't include this tag, are not resizable.</value>
             </object>
         </object>
         <object class="sizeritem">
diff --git a/samples/xrc/rc/derivdlg.xrc b/samples/xrc/rc/derivdlg.xrc
index cbf8318c7a..b7230d4229 100644
--- a/samples/xrc/rc/derivdlg.xrc
+++ b/samples/xrc/rc/derivdlg.xrc
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<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="wxDialog" name="derived_dialog">
     <title>Derived Dialog Example</title>
diff --git a/samples/xrc/rc/frame.xrc b/samples/xrc/rc/frame.xrc
index 8b9c8ca5b8..ad7b03f7d6 100644
--- a/samples/xrc/rc/frame.xrc
+++ b/samples/xrc/rc/frame.xrc
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<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="wxFrame" name="main_frame">
     <title>XML Resources Demo</title>
@@ -18,7 +18,7 @@
             <object class="wxTextCtrl" name="message_textctrl">
                 <size>500,280</size>
                 <style>wxTE_MULTILINE</style>
-                <value>Welcome to the wxWindows XmlResource (XRC) sample! Using wxWindows XML resources makes your GUI C++ programming much faster and easier.\n\nView the examples under the "Basic" menu to learn how to get up and running with XRC quickly, and later have a look at the examples under the "Advanced" menu for advanced techniques.\n\nThe XML file that described this frame is the sample's frame.xrc file, with the menu in menu.xrc, and the toolbar in toolbar.xrc. The frame XRC file structure is exactly the same as the XRC files for the dialogs, except that the top level node is a wxFrame, not a wxDialog. Each of the other dialog in this example is a separate XRC file, each of which can be examined for how they work.</value>
+                <value>Welcome to the wxWidgets XmlResource (XRC) sample! Using wxWidgets XML resources makes your GUI C++ programming much faster and easier.\n\nView the examples under the "Basic" menu to learn how to get up and running with XRC quickly, and later have a look at the examples under the "Advanced" menu for advanced techniques.\n\nThe XML file that described this frame is the sample's frame.xrc file, with the menu in menu.xrc, and the toolbar in toolbar.xrc. The frame XRC file structure is exactly the same as the XRC files for the dialogs, except that the top level node is a wxFrame, not a wxDialog. Each of the other dialog in this example is a separate XRC file, each of which can be examined for how they work.</value>
             </object>
         </object>
     </object>
diff --git a/samples/xrc/rc/menu.xrc b/samples/xrc/rc/menu.xrc
index 64d3ccbf04..1257cc72a0 100644
--- a/samples/xrc/rc/menu.xrc
+++ b/samples/xrc/rc/menu.xrc
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<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="wxMenuBar" name="main_menu">
 <style>wxMB_DOCKABLE</style>
@@ -28,7 +28,7 @@
         <object class="wxMenuItem" name="controls_tool_or_menuitem">
             <label>_Controls Example</label>
             <bitmap>controls.xpm</bitmap>
-            <help>A notebook displaying all the wxWindows controls</help>
+            <help>A notebook displaying all the wxWidgets controls</help>
         </object>        
         <object class="wxMenuItem" name="uncentered_tool_or_menuitem">
             <label>_Uncentered Example</label>
diff --git a/samples/xrc/rc/platform.xrc b/samples/xrc/rc/platform.xrc
index 9f143bf5a8..43313cb853 100644
--- a/samples/xrc/rc/platform.xrc
+++ b/samples/xrc/rc/platform.xrc
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<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="wxDialog" name="platform_property_dialog">
     <title>Platform Property Example</title>
diff --git a/samples/xrc/rc/resource.xrc b/samples/xrc/rc/resource.xrc
index 3498b44977..6673e0e8f2 100644
--- a/samples/xrc/rc/resource.xrc
+++ b/samples/xrc/rc/resource.xrc
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<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="wxMenuBar" name="mainmenu">
     <style>wxMB_DOCKABLE</style>
     <object class="wxMenu" name="menu_file">
diff --git a/samples/xrc/rc/toolbar.xrc b/samples/xrc/rc/toolbar.xrc
index 9bc8082182..f33a423048 100644
--- a/samples/xrc/rc/toolbar.xrc
+++ b/samples/xrc/rc/toolbar.xrc
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<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="wxToolBar" name="main_toolbar">
     <style>wxTB_FLAT|wxTB_DOCKABLE</style>
@@ -18,7 +18,7 @@
     <object class="tool" name="controls_tool_or_menuitem">
         <tooltip>Controls Example</tooltip>
         <bitmap>controls.xpm</bitmap>
-        <longhelp>A notebook displaying all the wxWindows controls</longhelp>
+        <longhelp>A notebook displaying all the wxWidgets controls</longhelp>
     </object>        
     <object class="tool" name="uncentered_tool_or_menuitem">
         <tooltip>Uncentered Example</tooltip>
diff --git a/samples/xrc/rc/uncenter.xrc b/samples/xrc/rc/uncenter.xrc
index b1613d8ef5..4f6f6ce532 100644
--- a/samples/xrc/rc/uncenter.xrc
+++ b/samples/xrc/rc/uncenter.xrc
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<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="wxDialog" name="uncentered_dialog">
     <title>Uncentered Example</title>
diff --git a/samples/xrc/rc/variable.xrc b/samples/xrc/rc/variable.xrc
index b2d54bf4e9..91d7d5cc24 100644
--- a/samples/xrc/rc/variable.xrc
+++ b/samples/xrc/rc/variable.xrc
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<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="wxDialog" name="variable_expansion_dialog">
     <title>Variable Expansion Example</title>
diff --git a/samples/xrc/xrcdemo.cpp b/samples/xrc/xrcdemo.cpp
index c904f52e28..824477921d 100644
--- a/samples/xrc/xrcdemo.cpp
+++ b/samples/xrc/xrcdemo.cpp
@@ -16,7 +16,7 @@
 #endif
 
 //-----------------------------------------------------------------------------
-// Standard wxWindows headers
+// Standard wxWidgets headers
 //-----------------------------------------------------------------------------
 
 // For compilers that support precompilation, includes "wx/wx.h".
@@ -27,7 +27,7 @@
 #endif
 
 // For all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers)
+// need because it includes almost all "standard" wxWidgets headers)
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
@@ -53,10 +53,10 @@
 #include "myframe.h"
 
 //-----------------------------------------------------------------------------
-// wxWindows macro: Declare the application.
+// wxWidgets macro: Declare the application.
 //-----------------------------------------------------------------------------
 
-// Create a new application object: this macro will allow wxWindows to create
+// Create a new application object: this macro will allow wxWidgets to create
 // the application object during program execution (it's better than using a
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. the_app and
diff --git a/src/stc/PlatWX.cpp b/src/stc/PlatWX.cpp
index 46d478e701..ab3e95c9d5 100644
--- a/src/stc/PlatWX.cpp
+++ b/src/stc/PlatWX.cpp
@@ -1,5 +1,5 @@
 // Scintilla source code edit control
-// PlatWX.cxx - implementation of platform facilities on wxWindows
+// PlatWX.cxx - implementation of platform facilities on wxWidgets
 // Copyright 1998-1999 by Neil Hodgson <neilh@scintilla.org>
 //                        Robin Dunn <robin@aldunn.com>
 // The License.txt file describes the conditions under which this software may be distributed.
diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp
index 485b612cc9..6fd051521e 100644
--- a/src/stc/ScintillaWX.cpp
+++ b/src/stc/ScintillaWX.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////
 // Name:        ScintillaWX.cxx
-// Purpose:     A wxWindows implementation of Scintilla.  A class derived
+// Purpose:     A wxWidgets implementation of Scintilla.  A class derived
 //              from ScintillaBase that uses the "wx platform" defined in
 //              PlatformWX.cxx  This class is one end of a bridge between
 //              the wx world and the Scintilla world.  It needs a peer
diff --git a/src/stc/ScintillaWX.h b/src/stc/ScintillaWX.h
index bb09a482bf..d5a0127b7c 100644
--- a/src/stc/ScintillaWX.h
+++ b/src/stc/ScintillaWX.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////
 // Name:        ScintillaWX.h
-// Purpose:     A wxWindows implementation of Scintilla.  A class derived
+// Purpose:     A wxWidgets implementation of Scintilla.  A class derived
 //              from ScintillaBase that uses the "wx platform" defined in
 //              PlatWX.cpp.  This class is one end of a bridge between
 //              the wx world and the Scintilla world.  It needs a peer
diff --git a/src/stc/scintilla/include/Platform.h b/src/stc/scintilla/include/Platform.h
index 279a3df3ed..1058242fb3 100644
--- a/src/stc/scintilla/include/Platform.h
+++ b/src/stc/scintilla/include/Platform.h
@@ -1,7 +1,7 @@
 // Scintilla source code edit control
 /** @file Platform.h
  ** Interface to platform facilities. Also includes some basic utilities.
- ** Implemented in PlatGTK.cxx for GTK+/Linux, PlatWin.cxx for Windows, and PlatWX.cxx for wxWindows.
+ ** Implemented in PlatGTK.cxx for GTK+/Linux, PlatWin.cxx for Windows, and PlatWX.cxx for wxWidgets.
  **/
 // Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
 // The License.txt file describes the conditions under which this software may be distributed.
@@ -12,7 +12,7 @@
 // PLAT_GTK = GTK+ on Linux or Win32
 // PLAT_GTK_WIN32 is defined additionally when running PLAT_GTK under Win32
 // PLAT_WIN = Win32 API on Win32 OS
-// PLAT_WX is wxWindows on any supported platform
+// PLAT_WX is wxWidgets on any supported platform
 
 #define PLAT_GTK 0
 #define PLAT_GTK_WIN32 0
diff --git a/src/stc/stc.cpp b/src/stc/stc.cpp
index c3a5c5a725..e3dace9d0a 100644
--- a/src/stc/stc.cpp
+++ b/src/stc/stc.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////
 // Name:        stc.cpp
-// Purpose:     A wxWindows implementation of Scintilla.  This class is the
+// Purpose:     A wxWidgets implementation of Scintilla.  This class is the
 //              one meant to be used directly by wx applications.  It does not
 //              derive directly from the Scintilla classes, but instead
 //              delegates most things to the real Scintilla class.
diff --git a/src/stc/stc.cpp.in b/src/stc/stc.cpp.in
index a859ec1a47..e49f56ef4a 100644
--- a/src/stc/stc.cpp.in
+++ b/src/stc/stc.cpp.in
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////
 // Name:        stc.cpp
-// Purpose:     A wxWindows implementation of Scintilla.  This class is the
+// Purpose:     A wxWidgets implementation of Scintilla.  This class is the
 //              one meant to be used directly by wx applications.  It does not
 //              derive directly from the Scintilla classes, but instead
 //              delegates most things to the real Scintilla class.
diff --git a/utils/HelpGen/src/HelpGen.cpp b/utils/HelpGen/src/HelpGen.cpp
index 3f8541a125..5bd04744c7 100644
--- a/utils/HelpGen/src/HelpGen.cpp
+++ b/utils/HelpGen/src/HelpGen.cpp
@@ -48,7 +48,7 @@
 // headers
 // -----------------------------------------------------------------------------
 
-// wxWindows
+// wxWidgets
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP
@@ -575,7 +575,7 @@ int main(int argc, char **argv)
     wxInitializer initializer;
     if ( !initializer )
     {
-        fprintf(stderr, "Failed to initialize the wxWindows library, aborting.");
+        fprintf(stderr, "Failed to initialize the wxWidgets library, aborting.");
 
         return -1;
     }
@@ -1027,7 +1027,7 @@ void HelpGenVisitor::VisitClass( spClass& cl )
     // if the header includes other headers they must be related to it... try to
     // automatically generate the "See also" clause
     if ( !m_headers.IsEmpty() ) {
-        // correspondence between wxWindows headers and class names
+        // correspondence between wxWidgets headers and class names
         static const char *headers[] = {
             "object",
             "defs",
@@ -1430,7 +1430,7 @@ bool DocManager::ParseTeXFile(const wxString& filename)
 
     // the name of the class from the last "\membersection" command: we assume
     // that the following "\func" or "\constfunc" always documents a method of
-    // this class (and it should always be like that in wxWindows documentation)
+    // this class (and it should always be like that in wxWidgets documentation)
     wxString classname;
 
     for ( const char *current = buf; current - buf < len; current++ ) {
@@ -2185,6 +2185,9 @@ static const wxString GetVersionString()
 
 /*
    $Log$
+   Revision 1.28  2004/05/25 11:19:57  JS
+   More name changes
+
    Revision 1.27  2003/10/13 17:21:30  MBN
      Compilation fixes.
 
@@ -2299,7 +2302,7 @@ static const wxString GetVersionString()
     date: 1999/01/08 17:45:55;  author: VZ;  state: Exp;
 
     HelpGen is a prototype of the tool for automatic generation of the .tex files
-    for wxWindows documentation from C++ headers
+    for wxWidgets documentation from C++ headers
 */
 
 /* vi: set tw=80 et ts=4 sw=4: */
diff --git a/utils/configtool/docs/manual/configtool.tex b/utils/configtool/docs/manual/configtool.tex
index b0cf64994c..818cb730ab 100644
--- a/utils/configtool/docs/manual/configtool.tex
+++ b/utils/configtool/docs/manual/configtool.tex
@@ -41,7 +41,7 @@
 \setheader{{\it Welcome}}{}{}{}{}{{\it Welcome}}%
 \setfooter{\thepage}{}{}{}{}{\thepage}%
 
-Welcome to \ctname, the easy way to configure wxWindows.
+Welcome to \ctname, the easy way to configure wxWidgets.
 Instead of tweaking a setup.h file, or typing a long configure
 command, you can now check and uncheck options in a convenient
 GUI tool, read the relevant reference document for each
@@ -63,7 +63,7 @@ The \ctname home page is at:
 {\tt \cturl}
 
 For help with \ctshortname or to report bugs,
-please go to the wxWindows web site.
+please go to the wxWidgets web site.
 
 \section{Credits}
 
@@ -80,7 +80,7 @@ please go to the wxWindows web site.
 
 {\it Additional programming by}
 
-{\bf The wxWindows development team}
+{\bf The wxWidgets development team}
 
 \end{center}
 
@@ -107,7 +107,7 @@ in your filesystem. A directory of the form wxconfigtool-x.xx
 
 Add the location to your PATH and run the application with
 'wxconfigtool'. You may wish to set the environment variable
-WXCONFIGTOOLDIR so that wxWindows Configuration Tool can find its data files.
+WXCONFIGTOOLDIR so that wxWidgets Configuration Tool can find its data files.
 
 For example:
 
@@ -125,14 +125,14 @@ script in a location already on your PATH, such as
 
 \begin{verbatim}
   #!/bin/sh
-  # Invokes wxWindows Configuration Tool
+  # Invokes wxWidgets Configuration Tool
   export WXCONFIGTOOLDIR=/home/mydir/wxconfigtool-1.01
   $WXCONFIGTOOLDIR/wxconfigtool $*
 \end{verbatim}
 
 {\bf On Mac:}
 
-Download and unarchive the HQX file, and drag the wxWindows Configuration Tool folder to an appropriate location
+Download and unarchive the HQX file, and drag the wxWidgets Configuration Tool folder to an appropriate location
 on your hard disk. Then double-click on the 'wxconfigtool' executable.
 
 \chapter{Release notes}\label{releasenotes}%
@@ -206,7 +206,7 @@ the command-line. Just like configure :-)
 
 \section{Differences between Windows, Linux and Mac versions}\label{platformdifferences}
 
-Although every effort has been made to make wxWindows Configuration Tool work
+Although every effort has been made to make wxWidgets Configuration Tool work
 the same way on different environments, some small differences
 are inevitable.
 
@@ -299,7 +299,7 @@ the property type, it will be shown.
 You can invoke help for the selected option, by clicking
 on the question mark toolbar button or the {\bf Help | Configuration Item Help} menu
 item. If there is a help topic defined for the option, the
-wxWindows reference manual will be opened at that topic.
+wxWidgets reference manual will be opened at that topic.
 
 \begin{comment}
 \chapter{Getting started: a step-by-step guide}\label{gettingstarted}%
@@ -439,9 +439,9 @@ The Help menu gives you commands related to getting help.
 \twocolwidtha{5cm}
 \begin{twocollist}\itemsep=0pt
 \twocolitem{{\bf Contents}}{Invokes the on-line help, showing the contents page.}
-\twocolitem{{\bf wxWindows Help Contents}}{Invokes the on-line wxWindows reference manual, showing the contents page.}
+\twocolitem{{\bf wxWidgets Help Contents}}{Invokes the on-line wxWidgets reference manual, showing the contents page.}
 \twocolitem{\hrule}{\htmlonly{\hrule}}
-\twocolitem{{\bf Configuration Option Help} (F1)}{Invokes the on-line wxWindows reference manual at the topic for the selected option (if a topic
+\twocolitem{{\bf Configuration Option Help} (F1)}{Invokes the on-line wxWidgets reference manual at the topic for the selected option (if a topic
 is defined).}
 \twocolitem{{\bf What's This?}}{Click to get help on a window or configuration option.}
 \twocolitem{\hrule}{\htmlonly{\hrule}}
@@ -498,7 +498,7 @@ commands.
 \twocolitem{\hrule}{\htmlonly{\hrule}}
 \twocolitem{\image{}{go.png}{\bf Go}}{Saves the generated setup.h file or configurewx.sh script (according to the default setting) in the last-saved.}
 \twocolitem{\hrule}{\htmlonly{\hrule}}
-\twocolitem{\image{}{help.png}{\bf  Help}}{Shows the wxWindows manual topic for the
+\twocolitem{\image{}{help.png}{\bf  Help}}{Shows the wxWidgets manual topic for the
 \twocolitem{\image{}{helpcs.png}{\bf  Context Help}}{Shows a context-sensitive help
 cursor; click on a window to show brief help about that window.}
 selected configuration item.}
@@ -546,7 +546,7 @@ The Location Settings Dialog allows you to choose various locations.
 
 \twocolwidtha{5cm}
 \begin{twocollist}\itemsep=0pt
-\twocolitem{{\bf wxWindows hierarchy}}{This determines where \ctshortname will look
+\twocolitem{{\bf wxWidgets hierarchy}}{This determines where \ctshortname will look
 when prompting for filenames.}
 \twocolitem{{\bf Use WXWIN environment variable}}{Check this to use
 the value of the WXWIN variable instead of the path entered in the text field.}
diff --git a/utils/configtool/docs/readme-after.txt b/utils/configtool/docs/readme-after.txt
index 46eafb838e..b6e6fb79be 100644
--- a/utils/configtool/docs/readme-after.txt
+++ b/utils/configtool/docs/readme-after.txt
@@ -1,8 +1,8 @@
 
-Congratulations! You have installed wxWindows Configuration Tool.
-Please see the wxWindows web site for support:
+Congratulations! You have installed wxWidgets Configuration Tool.
+Please see the wxWidgets web site for support:
 
-http://www.wxwindows.org
+http://www.wxwidgets.org
 
 Thank you for using wxWindows Configuration Tool, and we hope
 you enjoy it!
diff --git a/utils/configtool/docs/readme.txt b/utils/configtool/docs/readme.txt
index a343eda27a..071b2e2e50 100644
--- a/utils/configtool/docs/readme.txt
+++ b/utils/configtool/docs/readme.txt
@@ -1,28 +1,28 @@
-Welcome to wxWindows Configuration Tool!
+Welcome to wxWidgets Configuration Tool!
 =============================================
 
-wxWindows Configuration Tool is a tool for
-helping to configure wxWindows.
+wxWidgets Configuration Tool is a tool for
+helping to configure wxWidgets.
 
 For further information, please see the manual, and the
 following site:
 
-http://www.wxwindows.org
+http://www.wxwidgets.org
 
 ------------------------------------------------------
-Installing wxWindows Configuration Tool on Windows
+Installing wxWidgets Configuration Tool on Windows
 ------------------------------------------------------
 
 Run wxconfigtool-x.yz-setup.exe and follow the instructions
-to install wxWindows Configuration Tool.
+to install wxWidgets Configuration Tool.
 
 You should find a shortcut on your desktop, and you can
 also find it in a group similar to this:
 
-Start -> Program Files -> wxWindows Configuration Tool x.y
+Start -> Program Files -> wxWidgets Configuration Tool x.y
 
 ------------------------------------------------------
-Installing wxWindows Configuration Tool on Unix
+Installing wxWidgets Configuration Tool on Unix
 ------------------------------------------------------
 
 Unarchive wxconfigtool-x.yz.tar.gz to a suitable location
@@ -31,7 +31,7 @@ in your filesystem. A directory of the form wxconfigtool-x.yz
 
 Add the location to your PATH and run the application with
 'wxconfigtool'. You may wish to set the environment variable
-WXCONFIGTOOLDIR so that wxWindows Configuration Tool can find its data files.
+WXCONFIGTOOLDIR so that wxWidgets Configuration Tool can find its data files.
 
 For example:
 
@@ -46,12 +46,12 @@ script in a location already on your PATH, such as
 /usr/local/bin. For example:
 
   #!/bin/sh
-  # Invokes wxWindows Configuration Tool
+  # Invokes wxWidgets Configuration Tool
   export WXCONFIGTOOLDIR=/home/mydir/wxconfigtool-1.01
   $WXCONFIGTOOLDIR/wxconfigtool $*
 
-If you wish to associate the wxWindows Configuration Tool file extension
-(pjd) with wxWindows Configuration Tool, you will need to edit your
+If you wish to associate the wxWidgets Configuration Tool file extension
+(pjd) with wxWidgets Configuration Tool, you will need to edit your
 ~/.mailcap file (or create one if it doesn't exist)
 and add an entry similar to this:
 
@@ -60,7 +60,7 @@ and add an entry similar to this:
 and add this ~/.mime.types:
     
     type=application/wxconfigtool \
-    desc="wxWindows Configuration Tool Document" \
+    desc="wxWidgets Configuration Tool Document" \
     exts="pjd"
 
 
diff --git a/utils/configtool/docs/todo.txt b/utils/configtool/docs/todo.txt
index 8e5127f043..7236b77b71 100644
--- a/utils/configtool/docs/todo.txt
+++ b/utils/configtool/docs/todo.txt
@@ -44,7 +44,7 @@ Nice-to-have
   for independent apps
 
 - possibly evolve it into a central command
-  centre for wxWindows: invoke other apps such
+  centre for wxWidgets: invoke other apps such
   as poEdit, <favourite dialog editor>, help,
   wizards, etc. Upgrade your wxWin version
   via the web.
\ No newline at end of file
diff --git a/utils/configtool/scripts/innobott.txt b/utils/configtool/scripts/innobott.txt
index 7ea092777d..77b328edac 100644
--- a/utils/configtool/scripts/innobott.txt
+++ b/utils/configtool/scripts/innobott.txt
@@ -7,7 +7,7 @@
 [Icons]
     Name: {group}\%APPTITLE% %VERSION%; Filename: {app}\%APPNAME%.exe; WorkingDir: {app}; IconFilename: {app}\%APPNAME%.exe; IconIndex: 0
     Name: {group}\%APPTITLE% Help; Filename: {app}\%HELPFILE%; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
-    Name: {group}\wxWindows Reference; Filename: {app}\wx.chm; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
+    Name: {group}\wxWidgets Reference; Filename: {app}\wx.chm; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
     Name: {group}\%APPTITLE% ReadMe; Filename: {app}\readme.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
     Name: {group}\%APPTITLE% Licence; Filename: {app}\license.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
     Name: {userdesktop}\%APPTITLE% %VERSION%; Filename: {app}\%APPNAME%.exe; WorkingDir: {app}; IconFilename: {app}\%APPNAME%.exe; IconIndex: 0; Tasks: desktopicon
diff --git a/utils/configtool/src/appsettings.cpp b/utils/configtool/src/appsettings.cpp
index 89da227b7d..4eecaf4ca4 100644
--- a/utils/configtool/src/appsettings.cpp
+++ b/utils/configtool/src/appsettings.cpp
@@ -59,7 +59,7 @@ ctSettings::ctSettings()
     // m_backgroundColour = wxColour(140, 172, 179); // blue-grey
     m_editWindowFont = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
 
-    m_appName = wxT("wxWindows Configuration Tool");
+    m_appName = wxT("wxWidgets Configuration Tool");
     m_appNameShort = wxT("Configuration Tool");
     m_showSplashScreen = FALSE;
     m_userName = wxEmptyString;
@@ -163,7 +163,7 @@ wxString ctSettings::GenerateFilename(const wxString& rootName)
 // Load config info
 bool ctSettings::LoadConfig()
 {
-    wxConfig config(wxGetApp().GetSettings().GetAppName(), wxT("wxWindows"));
+    wxConfig config(wxGetApp().GetSettings().GetAppName(), wxT("wxWidgets"));
 
     config.Read(wxT("Files/LastFile"), & m_lastFilename);
     config.Read(wxT("Files/LastSetupSaveDir"), & m_lastSetupSaveDir);
@@ -224,7 +224,7 @@ bool ctSettings::LoadConfig()
 // Save config info
 bool ctSettings::SaveConfig()
 {
-    wxConfig config(wxGetApp().GetSettings().GetAppName(), wxT("wxWindows"));
+    wxConfig config(wxGetApp().GetSettings().GetAppName(), wxT("wxWidgets"));
 
     config.Write(wxT("Files/LastFile"), m_lastFilename);
     config.Write(wxT("Files/LastSetupSaveDir"), m_lastSetupSaveDir);
diff --git a/utils/configtool/src/configitem.cpp b/utils/configtool/src/configitem.cpp
index c64056711d..0e8519a1bc 100644
--- a/utils/configtool/src/configitem.cpp
+++ b/utils/configtool/src/configitem.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        configitem.cpp
-// Purpose:     wxWindows Configuration Tool config item class
+// Purpose:     wxWidgets Configuration Tool config item class
 // Author:      Julian Smart
 // Modified by:
 // Created:     2003-06-03
@@ -246,7 +246,7 @@ void ctConfigItem::InitProperties()
 
     m_properties.AddProperty(
         new ctProperty(
-        wxT("<B>Help-topic</B><P> The help topic in the wxWindows manual for this component or setting."),
+        wxT("<B>Help-topic</B><P> The help topic in the wxWidgets manual for this component or setting."),
         wxVariant(wxT(""), wxT("help-topic")),
         wxT("multiline")));
 
diff --git a/utils/configtool/src/configitem.h b/utils/configtool/src/configitem.h
index c7989a70e5..3a357d1990 100644
--- a/utils/configtool/src/configitem.h
+++ b/utils/configtool/src/configitem.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        configitem.h
-// Purpose:     wxWindows Configuration Tool config item class
+// Purpose:     wxWidgets Configuration Tool config item class
 // Author:      Julian Smart
 // Modified by:
 // Created:     2003-06-03
diff --git a/utils/configtool/src/configtooldoc.cpp b/utils/configtool/src/configtooldoc.cpp
index c2cb229ce8..4ef42ebd16 100644
--- a/utils/configtool/src/configtooldoc.cpp
+++ b/utils/configtool/src/configtooldoc.cpp
@@ -266,7 +266,7 @@ bool ctConfigToolDoc::DoSave(const wxString& filename)
         return FALSE;
 
     stream << wxT("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n");
-    stream << wxT("<settings xmlns=\"http://www.wxwindows.org/wxs\" version=\"2.5.0.1\">");
+    stream << wxT("<settings xmlns=\"http://www.wxwidgets.org/wxs\" version=\"2.5.0.1\">");
 
     DoSave(m_topItem, stream, 1);
 
diff --git a/utils/configtool/src/configtooldoc.h b/utils/configtool/src/configtooldoc.h
index b1abcab4a7..6929e5cb55 100644
--- a/utils/configtool/src/configtooldoc.h
+++ b/utils/configtool/src/configtooldoc.h
@@ -41,7 +41,7 @@ public:
     virtual bool OnSaveDocument(const wxString& filename);
     virtual bool OnNewDocument() { return TRUE; }
     virtual bool OnCloseDocument() ;
-    virtual bool Save(); // Overridden only to correct bug in wxWindows, docview.cpp
+    virtual bool Save(); // Overridden only to correct bug in wxWidgets, docview.cpp
 
 //// Accessors
 
diff --git a/utils/configtool/src/configtree.cpp b/utils/configtool/src/configtree.cpp
index 6d36f3964f..7236c81ec2 100644
--- a/utils/configtool/src/configtree.cpp
+++ b/utils/configtool/src/configtree.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        configtree.h
-// Purpose:     wxWindows Configuration Tool tree class
+// Purpose:     wxWidgets Configuration Tool tree class
 // Author:      Julian Smart
 // Modified by:
 // Created:     2003-06-03
diff --git a/utils/configtool/src/configtree.h b/utils/configtool/src/configtree.h
index 757c746db6..4410af90dc 100644
--- a/utils/configtool/src/configtree.h
+++ b/utils/configtool/src/configtree.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        configtree.h
-// Purpose:     wxWindows Configuration Tool tree class
+// Purpose:     wxWidgets Configuration Tool tree class
 // Author:      Julian Smart
 // Modified by:
 // Created:     2003-06-03
diff --git a/utils/configtool/src/mainframe.cpp b/utils/configtool/src/mainframe.cpp
index ff22400c82..b91d75eb53 100644
--- a/utils/configtool/src/mainframe.cpp
+++ b/utils/configtool/src/mainframe.cpp
@@ -337,7 +337,7 @@ wxMenuBar* ctMainFrame::CreateMenuBar()
 
     wxMenu *helpMenu = new wxMenu;
     helpMenu->Append(wxID_HELP, wxT("&Help Contents"), wxT("Show Configuration Tool help"));
-    helpMenu->Append(ctID_REFERENCE_CONTENTS, wxT("&wxWindows Help Contents"), wxT("Show wxWindows reference"));
+    helpMenu->Append(ctID_REFERENCE_CONTENTS, wxT("&wxWidgets Help Contents"), wxT("Show wxWidgets reference"));
     helpMenu->AppendSeparator();
     helpMenu->Append(ctID_ITEM_HELP, wxT("&Configuration Option Help\tF1"), wxT("Show help for the selected option"));
     helpMenu->Append(wxID_HELP_CONTEXT, wxT("&What's this?"), wxT("Show help on the clicked item"));
@@ -352,7 +352,7 @@ wxMenuBar* ctMainFrame::CreateMenuBar()
     menuBar->Append(helpMenu, wxT("&Help"));
 
     {
-        wxConfig config(wxGetApp().GetSettings().GetAppName(), wxT("wxWindows"));
+        wxConfig config(wxGetApp().GetSettings().GetAppName(), wxT("wxWidgets"));
         config.SetPath(wxT("FileHistory/"));
         wxGetApp().GetDocManager()->FileHistoryLoad(config);
     }    
diff --git a/utils/configtool/src/propeditor.cpp b/utils/configtool/src/propeditor.cpp
index d45415fe2f..9b20dc3fca 100644
--- a/utils/configtool/src/propeditor.cpp
+++ b/utils/configtool/src/propeditor.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        propeditor.cpp
-// Purpose:     wxWindows Configuration Tool property editor
+// Purpose:     wxWidgets Configuration Tool property editor
 // Author:      Julian Smart
 // Modified by:
 // Created:     2003-06-03
diff --git a/utils/configtool/src/propeditor.h b/utils/configtool/src/propeditor.h
index c1c3fa33c1..6fa790c41b 100644
--- a/utils/configtool/src/propeditor.h
+++ b/utils/configtool/src/propeditor.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        propeditor.cpp
-// Purpose:     Property editor for wxWindows configuration tool
+// Purpose:     Property editor for wxWidgets configuration tool
 // Author:      Julian Smart
 // Modified by:
 // Created:     2003-06-03
diff --git a/utils/configtool/src/settingsdialog.cpp b/utils/configtool/src/settingsdialog.cpp
index ad3ac8e7d3..4d0784a198 100644
--- a/utils/configtool/src/settingsdialog.cpp
+++ b/utils/configtool/src/settingsdialog.cpp
@@ -319,25 +319,25 @@ void ctLocationSettingsDialog::CreateControls()
     wxStaticBoxSizer* item13 = new wxStaticBoxSizer(item13Static, wxVERTICAL);
     item12->Add(item13, 1, wxGROW|wxALL, 5);
 
-    wxStaticText* item14 = new wxStaticText(item11, wxID_STATIC, _("&wxWindows hierarchy:"), wxDefaultPosition, wxDefaultSize, 0);
+    wxStaticText* item14 = new wxStaticText(item11, wxID_STATIC, _("&wxWidgets hierarchy:"), wxDefaultPosition, wxDefaultSize, 0);
     item13->Add(item14, 0, wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE, 5);
 
     wxBoxSizer* item15 = new wxBoxSizer(wxHORIZONTAL);
     item13->Add(item15, 0, wxGROW, 5);
 
     wxTextCtrl* item16 = new wxTextCtrl(item11, ID_WXWIN_HIERARCHY, _(""), wxDefaultPosition, wxSize(200, -1), 0);
-    item16->SetHelpText(_("Enter the root path of the wxWindows hierarchy"));
+    item16->SetHelpText(_("Enter the root path of the wxWidgets hierarchy"));
 #if wxUSE_TOOLTIPS
     if (ShowToolTips())
-        item16->SetToolTip(_("Enter the root path of the wxWindows hierarchy"));
+        item16->SetToolTip(_("Enter the root path of the wxWidgets hierarchy"));
 #endif
     item15->Add(item16, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
     wxButton* item17 = new wxButton(item11, ID_CHOOSE_WXWIN_HIERARCHY, _("&Choose..."), wxDefaultPosition, wxDefaultSize, 0);
-    item17->SetHelpText(_("Click to choose the root path of the wxWindows hierarchy\\n"));
+    item17->SetHelpText(_("Click to choose the root path of the wxWidgets hierarchy\\n"));
 #if wxUSE_TOOLTIPS
     if (ShowToolTips())
-        item17->SetToolTip(_("Click to choose the root path of the wxWindows hierarchy\\n"));
+        item17->SetToolTip(_("Click to choose the root path of the wxWidgets hierarchy\\n"));
 #endif
     item15->Add(item17, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
@@ -382,7 +382,7 @@ void ctLocationSettingsDialog::OnChooseWxwinHierarchy( wxCommandEvent& WXUNUSED(
     wxASSERT( textCtrl != NULL );
     wxString defaultPath = textCtrl->GetValue();
 
-    wxDirDialog dialog(this, _("Choose the location of the wxWindows hierarchy"),
+    wxDirDialog dialog(this, _("Choose the location of the wxWidgets hierarchy"),
             defaultPath);
     if (dialog.ShowModal() == wxID_OK)
     {
diff --git a/utils/configtool/src/symbols.h b/utils/configtool/src/symbols.h
index 2d0a0fe269..3f8cd3194b 100644
--- a/utils/configtool/src/symbols.h
+++ b/utils/configtool/src/symbols.h
@@ -33,6 +33,6 @@
 #define ctDESCRIPTION_BACKGROUND_COLOUR wxColour(255, 255, 192)
 
 // Misc symbols
-#define ctSYMBOL_WEBSITE            wxT("http://www.wxwindows.org")
+#define ctSYMBOL_WEBSITE            wxT("http://www.wxwidgets.org")
 
 #endif
diff --git a/utils/configtool/src/wxconfigtool.h b/utils/configtool/src/wxconfigtool.h
index 130bfbeaad..c1afc994f3 100644
--- a/utils/configtool/src/wxconfigtool.h
+++ b/utils/configtool/src/wxconfigtool.h
@@ -68,7 +68,7 @@ public:
     /// Returns the help controller object for the manual.
     wxHelpControllerBase& GetHelpController() { return *m_helpController; }
 
-    /// Returns the help controller object for the wxWindows reference manual.
+    /// Returns the help controller object for the wxWidgets reference manual.
     wxHelpControllerBase& GetReferenceHelpController() { return *m_helpControllerReference; }
 
     /// Returns the document manager object.
@@ -91,7 +91,7 @@ public:
     /// Saves config info to the registry or a file.
     virtual bool SaveConfig();
 
-    /// The help controller needs to be cleared before wxWindows
+    /// The help controller needs to be cleared before wxWidgets
     /// cleanup happens.
     void ClearHelpControllers() ;
 
diff --git a/utils/emulator/docs/readme.txt b/utils/emulator/docs/readme.txt
index 79e00f71f1..122c0f1ac5 100644
--- a/utils/emulator/docs/readme.txt
+++ b/utils/emulator/docs/readme.txt
@@ -1,8 +1,8 @@
-wxWindows PDA/Embedded System Emulator
+wxWidgets PDA/Embedded System Emulator
 ======================================
 
 This is a simple display emulator for embedded
-applications (wxWindows or other) that use
+applications (wxWidgets or other) that use
 an X server. The Familiar Linux distribution
 is one such environment, using Tiny-X.
 
@@ -86,7 +86,7 @@ Compiling wxEmulator
 
 You need to use wxX11 -- no other port is supported.
 Configure and make wxX11 in the usual way (see docs/x11/install.txt
-at the wxWindows top level), then compile wxEmulator
+at the wxWidgets top level), then compile wxEmulator
 using the makefile that configure created.
 
 Have fun!
diff --git a/utils/emulator/src/emulator.cpp b/utils/emulator/src/emulator.cpp
index 57cb827ee1..7b8e35d6ea 100644
--- a/utils/emulator/src/emulator.cpp
+++ b/utils/emulator/src/emulator.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        emulator.cpp
-// Purpose:     Emulator wxWindows sample
+// Purpose:     Emulator wxWidgets sample
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
@@ -29,7 +29,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers)
+// need because it includes almost all "standard" wxWidgets headers)
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
@@ -56,10 +56,10 @@
 #endif
 
 // ----------------------------------------------------------------------------
-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets
 // ----------------------------------------------------------------------------
 
-// the event tables connect the wxWindows events with the functions (event
+// the event tables connect the wxWidgets events with the functions (event
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(wxEmulatorFrame, wxFrame)
@@ -68,7 +68,7 @@ BEGIN_EVENT_TABLE(wxEmulatorFrame, wxFrame)
     EVT_CLOSE(wxEmulatorFrame::OnCloseWindow)
 END_EVENT_TABLE()
 
-// Create a new application object: this macro will allow wxWindows to create
+// Create a new application object: this macro will allow wxWidgets to create
 // the application object during program execution (it's better than using a
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. wxEmulatorApp and
@@ -147,7 +147,7 @@ bool wxEmulatorApp::OnInit()
         wxLog::SetActiveTarget(new wxLogStderr);
 #endif
         wxString msg;
-        msg.Printf(wxT("wxWindows PDA Emulator (c) Julian Smart, 2002 Version %.2f, %s"), wxEMULATOR_VERSION, __DATE__);
+        msg.Printf(wxT("wxWidgets PDA Emulator (c) Julian Smart, 2002 Version %.2f, %s"), wxEMULATOR_VERSION, __DATE__);
         wxLogMessage(msg);
         return false;
     }
@@ -454,7 +454,7 @@ bool wxEmulatorInfo::Load(const wxString& appDir)
     wxString rootPath = wxPathOnly(absoluteConfigPath);
 
     {
-        wxFileConfig config(wxT("wxEmulator"), wxT("wxWindows"),
+        wxFileConfig config(wxT("wxEmulator"), wxT("wxWidgets"),
             absoluteConfigPath, wxEmptyString, wxCONFIG_USE_LOCAL_FILE);
 
         config.Read(wxT("/General/title"), & m_emulatorTitle);
diff --git a/utils/emulator/src/emulator.h b/utils/emulator/src/emulator.h
index f24bf66f21..f14f968ff3 100644
--- a/utils/emulator/src/emulator.h
+++ b/utils/emulator/src/emulator.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     2002-03-10
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
+// Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -131,7 +131,7 @@ public:
     void OnCloseWindow(wxCloseEvent& 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()
 };
 
diff --git a/utils/helpview/src/client.cpp b/utils/helpview/src/client.cpp
index f4ff1e72f1..218d658a70 100644
--- a/utils/helpview/src/client.cpp
+++ b/utils/helpview/src/client.cpp
@@ -102,7 +102,7 @@ bool MyApp::OnInit()
     // for Unix, should be a valid file name (for a nonexistent file)
     // for nonMSW, nonUnix, must be port number, for example "4242" (TCP/IP based classes)
     // should be unique to the client app
-    a_service = "/tmp/wxWindows-helpconnection";
+    a_service = "/tmp/wxWidgets-helpconnection";
     //a_service = "4242";
     a_windowname = "HTML Help Test: %s";
 	
diff --git a/utils/helpview/src/helpview.cpp b/utils/helpview/src/helpview.cpp
index 14e98cf8dc..60b0f7e78f 100644
--- a/utils/helpview/src/helpview.cpp
+++ b/utils/helpview/src/helpview.cpp
@@ -22,7 +22,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers
+// need because it includes almost all "standard" wxWidgets headers
 #ifndef WX_PRECOMP
 #include "wx/wx.h"
 #endif
@@ -191,7 +191,7 @@ bool hvApp::OnInit()
     wxInitAllImageHandlers();
     wxFileSystem::AddHandler(new wxZipFSHandler);
 
-    SetVendorName(wxT("wxWindows") );
+    SetVendorName(wxT("wxWidgets") );
     SetAppName(wxT("wxHTMLHelpServer") );
     wxConfig::Get(); // create an instance
 
@@ -395,7 +395,7 @@ wxBitmap AlternateArtProvider::CreateBitmap(const wxArtID& id,
 
         //ART(wxART_GO_HOME,                             home)
 
-        // Any wxWindows icons not implemented here
+        // Any wxWidgets icons not implemented here
         // will be provided by the default art provider.
         return wxNullBitmap;
 }
diff --git a/utils/helpview/src/readme.txt b/utils/helpview/src/readme.txt
index 45a5b724c3..9d803e024b 100644
--- a/utils/helpview/src/readme.txt
+++ b/utils/helpview/src/readme.txt
@@ -15,7 +15,7 @@ If USE_REMOTE in client.cpp is undefined, the "client" app will use wxHtmlHelpCo
 ------------------------------------------------
 wxRemoteHtmlHelpController Class
 
-This class can be added to an application (the client) to provide wxWindows HTML help.  It will start up the remote help controller (helpview) the first time the Display member function is called, passing the server the connection name or port number, the name of the help window and the help book (.hhp, .htb, .zip).  This class will only work with a particular server app, helpview.
+This class can be added to an application (the client) to provide wxWidgets HTML help.  It will start up the remote help controller (helpview) the first time the Display member function is called, passing the server the connection name or port number, the name of the help window and the help book (.hhp, .htb, .zip).  This class will only work with a particular server app, helpview.
 
 Most of the functions of wxHtmlHelpController are available - the relevant arguments are just passed to wxHtmlHelpController in the server.  The functions involving wxConfig are not implemented - the config parameters (font, windows size and position) are kept in the server. 
 
diff --git a/utils/nplugin/samples/gui/gui.cpp b/utils/nplugin/samples/gui/gui.cpp
index 3ae118fda0..319e029e2a 100644
--- a/utils/nplugin/samples/gui/gui.cpp
+++ b/utils/nplugin/samples/gui/gui.cpp
@@ -1,6 +1,6 @@
 /*
  * File:	simple.cpp
- * Purpose:	Minimal wxWindows plugin
+ * Purpose:	Minimal wxWidgets plugin
  * Author:	Julian Smart
  * Created:	1997
  * Updated:	
diff --git a/utils/nplugin/samples/gui/gui.h b/utils/nplugin/samples/gui/gui.h
index 01e46d64b6..e774a4fed9 100644
--- a/utils/nplugin/samples/gui/gui.h
+++ b/utils/nplugin/samples/gui/gui.h
@@ -1,6 +1,6 @@
 /*
  * File:	gui.h
- * Purpose:	wxWindows plugin with a few GUI elements
+ * Purpose:	wxWidgets plugin with a few GUI elements
  * Author:	Julian Smart
  * Created:	1997
  * Updated:	
diff --git a/utils/nplugin/samples/simple/simple.cpp b/utils/nplugin/samples/simple/simple.cpp
index 4e4a83f593..3c46d88c8d 100644
--- a/utils/nplugin/samples/simple/simple.cpp
+++ b/utils/nplugin/samples/simple/simple.cpp
@@ -1,6 +1,6 @@
 /*
  * File:	simple.cpp
- * Purpose:	Minimal wxWindows plugin
+ * Purpose:	Minimal wxWidgets plugin
  * Author:	Julian Smart
  * Created:	1997
  * Updated:	
diff --git a/utils/nplugin/src/npapp.cpp b/utils/nplugin/src/npapp.cpp
index b9e28cc159..a2499e1cf8 100644
--- a/utils/nplugin/src/npapp.cpp
+++ b/utils/nplugin/src/npapp.cpp
@@ -240,7 +240,7 @@ NPError      wxPluginApp::NPP_SetWindow(NPP instance, NPWindow* window)
 
 void      wxPluginApp::NPP_Shutdown(void)
 {
-    // Clean up wxWindows
+    // Clean up wxWidgets
     CleanUp();
 }
 
diff --git a/utils/nplugin/src/npframe.cpp b/utils/nplugin/src/npframe.cpp
index 2e050c174b..47401b59b9 100644
--- a/utils/nplugin/src/npframe.cpp
+++ b/utils/nplugin/src/npframe.cpp
@@ -93,7 +93,7 @@ void wxPluginFrame::GetClientSize(int *x, int *y) const
 }
 
 // Set the client size (i.e. leave the calculation of borders etc.
-// to wxWindows)
+// to wxWidgets)
 void wxPluginFrame::SetClientSize(const int width, const int height)
 {
     if ( !m_hWnd )
diff --git a/utils/tex2rtf/distrib/innobott.txt b/utils/tex2rtf/distrib/innobott.txt
index e33a761ca3..8dc2a6ec8b 100644
--- a/utils/tex2rtf/distrib/innobott.txt
+++ b/utils/tex2rtf/distrib/innobott.txt
@@ -33,6 +33,6 @@
 ;InnoVer=1.3
 ;AddVerTo=AppVerName
 ;SetupFilename=setup.exe
-;OutputFolder=C:\wx2dev\wxWindows\deliver
+;OutputFolder=C:\wx2dev\wxWidgets\deliver
 ;CopyrightText=Copyright © Julian Smart, 2002
 
diff --git a/utils/tex2rtf/distrib/innotop.txt b/utils/tex2rtf/distrib/innotop.txt
index 1a26b5fa19..d13e51ed65 100644
--- a/utils/tex2rtf/distrib/innotop.txt
+++ b/utils/tex2rtf/distrib/innotop.txt
@@ -40,8 +40,8 @@
     DiskClusterSize=512
     ReserveBytes=0
     UseSetupLdr=1
-    LicenseFile=c:\wx2dev\wxWindows\utils\tex2rtf\docs\licence.txt
-    InfoAfterFile=c:\wx2dev\wxWindows\utils\tex2rtf\docs\readme.txt
-    SourceDir=c:\wx2dev\wxWindows\deliver\tex2rtf
-    OutputDir=c:\wx2dev\wxWindows\deliver
+    LicenseFile=c:\wx2dev\wxWidgets\utils\tex2rtf\docs\licence.txt
+    InfoAfterFile=c:\wx2dev\wxWidgets\utils\tex2rtf\docs\readme.txt
+    SourceDir=c:\wx2dev\wxWidgets\deliver\tex2rtf
+    OutputDir=c:\wx2dev\wxWidgets\deliver
 
diff --git a/utils/tex2rtf/docs/install.txt b/utils/tex2rtf/docs/install.txt
index 6224eec7ec..944c4ddde8 100644
--- a/utils/tex2rtf/docs/install.txt
+++ b/utils/tex2rtf/docs/install.txt
@@ -10,7 +10,7 @@ will need to compile Tex2RTF. There are several options for doing this.
 
 If you want to have a graphical interface for Tex2RTF
 (not essential for a conversion utility!) then you
-will need to download wxWindows from skye.aiai.ed.ac.uk
+will need to download wxWidgets from skye.aiai.ed.ac.uk
 (192.41.104.6) in the directory /pub/wxwin/beta, files
 wx150?_*.tar.Z (or .gz) where ? is the latest beta letter,
 currently i.
@@ -30,7 +30,7 @@ change the makefiles or build project files for other compilers.)
 (2) Non-GUI version
 
 Under UNIX, simply use the target 'nogui'. The supplied files in the
-src/wxwin directory supply the essential utilities from wxWindows, and
+src/wxwin directory supply the essential utilities from wxWidgets, and
 Tex2RTF will be built as a command-line program.
 
 On a PC, add 'NOGUI=1' to the makefile command line. Note that the small
diff --git a/utils/tex2rtf/docs/readme.txt b/utils/tex2rtf/docs/readme.txt
index d5c2afeacb..31e97dbb12 100644
--- a/utils/tex2rtf/docs/readme.txt
+++ b/utils/tex2rtf/docs/readme.txt
@@ -32,7 +32,7 @@ Output
 
   *  HTML (the World Wide Web hypertext format)
 
-  *  wxHTML Help (the wxWindows GUI library help file format)
+  *  wxHTML Help (the wxWidgets GUI library help file format)
 
 Installation
 ============
@@ -47,7 +47,7 @@ Platforms supported
 
   *  Windows (all 32-bit desktop versions)
 
-  *  Any Unix supporting wxWindows
+  *  Any Unix supporting wxWidgets
 
   *  Mac OS X
 
@@ -61,12 +61,12 @@ from:
 
 The WWW pages are at:
 
-    http://www.wxwindows.org/tex2rtf
+    http://www.wxwidgets.org/tex2rtf
 
 Tex2RTF was developed using the free, cross-platform GUI toolkit
-wxWindows, at http://www.wxwindows.org. To compile Tex2RTF
+wxWidgets, at http://www.wxwidgets.org. To compile Tex2RTF
 for platforms for which there are no Tex2RTF binaries,
-you need to download an appropriate version of wxWindows,
+you need to download an appropriate version of wxWidgets,
 configure and compile the library, then compile Tex2RTF
 in utils/tex2rtf/src.
 
diff --git a/utils/wxOLE/gtk/wxole.cpp b/utils/wxOLE/gtk/wxole.cpp
index aa48f8a614..07368ca3c0 100644
--- a/utils/wxOLE/gtk/wxole.cpp
+++ b/utils/wxOLE/gtk/wxole.cpp
@@ -358,7 +358,7 @@ bool wxOleControl::Create( wxWindowID id, long style, const wxString &name )
 
     PreCreation( (wxWindow*) NULL, id, wxDefaultPosition, wxDefaultSize, style, name );
 
-    m_title = _T("wxWindows OLE Server");
+    m_title = _T("wxWidgets OLE Server");
     
     /* any widget that can contain another widget and resizes it
        to its full size */
diff --git a/utils/wxOLE/samples/servlet/servlet.cpp b/utils/wxOLE/samples/servlet/servlet.cpp
index 9e6b2d6416..216195d35c 100644
--- a/utils/wxOLE/samples/servlet/servlet.cpp
+++ b/utils/wxOLE/samples/servlet/servlet.cpp
@@ -130,6 +130,6 @@ void MyOleControl::OnPaint( wxPaintEvent &WXUNUSED(event) )
 {
   wxPaintDC dc(this);
   dc.SetFont( wxFont( 24, wxDECORATIVE, wxNORMAL, wxNORMAL, FALSE, "charter" ) );
-  dc.DrawText( "wxWindows rules!", 5, 5 );
+  dc.DrawText( "wxWidgets rules!", 5, 5 );
 }
     
-- 
2.50.0

