From: Julian Smart <julian@anthemion.co.uk>
Date: Sun, 23 May 2004 14:56:36 +0000 (+0000)
Subject: Name and version changes
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/77ffb5937e89927b621128789401db8921fe580f

Name and version changes


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

diff --git a/build/bakefiles/Bakefiles.bkgen b/build/bakefiles/Bakefiles.bkgen
index e3d4115cd6..01d55397df 100644
--- a/build/bakefiles/Bakefiles.bkgen
+++ b/build/bakefiles/Bakefiles.bkgen
@@ -29,7 +29,7 @@
     <disable-formats>dmars,dmars_smake,cbx_unix,cbuilderx,msevc4prj</disable-formats>
     
 
-    <!-- These wildcards match all .bkl files in wxWindows tree: -->
+    <!-- These wildcards match all .bkl files in wxWidgets tree: -->
     <input>
         wx.bkl
         ../../contrib/build/*/*.bkl
@@ -139,7 +139,7 @@
 
     <add-formats files="wx.bkl">wx24dsp</add-formats>
     <add-flags formats="wx24dsp">
-        -DUSE_GUI=1 -DWXUNIV=0 -o../../src/wxWindows.dsp
+        -DUSE_GUI=1 -DWXUNIV=0 -o../../src/wxWidgets.dsp
     </add-flags>
     
     <add-formats files="wx.bkl">rpmspec</add-formats>
diff --git a/build/bakefiles/README b/build/bakefiles/README
index 9bbcf5fbc2..b0a86b12e1 100644
--- a/build/bakefiles/README
+++ b/build/bakefiles/README
@@ -1,6 +1,6 @@
 
 This directory contains Bakefile (see http://bakefile.sourceforge.net)
-files needed to generate native makefiles for wxWindows library, contrib and
+files needed to generate native makefiles for wxWidgets library, contrib and
 samples.
 
 Use the bakefile_gen utility to regenerate the makefiles (run it in this
@@ -36,7 +36,7 @@ Note: the following files are generated using bakefile_gen:
     that contain "This makefile was generated by Bakefile" banner and
     VC++ project files in samples, demos and utils directories (inc. contrib
     ones)
-  * src/wxWindows.dsp
+  * src/wxWidgets.dsp
   * {wxGTK,wxMotif,wxX11}.spec (only wxBase headers list)
   * autoconf_inc.m4
   * all Makefile.in files
diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 77f2e66b5e..1265f4fc8e 100644
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -16,7 +16,7 @@
     <include file="plugins_deps.bkl"/>
     
     <!-- ================================================================== -->
-    <!--                     wxWindows version numbers:                     -->
+    <!--                     wxWidgets version numbers:                     -->
     <!-- ================================================================== -->
 
     <set var="WXVER_MAJOR">$(wxwin.getVersionMajor())</set>
@@ -260,7 +260,7 @@
         <libname>$(id)$(WXDEBUGFLAG)$(HOST_SUFFIX)</libname>
         <!--
         we want to install 3rd party libs system-wide only with static
-        version of wxWindows; otherwise they are embedded in shared libs:
+        version of wxWidgets; otherwise they are embedded in shared libs:
         -->
         <install-if>SHARED=='0'</install-if>
         <pic>$(substituteFromDict(SHARED, {'0':'off', '1':'on'}))</pic>
@@ -323,7 +323,7 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
 
     
     <!-- =============================================================== -->
-    <!--                  Templates for wxWindows libs:                  -->
+    <!--                  Templates for wxWidgets libs:                  -->
     <!-- =============================================================== -->
 
     <template id="wx" template="common_settings">
@@ -493,7 +493,7 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
     </template>
                            
     <!-- =============================================================== -->
-    <!--             Templates for building wxWindows plugins:           -->
+    <!--             Templates for building wxWidgets plugins:           -->
     <!-- =============================================================== -->
 
     <if cond="WX_STABLE_BRANCH=='1'">
@@ -555,7 +555,7 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
     </define-rule>
     
     <!-- =============================================================== -->
-    <!--               Support for wxWindows samples and contrib:        -->
+    <!--               Support for wxWidgets samples and contrib:        -->
     <!-- =============================================================== -->
 
     <!-- Link against one wxWin library. Value must be literal! -->
diff --git a/build/bakefiles/common_samples.bkl b/build/bakefiles/common_samples.bkl
index a6eb1e06af..b1a25cdab3 100644
--- a/build/bakefiles/common_samples.bkl
+++ b/build/bakefiles/common_samples.bkl
@@ -7,7 +7,7 @@
     <set var="file_common_samples_included">1</set>
     
     <!-- =============================================================== -->
-    <!--                    Template for wxWindows samples:              -->
+    <!--                    Template for wxWidgets samples:              -->
     <!-- =============================================================== -->
 
     <if cond="FORMAT=='autoconf'">
diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl
index 6c697ad2c9..23a9c24b90 100644
--- a/build/bakefiles/config.bkl
+++ b/build/bakefiles/config.bkl
@@ -28,7 +28,7 @@
         <values-description>,Unicode</values-description>
         <default-value>0</default-value>        
         <description>
-            Compile Unicode build of wxWindows?
+            Compile Unicode build of wxWidgets?
         </description>
     </option>
 
@@ -159,7 +159,7 @@ Acts according to DEBUG_INFO by default.
         <values>0,1</values>
         <default-value>0</default-value>
         <description>
-            Is this official build by wxWindows developers?
+            Is this official build by wxWidgets developers?
         </description>
     </option>
     <option name="VENDOR">
diff --git a/build/bakefiles/formats/FORMATS.bkmanifest b/build/bakefiles/formats/FORMATS.bkmanifest
index 7e380ffe6a..22e76f37c0 100644
--- a/build/bakefiles/formats/FORMATS.bkmanifest
+++ b/build/bakefiles/formats/FORMATS.bkmanifest
@@ -4,9 +4,9 @@
 
     <format id="wx24dsp">
         <description>
-            src/wxWindows.dsp which makes same files as 2.4 version
+            src/wxWidgets.dsp which makes same files as 2.4 version
         </description>
-        <default-filename>wxWindows.dsp</default-filename>
+        <default-filename>wxWidgets.dsp</default-filename>
     </format>
     
     <format id="rpmspec">
diff --git a/build/bakefiles/formats/README b/build/bakefiles/formats/README
index 039ed338fc..3e64c5e750 100644
--- a/build/bakefiles/formats/README
+++ b/build/bakefiles/formats/README
@@ -1,6 +1,6 @@
 
-This directory contains misc Bakefile backends that are wxWindows-specific:
+This directory contains misc Bakefile backends that are wxWidgets-specific:
 
-wx24dsp     - generates wx2.4-compatible VC++ project file (src/wxWindows.dsp)
+wx24dsp     - generates wx2.4-compatible VC++ project file (src/wxWidgets.dsp)
 rpmspec     - generates part of .spec files with list of wxBase headers
 cbx_unix    - Borland C++BuilderX project files for configure-based build
diff --git a/build/bakefiles/formats/wx24dsp.empy b/build/bakefiles/formats/wx24dsp.empy
index 48e5aeea02..32a642f9d9 100644
--- a/build/bakefiles/formats/wx24dsp.empy
+++ b/build/bakefiles/formats/wx24dsp.empy
@@ -28,35 +28,35 @@ commonHdrs.sort()
 HEADERS.insert(0, ('Common', commonHdrs))
 
 }@
-# Microsoft Developer Studio Project File - Name="wxWindows" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="wxWidgets" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
 
-CFG=wxWindows - Win32 Debug
+CFG=wxWidgets - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
-!MESSAGE NMAKE /f "wxWindows.mak".
+!MESSAGE NMAKE /f "wxWidgets.mak".
 !MESSAGE 
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "wxWindows.mak" CFG="wxWindows - Win32 Debug"
+!MESSAGE NMAKE /f "wxWidgets.mak" CFG="wxWidgets - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "wxWindows - Win32 Release Unicode DLL" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "wxWindows - Win32 Debug Unicode DLL" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "wxWindows - Win32 Release Unicode" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxWindows - Win32 Debug Unicode" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxWindows - Win32 Release DLL" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "wxWindows - Win32 Debug DLL" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "wxWindows - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxWindows - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxWindows - Win32 Release With Debug Info" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxWidgets - Win32 Release Unicode DLL" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "wxWidgets - Win32 Debug Unicode DLL" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "wxWidgets - Win32 Release Unicode" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxWidgets - Win32 Debug Unicode" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxWidgets - Win32 Release DLL" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "wxWidgets - Win32 Debug DLL" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "wxWidgets - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxWidgets - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxWidgets - Win32 Release With Debug Info" (based on "Win32 (x86) Static Library")
 !MESSAGE 
 
 # Begin Project
@@ -64,7 +64,7 @@ CFG=wxWindows - Win32 Debug
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
 
-!IF  "$(CFG)" == "wxWindows - Win32 Release Unicode DLL"
+!IF  "$(CFG)" == "wxWidgets - Win32 Release Unicode DLL"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -93,7 +93,7 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\expat.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /dll /machine:I386 /out:"../lib/wxmsw250u.dll"
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\expat.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250u.dll"
 
-!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug Unicode DLL"
+!ELSEIF  "$(CFG)" == "wxWidgets - Win32 Debug Unicode DLL"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -122,7 +122,7 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\expatd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /out:"../lib/wxmsw250ud.dll" /pdbtype:sept
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\expatd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250ud.dll"
 
-!ELSEIF  "$(CFG)" == "wxWindows - Win32 Release Unicode"
+!ELSEIF  "$(CFG)" == "wxWidgets - Win32 Release Unicode"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -147,7 +147,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo /out:"..\lib\wxmswu.lib"
 
-!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug Unicode"
+!ELSEIF  "$(CFG)" == "wxWidgets - Win32 Debug Unicode"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -172,7 +172,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo /out:"..\lib\wxmswud.lib"
 
-!ELSEIF  "$(CFG)" == "wxWindows - Win32 Release DLL"
+!ELSEIF  "$(CFG)" == "wxWidgets - Win32 Release DLL"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -201,7 +201,7 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\expat.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /dll /machine:I386 /out:"../lib/wxmsw250.dll"
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\expat.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250.dll"
 
-!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug DLL"
+!ELSEIF  "$(CFG)" == "wxWidgets - Win32 Debug DLL"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -230,7 +230,7 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\expatd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /out:"../lib/wxmsw250d.dll" /pdbtype:sept
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\expatd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250d.dll"
 
-!ELSEIF  "$(CFG)" == "wxWindows - Win32 Release"
+!ELSEIF  "$(CFG)" == "wxWidgets - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -255,7 +255,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo /out:"..\lib\wxmsw.lib"
 
-!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug"
+!ELSEIF  "$(CFG)" == "wxWidgets - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -280,12 +280,12 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo /out:"..\lib\wxmswd.lib"
 
-!ELSEIF  "$(CFG)" == "wxWindows - Win32 Release With Debug Info"
+!ELSEIF  "$(CFG)" == "wxWidgets - Win32 Release With Debug Info"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "wxWindows___Win32_Release_With_Debug_Info"
-# PROP BASE Intermediate_Dir "wxWindows___Win32_Release_With_Debug_Info"
+# PROP BASE Output_Dir "wxWidgets___Win32_Release_With_Debug_Info"
+# PROP BASE Intermediate_Dir "wxWidgets___Win32_Release_With_Debug_Info"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
@@ -309,15 +309,15 @@ LIB32=link.exe -lib
 
 # Begin Target
 
-# Name "wxWindows - Win32 Release Unicode DLL"
-# Name "wxWindows - Win32 Debug Unicode DLL"
-# Name "wxWindows - Win32 Release Unicode"
-# Name "wxWindows - Win32 Debug Unicode"
-# Name "wxWindows - Win32 Release DLL"
-# Name "wxWindows - Win32 Debug DLL"
-# Name "wxWindows - Win32 Release"
-# Name "wxWindows - Win32 Debug"
-# Name "wxWindows - Win32 Release With Debug Info"
+# Name "wxWidgets - Win32 Release Unicode DLL"
+# Name "wxWidgets - Win32 Debug Unicode DLL"
+# Name "wxWidgets - Win32 Release Unicode"
+# Name "wxWidgets - Win32 Debug Unicode"
+# Name "wxWidgets - Win32 Release DLL"
+# Name "wxWidgets - Win32 Debug DLL"
+# Name "wxWidgets - Win32 Release"
+# Name "wxWidgets - Win32 Debug"
+# Name "wxWidgets - Win32 Release With Debug Info"
 # Begin Source File
 
 SOURCE="This project is deprecated, please see install.txt"
@@ -350,7 +350,7 @@ SOURCE=.\@src[4:].replace('/','\\')
 
 SOURCE=..\include\wx\msw\setup.h
 
-!IF  "$(CFG)" == "wxWindows - Win32 Release Unicode DLL"
+!IF  "$(CFG)" == "wxWidgets - Win32 Release Unicode DLL"
 
 # Begin Custom Build - Creating ..\lib\mswdllu\wx\setup.h from $(InputPath)
 InputPath=..\include\wx\msw\setup.h
@@ -360,7 +360,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug Unicode DLL"
+!ELSEIF  "$(CFG)" == "wxWidgets - Win32 Debug Unicode DLL"
 
 # Begin Custom Build - Creating ..\lib\mswdllud\wx\setup.h from $(InputPath)
 InputPath=..\include\wx\msw\setup.h
@@ -370,7 +370,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "wxWindows - Win32 Release Unicode"
+!ELSEIF  "$(CFG)" == "wxWidgets - Win32 Release Unicode"
 
 # Begin Custom Build - Creating ..\lib\mswu\wx\setup.h from $(InputPath)
 InputPath=..\include\wx\msw\setup.h
@@ -380,7 +380,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug Unicode"
+!ELSEIF  "$(CFG)" == "wxWidgets - Win32 Debug Unicode"
 
 # Begin Custom Build - Creating ..\lib\mswud\wx\setup.h from $(InputPath)
 InputPath=..\include\wx\msw\setup.h
@@ -390,7 +390,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "wxWindows - Win32 Release DLL"
+!ELSEIF  "$(CFG)" == "wxWidgets - Win32 Release DLL"
 
 # Begin Custom Build - Creating ..\lib\mswdll\wx\setup.h from $(InputPath)
 InputPath=..\include\wx\msw\setup.h
@@ -400,7 +400,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug DLL"
+!ELSEIF  "$(CFG)" == "wxWidgets - Win32 Debug DLL"
 
 # Begin Custom Build - Creating ..\lib\mswdlld\wx\setup.h from $(InputPath)
 InputPath=..\include\wx\msw\setup.h
@@ -410,7 +410,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "wxWindows - Win32 Release"
+!ELSEIF  "$(CFG)" == "wxWidgets - Win32 Release"
 
 # Begin Custom Build - Creating ..\lib\msw\wx\setup.h from $(InputPath)
 InputPath=..\include\wx\msw\setup.h
@@ -420,7 +420,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug"
+!ELSEIF  "$(CFG)" == "wxWidgets - Win32 Debug"
 
 # Begin Custom Build - Creating ..\lib\mswd\wx\setup.h from $(InputPath)
 InputPath=..\include\wx\msw\setup.h
@@ -430,7 +430,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "wxWindows - Win32 Release With Debug Info"
+!ELSEIF  "$(CFG)" == "wxWidgets - Win32 Release With Debug Info"
 
 # Begin Custom Build - Creating ..\lib\msw\wx\setup.h from $(InputPath)
 InputPath=..\include\wx\msw\setup.h
diff --git a/build/bakefiles/mac_bundles.bkl b/build/bakefiles/mac_bundles.bkl
index 12292f47f2..87443306a3 100644
--- a/build/bakefiles/mac_bundles.bkl
+++ b/build/bakefiles/mac_bundles.bkl
@@ -4,7 +4,7 @@
 <makefile>
 
     <!--
-    Support for application bundles, for wxWindows samples.
+    Support for application bundles, for wxWidgets samples.
     -->
     
     <!-- 
@@ -61,7 +61,7 @@
                 <!-- make a hardlink to the binary: -->
                 ln -f $(ref("__targetdir",id))$(ref("__targetname",id)) $(BUNDLE)/MacOS/$(id)
 
-                <!-- ditto wxWindows resources and icons: -->
+                <!-- ditto wxWidgets resources and icons: -->
                 cp -f $(BUNDLE_RESOURCE) $(BUNDLE)/Resources/$(id).rsrc
                 cp -f $(BUNDLE_ICONS) $(BUNDLE)/Resources/wxmac.icns
             </command>            
diff --git a/build/bakefiles/make_dist.mk b/build/bakefiles/make_dist.mk
index f10e626d3b..8e6ae21f06 100644
--- a/build/bakefiles/make_dist.mk
+++ b/build/bakefiles/make_dist.mk
@@ -992,7 +992,7 @@ distrib_clean:
 # VZ: the -only targets allow to do "make dist bzip-dist-only" without copying
 #     the files twice
 dist-only:
-	@echo "*** Creating wxWindows distribution in $(DISTDIR)..."
+	@echo "*** Creating wxWidgets distribution in $(DISTDIR)..."
 	@cd _dist_dir && tar ch $(DISTDIRNAME) | gzip -f9 > ../$(WXARCHIVE);
 	@if test "$(USE_GUI)" = 1; then \
 	cd $(DISTDIR); \
@@ -1007,7 +1007,7 @@ dist-only:
 	fi
 
 dist: @GUIDIST@
-	@echo "*** Creating wxWindows distribution in $(DISTDIR)..."
+	@echo "*** Creating wxWidgets distribution in $(DISTDIR)..."
 	@# now prune away a lot of the crap included by using cp -R
 	@# in other dist targets.
 	find $(DISTDIR) \( -name "CVS" -o -name ".cvsignore" -o -name "*.dsp" -o -name "*.dsw" -o -name "*.hh*" -o \
@@ -1027,7 +1027,7 @@ dist: @GUIDIST@
 	fi
 
 bzip-dist-only:
-	@echo "*** Creating wxWindows distribution in $(DISTDIR)..."
+	@echo "*** Creating wxWidgets distribution in $(DISTDIR)..."
 	@cd _dist_dir && tar ch $(DISTDIRNAME) | bzip2 -f9 > ../$(WXARCHIVE_BZIP);
 	@if test "$(USE_GUI)" = 1; then \
 	cd $(DISTDIR); \
@@ -1042,7 +1042,7 @@ bzip-dist-only:
 	fi
 
 bzip-dist: @GUIDIST@
-	@echo "*** Creating wxWindows distribution in $(DISTDIR)..."
+	@echo "*** Creating wxWidgets distribution in $(DISTDIR)..."
 	@cd _dist_dir && tar ch $(DISTDIRNAME) | bzip2 -f9 > ../$(WXARCHIVE_BZIP)
 	@if test "$(USE_GUI)" = 1; then \
 	cd $(DISTDIR); \
@@ -1056,7 +1056,7 @@ bzip-dist: @GUIDIST@
 
 # RR: Copy text and binary data separatly
 win-dist: MSW_ZIP_TEXT_DIST
-	@echo "*** Creating wxWindows ZIP distribution in $(DISTDIR)..."
+	@echo "*** Creating wxWidgets ZIP distribution in $(DISTDIR)..."
 	@cd _dist_dir && mv $(DISTDIRNAME) wxMSW
 	@cd _dist_dir && zip -r -l  ../$(WXARCHIVE_ZIP) *
 	cp $(INCDIR)/wx/msw/*.cur _dist_dir/wxMSW/include/wx/msw
diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl
index 0907ece4a7..c85d937d96 100644
--- a/build/bakefiles/wx.bkl
+++ b/build/bakefiles/wx.bkl
@@ -2,7 +2,7 @@
 <!-- $Id$ -->
 
 
-<!-- Master bakefile for wxWindows -->
+<!-- Master bakefile for wxWidgets -->
 
 <makefile>
 
@@ -19,7 +19,7 @@
     <!-- list of files sorted into categories: -->
     <include file="files.bkl"/>
     
-    <!-- wxWindows variant where everything is in one library: -->
+    <!-- wxWidgets variant where everything is in one library: -->
     <include file="monolithic.bkl"/>
     <!-- ...and when there are multiple libraries: -->
     <include file="multilib.bkl"/>
@@ -175,15 +175,15 @@
 @echo " "
 @echo " ------------------------------------------------------"
 @echo " "
-@echo " The installation of wxWindows is finished.  On certain"
+@echo " The installation of wxWidgets is finished.  On certain"
 @echo " platforms (e.g. Linux) you'll now have to run ldconfig"
 @echo " if you installed a shared library and also modify the"
 @echo " LD_LIBRARY_PATH (or equivalent) environment variable."
 @echo " "
-@echo " wxWindows comes with no guarantees and doesn't claim"
+@echo " wxWidgets comes with no guarantees and doesn't claim"
 @echo " to be suitable for any purpose."
 @echo " "
-@echo " Read the wxWindows Licence on licencing conditions."
+@echo " Read the wxWidgets Licence on licencing conditions."
 @echo " "
 @echo " ------------------------------------------------------"
 @echo " "
diff --git a/build/bakefiles/wxwin.py b/build/bakefiles/wxwin.py
index 7a1473b623..846a185031 100644
--- a/build/bakefiles/wxwin.py
+++ b/build/bakefiles/wxwin.py
@@ -1,5 +1,5 @@
 #
-# Helper functions for wxWindows bakefiles
+# Helper functions for wxWidgets bakefiles
 #
 # $Id$
 #
@@ -20,7 +20,7 @@ utils.addSubstituteCallback('OBJS', __noopSubst)
 
 
 def mk_wxid(id):
-    """Creates wxWindows library identifier from bakefile target ID that
+    """Creates wxWidgets library identifier from bakefile target ID that
        follows this convention: DLLs end with 'dll', static libraries
        end with 'lib'. If withPrefix=1, then _wxid is returned instead
        of wxid."""
@@ -93,7 +93,7 @@ wxVersion = None
 VERSION_FILE = '../../include/wx/version.h'
 
 def getVersion():
-    """Returns wxWindows version as a tuple: (major,minor,release)."""
+    """Returns wxWidgets version as a tuple: (major,minor,release)."""
     global wxVersion
     if wxVersion == None:
         f = open(VERSION_FILE, 'rt')
diff --git a/configure b/configure
index 29de7a8ed8..4fd36de632 100755
--- a/configure
+++ b/configure
@@ -1,9 +1,9 @@
 #! /bin/sh
 # From configure.in Id: configure.in.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for wxWindows 2.5.1.
+# Generated by GNU Autoconf 2.59 for wxWidgets 2.5.2.
 #
-# Report bugs to <wx-dev@lists.wxwindows.org>.
+# Report bugs to <wx-dev@lists.wxwidgets.org>.
 #
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
@@ -268,11 +268,11 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 : ${ac_max_here_lines=38}
 
 # Identity of this package.
-PACKAGE_NAME='wxWindows'
-PACKAGE_TARNAME='wxwindows'
-PACKAGE_VERSION='2.5.1'
-PACKAGE_STRING='wxWindows 2.5.1'
-PACKAGE_BUGREPORT='wx-dev@lists.wxwindows.org'
+PACKAGE_NAME='wxWidgets'
+PACKAGE_TARNAME='wxwidgets'
+PACKAGE_VERSION='2.5.2'
+PACKAGE_STRING='wxWidgets 2.5.2'
+PACKAGE_BUGREPORT='wx-dev@lists.wxwidgets.org'
 
 ac_unique_file="wx-config.in"
 # Factoring default headers for most tests.
@@ -794,7 +794,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures wxWindows 2.5.1 to adapt to many kinds of systems.
+\`configure' configures wxWidgets 2.5.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -860,7 +860,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of wxWindows 2.5.1:";;
+     short | recursive ) echo "Configuration of wxWidgets 2.5.2:";;
    esac
   cat <<\_ACEOF
 
@@ -868,9 +868,9 @@ Optional Features:
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-gui            use GUI classes
-  --enable-monolithic     build wxWindows as single library
-  --enable-plugins        build parts of wxWindows as loadable components
-  --enable-universal      use wxWindows GUI controls instead of native ones
+  --enable-monolithic     build wxWidgets as single library
+  --enable-plugins        build parts of wxWidgets as loadable components
+  --enable-universal      use wxWidgets GUI controls instead of native ones
   --enable-nanox          use NanoX
   --enable-gtk2           use GTK+ 2.0 if available (EXPERIMENTAL)
   --enable-gpe            use GNOME PDA Environment features if possible
@@ -889,8 +889,8 @@ Optional Features:
   --enable-no_exceptions  create code without C++ exceptions handling
   --enable-permissive     compile code disregarding strict ANSI
   --enable-no_deps        create code without dependency information
-  --enable-compat22       enable wxWindows 2.2 compatibility
-  --disable-compat24      disable wxWindows 2.4 compatibility
+  --enable-compat22       enable wxWidgets 2.2 compatibility
+  --disable-compat24      disable wxWidgets 2.4 compatibility
   --enable-rpath=DIR      output the rpath flag from wx-config
   --enable-intl           use internationalization system
   --enable-config         use wxConfig (and derived) classes
@@ -931,7 +931,7 @@ Optional Features:
   --enable-timer          use wxTimer class
   --enable-unicode        compile wxString with Unicode support
   --enable-sound          use wxSound class
-  --enable-wxprintfv      use wxWindows implementation of vprintf()
+  --enable-wxprintfv      use wxWidgets implementation of vprintf()
   --enable-zipstream      use wxZipInputStream
   --enable-url            use wxURL class
   --enable-protocol       use wxProtocol class
@@ -1029,7 +1029,7 @@ Optional Features:
   --enable-pnm            use pnm images (PNM file format)
   --enable-xpm            use xpm images (XPM file format)
   --enable-icocur         use Windows ICO and CUR formats
-  --enable-official_build official build of wxWindows (win32 DLL only)
+  --enable-official_build official build of wxWidgets (win32 DLL only)
   --enable-vendor=VENDOR  vendor name (win32 DLL only)
   --disable-largefile     omit support for large files
   --disable-gtktest       do not try to compile and run a test GTK+ program
@@ -1087,7 +1087,7 @@ Some influential environment variables:
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
-Report bugs to <wx-dev@lists.wxwindows.org>.
+Report bugs to <wx-dev@lists.wxwidgets.org>.
 _ACEOF
 fi
 
@@ -1183,7 +1183,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-wxWindows configure 2.5.1
+wxWidgets configure 2.5.2
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1197,7 +1197,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by wxWindows $as_me 2.5.1, which was
+It was created by wxWidgets $as_me 2.5.2, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -11866,8 +11866,8 @@ echo "${ECHO_T}no" >&6
 fi
 
 if test "x$AR" = "x" ; then
-    { { echo "$as_me:$LINENO: error: ar is needed to build wxWindows" >&5
-echo "$as_me: error: ar is needed to build wxWindows" >&2;}
+    { { echo "$as_me:$LINENO: error: ar is needed to build wxWidgets" >&5
+echo "$as_me: error: ar is needed to build wxWidgets" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -12842,7 +12842,7 @@ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precede
     (
       cat <<\_ASBOX
 ## ----------------------------------------- ##
-## Report this to wx-dev@lists.wxwindows.org ##
+## Report this to wx-dev@lists.wxwidgets.org ##
 ## ----------------------------------------- ##
 _ASBOX
     ) |
@@ -12992,7 +12992,7 @@ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precede
     (
       cat <<\_ASBOX
 ## ----------------------------------------- ##
-## Report this to wx-dev@lists.wxwindows.org ##
+## Report this to wx-dev@lists.wxwidgets.org ##
 ## ----------------------------------------- ##
 _ASBOX
     ) |
@@ -13142,7 +13142,7 @@ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precede
     (
       cat <<\_ASBOX
 ## ----------------------------------------- ##
-## Report this to wx-dev@lists.wxwindows.org ##
+## Report this to wx-dev@lists.wxwidgets.org ##
 ## ----------------------------------------- ##
 _ASBOX
     ) |
@@ -13292,7 +13292,7 @@ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precede
     (
       cat <<\_ASBOX
 ## ----------------------------------------- ##
-## Report this to wx-dev@lists.wxwindows.org ##
+## Report this to wx-dev@lists.wxwidgets.org ##
 ## ----------------------------------------- ##
 _ASBOX
     ) |
@@ -13444,7 +13444,7 @@ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precede
     (
       cat <<\_ASBOX
 ## ----------------------------------------- ##
-## Report this to wx-dev@lists.wxwindows.org ##
+## Report this to wx-dev@lists.wxwidgets.org ##
 ## ----------------------------------------- ##
 _ASBOX
     ) |
@@ -13596,7 +13596,7 @@ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precede
     (
       cat <<\_ASBOX
 ## ----------------------------------------- ##
-## Report this to wx-dev@lists.wxwindows.org ##
+## Report this to wx-dev@lists.wxwidgets.org ##
 ## ----------------------------------------- ##
 _ASBOX
     ) |
@@ -13852,7 +13852,7 @@ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precede
     (
       cat <<\_ASBOX
 ## ----------------------------------------- ##
-## Report this to wx-dev@lists.wxwindows.org ##
+## Report this to wx-dev@lists.wxwidgets.org ##
 ## ----------------------------------------- ##
 _ASBOX
     ) |
@@ -14013,7 +14013,7 @@ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precede
     (
       cat <<\_ASBOX
 ## ----------------------------------------- ##
-## Report this to wx-dev@lists.wxwindows.org ##
+## Report this to wx-dev@lists.wxwidgets.org ##
 ## ----------------------------------------- ##
 _ASBOX
     ) |
@@ -18806,7 +18806,7 @@ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precede
     (
       cat <<\_ASBOX
 ## ----------------------------------------- ##
-## Report this to wx-dev@lists.wxwindows.org ##
+## Report this to wx-dev@lists.wxwidgets.org ##
 ## ----------------------------------------- ##
 _ASBOX
     ) |
@@ -19540,7 +19540,7 @@ echo "$as_me: WARNING: hash_map: in the future, the compiler will take precedenc
     (
       cat <<\_ASBOX
 ## ----------------------------------------- ##
-## Report this to wx-dev@lists.wxwindows.org ##
+## Report this to wx-dev@lists.wxwidgets.org ##
 ## ----------------------------------------- ##
 _ASBOX
     ) |
@@ -19742,7 +19742,7 @@ echo "$as_me: WARNING: ext/hash_map: in the future, the compiler will take prece
     (
       cat <<\_ASBOX
 ## ----------------------------------------- ##
-## Report this to wx-dev@lists.wxwindows.org ##
+## Report this to wx-dev@lists.wxwidgets.org ##
 ## ----------------------------------------- ##
 _ASBOX
     ) |
@@ -20173,7 +20173,7 @@ echo "$as_me: WARNING: regex.h: in the future, the compiler will take precedence
     (
       cat <<\_ASBOX
 ## ----------------------------------------- ##
-## Report this to wx-dev@lists.wxwindows.org ##
+## Report this to wx-dev@lists.wxwidgets.org ##
 ## ----------------------------------------- ##
 _ASBOX
     ) |
@@ -20507,7 +20507,7 @@ echo "$as_me: WARNING: zlib.h: in the future, the compiler will take precedence"
     (
       cat <<\_ASBOX
 ## ----------------------------------------- ##
-## Report this to wx-dev@lists.wxwindows.org ##
+## Report this to wx-dev@lists.wxwidgets.org ##
 ## ----------------------------------------- ##
 _ASBOX
     ) |
@@ -20814,7 +20814,7 @@ echo "$as_me: WARNING: png.h: in the future, the compiler will take precedence"
     (
       cat <<\_ASBOX
 ## ----------------------------------------- ##
-## Report this to wx-dev@lists.wxwindows.org ##
+## Report this to wx-dev@lists.wxwidgets.org ##
 ## ----------------------------------------- ##
 _ASBOX
     ) |
@@ -21226,7 +21226,7 @@ echo "$as_me: WARNING: tiffio.h: in the future, the compiler will take precedenc
     (
       cat <<\_ASBOX
 ## ----------------------------------------- ##
-## Report this to wx-dev@lists.wxwindows.org ##
+## Report this to wx-dev@lists.wxwidgets.org ##
 ## ----------------------------------------- ##
 _ASBOX
     ) |
@@ -21468,7 +21468,7 @@ echo "$as_me: WARNING: expat.h: in the future, the compiler will take precedence
     (
       cat <<\_ASBOX
 ## ----------------------------------------- ##
-## Report this to wx-dev@lists.wxwindows.org ##
+## Report this to wx-dev@lists.wxwidgets.org ##
 ## ----------------------------------------- ##
 _ASBOX
     ) |
@@ -21779,7 +21779,7 @@ echo "$as_me: WARNING: mspack.h: in the future, the compiler will take precedenc
     (
       cat <<\_ASBOX
 ## ----------------------------------------- ##
-## Report this to wx-dev@lists.wxwindows.org ##
+## Report this to wx-dev@lists.wxwidgets.org ##
 ## ----------------------------------------- ##
 _ASBOX
     ) |
@@ -22015,7 +22015,7 @@ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precede
     (
       cat <<\_ASBOX
 ## ----------------------------------------- ##
-## Report this to wx-dev@lists.wxwindows.org ##
+## Report this to wx-dev@lists.wxwidgets.org ##
 ## ----------------------------------------- ##
 _ASBOX
     ) |
@@ -22161,7 +22161,7 @@ echo "$as_me: WARNING: windows.h: in the future, the compiler will take preceden
     (
       cat <<\_ASBOX
 ## ----------------------------------------- ##
-## Report this to wx-dev@lists.wxwindows.org ##
+## Report this to wx-dev@lists.wxwidgets.org ##
 ## ----------------------------------------- ##
 _ASBOX
     ) |
@@ -27456,7 +27456,7 @@ echo "$as_me: WARNING: sql.h: in the future, the compiler will take precedence"
     (
       cat <<\_ASBOX
 ## ----------------------------------------- ##
-## Report this to wx-dev@lists.wxwindows.org ##
+## Report this to wx-dev@lists.wxwidgets.org ##
 ## ----------------------------------------- ##
 _ASBOX
     ) |
@@ -27984,7 +27984,7 @@ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precede
     (
       cat <<\_ASBOX
 ## ----------------------------------------- ##
-## Report this to wx-dev@lists.wxwindows.org ##
+## Report this to wx-dev@lists.wxwidgets.org ##
 ## ----------------------------------------- ##
 _ASBOX
     ) |
@@ -28177,7 +28177,7 @@ echo "$as_me: WARNING: GL/gl.h: in the future, the compiler will take precedence
     (
       cat <<\_ASBOX
 ## ----------------------------------------- ##
-## Report this to wx-dev@lists.wxwindows.org ##
+## Report this to wx-dev@lists.wxwidgets.org ##
 ## ----------------------------------------- ##
 _ASBOX
     ) |
@@ -32459,7 +32459,7 @@ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precede
     (
       cat <<\_ASBOX
 ## ----------------------------------------- ##
-## Report this to wx-dev@lists.wxwindows.org ##
+## Report this to wx-dev@lists.wxwidgets.org ##
 ## ----------------------------------------- ##
 _ASBOX
     ) |
@@ -33023,7 +33023,7 @@ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precede
     (
       cat <<\_ASBOX
 ## ----------------------------------------- ##
-## Report this to wx-dev@lists.wxwindows.org ##
+## Report this to wx-dev@lists.wxwidgets.org ##
 ## ----------------------------------------- ##
 _ASBOX
     ) |
@@ -34873,7 +34873,7 @@ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precede
     (
       cat <<\_ASBOX
 ## ----------------------------------------- ##
-## Report this to wx-dev@lists.wxwindows.org ##
+## Report this to wx-dev@lists.wxwidgets.org ##
 ## ----------------------------------------- ##
 _ASBOX
     ) |
@@ -36696,7 +36696,7 @@ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precede
     (
       cat <<\_ASBOX
 ## ----------------------------------------- ##
-## Report this to wx-dev@lists.wxwindows.org ##
+## Report this to wx-dev@lists.wxwidgets.org ##
 ## ----------------------------------------- ##
 _ASBOX
     ) |
@@ -37075,7 +37075,7 @@ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precede
     (
       cat <<\_ASBOX
 ## ----------------------------------------- ##
-## Report this to wx-dev@lists.wxwindows.org ##
+## Report this to wx-dev@lists.wxwidgets.org ##
 ## ----------------------------------------- ##
 _ASBOX
     ) |
@@ -37212,8 +37212,8 @@ fi
 
 if test "$wxUSE_IPC" = "yes"; then
     if test "$wxUSE_SOCKETS" != "yes"; then
-        { echo "$as_me:$LINENO: WARNING: wxWindows IPC classes require sockets... disabled" >&5
-echo "$as_me: WARNING: wxWindows IPC classes require sockets... disabled" >&2;}
+        { echo "$as_me:$LINENO: WARNING: wxWidgets IPC classes require sockets... disabled" >&5
+echo "$as_me: WARNING: wxWidgets IPC classes require sockets... disabled" >&2;}
     fi
 
     cat >>confdefs.h <<\_ACEOF
@@ -42380,7 +42380,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by wxWindows $as_me 2.5.1, which was
+This file was extended by wxWidgets $as_me 2.5.2, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -42443,7 +42443,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-wxWindows config.status 2.5.1
+wxWidgets config.status 2.5.2
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -43772,20 +43772,20 @@ fi
 
 
 echo
-echo "Configured wxWindows ${WX_VERSION} for \`${host}'"
+echo "Configured wxWidgets ${WX_VERSION} for \`${host}'"
 echo ""
-echo "  Which GUI toolkit should wxWindows use?                 ${TOOLKIT_LOWERCASE:-base only}"
-echo "  Should wxWindows be compiled into single library?       ${wxUSE_MONOLITHIC:-yes}"
+echo "  Which GUI toolkit should wxWidgets use?                 ${TOOLKIT_LOWERCASE:-base only}"
+echo "  Should wxWidgets be compiled into single library?       ${wxUSE_MONOLITHIC:-yes}"
 
-echo "  Should wxWindows be compiled in debug mode?             ${wxUSE_DEBUG:-no}"
-echo "  Should wxWindows be linked as a shared library?         ${wxUSE_SHARED:-no}"
-echo "  Should wxWindows be compiled in Unicode mode?           ${wxUSE_UNICODE:-no}"
+echo "  Should wxWidgets be compiled in debug mode?             ${wxUSE_DEBUG:-no}"
+echo "  Should wxWidgets be linked as a shared library?         ${wxUSE_SHARED:-no}"
+echo "  Should wxWidgets be compiled in Unicode mode?           ${wxUSE_UNICODE:-no}"
 
-echo "  What level of wxWindows compatibility should be enabled?"
-echo "                                       wxWindows 2.2      ${WXWIN_COMPATIBILITY_2_2:-no}"
-echo "                                       wxWindows 2.4      ${WXWIN_COMPATIBILITY_2_4:-yes}"
+echo "  What level of wxWidgets compatibility should be enabled?"
+echo "                                       wxWidgets 2.2      ${WXWIN_COMPATIBILITY_2_2:-no}"
+echo "                                       wxWidgets 2.4      ${WXWIN_COMPATIBILITY_2_4:-yes}"
 
-echo "  Which libraries should wxWindows use?"
+echo "  Which libraries should wxWidgets use?"
 echo "                                       jpeg               ${wxUSE_LIBJPEG-none}"
 echo "                                       png                ${wxUSE_LIBPNG-none}"
 echo "                                       regex              ${wxUSE_REGEX}"
diff --git a/configure.in b/configure.in
index b083c5c880..b0dad45b6d 100644
--- a/configure.in
+++ b/configure.in
@@ -5,10 +5,10 @@ AC_PREREQ(2.57)
 
 dnl ---------------------------------------------------------------------------
 dnl
-dnl Top-level configure.in for wxWindows by Robert Roebling, Phil Blecker,
+dnl Top-level configure.in for wxWidgets by Robert Roebling, Phil Blecker,
 dnl Vadim Zeitlin and Ron Lee
 dnl
-dnl This script is under the wxWindows licence.
+dnl This script is under the wxWidgets licence.
 dnl
 dnl Version: $Id$
 dnl ---------------------------------------------------------------------------
@@ -17,7 +17,7 @@ dnl ---------------------------------------------------------------------------
 dnl initialization
 dnl ---------------------------------------------------------------------------
 
-AC_INIT([wxWindows], [2.5.1], [wx-dev@lists.wxwindows.org])
+AC_INIT([wxWidgets], [2.5.2], [wx-dev@lists.wxwidgets.org])
 
 dnl the file passed to AC_CONFIG_SRCDIR should be specific to our package
 AC_CONFIG_SRCDIR([wx-config.in])
@@ -745,7 +745,7 @@ for toolkit in `echo $ALL_TOOLKITS`; do
 done
 
 dnl ---------------------------------------------------------------------------
-dnl --disable-gui will build only non-GUI part of wxWindows: check for this
+dnl --disable-gui will build only non-GUI part of wxWidgets: check for this
 dnl first to disable many other switches if it's given
 dnl
 dnl NB: this is still in testing stage, don't use if you don't know what you're
@@ -753,12 +753,12 @@ dnl     doing
 dnl ---------------------------------------------------------------------------
 
 WX_ARG_ENABLE(gui,         [  --enable-gui            use GUI classes], wxUSE_GUI)
-WX_ARG_ENABLE(monolithic,  [  --enable-monolithic     build wxWindows as single library], wxUSE_MONOLITHIC)
-WX_ARG_ENABLE(plugins,     [  --enable-plugins        build parts of wxWindows as loadable components], wxUSE_PLUGINS)
+WX_ARG_ENABLE(monolithic,  [  --enable-monolithic     build wxWidgets as single library], wxUSE_MONOLITHIC)
+WX_ARG_ENABLE(plugins,     [  --enable-plugins        build parts of wxWidgets as loadable components], wxUSE_PLUGINS)
 
 if test "$wxUSE_GUI" = "yes"; then
 
-WX_ARG_ENABLE(universal,   [  --enable-universal      use wxWindows GUI controls instead of native ones], wxUSE_UNIVERSAL)
+WX_ARG_ENABLE(universal,   [  --enable-universal      use wxWidgets GUI controls instead of native ones], wxUSE_UNIVERSAL)
 AC_ARG_WITH(gtk,           [  --with-gtk              use GTK+], [wxUSE_GTK="$withval" CACHE_GTK=1 TOOLKIT_GIVEN=1])
 AC_ARG_WITH(motif,         [  --with-motif            use Motif/Lesstif], [wxUSE_MOTIF="$withval" CACHE_MOTIF=1 TOOLKIT_GIVEN=1])
 AC_ARG_WITH(mac,           [  --with-mac              use Mac OS X], [wxUSE_MAC="$withval" TOOLKIT_GIVEN=1])
@@ -824,8 +824,8 @@ WX_ARG_ENABLE(no_exceptions, [  --enable-no_exceptions  create code without C++
 WX_ARG_ENABLE(permissive,    [  --enable-permissive     compile code disregarding strict ANSI], wxUSE_PERMISSIVE)
 WX_ARG_ENABLE(no_deps,       [  --enable-no_deps        create code without dependency information], wxUSE_NO_DEPS)
 
-WX_ARG_ENABLE(compat22,      [  --enable-compat22       enable wxWindows 2.2 compatibility], WXWIN_COMPATIBILITY_2_2)
-WX_ARG_ENABLE(compat24,      [  --disable-compat24      disable wxWindows 2.4 compatibility], WXWIN_COMPATIBILITY_2_4, disable)
+WX_ARG_ENABLE(compat22,      [  --enable-compat22       enable wxWidgets 2.2 compatibility], WXWIN_COMPATIBILITY_2_2)
+WX_ARG_ENABLE(compat24,      [  --disable-compat24      disable wxWidgets 2.4 compatibility], WXWIN_COMPATIBILITY_2_4, disable)
 
 AC_ARG_ENABLE(rpath,         [  --enable-rpath=DIR      output the rpath flag from wx-config], [wxRPATH_DIR="$enableval"])
 
@@ -881,7 +881,7 @@ WX_ARG_ENABLE(textfile,      [  --enable-textfile       use wxTextFile class], w
 WX_ARG_ENABLE(timer,         [  --enable-timer          use wxTimer class], wxUSE_TIMER)
 WX_ARG_ENABLE(unicode,       [  --enable-unicode        compile wxString with Unicode support], wxUSE_UNICODE)
 WX_ARG_ENABLE(sound,         [  --enable-sound          use wxSound class], wxUSE_SOUND)
-WX_ARG_ENABLE(wxprintfv,     [  --enable-wxprintfv      use wxWindows implementation of vprintf()], wxUSE_EXPERIMENTAL_PRINTF)
+WX_ARG_ENABLE(wxprintfv,     [  --enable-wxprintfv      use wxWidgets implementation of vprintf()], wxUSE_EXPERIMENTAL_PRINTF)
 WX_ARG_ENABLE(zipstream,     [  --enable-zipstream      use wxZipInputStream], wxUSE_ZIPSTREAM)
 
 WX_ARG_ENABLE(url,           [  --enable-url            use wxURL class], wxUSE_URL)
@@ -1133,7 +1133,7 @@ dnl ---------------------------------------------------------------------------
 dnl some win32 settings
 dnl ---------------------------------------------------------------------------
 
-WX_ARG_ENABLE(official_build,  [  --enable-official_build official build of wxWindows (win32 DLL only)], wxUSE_OFFICIAL_BUILD)
+WX_ARG_ENABLE(official_build,  [  --enable-official_build official build of wxWidgets (win32 DLL only)], wxUSE_OFFICIAL_BUILD)
 AC_ARG_ENABLE(vendor,  [  --enable-vendor=VENDOR  vendor name (win32 DLL only)], [VENDOR="$enableval"])
 if test "x$VENDOR" = "x"; then
     VENDOR="custom"
@@ -1370,7 +1370,7 @@ dnl ar command
 dnl   defines AR with the appropriate command
 AC_CHECK_PROG(AR, ar, ar)
 if test "x$AR" = "x" ; then
-    AC_MSG_ERROR([ar is needed to build wxWindows])
+    AC_MSG_ERROR([ar is needed to build wxWidgets])
 fi
 
 dnl install checks
@@ -3659,7 +3659,7 @@ dnl
 dnl the trouble here is that on some systems (notable HP-UX) this function is
 dnl present in libc but not in the system headers and so AC_CHECK_FUNCS (which,
 dnl stupidly, provides a dummy function declaration inside its extension)
-dnl succeeds, even with C++ compiler, but the compilation of wxWindows fails
+dnl succeeds, even with C++ compiler, but the compilation of wxWidgets fails
 dnl
 dnl so we first check if the function is in the library
 AC_CHECK_FUNCS(vsnprintf)
@@ -5249,7 +5249,7 @@ fi
 
 if test "$wxUSE_IPC" = "yes"; then
     if test "$wxUSE_SOCKETS" != "yes"; then
-        AC_MSG_WARN(wxWindows IPC classes require sockets... disabled)
+        AC_MSG_WARN(wxWidgets IPC classes require sockets... disabled)
     fi
 
     AC_DEFINE(wxUSE_IPC)
@@ -5818,7 +5818,7 @@ dnl ---------------------------------------------------------------------------
 dnl Output the makefiles and such from the results found above
 dnl ---------------------------------------------------------------------------
 
-dnl all additional libraries (except wxWindows itself) we link with
+dnl all additional libraries (except wxWidgets itself) we link with
 
 dnl note that we always link with -lm except for Mac OS X
 dnl extended.c uses floor() and is always linked in
@@ -5898,14 +5898,14 @@ fi
 
 dnl all -I options we must pass to the compiler
 dnl
-dnl note that the order is somewhat important: wxWindows headers should
+dnl note that the order is somewhat important: wxWidgets headers should
 dnl come first and the one with setup.h should be before $(top_srcdir)/include
 dnl in case the latter contains setup.h used by non-autoconf makefiles (e.g.
 dnl CodeWarrior):
 INCLUDES="-I\${top_builddir}lib/wx/include/${TOOLCHAIN_NAME} \
 -I\${top_srcdir}/include $TOOLKIT_INCLUDE"
 
-dnl C/C++ compiler options used to compile wxWindows
+dnl C/C++ compiler options used to compile wxWidgets
 if test "$GXX" = yes ; then
     dnl CXXWARNINGS="-Wall -W -Wcast-qual -Werror"
     CXXWARNINGS="-Wall"
@@ -6316,20 +6316,20 @@ AC_OUTPUT
 
 dnl report on what we decided to do
 echo
-echo "Configured wxWindows ${WX_VERSION} for \`${host}'"
+echo "Configured wxWidgets ${WX_VERSION} for \`${host}'"
 echo ""
-echo "  Which GUI toolkit should wxWindows use?                 ${TOOLKIT_LOWERCASE:-base only}"
-echo "  Should wxWindows be compiled into single library?       ${wxUSE_MONOLITHIC:-yes}"
+echo "  Which GUI toolkit should wxWidgets use?                 ${TOOLKIT_LOWERCASE:-base only}"
+echo "  Should wxWidgets be compiled into single library?       ${wxUSE_MONOLITHIC:-yes}"
 
-echo "  Should wxWindows be compiled in debug mode?             ${wxUSE_DEBUG:-no}"
-echo "  Should wxWindows be linked as a shared library?         ${wxUSE_SHARED:-no}"
-echo "  Should wxWindows be compiled in Unicode mode?           ${wxUSE_UNICODE:-no}"
+echo "  Should wxWidgets be compiled in debug mode?             ${wxUSE_DEBUG:-no}"
+echo "  Should wxWidgets be linked as a shared library?         ${wxUSE_SHARED:-no}"
+echo "  Should wxWidgets be compiled in Unicode mode?           ${wxUSE_UNICODE:-no}"
 
-echo "  What level of wxWindows compatibility should be enabled?"
-echo "                                       wxWindows 2.2      ${WXWIN_COMPATIBILITY_2_2:-no}"
-echo "                                       wxWindows 2.4      ${WXWIN_COMPATIBILITY_2_4:-yes}"
+echo "  What level of wxWidgets compatibility should be enabled?"
+echo "                                       wxWidgets 2.2      ${WXWIN_COMPATIBILITY_2_2:-no}"
+echo "                                       wxWidgets 2.4      ${WXWIN_COMPATIBILITY_2_4:-yes}"
 
-echo "  Which libraries should wxWindows use?"
+echo "  Which libraries should wxWidgets use?"
 echo "                                       jpeg               ${wxUSE_LIBJPEG-none}"
 echo "                                       png                ${wxUSE_LIBPNG-none}"
 echo "                                       regex              ${wxUSE_REGEX}"
diff --git a/contrib/build/gizmos/gizmos.bkl b/contrib/build/gizmos/gizmos.bkl
index 6ab57b2c54..ec857abf10 100644
--- a/contrib/build/gizmos/gizmos.bkl
+++ b/contrib/build/gizmos/gizmos.bkl
@@ -12,7 +12,7 @@
         multicell.cpp
         splittree.cpp
         statpict.cpp
-<!--        treelistctrl.cpp -->
+        treelistctrl.cpp
     </set>
 
     <headers template="wx_contrib_headers">
@@ -24,7 +24,7 @@
             wx/gizmos/splittree.h
             wx/gizmos/statpict.h
             wx/gizmos/gizmos.h
-<!--            wx/gizmos/treelistctrl.h -->
+            wx/gizmos/treelistctrl.h
         </files>
     </headers>
 
diff --git a/distrib/msw/dsp2dos.bat b/distrib/msw/dsp2dos.bat
index e3afd7c617..9ee42483ee 100755
--- a/distrib/msw/dsp2dos.bat
+++ b/distrib/msw/dsp2dos.bat
@@ -1,7 +1,7 @@
 echo "dsp2dos [ver. 1.1]"
-echo "Convert wxWindows workspaces from Unix to Dos format"
+echo "Convert wxWidgets workspaces from Unix to Dos format"
 echo "  Author : Marco Cavallini (www.koansoftware.com)"
-echo "You need to build wxWindows/distrib/msw/unix2dos.c for using it"
+echo "You need to build wxWidgets/distrib/msw/unix2dos.c for using it"
 unix2dos --unix2dos $WXWIN/src/wxBase.dsp
 unix2dos --unix2dos $WXWIN/src/wxBase.dsw
 unix2dos --unix2dos $WXWIN/src/wxUniv.dsp
diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp
index d2cd32be06..0077cd989c 100644
--- a/distrib/msw/generic.rsp
+++ b/distrib/msw/generic.rsp
@@ -17,12 +17,12 @@ regen
 build/bakefiles/*.bkl
 build/bakefiles/Bakefiles.bkgen
 build/bakefiles/README
-build/bakefiles/*.py
+build/bakefiles/*.py*
 build/bakefiles/*.mk
-build/bakefiles/compat/FORMATS.bkmanifest
-build/bakefiles/compat/README
-build/bakefiles/compat/wx24dsp.bkl
-build/bakefiles/compat/wx24dsp.empy
+build/bakefiles/formats/*.bkl
+build/bakefiles/formats/*.empy
+build/bakefiles/formats/README
+build/bakefiles/formats/*.bkmanifest
 
 distrib/msw/*.rsp
 distrib/msw/*.bat
@@ -1376,30 +1376,21 @@ tests/makefile*.*
 tests/test.dsp
 tests/test.dsw
 tests/*.cpp
+tests/*.fc
 
+tests/arrays/*.cpp
 tests/filesys/*.cpp
-tests/filesys/*.h
-tests/filesys/*.bkl
-tests/filesys/*.inc
-
-tests/formatconverter/*.pl
 tests/formatconverter/*.cpp
-tests/formatconverter/*.txt
-
+tests/longlong/*.cpp
 tests/mbconv/*.cpp
-tests/mbconv/*.h
-tests/mbconv/*.bkl
-tests/mbconv/*.inc
 
 tests/regex/*.cpp
-tests/regex/*.h
-tests/regex/*.bkl
 tests/regex/*.inc
 tests/regex/*.pl
 tests/regex/*.test
 
 tests/streams/*.cpp
 tests/streams/*.h
-tests/streams/*.bkl
-tests/streams/*.inc
+
+tests/strings/*.cpp
 
diff --git a/distrib/msw/innobott.txt b/distrib/msw/innobott.txt
index db6c775b86..b3b2b12333 100644
--- a/distrib/msw/innobott.txt
+++ b/distrib/msw/innobott.txt
@@ -4,12 +4,12 @@
     Name: {group}\Tex2rtf Help; Filename: {app}\bin\tex2rtf.chm; WorkingDir: {app}\bin; IconIndex: 0; Flags: useapppaths
     Name: {group}\Changes; Filename: {app}\docs\changes.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
     Name: {group}\Readme; Filename: {app}\docs\readme.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
-    Name: {group}\Compiling wxWindows; Filename: {app}\docs\msw\install.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
-    Name: {group}\wxWindows Manual; Filename: {app}\docs\htmlhelp\wx.chm; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
+    Name: {group}\Compiling wxWidgets; Filename: {app}\docs\msw\install.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
+    Name: {group}\wxWidgets Manual; Filename: {app}\docs\htmlhelp\wx.chm; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
 ;    Name: {group}\Tutorial; Filename: {app}\docs\pdf\wxTutorial.pdf; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
     Name: {group}\Document Index; Filename: {app}\docs\html\index.htm; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
     Name: {group}\Widgets Sample; Filename: {app}\bin\widgets.exe; WorkingDir: {app}\bin; IconFilename: {app}\bin\widgets.exe; IconIndex: 0
-    Name: "{group}\Uninstall wxWindows %VERSION%"; Filename: "{uninstallexe}"
+    Name: "{group}\Uninstall wxWidgets %VERSION%"; Filename: "{uninstallexe}"
 
 [INI]
 
@@ -35,6 +35,6 @@
 ;InnoVer=1.3
 ;AddVerTo=AppVerName
 ;SetupFilename=setup.exe
-;OutputFolder=C:\wx2dev\wxWindows\deliver
-;CopyrightText=Copyright © The wxWindows Team
+;OutputFolder=C:\wx2dev\wxWidgets\deliver
+;CopyrightText=Copyright © The wxWidgets Team
 
diff --git a/distrib/msw/makeall.bat b/distrib/msw/makeall.bat
index 6920426715..5823cede55 100755
--- a/distrib/msw/makeall.bat
+++ b/distrib/msw/makeall.bat
@@ -1,5 +1,5 @@
 Rem @echo off
-Rem This script compiles wxWindows and some samples/demos with
+Rem This script compiles wxWidgets and some samples/demos with
 Rem a range of compilers.
 Rem Note that it currently uses batch scripts local to Julian Smart's machine,
 Rem to set up the environment correctly.
@@ -19,7 +19,7 @@ Rem The following line is for a specific environment -- edit, or comment out
 Rem Not working in 4NT?
 Rem if not %@INDEX["%WXDIR%","wx2stable"] == "-1" set FATWXWIN=c:\wx2sta~1\wxwind~1
 
-echo Full wxWindows path is %FULLWXWIN%, FAT path is %FATWXWIN%
+echo Full wxWidgets path is %FULLWXWIN%, FAT path is %FATWXWIN%
 set BUILDDEST=%TEMP%\wxWinBuild
 Rem Only carry on if we haven't specified a single target
 set CARRYON=0
@@ -50,7 +50,7 @@ erase /S *.exe
 cd %WXDIR%\utils\tex2rtf\src
 erase /S *.exe
 
-echo Starting wxWindows build at %_TIME, %_DATE
+echo Starting wxWidgets build at %_TIME, %_DATE
 
 Rem First, VC++ 6.
 
@@ -490,7 +490,7 @@ echo ===================
 Rem Set up the environment
 call msvc1
 
-Rem Needs full wxWindows path for making libraries
+Rem Needs full wxWidgets path for making libraries
 set WXWIN=%FULLWXWIN%
 
 echo *** VC++ Debug ***
@@ -504,7 +504,7 @@ erase /F /Y %BUILDDEST%\VC1Debug
 Rem Make one sample, just to make sure Debug mode is OK
 cd %WXDIR%\samples\minimal
 nmake -f makefile.dos clean
-Rem Needs FAT wxWindows path for making executables
+Rem Needs FAT wxWidgets path for making executables
 set WXWIN=%FATWXWIN%
 nmake -f makefile.dos
 
@@ -514,7 +514,7 @@ nmake -f makefile.dos clean
 cd %WXDIR%\src\msw
 nmake -f makefile.dos cleanall
 
-Rem Needs full wxWindows path for making libraries
+Rem Needs full wxWidgets path for making libraries
 set WXWIN=%FULLWXWIN%
 
 echo *** VC++ Release ***
@@ -529,7 +529,7 @@ Rem Make one sample, just to make sure Release mode is OK
 cd %WXDIR%\samples\minimal
 nmake -f makefile.dos clean
 nmake -f makefile.dos FINAL=1
-Rem Needs FAT wxWindows path for making executables
+Rem Needs FAT wxWidgets path for making executables
 set WXWIN=%FATWXWIN%
 nmake -f makefile.dos FINAL=1
 copy minimal.exe /S %BUILDDEST%\VC1Release
@@ -591,5 +591,5 @@ make -f makefile.bcc cleanall FINAL=1
 
 :end
 
-echo Finished wxWindows build at %_TIME, %_DATE
+echo Finished wxWidgets build at %_TIME, %_DATE
 
diff --git a/distrib/msw/makedist.sh b/distrib/msw/makedist.sh
index 40fe30d15f..f0e62df846 100644
--- a/distrib/msw/makedist.sh
+++ b/distrib/msw/makedist.sh
@@ -1,7 +1,7 @@
 #! /bin/bash
 # makedist.sh
 #
-# Build wxWindows 2 for Windows distribution.
+# Build wxWidgets 2 for Windows distribution.
 # This builds all required binaries and documents before calling
 # zipdist.sh to make the archives.
 #
@@ -19,7 +19,7 @@
 # - update the readmes, change log, manual version etc.
 # - update version.h
 # - update distrib/msw/wisetop.txt, wisebott.txt with the correct version
-#   number, plus any hard-wired wxWindows paths
+#   number, plus any hard-wired wxWidgets paths
 # - test on a variety of compilers
 #
 # TODO:
@@ -96,7 +96,7 @@ check_files() {
 build_docs() {
     cd "$SRC/src/msw"
     echo "---------------------------------"
-    echo "Building wxWindows documents"
+    echo "Building wxWidgets documents"
     nmake -f makefile.vc cleandocs docs
 
     cd "$SRC/utils/tex2rtf/src"
@@ -113,7 +113,7 @@ build_docs() {
 # This has to be interactive at present.
 build_pdf() {
     echo "---------------------------------"
-    echo "Building wxWindows PDF documents"
+    echo "Building wxWidgets PDF documents"
     if [ -e "$WORDEXE" ]; then
         "$WORDEXE" "$WXWIN\\docs\\pdf\\wx.rtf"
         "$WORDEXE" "$WXWIN\\docs\\pdf\\tex2rtf.rtf"
@@ -124,12 +124,12 @@ build_pdf() {
     fi
 }
 
-# Build wxWindows
+# Build wxWidgets
 build_wxwin_vc() {
     echo "---------------------------------"
-    echo "Building wxWindows using VC++"
+    echo "Building wxWidgets using VC++"
     cd "$SRC/src"
-    echo Building wxWindows Release library in `pwd`
+    echo Building wxWidgets Release library in `pwd`
     echo Command: msdev wxvc.dsw /useenv /make "wxvc - Win32 Release" /rebuild
     msdev wxvc.dsw /useenv /make "wxvc - Win32 Release" /rebuild | egrep -v "$WARNINGS"
 }
diff --git a/distrib/msw/makefile.vc b/distrib/msw/makefile.vc
index d1d54e5d47..63a97a1d79 100644
--- a/distrib/msw/makefile.vc
+++ b/distrib/msw/makefile.vc
@@ -6,7 +6,7 @@
 #
 # "%W% %G%"
 #
-# Makefile : Builds wxWindows library wx.lib for VC++ (32-bit)
+# Makefile : Builds wxWidgets library wx.lib for VC++ (32-bit)
 # Arguments:
 #
 # FINAL=1 argument to nmake to build version with no debugging info.
@@ -198,7 +198,7 @@ cleandocs:
 # Start Word, running the GeneratePDF macro. MakeManual.dot should be in the
 # Office StartUp folder, and PDFMaker should be installed.
 updatepdf:  # touchmanual pdfrtf
-    start $(WAITFLAG) "winword d:\wx2\wxWindows\docs\latex\pdf\wx.rtf /mGeneratePDF"
+    start $(WAITFLAG) "winword d:\wx2\wxWidgets\docs\latex\pdf\wx.rtf /mGeneratePDF"
 
 
 MFTYPE=vc
diff --git a/distrib/msw/makerpm b/distrib/msw/makerpm
index c277435583..efed7e263e 100755
--- a/distrib/msw/makerpm
+++ b/distrib/msw/makerpm
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Makes the wxWindows RPMs
+# Makes the wxWidgets RPMs
 
 doupdatecvs()
 {
@@ -442,7 +442,7 @@ for i in "$@"; do
     esac
 done
 
-echo About to make wxWindows RPMs:
+echo About to make wxWidgets RPMs:
 echo   From    $WXSRC
 echo   To      $WXDEST
 echo   Version $WXVER
diff --git a/distrib/msw/makesetup.sh b/distrib/msw/makesetup.sh
index 99e1d3ce4c..54c820c417 100644
--- a/distrib/msw/makesetup.sh
+++ b/distrib/msw/makesetup.sh
@@ -115,13 +115,13 @@ dospinos2()
     zip $ZIPFLAGS -u -@ $DESTDIR/wxOS2-$VERSION.zip < $APPDIR/distrib/msw/deprecated.rsp
     zip $ZIPFLAGS -u -@ $DESTDIR/wxOS2-$VERSION.zip < $APPDIR/distrib/msw/makefile.rsp
 
-    # Rearchive under wxWindows-$VERSION
-    if [ -d $DESTDIR/wxWindows-$VERSION ]; then
-        rm -f -r $DESTDIR/wxWindows-$VERSION
+    # Rearchive under wxWidgets-$VERSION
+    if [ -d $DESTDIR/wxWidgets-$VERSION ]; then
+        rm -f -r $DESTDIR/wxWidgets-$VERSION
     fi
 
-    mkdir $DESTDIR/wxWindows-$VERSION
-    cd $DESTDIR/wxWindows-$VERSION
+    mkdir $DESTDIR/wxWidgets-$VERSION
+    cd $DESTDIR/wxWidgets-$VERSION
     unzip $ZIPFLAGS ../wxOS2-$VERSION.zip
     # No longer do this, configure should be OK
     # echo Overwriting with OS2-specific versions of configure files...
@@ -145,7 +145,7 @@ dospinos2()
     cd $DESTDIR
 
     rm -f wxOS2-$VERSION.zip
-    zip $ZIPFLAGS -r wxOS2-$VERSION.zip wxWindows-$VERSION/*
+    zip $ZIPFLAGS -r wxOS2-$VERSION.zip wxWidgets-$VERSION/*
 }
 
 dospinmac()
@@ -170,16 +170,16 @@ dospinmac()
     zip $ZIPFLAGS -u -@ $DESTDIR/wxMac-$VERSION.zip < $APPDIR/distrib/msw/deprecated.rsp
     zip $ZIPFLAGS -u -@ $DESTDIR/wxMac-$VERSION.zip < $APPDIR/distrib/msw/makefile.rsp
 
-    zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-CW-Mac.zip < $APPDIR/distrib/msw/cw_mac.rsp
+    zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-CW-Mac.zip < $APPDIR/distrib/msw/cw_mac.rsp
 
     rm -f $APPDIR/include/wx/setup.h
 
-    if [ -d $DESTDIR/wxWindows-$VERSION ]; then
-        rm -f -r $DESTDIR/wxWindows-$VERSION
+    if [ -d $DESTDIR/wxWidgets-$VERSION ]; then
+        rm -f -r $DESTDIR/wxWidgets-$VERSION
     fi
 
-    mkdir $DESTDIR/wxWindows-$VERSION
-    cd $DESTDIR/wxWindows-$VERSION
+    mkdir $DESTDIR/wxWidgets-$VERSION
+    cd $DESTDIR/wxWidgets-$VERSION
     unzip $ZIPFLAGS ../wxMac-$VERSION.zip
     rm -f src/gtk/descrip.mms src/motif/descrip.mms docs/pdf/*.pdf
     rm -f -r docs/html/tex2rtf docs/htmlhelp
@@ -195,40 +195,40 @@ dospinmac()
     cd $DESTDIR
 
     rm -f wxMac-$VERSION.zip
-    zip $ZIPFLAGS -r wxMac-$VERSION.zip wxWindows-$VERSION/*
+    zip $ZIPFLAGS -r wxMac-$VERSION.zip wxWidgets-$VERSION/*
 }
 
 dospinmsw()
 {
     cd $APPDIR
 
-    # Create wxWindows-$VERSION-win.zip which is used to create wxMSW
+    # Create wxWidgets-$VERSION-win.zip which is used to create wxMSW
     echo Zipping individual components
-    zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/generic.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/makefile.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/msw.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/ogl.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/mmedia.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/stc.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/tex2rtf.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/jpeg.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/tiff.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/xml.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/contrib.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/deprecated.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/utils.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/utilmake.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/univ.rsp
-
-#    rearchive wxWindows-$VERSION-win.zip wxWindows-$VERSION $DESTDIR
-
-    if [ -d $DESTDIR/wxWindows-$VERSION ]; then
-        rm -f -r $DESTDIR/wxWindows-$VERSION
+    zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/generic.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/makefile.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/msw.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/ogl.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/mmedia.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/stc.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/tex2rtf.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/jpeg.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/tiff.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/xml.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/contrib.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/deprecated.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/utils.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/utilmake.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/univ.rsp
+
+#    rearchive wxWidgets-$VERSION-win.zip wxWidgets-$VERSION $DESTDIR
+
+    if [ -d $DESTDIR/wxWidgets-$VERSION ]; then
+        rm -f -r $DESTDIR/wxWidgets-$VERSION
     fi
 
-    mkdir $DESTDIR/wxWindows-$VERSION
-    cd $DESTDIR/wxWindows-$VERSION
-    unzip $ZIPFLAGS ../wxWindows-$VERSION-win.zip
+    mkdir $DESTDIR/wxWidgets-$VERSION
+    cd $DESTDIR/wxWidgets-$VERSION
+    unzip $ZIPFLAGS ../wxWidgets-$VERSION-win.zip
 
     echo Removing .mms files
     rm -f src/gtk/descrip.mms src/motif/descrip.mms
@@ -243,53 +243,53 @@ dospinmsw()
 
     cd $DESTDIR
 
-    rm -f wxWindows-$VERSION-win.zip
-    zip $ZIPFLAGS -r wxWindows-$VERSION-win.zip wxWindows-$VERSION/*
+    rm -f wxWidgets-$VERSION-win.zip
+    zip $ZIPFLAGS -r wxWidgets-$VERSION-win.zip wxWidgets-$VERSION/*
 }
 
 dospindocs()
 {
     cd $APPDIR
 
-    echo Creating $DESTDIR/wxWindows-$VERSION-DocSource.zip
-    zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-DocSource.zip < $APPDIR/distrib/msw/docsrc.rsp
-    rearchive wxWindows-$VERSION-DocSource.zip wxWindows-$VERSION $DESTDIR
+    echo Creating $DESTDIR/wxWidgets-$VERSION-DocSource.zip
+    zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-DocSource.zip < $APPDIR/distrib/msw/docsrc.rsp
+    rearchive wxWidgets-$VERSION-DocSource.zip wxWidgets-$VERSION $DESTDIR
 
-    echo Creating $DESTDIR/wxWindows-$VERSION-WinHelp.zip
-    zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-WinHelp.zip < $APPDIR/distrib/msw/wx_hlp.rsp
-    rearchive wxWindows-$VERSION-WinHelp.zip wxWindows-$VERSION $DESTDIR
+    echo Creating $DESTDIR/wxWidgets-$VERSION-WinHelp.zip
+    zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-WinHelp.zip < $APPDIR/distrib/msw/wx_hlp.rsp
+    rearchive wxWidgets-$VERSION-WinHelp.zip wxWidgets-$VERSION $DESTDIR
 
-    echo Creating $DESTDIR/wxWindows-$VERSION-HTML.zip
-    zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-HTML.zip < $APPDIR/distrib/msw/wx_html.rsp
-    rearchive wxWindows-$VERSION-HTML.zip wxWindows-$VERSION $DESTDIR
+    echo Creating $DESTDIR/wxWidgets-$VERSION-HTML.zip
+    zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-HTML.zip < $APPDIR/distrib/msw/wx_html.rsp
+    rearchive wxWidgets-$VERSION-HTML.zip wxWidgets-$VERSION $DESTDIR
 
-    echo Creating $DESTDIR/wxWindows-$VERSION-PDF.zip
-    zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-PDF.zip < $APPDIR/distrib/msw/wx_pdf.rsp
-    rearchive wxWindows-$VERSION-PDF.zip wxWindows-$VERSION $DESTDIR
+    echo Creating $DESTDIR/wxWidgets-$VERSION-PDF.zip
+    zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-PDF.zip < $APPDIR/distrib/msw/wx_pdf.rsp
+    rearchive wxWidgets-$VERSION-PDF.zip wxWidgets-$VERSION $DESTDIR
 
-    # zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-Word.zip < $APPDIR/distrib/msw/wx_word.rsp
-    # rearchive wxWindows-$VERSION-Word.zip wxWindows-$VERSION $DESTDIR
+    # zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-Word.zip < $APPDIR/distrib/msw/wx_word.rsp
+    # rearchive wxWidgets-$VERSION-Word.zip wxWidgets-$VERSION $DESTDIR
 
-    echo Creating $DESTDIR/wxWindows-$VERSION-HTB.zip
-    zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-HTB.zip < $APPDIR/distrib/msw/wx_htb.rsp
-    rearchive wxWindows-$VERSION-HTB.zip wxWindows-$VERSION $DESTDIR
+    echo Creating $DESTDIR/wxWidgets-$VERSION-HTB.zip
+    zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-HTB.zip < $APPDIR/distrib/msw/wx_htb.rsp
+    rearchive wxWidgets-$VERSION-HTB.zip wxWidgets-$VERSION $DESTDIR
 
-    echo Creating $DESTDIR/wxWindows-$VERSION-HTMLHelp.zip
-    zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-HTMLHelp.zip < $APPDIR/distrib/msw/wx_chm.rsp
-    rearchive wxWindows-$VERSION-HTMLHelp.zip wxWindows-$VERSION $DESTDIR
+    echo Creating $DESTDIR/wxWidgets-$VERSION-HTMLHelp.zip
+    zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-HTMLHelp.zip < $APPDIR/distrib/msw/wx_chm.rsp
+    rearchive wxWidgets-$VERSION-HTMLHelp.zip wxWidgets-$VERSION $DESTDIR
 
     # Add Linuxy docs to a separate archive to be transported to Linux for the
     # Linux-based releases
-    echo Creating $DESTDIR/wxWindows-$VERSION-LinuxDocs.zip
-    zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-LinuxDocs.zip < $APPDIR/distrib/msw/wx_html.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-LinuxDocs.zip < $APPDIR/distrib/msw/wx_pdf.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-LinuxDocs.zip < $APPDIR/distrib/msw/wx_htb.rsp
+    echo Creating $DESTDIR/wxWidgets-$VERSION-LinuxDocs.zip
+    zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-LinuxDocs.zip < $APPDIR/distrib/msw/wx_html.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-LinuxDocs.zip < $APPDIR/distrib/msw/wx_pdf.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-LinuxDocs.zip < $APPDIR/distrib/msw/wx_htb.rsp
 
     # PDF/HTML docs that should go into the Windows setup because
     # there are no WinHelp equivalents
-    echo Creating $DESTDIR/wxWindows-$VERSION-ExtraDoc.zip
-    zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-ExtraDoc.zip < $APPDIR/distrib/msw/extradoc.rsp
-    rearchive wxWindows-$VERSION-ExtraDoc.zip wxWindows-$VERSION $DESTDIR
+    echo Creating $DESTDIR/wxWidgets-$VERSION-ExtraDoc.zip
+    zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-ExtraDoc.zip < $APPDIR/distrib/msw/extradoc.rsp
+    rearchive wxWidgets-$VERSION-ExtraDoc.zip wxWidgets-$VERSION $DESTDIR
 }
 
 dospinmisc()
@@ -297,24 +297,24 @@ dospinmisc()
     cd $APPDIR
 
     # zip up Univ-specific files
-    echo Creating $DESTDIR/wxWindows-$VERSION-Univ.zip
-    zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-Univ.zip < $APPDIR/distrib/msw/univ.rsp
-    rearchive wxWindows-$VERSION-Univ.zip wxWindows-$VERSION $DESTDIR
+    echo Creating $DESTDIR/wxWidgets-$VERSION-Univ.zip
+    zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-Univ.zip < $APPDIR/distrib/msw/univ.rsp
+    rearchive wxWidgets-$VERSION-Univ.zip wxWidgets-$VERSION $DESTDIR
 
     # VC++ project files
-    echo Creating $DESTDIR/wxWindows-$VERSION-VC.zip
-    zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-VC.zip < $APPDIR/distrib/msw/vc.rsp
-    # rearchive wxWindows-$VERSION-VC.zip wxWindows-$VERSION $DESTDIR
+    echo Creating $DESTDIR/wxWidgets-$VERSION-VC.zip
+    zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-VC.zip < $APPDIR/distrib/msw/vc.rsp
+    # rearchive wxWidgets-$VERSION-VC.zip wxWidgets-$VERSION $DESTDIR
 
     # BC++ project files
-    echo Creating $DESTDIR/wxWindows-$VERSION-BC.zip
-    zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-BC.zip < $APPDIR/distrib/msw/bc.rsp
-    # rearchive wxWindows-$VERSION-BC.zip wxWindows-$VERSION $DESTDIR
+    echo Creating $DESTDIR/wxWidgets-$VERSION-BC.zip
+    zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-BC.zip < $APPDIR/distrib/msw/bc.rsp
+    # rearchive wxWidgets-$VERSION-BC.zip wxWidgets-$VERSION $DESTDIR
 
     # CodeWarrior project files
-    echo Creating $DESTDIR/wxWindows-$VERSION-CW.zip
-    zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-CW.zip < $APPDIR/distrib/msw/cw.rsp
-    # rearchive wxWindows-$VERSION-CW.zip wxWindows-$VERSION $DESTDIR
+    echo Creating $DESTDIR/wxWidgets-$VERSION-CW.zip
+    zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-CW.zip < $APPDIR/distrib/msw/cw.rsp
+    # rearchive wxWidgets-$VERSION-CW.zip wxWidgets-$VERSION $DESTDIR
 }
 
 dospinsetup()
@@ -322,23 +322,23 @@ dospinsetup()
     cd $DESTDIR
 
     # Put all archives for transit to Linux in a zip file
-    echo Creating $DESTDIR/wxWindows-$VERSION-LinuxTransit.zip
-    rm -f $DESTDIR/wxWindows-$VERSION-LinuxTransit.zip
-    zip $ZIPFLAGS $DESTDIR/wxWindows-$VERSION-LinuxTransit.zip wxWindows-$VERSION-LinuxDocs.zip wxWindows-$VERSION-VC.zip wxWindows-$VERSION-CW-Mac.zip
+    echo Creating $DESTDIR/wxWidgets-$VERSION-LinuxTransit.zip
+    rm -f $DESTDIR/wxWidgets-$VERSION-LinuxTransit.zip
+    zip $ZIPFLAGS $DESTDIR/wxWidgets-$VERSION-LinuxTransit.zip wxWidgets-$VERSION-LinuxDocs.zip wxWidgets-$VERSION-VC.zip wxWidgets-$VERSION-CW-Mac.zip
 
-    echo Unzipping the Windows files into wxWindows-$VERSION
+    echo Unzipping the Windows files into wxWidgets-$VERSION
 
-    unzip $ZIPFLAGS -o wxWindows-$VERSION-win.zip
-    unzip $ZIPFLAGS -o wxWindows-$VERSION-VC.zip -d wxWindows-$VERSION
-    unzip $ZIPFLAGS -o wxWindows-$VERSION-BC.zip -d wxWindows-$VERSION
-    unzip $ZIPFLAGS -o wxWindows-$VERSION-CW.zip -d wxWindows-$VERSION
-    unzip $ZIPFLAGS -o wxWindows-$VERSION-HTMLHelp.zip
-    unzip $ZIPFLAGS -o wxWindows-$VERSION-ExtraDoc.zip
+    unzip $ZIPFLAGS -o wxWidgets-$VERSION-win.zip
+    unzip $ZIPFLAGS -o wxWidgets-$VERSION-VC.zip -d wxWidgets-$VERSION
+    unzip $ZIPFLAGS -o wxWidgets-$VERSION-BC.zip -d wxWidgets-$VERSION
+    unzip $ZIPFLAGS -o wxWidgets-$VERSION-CW.zip -d wxWidgets-$VERSION
+    unzip $ZIPFLAGS -o wxWidgets-$VERSION-HTMLHelp.zip
+    unzip $ZIPFLAGS -o wxWidgets-$VERSION-ExtraDoc.zip
 
     # After this change of directory, we're in the
     # temporary 'wx' directory and not acting on
-    # the source wxWindows directory.
-    cd $DESTDIR/wxWindows-$VERSION
+    # the source wxWidgets directory.
+    cd $DESTDIR/wxWidgets-$VERSION
 
     # Now delete a few files that are unnecessary
     #attrib -R *
@@ -369,8 +369,8 @@ dospinsetup()
 
     # Make wxMSW-xxx.zip
     cd $DESTDIR
-    zip $ZIPFLAGS -r wxMSW-$VERSION.zip wxWindows-$VERSION/*
-    cd wxWindows-$VERSION
+    zip $ZIPFLAGS -r wxMSW-$VERSION.zip wxWidgets-$VERSION/*
+    cd wxWidgets-$VERSION
 
     echo Generating $SETUPSCRIPTNAME
     rm -f $SETUPSCRIPTNAME
@@ -448,8 +448,8 @@ dospinsetup()
     echo Putting all the setup files into a single zip archive
     zip wxMSW-$VERSION-setup.zip readme-$VERSION.txt setup*.*
 
-    rm -f wxWindows-$VERSION-win.zip
-    rm -f wxWindows-$VERSION-ExtraDoc.zip
+    rm -f wxWidgets-$VERSION-win.zip
+    rm -f wxWidgets-$VERSION-ExtraDoc.zip
 
     echo If you saw no warnings or errors, $APPTITLE was successfully spun.
     echo
@@ -514,8 +514,8 @@ makesetup()
     if [ ! -d $DESTDIR ]; then
         mkdir $DESTDIR
     fi
-    if [ -d $DESTDIR/wxWindows-$VERSION ]; then
-        rm -f -r $DESTDIR/wxWindows-$VERSION
+    if [ -d $DESTDIR/wxWidgets-$VERSION ]; then
+        rm -f -r $DESTDIR/wxWidgets-$VERSION
     fi
 
     # Copy FAQ from wxWebSite CVS
@@ -587,7 +587,7 @@ makesetup()
 }
 
 # We can't use e.g. this:
-# ls `cat $SRC/distrib/msw/makefile.rsp` zip -@ -u $DEST/wxWindows-$VERSION-gen.zip
+# ls `cat $SRC/distrib/msw/makefile.rsp` zip -@ -u $DEST/wxWidgets-$VERSION-gen.zip
 # because there's not enough space on the command line, plus we need to ignore the
 # blank lines.
 # So if we need to (not in this script so far) we do something like this instead:
diff --git a/distrib/msw/maketarballs b/distrib/msw/maketarballs
index 0c273f4cd8..b69d37736a 100755
--- a/distrib/msw/maketarballs
+++ b/distrib/msw/maketarballs
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Makes the wxWindows tarballs with 'make dist'
+# Makes the wxWidgets tarballs with 'make dist'
 
 doupdatecvs()
 {
@@ -224,7 +224,7 @@ for i in "$@"; do
     esac
 done
 
-echo About to make wxWindows RPMs:
+echo About to make wxWidgets RPMs:
 echo   From    $WXSRC
 echo   To      $WXDEST
 echo   Version $WXVER
diff --git a/distrib/msw/setup.var b/distrib/msw/setup.var
index 1df8776efb..83620e1e9f 100644
--- a/distrib/msw/setup.var
+++ b/distrib/msw/setup.var
@@ -11,13 +11,13 @@ APPNAME=wxwin
 # The application title
 #-------------------------------------------------------------------------
 
-APPTITLE="wxWindows"
+APPTITLE="wxWidgets"
 
 #-------------------------------------------------------------------------
 # The application author (copyright holder)
 #-------------------------------------------------------------------------
 
-AUTHOR="The wxWindows Team"
+AUTHOR="The wxWidgets Team"
 
 #-------------------------------------------------------------------------
 # The application vendor (organisation)
@@ -53,7 +53,7 @@ DESTDIR=$APPDIR/deliver
 # The temporary image directory to use when preparing the setup
 #-------------------------------------------------------------------------
 
-SETUPIMAGEDIR=$APPDIR/deliver/wxWindows-$VERSION
+SETUPIMAGEDIR=$APPDIR/deliver/wxWidgets-$VERSION
 
 #-------------------------------------------------------------------------
 # The name of the file with $VERSIONSYMBOL in it
diff --git a/distrib/msw/splitwise.cpp b/distrib/msw/splitwise.cpp
index 65a9624272..9182dfac3a 100644
--- a/distrib/msw/splitwise.cpp
+++ b/distrib/msw/splitwise.cpp
@@ -22,7 +22,7 @@
 // Created:     13/10/99
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/distrib/msw/tardist b/distrib/msw/tardist
index 4362fbfcf9..887187b1da 100644
--- a/distrib/msw/tardist
+++ b/distrib/msw/tardist
@@ -1,9 +1,9 @@
 #!/bin/sh
-# tardist: make up a tar.gz distribution of wxWindows 2
+# tardist: make up a tar.gz distribution of wxWidgets 2
 # Supply a source (e.g. ~/wx2) and destination (e.g. ~/wx2/deliver)
 
 # We can't use e.g. this:
-# ls `cat $SRC/distrib/msw/makefile.rsp` zip -@ -u $DEST/wxWindows-$VERSION-gen.zip
+# ls `cat $SRC/distrib/msw/makefile.rsp` zip -@ -u $DEST/wxWidgets-$VERSION-gen.zip
 # because there's not enough space on the command line, plus we need to ignore the
 # blank lines.
 
@@ -178,10 +178,10 @@ cd wxMac-${WXVER}
 
 # If we have the full set of Mac CW project files,
 # get them
-if [ -f $WXDEST/extra/wxWindows-${WXVER}-CW-Mac.zip ]; then
-  unzip -o $WXDEST/extra/wxWindows-${WXVER}-CW-Mac.zip
+if [ -f $WXDEST/extra/wxWidgets-${WXVER}-CW-Mac.zip ]; then
+  unzip -o $WXDEST/extra/wxWidgets-${WXVER}-CW-Mac.zip
 else
-  echo "Warning - did not find $WXDEST/deliver/extra/wxWindows-${WXVER}-CW-Mac.zip"
+  echo "Warning - did not find $WXDEST/deliver/extra/wxWidgets-${WXVER}-CW-Mac.zip"
 fi
 
 $TAR xf ../wxMac-${WXVER}.tar
@@ -204,18 +204,18 @@ gzip $WXDEST/wxMac-${WXVER}.tar
 #cd $WXSRC
 #cat $WXSRC/distrib/msw/univ.rsp > /tmp/wxuniv_in.txt
 #expandlines /tmp/wxuniv_in.txt /tmp/wxuniv.txt
-#$TAR cf $WXDEST/wxWindows-${WXVER}-Univ.tar -T /tmp/wxuniv.txt
+#$TAR cf $WXDEST/wxWidgets-${WXVER}-Univ.tar -T /tmp/wxuniv.txt
 #
 #echo Re-tarring wxUniversal in a subdirectory...
 #cd $WXDEST
-#mkdir wxWindows-${WXVER}
-#cd wxWindows-${WXVER}
-#$TAR xf ../wxWindows-${WXVER}-Univ.tar
+#mkdir wxWidgets-${WXVER}
+#cd wxWidgets-${WXVER}
+#$TAR xf ../wxWidgets-${WXVER}-Univ.tar
 #cd ..
-#rm -f wxWindows-${WXVER}-Univ.tar
-#$TAR cf $WXDEST/wxWindows-${WXVER}-Univ.tar wxWindows-${WXVER}/*
-#rm -f -r wxWindows-${WXVER}
-#gzip $WXDEST/wxWindows-${WXVER}-Univ.tar
+#rm -f wxWidgets-${WXVER}-Univ.tar
+#$TAR cf $WXDEST/wxWidgets-${WXVER}-Univ.tar wxWidgets-${WXVER}/*
+#rm -f -r wxWidgets-${WXVER}
+#gzip $WXDEST/wxWidgets-${WXVER}-Univ.tar
 
 dospinwxall()
 {
@@ -229,24 +229,24 @@ $TAR cf $WXDEST/wxAll-${WXVER}.tar -T /tmp/wxall.txt
 
 echo Re-tarring wxAll in a subdirectory...
 cd $WXDEST
-mkdir wxWindows-${WXVER}
+mkdir wxWidgets-${WXVER}
 
-cd wxWindows-${WXVER}
+cd wxWidgets-${WXVER}
 
 # If we have the full set of VC++ project files,
 # get them
-if [ -f $WXDEST/extra/wxWindows-${WXVER}-VC.zip ]; then
-  unzip -o $WXDEST/extra/wxWindows-${WXVER}-VC.zip
+if [ -f $WXDEST/extra/wxWidgets-${WXVER}-VC.zip ]; then
+  unzip -o $WXDEST/extra/wxWidgets-${WXVER}-VC.zip
 else
-  echo "Warning - did not find $WXDEST/deliver/extra/wxWindows-${WXVER}-VC.zip"
+  echo "Warning - did not find $WXDEST/deliver/extra/wxWidgets-${WXVER}-VC.zip"
 fi
 
 # If we have the full set of Mac CW project files,
 # get them
-if [ -f $WXDEST/extra/wxWindows-${WXVER}-CW-Mac.zip ]; then
-  unzip -o $WXDEST/extra/wxWindows-${WXVER}-CW-Mac.zip
+if [ -f $WXDEST/extra/wxWidgets-${WXVER}-CW-Mac.zip ]; then
+  unzip -o $WXDEST/extra/wxWidgets-${WXVER}-CW-Mac.zip
 else
-  echo "Warning - did not find $WXDEST/deliver/extra/wxWindows-${WXVER}-CW-Mac.zip"
+  echo "Warning - did not find $WXDEST/deliver/extra/wxWidgets-${WXVER}-CW-Mac.zip"
 fi
 
 $TAR xf ../wxAll-${WXVER}.tar
@@ -272,8 +272,8 @@ cp $WXSRC/docs/os2/install.txt INSTALL-OS2.txt
 
 cd ..
 rm -f wxAll-${WXVER}.tar
-$TAR cf $WXDEST/wxAll-${WXVER}.tar wxWindows-${WXVER}/*
-rm -f -r wxWindows-${WXVER}
+$TAR cf $WXDEST/wxAll-${WXVER}.tar wxWidgets-${WXVER}/*
+rm -f -r wxWidgets-${WXVER}
 gzip $WXDEST/wxAll-${WXVER}.tar
 }
 
@@ -285,138 +285,138 @@ echo Tarring wxDocs...
 #cd $WXSRC
 #cat $WXSRC/distrib/msw/docsrc.rsp > /tmp/docsrc_in.txt
 #expandlines /tmp/docsrc_in.txt /tmp/docsrc.txt
-#$TAR cf $WXDEST/wxWindows-${WXVER}-doc.tar -T /tmp/docsrc.txt
+#$TAR cf $WXDEST/wxWidgets-${WXVER}-doc.tar -T /tmp/docsrc.txt
 #
 #echo Re-tarring docs in a subdirectory...
 #cd $WXDEST
-#mkdir wxWindows-${WXVER}
-#cd wxWindows-${WXVER}
-#$TAR xf ../wxWindows-${WXVER}-doc.tar
+#mkdir wxWidgets-${WXVER}
+#cd wxWidgets-${WXVER}
+#$TAR xf ../wxWidgets-${WXVER}-doc.tar
 #cd ..
-#rm -f wxWindows-${WXVER}-doc.tar
-#$TAR cf $WXDEST/wxWindows-${WXVER}-doc.tar wxWindows-${WXVER}/*
-#rm -f -r wxWindows-${WXVER}
-#gzip $WXDEST/wxWindows-${WXVER}-doc.tar
+#rm -f wxWidgets-${WXVER}-doc.tar
+#$TAR cf $WXDEST/wxWidgets-${WXVER}-doc.tar wxWidgets-${WXVER}/*
+#rm -f -r wxWidgets-${WXVER}
+#gzip $WXDEST/wxWidgets-${WXVER}-doc.tar
 
 ### HTML docs
 cd $WXSRC
 cat $WXSRC/distrib/msw/wx_html.rsp > /tmp/html_in.txt
 expandlines /tmp/html_in.txt /tmp/html.txt
-$TAR cf $WXDEST/wxWindows-${WXVER}-HTML.tar -T /tmp/html.txt
+$TAR cf $WXDEST/wxWidgets-${WXVER}-HTML.tar -T /tmp/html.txt
 
 echo Re-tarring HTML in a subdirectory...
 cd $WXDEST
-mkdir wxWindows-${WXVER}
-cd wxWindows-${WXVER}
-$TAR xf ../wxWindows-${WXVER}-HTML.tar
+mkdir wxWidgets-${WXVER}
+cd wxWidgets-${WXVER}
+$TAR xf ../wxWidgets-${WXVER}-HTML.tar
 cd ..
-rm -f wxWindows-${WXVER}-HTML.tar
-$TAR cf $WXDEST/wxWindows-${WXVER}-HTML.tar wxWindows-${WXVER}/*
-rm -f -r wxWindows-${WXVER}
-gzip $WXDEST/wxWindows-${WXVER}-HTML.tar
+rm -f wxWidgets-${WXVER}-HTML.tar
+$TAR cf $WXDEST/wxWidgets-${WXVER}-HTML.tar wxWidgets-${WXVER}/*
+rm -f -r wxWidgets-${WXVER}
+gzip $WXDEST/wxWidgets-${WXVER}-HTML.tar
 
 ### HTB docs
 cd $WXSRC
 cat $WXSRC/distrib/msw/wx_htb.rsp > /tmp/htb_in.txt
 expandlines /tmp/htb_in.txt /tmp/htb.txt
-$TAR cf $WXDEST/wxWindows-${WXVER}-HTB.tar -T /tmp/htb.txt
+$TAR cf $WXDEST/wxWidgets-${WXVER}-HTB.tar -T /tmp/htb.txt
 
 echo Re-tarring HTB in a subdirectory...
 cd $WXDEST
-mkdir wxWindows-${WXVER}
-cd wxWindows-${WXVER}
-$TAR xf ../wxWindows-${WXVER}-HTB.tar
+mkdir wxWidgets-${WXVER}
+cd wxWidgets-${WXVER}
+$TAR xf ../wxWidgets-${WXVER}-HTB.tar
 cd ..
-rm -f wxWindows-${WXVER}-HTB.tar
-$TAR cf $WXDEST/wxWindows-${WXVER}-HTB.tar wxWindows-${WXVER}/*
-rm -f -r wxWindows-${WXVER}
-gzip $WXDEST/wxWindows-${WXVER}-HTB.tar
+rm -f wxWidgets-${WXVER}-HTB.tar
+$TAR cf $WXDEST/wxWidgets-${WXVER}-HTB.tar wxWidgets-${WXVER}/*
+rm -f -r wxWidgets-${WXVER}
+gzip $WXDEST/wxWidgets-${WXVER}-HTB.tar
 
 ### PDF docs
 cd $WXSRC
 cat $WXSRC/distrib/msw/wx_pdf.rsp > /tmp/pdf_in.txt
 expandlines /tmp/pdf_in.txt /tmp/pdf.txt
-$TAR cf $WXDEST/wxWindows-${WXVER}-PDF.tar -T /tmp/pdf.txt
+$TAR cf $WXDEST/wxWidgets-${WXVER}-PDF.tar -T /tmp/pdf.txt
 
 echo Re-tarring PDF in a subdirectory...
 cd $WXDEST
-mkdir wxWindows-${WXVER}
-cd wxWindows-${WXVER}
-$TAR xf ../wxWindows-${WXVER}-PDF.tar
+mkdir wxWidgets-${WXVER}
+cd wxWidgets-${WXVER}
+$TAR xf ../wxWidgets-${WXVER}-PDF.tar
 cd ..
-rm -f wxWindows-${WXVER}-PDF.tar
-$TAR cf $WXDEST/wxWindows-${WXVER}-PDF.tar wxWindows-${WXVER}/*
-rm -f -r wxWindows-${WXVER}
-gzip $WXDEST/wxWindows-${WXVER}-PDF.tar
+rm -f wxWidgets-${WXVER}-PDF.tar
+$TAR cf $WXDEST/wxWidgets-${WXVER}-PDF.tar wxWidgets-${WXVER}/*
+rm -f -r wxWidgets-${WXVER}
+gzip $WXDEST/wxWidgets-${WXVER}-PDF.tar
 }
 
 ### Tex2RTF
 #cd $WXSRC
 #cat $WXSRC/distrib/msw/tex2rtf.rsp > /tmp/tex2rtf_in.txt
 #expandlines /tmp/tex2rtf_in.txt /tmp/tex2rtf.txt
-#$TAR cf $WXDEST/wxWindows-${WXVER}-tex2rtf.tar -T /tmp/tex2rtf.txt
+#$TAR cf $WXDEST/wxWidgets-${WXVER}-tex2rtf.tar -T /tmp/tex2rtf.txt
 #
 #echo Re-tarring Tex2RTF in a subdirectory...
 #cd $WXDEST
-#mkdir wxWindows-${WXVER}
-#cd wxWindows-${WXVER}
-#$TAR xf ../wxWindows-${WXVER}-tex2rtf.tar
+#mkdir wxWidgets-${WXVER}
+#cd wxWidgets-${WXVER}
+#$TAR xf ../wxWidgets-${WXVER}-tex2rtf.tar
 #cd ..
-#rm -f wxWindows-${WXVER}-tex2rtf.tar
-#$TAR cf $WXDEST/wxWindows-${WXVER}-tex2rtf.tar wxWindows-${WXVER}/*
-#rm -f -r wxWindows-${WXVER}
-#gzip $WXDEST/wxWindows-${WXVER}-tex2rtf.tar
+#rm -f wxWidgets-${WXVER}-tex2rtf.tar
+#$TAR cf $WXDEST/wxWidgets-${WXVER}-tex2rtf.tar wxWidgets-${WXVER}/*
+#rm -f -r wxWidgets-${WXVER}
+#gzip $WXDEST/wxWidgets-${WXVER}-tex2rtf.tar
 
 ### OGL
 #cd $WXSRC
 #cat $WXSRC/distrib/msw/ogl.rsp > /tmp/ogl_in.txt
 #expandlines /tmp/ogl_in.txt /tmp/ogl.txt
-#$TAR cf $WXDEST/wxWindows-${WXVER}-ogl.tar -T /tmp/ogl.txt
+#$TAR cf $WXDEST/wxWidgets-${WXVER}-ogl.tar -T /tmp/ogl.txt
 #
 #echo Re-tarring OGL in a subdirectory...
 #cd $WXDEST
-#mkdir wxWindows-${WXVER}
-#cd wxWindows-${WXVER}
-#$TAR xf ../wxWindows-${WXVER}-ogl.tar
+#mkdir wxWidgets-${WXVER}
+#cd wxWidgets-${WXVER}
+#$TAR xf ../wxWidgets-${WXVER}-ogl.tar
 #cd ..
-#rm -f wxWindows-${WXVER}-ogl.tar
-#$TAR cf $WXDEST/wxWindows-${WXVER}-ogl.tar wxWindows-${WXVER}/*
-#rm -f -r wxWindows-${WXVER}
-#gzip $WXDEST/wxWindows-${WXVER}-ogl.tar
+#rm -f wxWidgets-${WXVER}-ogl.tar
+#$TAR cf $WXDEST/wxWidgets-${WXVER}-ogl.tar wxWidgets-${WXVER}/*
+#rm -f -r wxWidgets-${WXVER}
+#gzip $WXDEST/wxWidgets-${WXVER}-ogl.tar
 
 ### JPEG
 #cd $WXSRC
 #cat $WXSRC/distrib/msw/jpeg.rsp > /tmp/jpeg_in.txt
 #expandlines /tmp/jpeg_in.txt /tmp/jpeg.txt
-#$TAR cf $WXDEST/wxWindows-${WXVER}-jpeg.tar -T /tmp/jpeg.txt
+#$TAR cf $WXDEST/wxWidgets-${WXVER}-jpeg.tar -T /tmp/jpeg.txt
 #
 #echo Re-tarring jpeg in a subdirectory...
 #cd $WXDEST
-#mkdir wxWindows-${WXVER}
-#cd wxWindows-${WXVER}
-#$TAR xf ../wxWindows-${WXVER}-jpeg.tar
+#mkdir wxWidgets-${WXVER}
+#cd wxWidgets-${WXVER}
+#$TAR xf ../wxWidgets-${WXVER}-jpeg.tar
 #cd ..
-#rm -f wxWindows-${WXVER}-jpeg.tar
-#$TAR cf $WXDEST/wxWindows-${WXVER}-jpeg.tar wxWindows-${WXVER}/*
-#rm -f -r wxWindows-${WXVER}
-#gzip $WXDEST/wxWindows-${WXVER}-jpeg.tar
+#rm -f wxWidgets-${WXVER}-jpeg.tar
+#$TAR cf $WXDEST/wxWidgets-${WXVER}-jpeg.tar wxWidgets-${WXVER}/*
+#rm -f -r wxWidgets-${WXVER}
+#gzip $WXDEST/wxWidgets-${WXVER}-jpeg.tar
 
 ### TIFF
 #cd $WXSRC
 #cat $WXSRC/distrib/msw/tiff.rsp > /tmp/tiff_in.txt
 #expandlines /tmp/tiff_in.txt /tmp/tiff.txt
-#$TAR cf $WXDEST/wxWindows-${WXVER}-tiff.tar -T /tmp/tiff.txt
+#$TAR cf $WXDEST/wxWidgets-${WXVER}-tiff.tar -T /tmp/tiff.txt
 #
 #echo Re-tarring docs in a subdirectory...
 #cd $WXDEST
-#mkdir wxWindows-${WXVER}
-#cd wxWindows-${WXVER}
-#$TAR xf ../wxWindows-${WXVER}-tiff.tar
+#mkdir wxWidgets-${WXVER}
+#cd wxWidgets-${WXVER}
+#$TAR xf ../wxWidgets-${WXVER}-tiff.tar
 #cd ..
-#rm -f wxWindows-${WXVER}-tiff.tar
-#$TAR cf $WXDEST/wxWindows-${WXVER}-tiff.tar wxWindows-${WXVER}/*
-#rm -f -r wxWindows-${WXVER}
-#gzip $WXDEST/wxWindows-${WXVER}-tiff.tar
+#rm -f wxWidgets-${WXVER}-tiff.tar
+#$TAR cf $WXDEST/wxWidgets-${WXVER}-tiff.tar wxWidgets-${WXVER}/*
+#rm -f -r wxWidgets-${WXVER}
+#gzip $WXDEST/wxWidgets-${WXVER}-tiff.tar
 
 init=""
 if [ "$1" = "" ]
@@ -484,7 +484,7 @@ for i in "$@"; do
     esac
 done
 
-echo About to archive wxWindows:
+echo About to archive wxWidgets:
 echo   From    $WXSRC
 echo   To      $WXDEST
 echo   Version $WXVER
diff --git a/distrib/msw/tardist.bat b/distrib/msw/tardist.bat
index 91ce1fdf16..3ed2dedc22 100755
--- a/distrib/msw/tardist.bat
+++ b/distrib/msw/tardist.bat
@@ -1,5 +1,5 @@
 @echo off
-rem Tar up an external distribution of wxWindows 2.0: but
+rem Tar up an external distribution of wxWidgets 2.0: but
 rem putting in separate ASCII and binary files
 rem This seems to be the one that works, using
 rem separate tar programs for conversion/non-conversion
@@ -7,7 +7,7 @@ rem of ASCII/binary files.
 
 if "%1" == "" goto usage
 if "%2" == "" goto usage
-echo About to archive an external wxWindows 2.0 distribution:
+echo About to archive an external wxWidgets 2.0 distribution:
 echo   From   %1
 echo   To     %2\wx200_1.tgz, %2\wx200_2.tgz, %2\wx200hlp.tgz, %2\wx200ps.tgz, %2\wx200htm.tgz
 echo CTRL-C if this is not correct.
@@ -104,11 +104,11 @@ gzip32 %2\wx200pdf.tar
 ren %2\wx200pdf.tar.gz %2\wx200pdf.tgz
 
 cd %2
-echo wxWindows archived.
+echo wxWidgets archived.
 goto end
 
 :usage
-echo Tar/gzip wxWindows distribution under DOS, making an ASCII and binary file
+echo Tar/gzip wxWidgets distribution under DOS, making an ASCII and binary file
 echo Usage: tardist source destination
 echo e.g. tardist d:\wx d:\wx\deliver
 
diff --git a/distrib/msw/tarmicrowin.sh b/distrib/msw/tarmicrowin.sh
index 15deab230c..44c7dce0ee 100644
--- a/distrib/msw/tarmicrowin.sh
+++ b/distrib/msw/tarmicrowin.sh
@@ -22,7 +22,7 @@ fi
 
 WXVER=$3
 
-echo About to archive wxWindows:
+echo About to archive wxWidgets:
 echo   From   $1
 echo   To     $2
 echo CTRL-C if this is not correct.
diff --git a/distrib/msw/tarwxall b/distrib/msw/tarwxall
index 2dd6a350ce..f38c0e3790 100755
--- a/distrib/msw/tarwxall
+++ b/distrib/msw/tarwxall
@@ -3,7 +3,7 @@
 # Supply a source (e.g. ~/wx2) and destination (e.g. ~/wx2/deliver)
 
 # We can't use e.g. this:
-# ls `cat $SRC/distrib/msw/makefile.rsp` zip -@ -u $DEST/wxWindows-$VERSION-gen.zip
+# ls `cat $SRC/distrib/msw/makefile.rsp` zip -@ -u $DEST/wxWidgets-$VERSION-gen.zip
 # because there's not enough space on the command line, plus we need to ignore the
 # blank lines.
 
@@ -72,18 +72,18 @@ $TAR cf $2/wxAll-${WXVER}.tar -T /tmp/wxall.txt
 
 echo Re-tarring wxAll in a subdirectory...
 cd $2
-rm -f -r wxWindows-${WXVER}
-mkdir wxWindows-${WXVER}
+rm -f -r wxWidgets-${WXVER}
+mkdir wxWidgets-${WXVER}
 
 # If we have the full set of VC++ project files,
 # get them
-if [ -f $2/extra/wxWindows-${WXVER}-VC.zip ]; then
-  unzip -o $2/extra/wxWindows-${WXVER}-VC.zip
+if [ -f $2/extra/wxWidgets-${WXVER}-VC.zip ]; then
+  unzip -o $2/extra/wxWidgets-${WXVER}-VC.zip
 else
-  echo "Warning - did not find $2/deliver/extra/wxWindows-${WXVER}-VC.zip"
+  echo "Warning - did not find $2/deliver/extra/wxWidgets-${WXVER}-VC.zip"
 fi
 
-cd wxWindows-${WXVER}
+cd wxWidgets-${WXVER}
 $TAR xf ../wxAll-${WXVER}.tar
 
 # Translate all .dsp and .dsw files to DOS format
@@ -105,7 +105,7 @@ $1/distrib/msw/namedown src/os2/*.CPP src/os2/*.I
 cd ..
 
 rm -f wxAll-${WXVER}.tar
-$TAR cf $2/wxAll-${WXVER}.tar wxWindows-${WXVER}/*
-rm -f -r wxWindows-${WXVER}
+$TAR cf $2/wxAll-${WXVER}.tar wxWidgets-${WXVER}/*
+rm -f -r wxWidgets-${WXVER}
 gzip $2/wxAll-${WXVER}.tar
 
diff --git a/distrib/msw/tarwxmac b/distrib/msw/tarwxmac
index 0fb83a0885..627204cfea 100755
--- a/distrib/msw/tarwxmac
+++ b/distrib/msw/tarwxmac
@@ -3,7 +3,7 @@
 # Supply a source (e.g. ~/wx2) and destination (e.g. ~/wx2/deliver)
 
 # We can't use e.g. this:
-# ls `cat $SRC/distrib/msw/makefile.rsp` zip -@ -u $DEST/wxWindows-$VERSION-gen.zip
+# ls `cat $SRC/distrib/msw/makefile.rsp` zip -@ -u $DEST/wxWidgets-$VERSION-gen.zip
 # because there's not enough space on the command line, plus we need to ignore the
 # blank lines.
 
diff --git a/distrib/msw/tarwxmotif b/distrib/msw/tarwxmotif
index 4dd597efd9..ff9cddee4e 100644
--- a/distrib/msw/tarwxmotif
+++ b/distrib/msw/tarwxmotif
@@ -1,5 +1,5 @@
 #!/bin/sh
-# tardist: make up a tar.gz distribution of wxWindows 2
+# tardist: make up a tar.gz distribution of wxWidgets 2
 # Supply a source (e.g. ~/wx2) and destination (e.g. ~/wx2/deliver)
 
 init=""
@@ -14,7 +14,7 @@ then
   exit
 fi
 
-echo About to archive wxWindows:
+echo About to archive wxWidgets:
 echo   From   $1
 echo   To     $2
 echo CTRL-C if this is not correct.
@@ -29,7 +29,7 @@ echo Setting permissions...
 chmod a+x $1/configure $1/config.sub $1/config.guess $1/samples/configure $1/demos/configure $1/contrib/configure
 
 rm -f $2/wxMotif-${WXVER}*.tgz
-rm -f $2/wxWindows*.tgz
+rm -f $2/wxWidgets*.tgz
 rm -f $2/tex2rtf2.tgz
 rm -f $2/ogl3.tgz
 rm -f $2/jpeg.tgz
@@ -45,27 +45,27 @@ mv $2/wxMotif-${WXVER}.tar.gz $2/wxMotif-${WXVER}.tgz
 
 ### HTML docs
 ls `cat $1/distrib/msw/wx_html.rsp` > /tmp/html.txt
-tar cvf $2/wxWindows-${WXVER}-HTML.tar -T /tmp/html.txt
-gzip $2/wxWindows-${WXVER}-HTML.tar
-mv $2/wxWindows-${WXVER}-HTML.tar.gz $2/wxWindows-${WXVER}-HTML.tgz
+tar cvf $2/wxWidgets-${WXVER}-HTML.tar -T /tmp/html.txt
+gzip $2/wxWidgets-${WXVER}-HTML.tar
+mv $2/wxWidgets-${WXVER}-HTML.tar.gz $2/wxWidgets-${WXVER}-HTML.tgz
 
 ### HTB (wxHTML Help) docs
 ls `cat $1/distrib/msw/wx_htb.rsp` > /tmp/htb.txt
-tar cvf $2/wxWindows-${WXVER}-HTB.tar -T /tmp/htb.txt
-gzip $2/wxWindows-${WXVER}-HTB.tar
-mv $2/wxWindows-${WXVER}-HTB.tar.gz $2/wxWindows-${WXVER}-HTB.tgz
+tar cvf $2/wxWidgets-${WXVER}-HTB.tar -T /tmp/htb.txt
+gzip $2/wxWidgets-${WXVER}-HTB.tar
+mv $2/wxWidgets-${WXVER}-HTB.tar.gz $2/wxWidgets-${WXVER}-HTB.tgz
 
 ### PDF docs
 ls `cat $1/distrib/msw/wx_pdf.rsp` > /tmp/pdf.txt
-tar cvf $2/wxWindows-${WXVER}-PDF.tar -T /tmp/pdf.txt
-gzip $2/wxWindows-${WXVER}-PDF.tar
-mv $2/wxWindows-${WXVER}-PDF.tar.gz $2/wxWindows-${WXVER}-PDF.tgz
+tar cvf $2/wxWidgets-${WXVER}-PDF.tar -T /tmp/pdf.txt
+gzip $2/wxWidgets-${WXVER}-PDF.tar
+mv $2/wxWidgets-${WXVER}-PDF.tar.gz $2/wxWidgets-${WXVER}-PDF.tgz
 
 ### Stubs files
 #ls `cat $1/distrib/msw/stubs.rsp` > /tmp/stubs.txt
-#tar cvf $2/wxWindows-${WXVER}-stubs.tar -T /tmp/stubs.txt
-#gzip $2/wxWindows-${WXVER}-stubs.tar
-#mv $2/wxWindows-${WXVER}-stubs.tar.gz $2/wxWindows-${WXVER}-stubs.tgz
+#tar cvf $2/wxWidgets-${WXVER}-stubs.tar -T /tmp/stubs.txt
+#gzip $2/wxWidgets-${WXVER}-stubs.tar
+#mv $2/wxWidgets-${WXVER}-stubs.tar.gz $2/wxWidgets-${WXVER}-stubs.tgz
 
 ### Tex2RTF
 ls `cat $1/distrib/msw/tex2rtf.rsp` > /tmp/tex2rtf.txt
diff --git a/distrib/msw/tarwxx11 b/distrib/msw/tarwxx11
index e072fecd4f..b6e19c8b32 100755
--- a/distrib/msw/tarwxx11
+++ b/distrib/msw/tarwxx11
@@ -3,7 +3,7 @@
 # Supply a source (e.g. ~/wx2) and destination (e.g. ~/wx2/deliver)
 
 # We can't use e.g. this:
-# ls `cat $SRC/distrib/msw/makefile.rsp` zip -@ -u $DEST/wxWindows-$VERSION-gen.zip
+# ls `cat $SRC/distrib/msw/makefile.rsp` zip -@ -u $DEST/wxWidgets-$VERSION-gen.zip
 # because there's not enough space on the command line, plus we need to ignore the
 # blank lines.
 
diff --git a/distrib/msw/wince.rsp b/distrib/msw/wince.rsp
index 7057fc8925..7854565258 100644
--- a/distrib/msw/wince.rsp
+++ b/distrib/msw/wince.rsp
@@ -1,380 +1,368 @@
-src/msw/wince/wxWindowsCE.vcp
-src/msw/wince/wxWindowsCE.vcw
+build/wince/wx.vcw
+build/wince/wx_gl.vcp
+build/wince/wx_mono.vcp
+build/wince/wx_wxexpat.vcp
+build/wince/wx_wxjpeg.vcp
+build/wince/wx_wxpng.vcp
+build/wince/wx_wxzlib.vcp
 
-src/jpeg/jpegCE.vcp
-src/jpeg/jpegCE.vcw
+samples/access/access.vcp
+samples/access/access.vcw
 
-src/tiff/tiffCE.vcp
-src/tiff/tiffCE.vcw
+samples/artprov/artprov.vcp
+samples/artprov/artprov.vcw
 
-src/zlib/zlibCE.vcp
-src/zlib/zlibCE.vcw
+samples/calendar/arttest.vcp
+samples/calendar/arttest.vcw
 
-src/png/pngCE.vcp
-src/png/pngCE.vcw
+samples/calendar/calendar.vcp
+samples/calendar/calendar.vcw
 
-src/regex/regexCE.vcp
-src/regex/regexCE.vcw
+samples/caret/caret.vcp
+samples/caret/caret.vcw
 
-samples/samplesCE.vcw
+samples/checklst/checklst.vcp
+samples/checklst/checklst.vcw
 
-samples/access/accessCE.vcp
-samples/access/accessCE.vcw
+samples/config/config.vcp
+samples/config/config.vcw
 
-samples/artprov/artprovCE.vcp
-samples/artprov/artprovCE.vcw
+samples/console/console.vcp
+samples/console/console.vcw
 
-samples/calendar/arttestCE.vcp
-samples/calendar/arttestCE.vcw
+samples/controls/controls.vcp
+samples/controls/controls.vcw
 
-samples/calendar/calendarCE.vcp
-samples/calendar/calendarCE.vcw
+samples/db/db.vcp
+samples/db/db.vcw
 
-samples/caret/caretCE.vcp
-samples/caret/caretCE.vcw
+samples/dialogs/dialogs.vcp
+samples/dialogs/dialogs.vcw
 
-samples/checklst/checklstCE.vcp
-samples/checklst/checklstCE.vcw
+samples/dialup/dialup.vcp
+samples/dialup/dialup.vcw
 
-samples/config/configCE.vcp
-samples/config/configCE.vcw
+samples/display/display.vcp
+samples/display/display.vcw
 
-samples/console/consoleCE.vcp
-samples/console/consoleCE.vcw
+samples/dnd/dnd.vcp
+samples/dnd/dnd.vcw
 
-samples/controls/controlsCE.vcp
-samples/controls/controlsCE.vcw
+samples/dragimag/dragimag.vcp
+samples/dragimag/dragimag.vcw
 
-samples/db/dbCE.vcp
-samples/db/dbCE.vcw
+samples/docview/docview.vcp
+samples/docview/docview.vcw
 
-samples/dialogs/dialogsCE.vcp
-samples/dialogs/dialogsCE.vcw
+samples/docvwmdi/docvwmdi.vcp
+samples/docvwmdi/docvwmdi.vcw
 
-samples/dialup/dialupCE.vcp
-samples/dialup/dialupCE.vcw
+samples/drawing/drawing.vcp
+samples/drawing/drawing.vcw
 
-samples/display/displayCE.vcp
-samples/display/displayCE.vcw
+samples/dynamic/dynamic.vcp
+samples/dynamic/dynamic.vcw
 
-samples/dnd/dndCE.vcp
-samples/dnd/dndCE.vcw
+samples/erase/erase.vcp
+samples/erase/erase.vcw
 
-samples/dragimag/dragimagCE.vcp
-samples/dragimag/dragimagCE.vcw
+samples/event/event.vcp
+samples/event/event.vcw
 
-samples/docview/docviewCE.vcp
-samples/docview/docviewCE.vcw
+samples/exec/exec.vcp
+samples/exec/exec.vcw
 
-samples/docvwmdi/docvwmdiCE.vcp
-samples/docvwmdi/docvwmdiCE.vcw
+samples/font/font.vcp
+samples/font/font.vcw
 
-samples/drawing/drawingCE.vcp
-samples/drawing/drawingCE.vcw
+samples/grid/griddemo.vcp
+samples/grid/griddemo.vcw
 
-samples/dynamic/dynamicCE.vcp
-samples/dynamic/dynamicCE.vcw
+samples/help/help.vcp
+samples/help/help.vcw
 
-samples/erase/eraseCE.vcp
-samples/erase/eraseCE.vcw
+samples/htlbox/htlbox.vcp
+samples/htlbox/htlbox.vcw
 
-samples/event/eventCE.vcp
-samples/event/eventCE.vcw
+samples/html/about/about.vcp
+samples/html/about/about.vcw
+samples/html/help/help.vcp
+samples/html/help/help.vcw
+samples/html/helpview/helpview.vcp
+samples/html/helpview/helpview.vcw
+samples/html/printing/printing.vcp
+samples/html/printing/printing.vcw
+samples/html/test/test.vcp
+samples/html/test/test.vcw
+samples/html/virtual/virtual.vcp
+samples/html/virtual/virtual.vcw
+samples/html/widget/widget.vcp
+samples/html/widget/widget.vcw
+samples/html/zip/zip.vcp
+samples/html/zip/zip.vcw
 
-samples/exec/execCE.vcp
-samples/exec/execCE.vcw
+samples/image/image.vcp
+samples/image/image.vcw
 
-samples/font/fontCE.vcp
-samples/font/fontCE.vcw
+samples/internat/internat.vcp
+samples/internat/internat.vcw
 
-samples/grid/griddemoCE.vcp
-samples/grid/griddemoCE.vcw
+samples/keyboard/keyboard.vcp
+samples/keyboard/keyboard.vcw
 
-samples/help/helpCE.vcp
-samples/help/helpCE.vcw
+samples/ipc/client.vcp
+samples/ipc/client.vcw
+samples/ipc/server.vcp
+samples/ipc/server.vcw
 
-samples/htlbox/htlboxCE.vcp
-samples/htlbox/htlboxCE.vcw
+samples/joytest/joytest.vcp
+samples/joytest/joytest.vcw
 
-samples/html/about/aboutCE.vcp
-samples/html/about/aboutCE.vcw
-samples/html/help/helpCE.vcp
-samples/html/help/helpCE.vcw
-samples/html/helpview/helpviewCE.vcp
-samples/html/helpview/helpviewCE.vcw
-samples/html/printing/printingCE.vcp
-samples/html/printing/printingCE.vcw
-samples/html/test/testCE.vcp
-samples/html/test/testCE.vcw
-samples/html/virtual/virtualCE.vcp
-samples/html/virtual/virtualCE.vcw
-samples/html/widget/widgetCE.vcp
-samples/html/widget/widgetCE.vcw
-samples/html/zip/zipCE.vcp
-samples/html/zip/zipCE.vcw
+samples/layout/layout.vcp
+samples/layout/layout.vcw
 
-samples/image/imageCE.vcp
-samples/image/imageCE.vcw
+samples/listbox/lboxtest.vcp
+samples/listbox/lboxtest.vcw
 
-samples/internat/internatCE.vcp
-samples/internat/internatCE.vcw
+samples/listctrl/listctrl.vcp
+samples/listctrl/listctrl.vcw
 
-samples/keyboard/keyboardCE.vcp
-samples/keyboard/keyboardCE.vcw
+samples/mdi/mdi.vcp
+samples/mdi/mdi.vcw
 
-samples/ipc/clientCE.vcp
-samples/ipc/clientCE.vcw
-samples/ipc/serverCE.vcp
-samples/ipc/serverCE.vcw
+samples/memcheck/memcheck.vcp
+samples/memcheck/memcheck.vcw
 
-samples/joytest/joytestCE.vcp
-samples/joytest/joytestCE.vcw
+samples/menu/menu.vcp
+samples/menu/menu.vcw
 
-samples/layout/layoutCE.vcp
-samples/layout/layoutCE.vcw
+samples/mfc/mfc.vcp
+samples/mfc/mfc.vcw
 
-samples/listbox/lboxtestCE.vcp
-samples/listbox/lboxtestCE.vcw
+samples/minimal/minimal.vcp
+samples/minimal/minimal.vcw
 
-samples/listctrl/listctrlCE.vcp
-samples/listctrl/listctrlCE.vcw
+samples/minifram/minifram.vcp
+samples/minifram/minifram.vcw
 
-samples/mdi/mdiCE.vcp
-samples/mdi/mdiCE.vcw
+samples/mobile/styles/styles.vcp
+samples/mobile/wxedit/wxedit.vcw
 
-samples/memcheck/memcheckCE.vcp
-samples/memcheck/memcheckCE.vcw
+samples/multimon/multimon_test.vcp
+samples/multimon/multimon_test.vcw
 
-samples/menu/menuCE.vcp
-samples/menu/menuCE.vcw
+samples/nativdlg/nativdlg.vcp
+samples/nativdlg/nativdlg.vcw
 
-samples/mfc/mfcCE.vcp
-samples/mfc/mfcCE.vcw
+samples/notebook/notebook.vcp
+samples/notebook/notebook.vcw
 
-samples/minimal/minimalCE.vcp
-samples/minimal/minimalCE.vcw
+samples/oleauto/oleauto.vcp
+samples/oleauto/oleauto.vcw
 
-samples/minifram/miniframCE.vcp
-samples/minifram/miniframCE.vcw
+samples/ownerdrw/ownerDrw.vcp
+samples/ownerdrw/ownerDrw.vcw
 
-samples/mobile/styles/stylesCE.vcp
-samples/mobile/wxedit/wxeditCE.vcw
+samples/png/png.vcp
+samples/png/png.vcw
 
-samples/multimon/multimon_testCE.vcp
-samples/multimon/multimon_testCE.vcw
+samples/printing/printing.vcp
+samples/printing/printing.vcw
 
-samples/nativdlg/nativdlgCE.vcp
-samples/nativdlg/nativdlgCE.vcw
+samples/propsize/propsize.vcp
+samples/propsize/propsize.vcw
 
-samples/notebook/notebookCE.vcp
-samples/notebook/notebookCE.vcw
+samples/regtest/regtest.vcp
+samples/regtest/regtest.vcw
 
-samples/oleauto/oleautoCE.vcp
-samples/oleauto/oleautoCE.vcw
+samples/rotate/rotate.vcp
+samples/rotate/rotate.vcw
 
-samples/ownerdrw/ownerDrwCE.vcp
-samples/ownerdrw/ownerDrwCE.vcw
+samples/sashtest/sashtest.vcp
+samples/sashtest/sashtest.vcw
 
-samples/png/pngCE.vcp
-samples/png/pngCE.vcw
+samples/scroll/scroll.vcp
+samples/scroll/scroll.vcw
 
-samples/printing/printingCE.vcp
-samples/printing/printingCE.vcw
+samples/scrollsub/scrollsub.vcp
+samples/scrollsub/scrollsub.vcw
 
-samples/propsize/propsizeCE.vcp
-samples/propsize/propsizeCE.vcw
+samples/shaped/shaped.vcp
+samples/shaped/shaped.vcw
 
-samples/regtest/regtestCE.vcp
-samples/regtest/regtestCE.vcw
+samples/sockets/client.vcp
+samples/sockets/server.vcp
+samples/sockets/client.vcw
+samples/sockets/server.vcw
 
-samples/rotate/rotateCE.vcp
-samples/rotate/rotateCE.vcw
+samples/splitter/splitter.vcp
+samples/splitter/splitter.vcw
 
-samples/sashtest/sashtestCE.vcp
-samples/sashtest/sashtestCE.vcw
+samples/statbar/statbar.vcp
+samples/statbar/statbar.vcw
 
-samples/scroll/scrollCE.vcp
-samples/scroll/scrollCE.vcw
+samples/taskbar/taskbar.vcp
+samples/taskbar/taskbar.vcw
 
-samples/scrollsub/scrollsubCE.vcp
-samples/scrollsub/scrollsubCE.vcw
+samples/text/text.vcp
+samples/text/text.vcw
 
-samples/shaped/shapedCE.vcp
-samples/shaped/shapedCE.vcw
+samples/thread/thread.vcp
+samples/thread/thread.vcw
 
-samples/sockets/clientCE.vcp
-samples/sockets/serverCE.vcp
-samples/sockets/clientCE.vcw
-samples/sockets/serverCE.vcw
+samples/toolbar/toolbar.vcp
+samples/toolbar/toolbar.vcw
 
-samples/splitter/splitterCE.vcp
-samples/splitter/splitterCE.vcw
+samples/treectrl/treetest.vcp
+samples/treectrl/treetest.vcw
 
-samples/statbar/statbarCE.vcp
-samples/statbar/statbarCE.vcw
+samples/typetest/typetest.vcp
+samples/typetest/typetest.vcw
 
-samples/taskbar/taskbarCE.vcp
-samples/taskbar/taskbarCE.vcw
+samples/validate/validate.vcp
+samples/validate/validate.vcw
 
-samples/text/textCE.vcp
-samples/text/textCE.vcw
+samples/vscroll/vscroll.vcp
+samples/vscroll/vscroll.vcw
 
-samples/thread/threadCE.vcp
-samples/thread/threadCE.vcw
+samples/wizard/wizard.vcp
+samples/wizard/wizard.vcw
 
-samples/toolbar/toolbarCE.vcp
-samples/toolbar/toolbarCE.vcw
+samples/wxtest/wxtest.vcp
+samples/wxtest/wxtest.vcw
 
-samples/treectrl/treetestCE.vcp
-samples/treectrl/treetestCE.vcw
+samples/widgets/widgets.vcp
+samples/widgets/widgets.vcw
 
-samples/typetest/typetestCE.vcp
-samples/typetest/typetestCE.vcw
+samples/opengl/cube/cube.vcp
+samples/opengl/cube/cube.vcw
+samples/opengl/isosurf/isosurf.vcp
+samples/opengl/isosurf/isosurf.vcw
+samples/opengl/penguin/penguin.vcp
+samples/opengl/penguin/penguin.vcw
 
-samples/validate/validateCE.vcp
-samples/validate/validateCE.vcw
+demos/bombs/bombs.vcp
+demos/bombs/bombs.vcw
 
-samples/vscroll/vscrollCE.vcp
-samples/vscroll/vscrollCE.vcw
+demos/dbbrowse/dbbrowse.vcp
+demos/dbbrowse/dbbrowse.vcw
 
-samples/wizard/wizardCE.vcp
-samples/wizard/wizardCE.vcw
+demos/forty/forty.vcp
+demos/forty/forty.vcw
 
-samples/wxtest/wxtestCE.vcp
-samples/wxtest/wxtestCE.vcw
+demos/fractal/fractal.vcp
+demos/fractal/fractal.vcw
 
-samples/widgets/widgetsCE.vcp
-samples/widgets/widgetsCE.vcw
+demos/life/life.vcp
+demos/life/life.vcw
 
-samples/opengl/cube/cubeCE.vcp
-samples/opengl/cube/cubeCE.vcw
-samples/opengl/isosurf/isosurfCE.vcp
-samples/opengl/isosurf/isosurfCE.vcw
-samples/opengl/penguin/penguinCE.vcp
-samples/opengl/penguin/penguinCE.vcw
+demos/poem/poem.vcp
+demos/poem/poem.vcw
 
-demos/bombs/bombsCE.vcp
-demos/bombs/bombsCE.vcw
+utils/tex2rtf/src/Tex2RTF.vcp
+utils/tex2rtf/src/Tex2RTF.vcw
 
-demos/dbbrowse/dbbrowseCE.vcp
-demos/dbbrowse/dbbrowseCE.vcw
+utils/hhp2cached/hhp2cached.vcp
+utils/hhp2cached/hhp2cached.vcw
 
-demos/forty/fortyCE.vcp
-demos/forty/fortyCE.vcw
+utils/helpgen/src/HelpGen.vcp
+utils/helpgen/src/HelpGen.vcw
 
-demos/fractal/fractalCE.vcp
-demos/fractal/fractalCE.vcw
+utils/helpview/src/helpview.vcp
+utils/helpview/src/helpview.vcw
+utils/helpview/src/client.vcp
+utils/helpview/src/client.vcw
 
-demos/life/lifeCE.vcp
-demos/life/lifeCE.vcw
+contrib/src/ogl/Ogl.vcp
+contrib/src/ogl/Ogl.vcw
 
-demos/poem/poemCE.vcp
-demos/poem/poemCE.vcw
+contrib/samples/ogl/ogledit/Ogledit.vcp
+contrib/samples/ogl/ogledit/Ogledit.vcw
+contrib/samples/ogl/studio/Studio.vcp
+contrib/samples/ogl/studio/Studio.vcw
 
-utils/tex2rtf/src/Tex2RTFCE.vcp
-utils/tex2rtf/src/Tex2RTFCE.vcw
+contrib/src/xrc/Xrc.vcp
+contrib/src/xrc/Xrc.vcw
 
-utils/hhp2cached/hhp2cachedCE.vcp
-utils/hhp2cached/hhp2cachedCE.vcw
+contrib/samples/xrc/XrcDemo.vcp
+contrib/samples/xrc/XrcDemo.vcw
 
-utils/helpgen/src/HelpGenCE.vcp
-utils/helpgen/src/HelpGenCE.vcw
+contrib/src/mmedia/Mmedia.vcp
+contrib/src/mmedia/MMedia.vcw
 
-utils/helpview/src/helpviewCE.vcp
-utils/helpview/src/helpviewCE.vcw
-utils/helpview/src/clientCE.vcp
-utils/helpview/src/clientCE.vcw
+contrib/samples/mmedia/Mmboard.vcp
+contrib/samples/mmedia/Mmboard.vcw
 
-contrib/src/ogl/OglCE.vcp
-contrib/src/ogl/OglCE.vcw
+contrib/src/stc/Stc.vcp
+contrib/src/stc/Stc.vcw
 
-contrib/samples/ogl/ogledit/OgleditCE.vcp
-contrib/samples/ogl/ogledit/OgleditCE.vcw
-contrib/samples/ogl/studio/StudioCE.vcp
-contrib/samples/ogl/studio/StudioCE.vcw
+contrib/samples/stc/StcTest.vcp
+contrib/samples/stc/StcTest.vcw
 
-contrib/src/xrc/XrcCE.vcp
-contrib/src/xrc/XrcCE.vcw
+contrib/utils/wxrc/wxrc.vcp
+contrib/utils/wxrc/wxrc.vcw
 
-contrib/samples/xrc/XrcDemoCE.vcp
-contrib/samples/xrc/XrcDemoCE.vcw
+contrib/utils/convertrc/Convert.vcp
+contrib/utils/convertrc/Convert.vcw
 
-contrib/src/mmedia/MmediaCE.vcp
-contrib/src/mmedia/MMediaCE.vcw
+contrib/utils/wxrcedit/wxRcEdit.vcp
+contrib/utils/wxrcedit/wxRcEdit.vcw
 
-contrib/samples/mmedia/MmboardCE.vcp
-contrib/samples/mmedia/MmboardCE.vcw
+contrib/src/canvas/Canvas.vcp
+contrib/src/canvas/Canvas.vcw
+contrib/samples/canvas/simple/Simple.vcp
+contrib/samples/canvas/simple/Simple.vcw
+contrib/samples/canvas/test/Test.vcp
+contrib/samples/canvas/test/Test.vcw
 
-contrib/src/stc/StcCE.vcp
-contrib/src/stc/StcCE.vcw
+contrib/src/plot/Plot.vcp
+contrib/src/plot/Plot.vcw
+contrib/samples/plot/Plot.vcp
+contrib/samples/plot/Plot.vcw
 
-contrib/samples/stc/StcTestCE.vcp
-contrib/samples/stc/StcTestCE.vcw
+contrib/src/gizmos/Gizmos.vcp
+contrib/src/gizmos/Gizmos.vcw
+contrib/samples/gizmos/dynsash/dynsash.vcp
+contrib/samples/gizmos/dynsash/dynsash.vcw
+contrib/samples/gizmos/dynsash_switch/dynsash_switch.vcp
+contrib/samples/gizmos/dynsash_switch/dynsash_switch.vcw
+contrib/samples/gizmos/editlbox/editlbox.vcp
+contrib/samples/gizmos/editlbox/editlbox.vcw
+contrib/samples/gizmos/multicell/multicell.vcp
+contrib/samples/gizmos/multicell/multicell.vcw
+contrib/samples/gizmos/splittree/Tree.vcp
+contrib/samples/gizmos/splittree/Tree.vcw
+
+contrib/src/animate/Animate.vcp
+contrib/src/animate/Animate.vcw
+contrib/samples/animate/AniTest.vcp
+contrib/samples/animate/AniTest.vcw
 
-contrib/utils/wxrc/wxrcCE.vcp
-contrib/utils/wxrc/wxrcCE.vcw
-
-contrib/utils/convertrc/ConvertCE.vcp
-contrib/utils/convertrc/ConvertCE.vcw
-
-contrib/utils/wxrcedit/wxRcEditCE.vcp
-contrib/utils/wxrcedit/wxRcEditCE.vcw
-
-contrib/src/canvas/CanvasCE.vcp
-contrib/src/canvas/CanvasCE.vcw
-contrib/samples/canvas/simple/SimpleCE.vcp
-contrib/samples/canvas/simple/SimpleCE.vcw
-contrib/samples/canvas/test/TestCE.vcp
-contrib/samples/canvas/test/TestCE.vcw
-
-contrib/src/plot/PlotCE.vcp
-contrib/src/plot/PlotCE.vcw
-contrib/samples/plot/PlotCE.vcp
-contrib/samples/plot/PlotCE.vcw
-
-contrib/src/gizmos/GizmosCE.vcp
-contrib/src/gizmos/GizmosCE.vcw
-contrib/samples/gizmos/dynsash/dynsashCE.vcp
-contrib/samples/gizmos/dynsash/dynsashCE.vcw
-contrib/samples/gizmos/dynsash_switch/dynsash_switchCE.vcp
-contrib/samples/gizmos/dynsash_switch/dynsash_switchCE.vcw
-contrib/samples/gizmos/editlbox/editlboxCE.vcp
-contrib/samples/gizmos/editlbox/editlboxCE.vcw
-contrib/samples/gizmos/multicell/multicellCE.vcp
-contrib/samples/gizmos/multicell/multicellCE.vcw
-contrib/samples/gizmos/splittree/TreeCE.vcp
-contrib/samples/gizmos/splittree/TreeCE.vcw
-
-contrib/src/animate/AnimateCE.vcp
-contrib/src/animate/AnimateCE.vcw
-contrib/samples/animate/AniTestCE.vcp
-contrib/samples/animate/AniTestCE.vcw
-
-contrib/src/fl/flCE.vcp
-contrib/src/fl/flCE.vcw
-contrib/samples/fl/fl_demo1/fl_demoCE.vcp
-contrib/samples/fl/fl_demo1/fl_demoCE.vcw
-contrib/samples/fl/fl_demo2/fl_demoCE.vcp
-contrib/samples/fl/fl_demo2/fl_demoCE.vcw
-contrib/samples/fl/fl_sample1/fl_demoCE.vcp
-contrib/samples/fl/fl_sample1/fl_demoCE.vcw
-contrib/samples/fl/fl_sample2/fl_demoCE.vcp
-contrib/samples/fl/fl_sample2/fl_demoCE.vcw
-contrib/samples/fl/fl_sample3/fl_demoCE.vcp
-contrib/samples/fl/fl_sample3/fl_demoCE.vcw
-
-contrib/src/net/NetCE.vcp
-contrib/src/net/NetCE.vcw
-
-contrib/src/deprecated/deprecatedCE.vcp
-
-contrib/samples/deprecated/proplist/proplistCE.vcp
-contrib/samples/deprecated/proplist/proplistCE.vcw
-
-contrib/samples/deprecated/resource/resourceCE.vcp
-contrib/samples/deprecated/resource/resourceCE.vcw
-
-contrib/samples/deprecated/treelay/treelayCE.vcp
-contrib/samples/deprecated/treelay/treelayCE.vcw
+contrib/src/fl/fl.vcp
+contrib/src/fl/fl.vcw
+contrib/samples/fl/fl_demo1/fl_demo.vcp
+contrib/samples/fl/fl_demo1/fl_demo.vcw
+contrib/samples/fl/fl_demo2/fl_demo.vcp
+contrib/samples/fl/fl_demo2/fl_demo.vcw
+contrib/samples/fl/fl_sample1/fl_demo.vcp
+contrib/samples/fl/fl_sample1/fl_demo.vcw
+contrib/samples/fl/fl_sample2/fl_demo.vcp
+contrib/samples/fl/fl_sample2/fl_demo.vcw
+contrib/samples/fl/fl_sample3/fl_demo.vcp
+contrib/samples/fl/fl_sample3/fl_demo.vcw
+
+contrib/src/net/Net.vcp
+contrib/src/net/Net.vcw
+
+contrib/src/deprecated/deprecated.vcp
+
+contrib/samples/deprecated/proplist/proplist.vcp
+contrib/samples/deprecated/proplist/proplist.vcw
+
+contrib/samples/deprecated/resource/resource.vcp
+contrib/samples/deprecated/resource/resource.vcw
+
+contrib/samples/deprecated/treelay/treelay.vcp
+contrib/samples/deprecated/treelay/treelay.vcw
 
 
diff --git a/distrib/msw/zipdist.sh b/distrib/msw/zipdist.sh
index e34ecd51e3..727f464272 100644
--- a/distrib/msw/zipdist.sh
+++ b/distrib/msw/zipdist.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Zip up an external, generic + Windows distribution of wxWindows 2
+# Zip up an external, generic + Windows distribution of wxWidgets 2
 SRC=`cygpath -u $WXWIN`
 DEST=$SRC/deliver
 WISE=0
@@ -22,16 +22,16 @@ dowise()
 
     # After this change of directory, we're in the
     # temporary 'wx' directory and not acting on
-    # the source wxWindows directory.
+    # the source wxWidgets directory.
     cd $DEST/wx
-    unzip -o `$CYGPATHPROG -w ../wxWindows-$VERSION-msw.zip`
-    unzip -o `$CYGPATHPROG -w ../wxWindows-$VERSION-gen.zip`
-    unzip -o `$CYGPATHPROG -w ../wxWindows-$VERSION-vc.zip`
-    unzip -o `$CYGPATHPROG -w ../wxWindows-$VERSION-bc.zip`
-    unzip -o `$CYGPATHPROG -w ../wxWindows-$VERSION-HTMLHelp.zip`
+    unzip -o `$CYGPATHPROG -w ../wxWidgets-$VERSION-msw.zip`
+    unzip -o `$CYGPATHPROG -w ../wxWidgets-$VERSION-gen.zip`
+    unzip -o `$CYGPATHPROG -w ../wxWidgets-$VERSION-vc.zip`
+    unzip -o `$CYGPATHPROG -w ../wxWidgets-$VERSION-bc.zip`
+    unzip -o `$CYGPATHPROG -w ../wxWidgets-$VERSION-HTMLHelp.zip`
     unzip -o `$CYGPATHPROG -w ../extradoc.zip`
     # Need Word file, for Remstar DB classes
-    unzip -o `$CYGPATHPROG -w ../wxWindows-$VERSION-Word.zip`
+    unzip -o `$CYGPATHPROG -w ../wxWidgets-$VERSION-Word.zip`
     unzip -o `$CYGPATHPROG -w ../ogl3.zip`
     unzip -o `$CYGPATHPROG -w ../jpeg.zip`
     unzip -o `$CYGPATHPROG -w ../tiff.zip`
@@ -75,7 +75,7 @@ dowise()
     # Now invoke WISE install on the new wxwin2.wse
     echo Invoking WISE...
     /c/progra~1/wise/wise32.exe /C $WXWIN\\distrib\\msw\\wxwin2.wse
-    echo Press return to continue with the wxWindows distribution...
+    echo Press return to continue with the wxWidgets distribution...
     read dummy
 
     cd $DEST
@@ -183,58 +183,58 @@ echo Zipping...
 # for local use, and for creating wxMSW-xxx.zip.
 
 # We can't use e.g. this:
-# ls `cat $SRC/distrib/msw/makefile.rsp` zip -@ -u $DEST/wxWindows-$VERSION-gen.zip
+# ls `cat $SRC/distrib/msw/makefile.rsp` zip -@ -u $DEST/wxWidgets-$VERSION-gen.zip
 # because there's not enough space on the command line, plus we need to ignore the
 # blank lines.
 
 expandlines $SRC/distrib/msw/generic.rsp temp.txt
-zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-gen.zip` < temp.txt
+zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-gen.zip` < temp.txt
 
 expandlines $SRC/distrib/msw/makefile.rsp temp.txt
-zip -@ -u `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-gen.zip` < temp.txt
+zip -@ -u `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-gen.zip` < temp.txt
 
 expandlines $SRC/distrib/msw/msw.rsp temp.txt
-zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-msw.zip` < temp.txt
+zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-msw.zip` < temp.txt
 
 expandlines $SRC/distrib/msw/makefile.rsp temp.txt
-zip -@ -u `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-msw.zip` < temp.txt
+zip -@ -u `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-msw.zip` < temp.txt
 
 expandlines $SRC/distrib/msw/gtk.rsp temp.txt
-zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-gtk.zip` < temp.txt
+zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-gtk.zip` < temp.txt
 
 expandlines $SRC/distrib/msw/makefile.rsp temp.txt
-zip -@ -u `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-gtk.zip` < temp.txt
+zip -@ -u `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-gtk.zip` < temp.txt
 
 expandlines $SRC/distrib/msw/stubs.rsp temp.txt
-zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-stubs.zip` < temp.txt
+zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-stubs.zip` < temp.txt
 
 expandlines $SRC/distrib/msw/motif.rsp temp.txt
-zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-mot.zip` < temp.txt
+zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-mot.zip` < temp.txt
 
 expandlines $SRC/distrib/msw/makefile.rsp temp.txt
-zip -@ -u `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-mot.zip` < temp.txt
+zip -@ -u `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-mot.zip` < temp.txt
 
 
 expandlines $SRC/distrib/msw/docsrc.rsp temp.txt
-zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-DocSource.zip` < temp.txt
+zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-DocSource.zip` < temp.txt
 
 expandlines $SRC/distrib/msw/wx_hlp.rsp temp.txt
-zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-WinHelp.zip` < temp.txt
+zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-WinHelp.zip` < temp.txt
 
 expandlines $SRC/distrib/msw/wx_html.rsp temp.txt
-zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-HTML.zip` < temp.txt
+zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-HTML.zip` < temp.txt
 
 expandlines $SRC/distrib/msw/wx_pdf.rsp temp.txt
-zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-PDF.zip` < temp.txt
+zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-PDF.zip` < temp.txt
 
 expandlines $SRC/distrib/msw/wx_word.rsp temp.txt
-zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-Word.zip` < temp.txt
+zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-Word.zip` < temp.txt
 
 expandlines $SRC/distrib/msw/wx_htb.rsp temp.txt
-zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-HTB.zip` < temp.txt
+zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-HTB.zip` < temp.txt
 
 expandlines $SRC/distrib/msw/wx_chm.rsp temp.txt
-zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-HTMLHelp.zip` < temp.txt
+zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-HTMLHelp.zip` < temp.txt
 
 # PDF/HTML docs that should go into the Windows setup because
 # there are no WinHelp equivalents
@@ -243,15 +243,15 @@ zip -@ `$CYGPATHPROG -w $DEST/extradoc.zip` < temp.txt
 
 # VC++ project files
 expandlines $SRC/distrib/msw/vc.rsp temp.txt
-zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-vc.zip` < temp.txt
+zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-vc.zip` < temp.txt
 
 # BC++ project files
 expandlines $SRC/distrib/msw/bc.rsp temp.txt
-zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-bc.zip` < temp.txt
+zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-bc.zip` < temp.txt
 
 # CodeWarrior project files
 expandlines $SRC/distrib/msw/cw.rsp temp.txt
-zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-cw.zip` < temp.txt
+zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-cw.zip` < temp.txt
 
 # OGL 3
 expandlines $SRC/distrib/msw/ogl.rsp temp.txt
@@ -306,5 +306,5 @@ if [ "$WISE" = "1" ]; then
     dowise
 fi
 
-echo wxWindows archived.
+echo wxWidgets archived.
 
diff --git a/distrib/msw/zipmac.sh b/distrib/msw/zipmac.sh
index d459edbcd9..ab6cb393ff 100644
--- a/distrib/msw/zipmac.sh
+++ b/distrib/msw/zipmac.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Zip up an external, generic + Windows distribution of wxWindows 2
+# Zip up an external, generic + Windows distribution of wxWidgets 2
 # Usage: zipmac.sh dest-dir
 # (set the WXWIN variable first so it knows where to take the sources from)
 
@@ -83,9 +83,9 @@ expandlines $SRC/distrib/msw/xml.rsp temp.txt
 zip -u -@ `$CYGPATHPROGW $DEST/wxMac-$VERSION.zip` < temp.txt
 
 expandlines $SRC/distrib/msw/wx_html.rsp temp.txt
-zip -@ `$CYGPATHPROGW $DEST/wxWindows-$VERSION-HTML.zip` < temp.txt
+zip -@ `$CYGPATHPROGW $DEST/wxWidgets-$VERSION-HTML.zip` < temp.txt
 
 rm -f temp.txt
 
-echo wxWindows archived.
+echo wxWidgets archived.
 
diff --git a/distrib/msw/zippatch.bat b/distrib/msw/zippatch.bat
index ef6cd9491c..5ddf7f0965 100755
--- a/distrib/msw/zippatch.bat
+++ b/distrib/msw/zippatch.bat
@@ -6,12 +6,12 @@ if "%wxwin%" == "" goto usage
 set src=%wxwin%
 set dest=%src%\deliver
 
-Rem Set this to the required wxWindows version
+Rem Set this to the required wxWidgets version
 set wxversion=2.3.3
 Rem Set this to the required patch version
 set version=01
 
-set patchname=wxWindows-%wxversion%-patch-%version%.zip
+set patchname=wxWidgets-%wxversion%-patch-%version%.zip
 
 if "%src" == "" goto usage
 if "%dest" == "" goto usage
@@ -21,20 +21,20 @@ echo   To     %dest
 echo CTRL-C if this is not correct.
 pause
 
-erase /Q /E %dest%\wxWindows-*-patch*.zip
+erase /Q /E %dest%\wxWidgets-*-patch*.zip
 
 cd %src%
 echo Zipping...
 
 zip32 -@ %dest%\%patchname% < %src%\distrib\msw\patch.rsp
-echo wxWindows patch archived.
+echo wxWidgets patch archived.
 
 cd %dest
 
 goto end
 
 :usage
-echo wxWindows patch distribution.
+echo wxWidgets patch distribution.
 echo.
 echo Usage: zippatch
 echo You must set WXWIN appropriately before calling this script.
diff --git a/distrib/msw/zipwinminimal.bat b/distrib/msw/zipwinminimal.bat
index 65a74e665b..a5dbe93070 100755
--- a/distrib/msw/zipwinminimal.bat
+++ b/distrib/msw/zipwinminimal.bat
@@ -21,7 +21,7 @@ pause
 erase %dest\wxMSW-%VERSION%-Minimal*.zip
 
 if not direxist %dest mkdir %dest
-if direxist %dest%\wxWindows-%version% erase /sxyz %dest%\wxWindows-%version%
+if direxist %dest%\wxWidgets-%version% erase /sxyz %dest%\wxWidgets-%version%
 
 echo Zipping wxMSW-Minimal distribution
 
@@ -33,10 +33,10 @@ zip32 -u -@ %dest%\wxMSW-%version%-Minimal.zip < %src%\distrib\msw\png.rsp
 zip32 -u -@ %dest%\wxMSW-%version%-Minimal.zip < %src%\distrib\msw\zlib.rsp
 zip32 -u -@ %dest%\wxMSW-%version%-Minimal.zip < %src%\distrib\msw\tiff.rsp
 
-if direxist %dest%\wxWindows-%version% erase /sxyz %dest%\wxWindows-%version%
+if direxist %dest%\wxWidgets-%version% erase /sxyz %dest%\wxWidgets-%version%
 
-mkdir %dest%\wxWindows-%version%
-cd %dest%\wxWindows-%version%
+mkdir %dest%\wxWidgets-%version%
+cd %dest%\wxWidgets-%version%
 
 unzip32 ..\wxMSW-%version%-Minimal.zip
 erase /Y src\gtk\descrip.mms src\motif\descrip.mms docs\pdf\*.pdf
@@ -54,7 +54,7 @@ erase /XY include\wx\*cw*.h
 cd %dest%
 
 erase wxMSW-%version%-Minimal.zip
-zip32 -r wxMSW-%version%-Minimal.zip wxWindows-%version%/*
+zip32 -r wxMSW-%version%-Minimal.zip wxWidgets-%version%/*
 
 echo wxMSW-Minimal archived.
 
@@ -63,7 +63,7 @@ cd %src%\distrib\msw
 goto end
 
 :usage
-echo DOS wxWindows distribution. Zips up wxMSW-Minimal.
+echo DOS wxWidgets distribution. Zips up wxMSW-Minimal.
 echo.
 echo "Usage: zipwinminimal.bat"
 
diff --git a/distrib/msw/zipxml.bat b/distrib/msw/zipxml.bat
index fe2d7ee5c6..8ecfd6db62 100755
--- a/distrib/msw/zipxml.bat
+++ b/distrib/msw/zipxml.bat
@@ -23,7 +23,7 @@ goto end
 :usage
 echo DOS wxXML distribution.
 echo Usage: zipxml source destination
-echo e.g. zipxml d:\wx2\wxWindows d:\wx2\wxWindows\deliver
+echo e.g. zipxml d:\wx2\wxWidgets d:\wx2\wxWidgets\deliver
 
 :end
 
diff --git a/docs/mgl/install.txt b/docs/mgl/install.txt
index 2dfaaa1396..82217d293b 100644
--- a/docs/mgl/install.txt
+++ b/docs/mgl/install.txt
@@ -11,7 +11,7 @@ IMPORTANT NOTE:
   
   When sending bug reports tell us what version of wxWidgets you are 
   using (including the beta) and what compiler on what system. One 
-  example: wxMGL 2.5.1, gcc 2.95.3, Redhat 7.0
+  example: wxMGL 2.5.2, gcc 2.95.3, Redhat 7.0
 
 First steps
 -----------
diff --git a/docs/motif/install.txt b/docs/motif/install.txt
index 8b873f61bc..a24078c761 100644
--- a/docs/motif/install.txt
+++ b/docs/motif/install.txt
@@ -11,7 +11,7 @@ IMPORTANT NOTE:
   
   When sending bug reports tell us what version of wxWidgets you are 
   using (including the beta) and what compiler on what system. One 
-  example: wxMotif 2.5.1, gcc 2.95.4, Redhat 6.1
+  example: wxMotif 2.5.2, gcc 2.95.4, Redhat 6.1
 
 First steps
 -----------
diff --git a/docs/motif/readme.txt b/docs/motif/readme.txt
index fe97a2f3ba..55aac62b28 100644
--- a/docs/motif/readme.txt
+++ b/docs/motif/readme.txt
@@ -1,7 +1,7 @@
 
-  Welcome to wxWidgets/Motif 2.5.1
+  Welcome to wxWidgets/Motif 2.5.2
 
-You have downloaded version 2.5.1 of the Motif port of
+You have downloaded version 2.5.2 of the Motif port of
 the wxWidgets GUI library.
 
 More information about the wxWidgets project as a whole
diff --git a/docs/msw/install.txt b/docs/msw/install.txt
index 3bc210b02b..1aca7b46b1 100644
--- a/docs/msw/install.txt
+++ b/docs/msw/install.txt
@@ -1,7 +1,7 @@
-Installing wxWidgets 2.5.1
+Installing wxWidgets 2.5.2
 --------------------------
 
-This is wxWidgets 2.5.1 for Microsoft Windows 9x/ME, Windows NT, Windows 2000
+This is wxWidgets 2.5.2 for Microsoft Windows 9x/ME, Windows NT, Windows 2000
 and Windows XP. This is an unstable development release. Note that unstable in
 this context doesn't mean that it crashes a lot, just that the library API may
 change in backwards incompatible way during the 2.5 branch lifetime.
@@ -263,7 +263,7 @@ Metrowerks CodeWarrior compilation
 ----------------------------------
 
 1. CodeWarrior Pro7 project files in XML format are already
-   included in wxMSW-2.5.1.zip and the setup version.
+   included in wxMSW-2.5.2.zip and the setup version.
 
 2. Review the file include\wx\msw\setup.h (or include\wx\msw\setup0.h if
    you are working from the CVS version) to make sure the settings reflect
diff --git a/docs/msw/wince/readme.txt b/docs/msw/wince/readme.txt
index da81b4291e..7337d78c4a 100644
--- a/docs/msw/wince/readme.txt
+++ b/docs/msw/wince/readme.txt
@@ -1,9 +1,9 @@
 
   =================================================
-  Welcome to wxWidgets/CE 2.5.1
+  Welcome to wxWidgets/CE 2.5.2
   =================================================
 
-You have downloaded version 2.5.1 of the Windows CE port of
+You have downloaded version 2.5.2 of the Windows CE port of
 the wxWidgets GUI library. This runs on PocketPC 2002,
 SmartPhone 2002, and Windows CE .NET 4.x.
 
diff --git a/docs/os2/install.txt b/docs/os2/install.txt
index 3a631b72de..94c3206641 100644
--- a/docs/os2/install.txt
+++ b/docs/os2/install.txt
@@ -1,7 +1,7 @@
-Installing wxWidgets 2.5.1
+Installing wxWidgets 2.5.2
 --------------------------
 
-This is wxWidgets 2.5.1 for IBM OS/2 Warp3 and Warp4. This is an unstable
+This is wxWidgets 2.5.2 for IBM OS/2 Warp3 and Warp4. This is an unstable
 development release and OS/2 is considered to be in beta.
 
 IMPORTANT NOTE: If you experience problems installing, please
@@ -17,7 +17,7 @@ Unarchiving
 At this time there is no comprehensive setup.exe type installation program.
 wxWidgets for OS/2 requires you download various .zip files and unpack them
 to your desired location on your system.  Pick a location say,
-C:\wx\wxWidgets-2.5.1, copy the .zip files to there and unzip them ensuring you
+C:\wx\wxWidgets-2.5.2, copy the .zip files to there and unzip them ensuring you
 unzip the subdirectories as well.  You will need:
 
 - All common, generic and OS2-specific wxWidgets source;
@@ -30,7 +30,7 @@ unzip the subdirectories as well.  You will need:
 - PNG library source;
 - ZLIB library source;
 
-All but the documentation is included in wxOS2-2.5.1.zip, documentation
+All but the documentation is included in wxOS2-2.5.2.zip, documentation
 must be downloaded separately from the wxWidgets Web site.
 
 Other add-on packages are available from the wxWidgets Web site, such as:
@@ -46,27 +46,27 @@ General installation notes
 After unzipping everything your directory tree should look something like
 this:
 
-x:\wx\wxWidgets-2.5.1\docs (your HTML reference manual)
-x:\wx\wxWidgets-2.5.1\include\wx
-x:\wx\wxWidgets-2.5.1\include\wx\generic
-x:\wx\wxWidgets-2.5.1\include\wx\html
-x:\wx\wxWidgets-2.5.1\include\wx\os2
-x:\wx\wxWidgets-2.5.1\samples\....  (all the sample directories)
-x:\wx\wxWidgets-2.5.1\src
-x:\wx\wxWidgets-2.5.1\src\common
-x:\wx\wxWidgets-2.5.1\src\generic
-x:\wx\wxWidgets-2.5.1\src\html
-x:\wx\wxWidgets-2.5.1\src\jpeg
-x:\wx\wxWidgets-2.5.1\src\os2
-x:\wx\wxWidgets-2.5.1\src\png
-x:\wx\wxWidgets-2.5.1\src\tiff
-x:\wx\wxWidgets-2.5.1\src\zlib
+x:\wx\wxWidgets-2.5.2\docs (your HTML reference manual)
+x:\wx\wxWidgets-2.5.2\include\wx
+x:\wx\wxWidgets-2.5.2\include\wx\generic
+x:\wx\wxWidgets-2.5.2\include\wx\html
+x:\wx\wxWidgets-2.5.2\include\wx\os2
+x:\wx\wxWidgets-2.5.2\samples\....  (all the sample directories)
+x:\wx\wxWidgets-2.5.2\src
+x:\wx\wxWidgets-2.5.2\src\common
+x:\wx\wxWidgets-2.5.2\src\generic
+x:\wx\wxWidgets-2.5.2\src\html
+x:\wx\wxWidgets-2.5.2\src\jpeg
+x:\wx\wxWidgets-2.5.2\src\os2
+x:\wx\wxWidgets-2.5.2\src\png
+x:\wx\wxWidgets-2.5.2\src\tiff
+x:\wx\wxWidgets-2.5.2\src\zlib
 
 If you are using VisualAge, you will also need to ensure you have a
-\lib directory as well, x:\wx\wxWidgets-2.5.1\lib
+\lib directory as well, x:\wx\wxWidgets-2.5.2\lib
 and you will have to set a WXWIN environment variable in your
 config.sys,
-SET WXWIN=X:\WX\WXWINDOWS-2.5.1;
+SET WXWIN=X:\WX\WXWINDOWS-2.5.2;
 
 Compilation
 -----------
@@ -176,13 +176,13 @@ developping cross-platform applications you might want to compile (and
 update) e.g. wxGTK or wxX11 as well.
 
 In the following, let's assume you decided to build in
-\wx\wxWidgets-2.5.1\build\pm. Now we need to set some environment
+\wx\wxWidgets-2.5.2\build\pm. Now we need to set some environment
 variables, namely MAKESHELL (to a Unix like shell, let's assume ash)
 and INSTALL (to point to the install script. If you omit this, configure
 might find something like the system's tcpip\pcomos\install.exe which will
 not do the thing you want), e.g.
 SET MAKESHELL=ash
-SET INSTALL=/wx/wxWidgets-2.5.1/install-sh -c
+SET INSTALL=/wx/wxWidgets-2.5.2/install-sh -c
 
 Be warned that depending on the precise version of your make, the
 variable that needs to be set might be MAKE_SHELL instead of MAKESHELL.
@@ -225,7 +225,7 @@ Finally, if you also want to build a different port, e.g. wxGTK, you
 essentially have to use the procedure described above, the only difference
 being that you have to pass a switch to configure indicating which port
 to build. If you do not do this in a separate build directory (e.g.
-\wxWidgets-2.5.1\build\gtk), you'll have to do a `make clean' first.
+\wxWidgets-2.5.2\build\gtk), you'll have to do a `make clean' first.
 The magical switches that have to be passed to configure for the various
 ports are --with-gtk (wxGTK), --with-motif (wxMotif), --with-x11 (wxX11),
 and --disable-gui (wxBase). Note that contrary to the native, PM based
diff --git a/docs/publicity/announce.txt b/docs/publicity/announce.txt
index 7b3565d19a..810440c134 100644
--- a/docs/publicity/announce.txt
+++ b/docs/publicity/announce.txt
@@ -1,4 +1,4 @@
-Announcing wxWidgets 2.5.1: a cross-platform GUI toolkit
+Announcing wxWidgets 2.5.2: a cross-platform GUI toolkit
 ----------------------------------------------------------------
 
 February 24th, 2004 -- the wxWidgets team is pleased to announce
diff --git a/docs/readme.txt b/docs/readme.txt
index 3bbcb6f2b3..3c9700e6a8 100644
--- a/docs/readme.txt
+++ b/docs/readme.txt
@@ -1,4 +1,4 @@
-wxWidgets 2.5.1
+wxWidgets 2.5.2
 ---------------
 
 *** Please note that this is an UNSTABLE DEVELOPMENT SNAPSHOT.
@@ -37,11 +37,12 @@ Platforms supported
 
 wxWidgets currently supports the following platforms:
 
-- Windows 95/98/ME, Windows NT, Windows 2000, Windows XP
+- Windows 95/98/ME, Windows NT, Windows 2000, Windows XP, Pocket PC
 - Most Unix variants with GTK+
 - Most Unix variants with X11
 - Most Unix variants with Motif/Lesstif
-- MacOS 9.x and 10.x
+- MacOS 9.x and 10.x using Carbon (10.4 and above preferred)
+- MacOS 10.x using Cocoa
 - OS/2 (alpha)
 
 Most popular C++ compilers are supported; see the install.txt
@@ -210,5 +211,5 @@ web site.
 
 Have fun!
 
-The wxWidgets Team, February 2004
+The wxWidgets Team, May 2004
 
diff --git a/docs/tech/tn0005.txt b/docs/tech/tn0005.txt
index 952cb2ac63..57409307b0 100644
--- a/docs/tech/tn0005.txt
+++ b/docs/tech/tn0005.txt
@@ -3,7 +3,7 @@
 
 Here are some different kinds of contribution:
 
-1. Bug fixes. You can send these to the wx-devel list.
+1. Bug fixes. You can send these to the wx-dev list.
 2. New classes. New classes normally go in the contrib hierarchy:
    please see below for more details. They may be promoted to
    the main wxWidgets hierarchy if they are deemed to be 'core'.
@@ -14,7 +14,7 @@ Here are some different kinds of contribution:
 
 You may or may not wish to add your code to the main wxWidgets CVS
 archive. Whether your code is appropriate for this archive
-should first be ascertained by discussing it on wx-devel@wxwindows.org.
+should first be ascertained by discussing it on wx-dev@wxwidgets.org.
 
 The contrib hierarchy
 ---------------------
@@ -59,7 +59,7 @@ site in the 'Backroom' section. Include bakefile and generated makefiles
 
 Your archive can be in .tgz or .zip format. For inclusion on
 the wxWidgets ftp site and CD-ROM, please send your submission to
-Julian Smart <julian@wxwindows.org> as a binary attachment.
+Julian Smart <julian@wxwidgets.org> as a binary attachment.
 An entry will be added to the Contributions web page.
 
 Author:  Julian Smart
diff --git a/docs/tech/tn0007.txt b/docs/tech/tn0007.txt
index 901f00059e..50280b604e 100644
--- a/docs/tech/tn0007.txt
+++ b/docs/tech/tn0007.txt
@@ -2,7 +2,7 @@ Using and modifying the BC++ IDE files
 ======================================
 
 
-Please use wxWidgets 2.4.x - this is not currently supported in wxWidgets 2.5.1
+Please use wxWidgets 2.4.x - this is not currently supported in wxWidgets 2.5.2
 
 
 
diff --git a/docs/tech/tn0008.htm b/docs/tech/tn0008.htm
index 7bec6adf6a..196d5bfcbc 100644
--- a/docs/tech/tn0008.htm
+++ b/docs/tech/tn0008.htm
@@ -27,12 +27,12 @@ The following is a response by Edward Ream to a common question,
 
 Date: Sun, 04 Jun 2000 14:37:06 -0500<BR>
 From: "Edward K. Ream" <edream@tds.net> <BR>
-To: wx-users@wxwindows.org<BR>
+To: wx-users@wxwidgets.org<BR>
 Subject: Re: [wx-users] How to learn using wx-windows <BR>
-Reply-To: wx-users@wxwindows.org<P>
+Reply-To: wx-users@wxwidgets.org<P>
 
 &gt; Reading the Linux Journal article on wxpython, and having used wxclips<BR>
-&gt; I got interested in wxwindows as a development interface. However, the<BR>
+&gt; I got interested in wxwidgets as a development interface. However, the<BR>
 &gt; programming experience I got is old, and from a former generation (For-<BR>
 &gt; tran). I'd like to refresh my experience and start in C++.  Will<BR>
 &gt; wx-windows be a very high step to take?<P>
diff --git a/docs/tech/tn0013.txt b/docs/tech/tn0013.txt
index c6512191ea..52358f9d81 100644
--- a/docs/tech/tn0013.txt
+++ b/docs/tech/tn0013.txt
@@ -16,7 +16,7 @@ below.
 
 a) Do a fresh checkout using the command
 
-        cvs -d :pserver:anoncvs@cvs.wxwindows.org:/packs/cvsroots/wxwindows co wxGTK
+        cvs -d :pserver:anoncvs@cvs.wxwidgets.org:/packs/cvsroots/wxwidgets co wxGTK
 
    NB: if you realize later that some needed files were not checked out
        by this command, please modify CVSROOT/modules to include the missing
@@ -129,12 +129,12 @@ b) ftp://biolpc22.york.ac.uk/pub (Julian has the password)
 -------------------------
 
 a) FreshMeat:
-   - http://freshmeat.net/projects/wxwindowsgtk/
+   - http://freshmeat.net/projects/wxwidgetsgtk/
    - username and password are "wxgtk" for logging in
    - hit "new release" at the top
    - follow the step by step
 
-b) wx-announce mailing list: mailto:wx-announce@lists.wxwindows.org
+b) wx-announce mailing list: mailto:wx-announce@lists.wxwidgets.org
 
    [where is the announcement text? TODO]
 
diff --git a/docs/univ/readme.txt b/docs/univ/readme.txt
index 632f131c87..524b5b6ff9 100644
--- a/docs/univ/readme.txt
+++ b/docs/univ/readme.txt
@@ -57,7 +57,7 @@ b) Cygwin
 
    Please refer to the Unix section below
 
-** the instructions may be out of date as for wxWidgets 2.5.1+ **
+** the instructions may be out of date as for wxWidgets 2.5.2+ **
 
 c) Other compilers
    Borland: 
diff --git a/docs/x11/install.txt b/docs/x11/install.txt
index aba1589104..d50d07eca4 100644
--- a/docs/x11/install.txt
+++ b/docs/x11/install.txt
@@ -11,7 +11,7 @@ IMPORTANT NOTE:
 
   When sending bug reports tell us what version of wxWidgets you are 
   using (including the beta) and what compiler on what system. One 
-  example: wxX11 2.5.1, gcc 2.95.4, Redhat 6.2
+  example: wxX11 2.5.2, gcc 2.95.4, Redhat 6.2
 
 First steps
 -----------
diff --git a/docs/x11/readme.txt b/docs/x11/readme.txt
index d6815da53d..d884bfa453 100644
--- a/docs/x11/readme.txt
+++ b/docs/x11/readme.txt
@@ -1,7 +1,7 @@
 
-  Welcome to wxWidgets/X11 2.5.1
+  Welcome to wxWidgets/X11 2.5.2
 
-You have downloaded version 2.5.1 of the X11 port of
+You have downloaded version 2.5.2 of the X11 port of
 the wxWidgets GUI library. This runs on X11 with no
 Motif, Xt, GTK+ or any other standard widget set --
 instead it uses the wxUniversal widgets. The intention
diff --git a/include/wx/accel.h b/include/wx/accel.h
index faf7d50f88..ce47c83d2a 100644
--- a/include/wx/accel.h
+++ b/include/wx/accel.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     31.05.01 (extracted from other files)
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_ACCEL_H_BASE_
diff --git a/include/wx/access.h b/include/wx/access.h
index 8b33289c74..42379d9d0c 100644
--- a/include/wx/access.h
+++ b/include/wx/access.h
@@ -6,7 +6,7 @@
 // Created:     2003-02-12
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_ACCESSBASE_H_
diff --git a/include/wx/afterstd.h b/include/wx/afterstd.h
index ecb2c3c88e..a85cf0eca9 100644
--- a/include/wx/afterstd.h
+++ b/include/wx/afterstd.h
@@ -6,7 +6,7 @@
 // Created:     07/07/03
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 /**
diff --git a/include/wx/app.h b/include/wx/app.h
index b2e7a337b9..0997d1d6e6 100644
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -7,7 +7,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_APP_H_BASE_
diff --git a/include/wx/apptrait.h b/include/wx/apptrait.h
index beab013f93..637990dad5 100644
--- a/include/wx/apptrait.h
+++ b/include/wx/apptrait.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     19.06.2003
 // RCS-ID:      $Id$
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_APPTRAIT_H_
diff --git a/include/wx/arrimpl.cpp b/include/wx/arrimpl.cpp
index d0e3a7f5cd..e2f4dee76b 100644
--- a/include/wx/arrimpl.cpp
+++ b/include/wx/arrimpl.cpp
@@ -6,7 +6,7 @@
 // Created:     16.10.97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows license
+// Licence:     wxWidgets license
 ///////////////////////////////////////////////////////////////////////////////
 
 /*****************************************************************************
diff --git a/include/wx/arrstr.h b/include/wx/arrstr.h
index 9643b64e76..65e9d5d654 100644
--- a/include/wx/arrstr.h
+++ b/include/wx/arrstr.h
@@ -6,7 +6,7 @@
 // Created:     07/07/03
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_ARRSTR_H
diff --git a/include/wx/artprov.h b/include/wx/artprov.h
index adf181ca4a..be58e9d62c 100644
--- a/include/wx/artprov.h
+++ b/include/wx/artprov.h
@@ -6,7 +6,7 @@
 // Created:     18/03/2002
 // RCS-ID:      $Id$
 // Copyright:   (c) Vaclav Slavik
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_ARTPROV_H_
diff --git a/include/wx/beforestd.h b/include/wx/beforestd.h
index ee02dca945..9196f32a08 100644
--- a/include/wx/beforestd.h
+++ b/include/wx/beforestd.h
@@ -6,7 +6,7 @@
 // Created:     07/07/03
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 /**
diff --git a/include/wx/bitmap.h b/include/wx/bitmap.h
index 83e48ce737..9ad6825099 100644
--- a/include/wx/bitmap.h
+++ b/include/wx/bitmap.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     22.04.01
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_BITMAP_H_BASE_
diff --git a/include/wx/bmpbuttn.h b/include/wx/bmpbuttn.h
index c874c9d9da..d1fe53738a 100644
--- a/include/wx/bmpbuttn.h
+++ b/include/wx/bmpbuttn.h
@@ -6,7 +6,7 @@
 // Created:     25.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Vadim Zeitlin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_BMPBUTTON_H_BASE_
diff --git a/include/wx/bookctrl.h b/include/wx/bookctrl.h
index 3883770cf3..84820be05a 100644
--- a/include/wx/bookctrl.h
+++ b/include/wx/bookctrl.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     19.08.03
 // RCS-ID:      $Id$
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_BOOKCTRL_H_
diff --git a/include/wx/buffer.h b/include/wx/buffer.h
index 85c986a3e9..3e52ab1a31 100644
--- a/include/wx/buffer.h
+++ b/include/wx/buffer.h
@@ -6,7 +6,7 @@
 // Created:     12.04.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // these classes are for private use only for now, they're not documented
diff --git a/include/wx/build.h b/include/wx/build.h
index 833807da0c..f6f91b98e6 100644
--- a/include/wx/build.h
+++ b/include/wx/build.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     07.05.02
 // RCS-ID:      $Id$
-// Copyright:   (c) 2002 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
+// Copyright:   (c) 2002 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_BUILD_H_
diff --git a/include/wx/busyinfo.h b/include/wx/busyinfo.h
index f9fddb2ee1..23915ebb0b 100644
--- a/include/wx/busyinfo.h
+++ b/include/wx/busyinfo.h
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
 // RCS-ID:      $Id$
-// Licence:     wxWindows Licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __INFOWIN_H__
diff --git a/include/wx/button.h b/include/wx/button.h
index 1e7f14a0f7..83f0fede26 100644
--- a/include/wx/button.h
+++ b/include/wx/button.h
@@ -6,7 +6,7 @@
 // Created:     15.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) Vadim Zetlin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_BUTTON_H_BASE_
diff --git a/include/wx/calctrl.h b/include/wx/calctrl.h
index fb1f324d46..3eae4ccfbe 100644
--- a/include/wx/calctrl.h
+++ b/include/wx/calctrl.h
@@ -6,7 +6,7 @@
 // Created:     29.12.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 /*
diff --git a/include/wx/caret.h b/include/wx/caret.h
index f8e547bc38..5aceab1e70 100644
--- a/include/wx/caret.h
+++ b/include/wx/caret.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     23.05.99
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CARET_H_BASE_
diff --git a/include/wx/checkbox.h b/include/wx/checkbox.h
index 6d3ec75c4d..a4f928b203 100644
--- a/include/wx/checkbox.h
+++ b/include/wx/checkbox.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     07.09.00
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CHECKBOX_H_BASE_
diff --git a/include/wx/checklst.h b/include/wx/checklst.h
index ce34f6cbcd..842076dcf1 100644
--- a/include/wx/checklst.h
+++ b/include/wx/checklst.h
@@ -6,7 +6,7 @@
 // Created:     12.09.00
 // RCS-ID:      $Id$
 // Copyright:   (c) Vadim Zeitlin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CHECKLST_H_BASE_
diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 6673f2906f..5a25ccf34f 100644
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -5,8 +5,8 @@
 * Modified by:
 * Created:     09.08.00
 * RCS-ID:      $Id$
-* Copyright:   (c) 2000 Vadim Zeitlin <vadim@wxwindows.org>
-* Licence:     wxWindows licence
+* Copyright:   (c) 2000 Vadim Zeitlin <vadim@wxwidgets.org>
+* Licence:     wxWidgets licence
 */
 
 /* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
diff --git a/include/wx/choice.h b/include/wx/choice.h
index b6600e3592..78a678d7f4 100644
--- a/include/wx/choice.h
+++ b/include/wx/choice.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     26.07.99
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CHOICE_H_BASE_
diff --git a/include/wx/clipbrd.h b/include/wx/clipbrd.h
index ca72949a5c..d0e3495d14 100644
--- a/include/wx/clipbrd.h
+++ b/include/wx/clipbrd.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     19.10.99
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows Team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets Team
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CLIPBRD_H_BASE_
diff --git a/include/wx/clntdata.h b/include/wx/clntdata.h
index 3812ea2ed8..0de0cbb918 100644
--- a/include/wx/clntdata.h
+++ b/include/wx/clntdata.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     9-Oct-2001
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CLNTDATAH__
diff --git a/include/wx/cmdline.h b/include/wx/cmdline.h
index a6d7a0fa41..1ddf446507 100644
--- a/include/wx/cmdline.h
+++ b/include/wx/cmdline.h
@@ -7,7 +7,7 @@
 // Created:     04.01.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CMDLINE_H_
diff --git a/include/wx/cmdproc.h b/include/wx/cmdproc.h
index 1200640d37..7062fdcae3 100644
--- a/include/wx/cmdproc.h
+++ b/include/wx/cmdproc.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     05.11.00
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CMDPROC_H_
diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h
index fae981643e..99d5110eeb 100644
--- a/include/wx/cmndata.h
+++ b/include/wx/cmndata.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CMNDATA_H_BASE_
diff --git a/include/wx/cocoa/NSApplication.h b/include/wx/cocoa/NSApplication.h
index 35ead1e8f5..77d0142648 100644
--- a/include/wx/cocoa/NSApplication.h
+++ b/include/wx/cocoa/NSApplication.h
@@ -6,7 +6,7 @@
 // Created:     2004/01/26
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003,2004 David Elliott
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COCOA_NSAPPLICATION_H__
diff --git a/include/wx/cocoa/NSBox.h b/include/wx/cocoa/NSBox.h
index e0271570b2..fbed92240c 100644
--- a/include/wx/cocoa/NSBox.h
+++ b/include/wx/cocoa/NSBox.h
@@ -6,7 +6,7 @@
 // Created:     2003/03/19
 // RCS-ID:      $Id: 
 // Copyright:   (c) 2003 David Elliott
-// Licence:     wxWindows license
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_NSBOX_H__
diff --git a/include/wx/cocoa/NSButton.h b/include/wx/cocoa/NSButton.h
index 687fd77655..59becbd398 100644
--- a/include/wx/cocoa/NSButton.h
+++ b/include/wx/cocoa/NSButton.h
@@ -6,7 +6,7 @@
 // Created:     2002/12/09
 // RCS-ID:      $Id: 
 // Copyright:   (c) 2002 David Elliott
-// Licence:     wxWindows license
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_NSBUTTON_H__
diff --git a/include/wx/cocoa/NSControl.h b/include/wx/cocoa/NSControl.h
index 92785ac86d..c06b44578d 100644
--- a/include/wx/cocoa/NSControl.h
+++ b/include/wx/cocoa/NSControl.h
@@ -6,7 +6,7 @@
 // Created:     2003/02/15
 // RCS-ID:      $Id: 
 // Copyright:   (c) 2003 David Elliott
-// Licence:     wxWindows license
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_NSCONTROL_H__
diff --git a/include/wx/cocoa/NSMenu.h b/include/wx/cocoa/NSMenu.h
index 4d5df93f2a..a385775c1e 100644
--- a/include/wx/cocoa/NSMenu.h
+++ b/include/wx/cocoa/NSMenu.h
@@ -6,7 +6,7 @@
 // Created:     2002/12/09
 // RCS-ID:      $Id$
 // Copyright:   (c) 2002 David Elliott
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_NSMENU_H__
diff --git a/include/wx/cocoa/NSPanel.h b/include/wx/cocoa/NSPanel.h
index 2626566d12..bd02432c66 100644
--- a/include/wx/cocoa/NSPanel.h
+++ b/include/wx/cocoa/NSPanel.h
@@ -6,7 +6,7 @@
 // Created:     2003/03/16
 // RCS-ID:      $Id:
 // Copyright:   (c) 2003 David Elliott
-// Licence:     wxWindows license
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_NSPANEL_H__
diff --git a/include/wx/cocoa/NSTabView.h b/include/wx/cocoa/NSTabView.h
index 52bad3da13..e4bd715af0 100644
--- a/include/wx/cocoa/NSTabView.h
+++ b/include/wx/cocoa/NSTabView.h
@@ -6,7 +6,7 @@
 // Created:     2004/04/08
 // RCS-ID:      $Id$
 // Copyright:   (c) 2004 David Elliott
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COCOA_NSTABVIEW_H__
diff --git a/include/wx/cocoa/NSTableDataSource.h b/include/wx/cocoa/NSTableDataSource.h
index c9c687fe1e..853b6a25ab 100644
--- a/include/wx/cocoa/NSTableDataSource.h
+++ b/include/wx/cocoa/NSTableDataSource.h
@@ -6,7 +6,7 @@
 // Created:     2003/08/05
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_NSTABLEDATASOURCE_H__
diff --git a/include/wx/cocoa/NSTableView.h b/include/wx/cocoa/NSTableView.h
index 4edb1f22b9..1d1f86da5f 100644
--- a/include/wx/cocoa/NSTableView.h
+++ b/include/wx/cocoa/NSTableView.h
@@ -6,7 +6,7 @@
 // Created:     2003/08/05
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_NSTABLEVIEW_H__
diff --git a/include/wx/cocoa/NSTextField.h b/include/wx/cocoa/NSTextField.h
index 10b8244940..be75c0e0ea 100644
--- a/include/wx/cocoa/NSTextField.h
+++ b/include/wx/cocoa/NSTextField.h
@@ -6,7 +6,7 @@
 // Created:     2002/12/09
 // RCS-ID:      $Id: 
 // Copyright:   (c) 2002 David Elliott
-// Licence:     wxWindows license
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_NSTEXTFIELD_H__
diff --git a/include/wx/cocoa/NSView.h b/include/wx/cocoa/NSView.h
index f9c023dbb8..2eef181fcf 100644
--- a/include/wx/cocoa/NSView.h
+++ b/include/wx/cocoa/NSView.h
@@ -6,7 +6,7 @@
 // Created:     2003/02/15
 // RCS-ID:      $Id: 
 // Copyright:   (c) 2003 David Elliott
-// Licence:     wxWindows license
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_NSVIEW_H__
diff --git a/include/wx/cocoa/NSWindow.h b/include/wx/cocoa/NSWindow.h
index 65f702041b..1963f62204 100644
--- a/include/wx/cocoa/NSWindow.h
+++ b/include/wx/cocoa/NSWindow.h
@@ -6,7 +6,7 @@
 // Created:     2003/03/16
 // RCS-ID:      $Id:
 // Copyright:   (c) 2003 David Elliott
-// Licence:     wxWindows license
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_NSWINDOW_H__
diff --git a/include/wx/cocoa/ObjcAssociate.h b/include/wx/cocoa/ObjcAssociate.h
index 31b087e46c..1379fe5638 100644
--- a/include/wx/cocoa/ObjcAssociate.h
+++ b/include/wx/cocoa/ObjcAssociate.h
@@ -6,7 +6,7 @@
 // Created:     2002/12/03
 // RCS-ID:      $Id:
 // Copyright:   (c) 2002 David Elliott <dfe@cox.net>
-// Licence:     wxWindows license
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_OBJC_ASSOCIATE_H__
@@ -58,7 +58,7 @@ public: \
 WX_IMPLEMENT_OBJC_INTERFACE_HASHMAP(ObjcClass)
 
 /*-------------------------------------------------------------------------
-Stuff to be used by the wxWindows class (not the Cocoa interface)
+Stuff to be used by the wxWidgets class (not the Cocoa interface)
 -------------------------------------------------------------------------*/
 #define WX_DECLARE_COCOA_OWNER(ObjcClass,ObjcBase,ObjcRoot) \
 public: \
diff --git a/include/wx/cocoa/ObjcPose.h b/include/wx/cocoa/ObjcPose.h
index b787528638..004fa6ede0 100644
--- a/include/wx/cocoa/ObjcPose.h
+++ b/include/wx/cocoa/ObjcPose.h
@@ -6,7 +6,7 @@
 // Created:     2002/12/03
 // RCS-ID:      $Id:
 // Copyright:   (c) 2002 David Elliott <dfe@cox.net>
-// Licence:     wxWindows license
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_PRIVATE_POSER_H__
diff --git a/include/wx/cocoa/ObjcRef.h b/include/wx/cocoa/ObjcRef.h
index faa11bea36..1fc3e0e574 100644
--- a/include/wx/cocoa/ObjcRef.h
+++ b/include/wx/cocoa/ObjcRef.h
@@ -6,7 +6,7 @@
 // Created:     2004/03/28
 // RCS-ID:      $Id$
 // Copyright:   (c) 2004 David Elliott <dfe@cox.net>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COCOA_OBJCREF_H__
diff --git a/include/wx/cocoa/app.h b/include/wx/cocoa/app.h
index d0e7c78261..c2b2ebc1ff 100644
--- a/include/wx/cocoa/app.h
+++ b/include/wx/cocoa/app.h
@@ -6,7 +6,7 @@
 // Created:     2002/11/27
 // RCS-ID:      $Id$
 // Copyright:   (c) 2002 David Elliott
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COCOA_APP_H_
diff --git a/include/wx/cocoa/autorelease.h b/include/wx/cocoa/autorelease.h
index eedba0fdba..cbf2708718 100644
--- a/include/wx/cocoa/autorelease.h
+++ b/include/wx/cocoa/autorelease.h
@@ -6,7 +6,7 @@
 // Created:     2003/07/11
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott <dfe@cox.net>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_AUTORELEASE_H__
diff --git a/include/wx/cocoa/bitmap.h b/include/wx/cocoa/bitmap.h
index 47dc498d96..cde78d1c07 100644
--- a/include/wx/cocoa/bitmap.h
+++ b/include/wx/cocoa/bitmap.h
@@ -6,7 +6,7 @@
 // Created:     2003/07/19
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_BITMAP_H__
diff --git a/include/wx/cocoa/bmpbuttn.h b/include/wx/cocoa/bmpbuttn.h
index d75f85654a..d2d003c133 100644
--- a/include/wx/cocoa/bmpbuttn.h
+++ b/include/wx/cocoa/bmpbuttn.h
@@ -6,7 +6,7 @@
 // Created:     2003/03/16
 // RCS-ID:      $Id:
 // Copyright:   (c) 2003 David Elliott
-// Licence:   	wxWindows license
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_BMPBUTTN_H__
diff --git a/include/wx/cocoa/brush.h b/include/wx/cocoa/brush.h
index d561168a24..dfee4ddf87 100644
--- a/include/wx/cocoa/brush.h
+++ b/include/wx/cocoa/brush.h
@@ -6,7 +6,7 @@
 // Created:     2003/07/03
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_BRUSH_H__
diff --git a/include/wx/cocoa/button.h b/include/wx/cocoa/button.h
index 0cf3f2df6d..f1ddb92218 100644
--- a/include/wx/cocoa/button.h
+++ b/include/wx/cocoa/button.h
@@ -6,7 +6,7 @@
 // Created:     2002/12/29
 // RCS-ID:      $Id: 
 // Copyright:   (c) 2002 David Elliott
-// Licence:   	wxWindows license
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_BUTTON_H__
diff --git a/include/wx/cocoa/checkbox.h b/include/wx/cocoa/checkbox.h
index 2862e6e81d..3571483d22 100644
--- a/include/wx/cocoa/checkbox.h
+++ b/include/wx/cocoa/checkbox.h
@@ -6,7 +6,7 @@
 // Created:     2003/03/16
 // RCS-ID:      $Id:
 // Copyright:   (c) 2003 David Elliott
-// Licence:   	wxWindows license
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_CHECKBOX_H__
diff --git a/include/wx/cocoa/checklst.h b/include/wx/cocoa/checklst.h
index 7b4c59315d..49c81537f0 100644
--- a/include/wx/cocoa/checklst.h
+++ b/include/wx/cocoa/checklst.h
@@ -6,7 +6,7 @@
 // Created:     2003/03/16
 // RCS-ID:      $Id:
 // Copyright:   (c) 2003 David Elliott
-// Licence:   	wxWindows license
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_CHECKLST_H__
diff --git a/include/wx/cocoa/choice.h b/include/wx/cocoa/choice.h
index 7db48f39f0..88a26c187e 100644
--- a/include/wx/cocoa/choice.h
+++ b/include/wx/cocoa/choice.h
@@ -6,7 +6,7 @@
 // Created:     2003/03/16
 // RCS-ID:      $Id:
 // Copyright:   (c) 2003 David Elliott
-// Licence:   	wxWindows license
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_CHOICE_H__
diff --git a/include/wx/cocoa/clipbrd.h b/include/wx/cocoa/clipbrd.h
index 29c95bc812..c71180d03b 100644
--- a/include/wx/cocoa/clipbrd.h
+++ b/include/wx/cocoa/clipbrd.h
@@ -6,7 +6,7 @@
 // Created:     2003/07/23
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_CLIPBRD_H__
diff --git a/include/wx/cocoa/colour.h b/include/wx/cocoa/colour.h
index 3b1fe9706a..b8c0087ee9 100644
--- a/include/wx/cocoa/colour.h
+++ b/include/wx/cocoa/colour.h
@@ -6,7 +6,7 @@
 // Created:     2003/06/17
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_COLOUR_H__
diff --git a/include/wx/cocoa/combobox.h b/include/wx/cocoa/combobox.h
index b1abb3950c..80c212bc48 100644
--- a/include/wx/cocoa/combobox.h
+++ b/include/wx/cocoa/combobox.h
@@ -6,7 +6,7 @@
 // Created:     2003/07/14
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_COMBOBOX_H__
diff --git a/include/wx/cocoa/control.h b/include/wx/cocoa/control.h
index 153e6e1555..685dfb9805 100644
--- a/include/wx/cocoa/control.h
+++ b/include/wx/cocoa/control.h
@@ -6,7 +6,7 @@
 // Created:     2003/02/15
 // RCS-ID:      $Id: 
 // Copyright:   (c) 2003 David Elliott
-// Licence:   	wxWindows license
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_CONTROL_H__
diff --git a/include/wx/cocoa/cursor.h b/include/wx/cocoa/cursor.h
index e51ead594d..4ee5cce34f 100644
--- a/include/wx/cocoa/cursor.h
+++ b/include/wx/cocoa/cursor.h
@@ -6,7 +6,7 @@
 // Created:     2002/11/27
 // RCS-ID:      
 // Copyright:   (c) David Elliott
-// Licence:   	wxWindows license
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COCOA_CURSOR_H_
diff --git a/include/wx/cocoa/dataform.h b/include/wx/cocoa/dataform.h
index 17b95ee4a8..fd0cc7791d 100644
--- a/include/wx/cocoa/dataform.h
+++ b/include/wx/cocoa/dataform.h
@@ -6,7 +6,7 @@
 // Created:     2003/07/23
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_DATAFORM_H__
diff --git a/include/wx/cocoa/dataobj.h b/include/wx/cocoa/dataobj.h
index 666d24a8a3..997a0aca86 100644
--- a/include/wx/cocoa/dataobj.h
+++ b/include/wx/cocoa/dataobj.h
@@ -6,7 +6,7 @@
 // Created:     2003/07/23
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_DATAOBJ_H__
diff --git a/include/wx/cocoa/dataobj2.h b/include/wx/cocoa/dataobj2.h
index 5c2f561778..a447bb72e1 100644
--- a/include/wx/cocoa/dataobj2.h
+++ b/include/wx/cocoa/dataobj2.h
@@ -6,7 +6,7 @@
 // Created:     2003/07/23
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_DATAOBJ2_H__
diff --git a/include/wx/cocoa/dc.h b/include/wx/cocoa/dc.h
index f1bc6b4592..72d1caffa3 100644
--- a/include/wx/cocoa/dc.h
+++ b/include/wx/cocoa/dc.h
@@ -6,7 +6,7 @@
 // Created:     2003/04/01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
-// Licence:   	wxWindows license
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_DC_H__
diff --git a/include/wx/cocoa/dcclient.h b/include/wx/cocoa/dcclient.h
index 00bd2d8d1f..625a16d179 100644
--- a/include/wx/cocoa/dcclient.h
+++ b/include/wx/cocoa/dcclient.h
@@ -6,7 +6,7 @@
 // Created:     2003/04/01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
-// Licence:   	wxWindows license
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_DCCLIENT_H__
diff --git a/include/wx/cocoa/dcmemory.h b/include/wx/cocoa/dcmemory.h
index a81f980166..f0da158567 100644
--- a/include/wx/cocoa/dcmemory.h
+++ b/include/wx/cocoa/dcmemory.h
@@ -6,7 +6,7 @@
 // Created:     2003/03/16
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_DCMEMORY_H__
diff --git a/include/wx/cocoa/dcscreen.h b/include/wx/cocoa/dcscreen.h
index f6e08fd043..8c22586b51 100644
--- a/include/wx/cocoa/dcscreen.h
+++ b/include/wx/cocoa/dcscreen.h
@@ -6,7 +6,7 @@
 // Created:     2003/03/16
 // RCS-ID:      $Id:
 // Copyright:   (c) 2003 David Elliott
-// Licence:   	wxWindows license
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_DCSCREEN_H__
diff --git a/include/wx/cocoa/dialog.h b/include/wx/cocoa/dialog.h
index 38cdea30de..8ba00a62eb 100644
--- a/include/wx/cocoa/dialog.h
+++ b/include/wx/cocoa/dialog.h
@@ -6,7 +6,7 @@
 // Created:     2002/12/15
 // RCS-ID:      $Id:
 // Copyright:   David Elliott
-// Licence:   	wxWindows license
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COCOA_DIALOG_H_
diff --git a/include/wx/cocoa/font.h b/include/wx/cocoa/font.h
index f2075fe537..65901cdb05 100644
--- a/include/wx/cocoa/font.h
+++ b/include/wx/cocoa/font.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FONT_H_
diff --git a/include/wx/cocoa/frame.h b/include/wx/cocoa/frame.h
index 5c479efc91..a4c60ff424 100644
--- a/include/wx/cocoa/frame.h
+++ b/include/wx/cocoa/frame.h
@@ -6,7 +6,7 @@
 // Created:     2003/03/16
 // RCS-ID:      $Id:
 // Copyright:   (c) 2003 David Elliott
-// Licence:     wxWindows license
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COCOA_FRAME_H_
diff --git a/include/wx/cocoa/gauge.h b/include/wx/cocoa/gauge.h
index dd5228059b..357eeb4c24 100644
--- a/include/wx/cocoa/gauge.h
+++ b/include/wx/cocoa/gauge.h
@@ -6,7 +6,7 @@
 // Created:     2003/07/15
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_GAUGE_H__
diff --git a/include/wx/cocoa/gdiobj.h b/include/wx/cocoa/gdiobj.h
index cb4176ce05..e63cfba926 100644
--- a/include/wx/cocoa/gdiobj.h
+++ b/include/wx/cocoa/gdiobj.h
@@ -6,7 +6,7 @@
 // Created:     2002/11/27
 // RCS-ID:      
 // Copyright:   (c) AUTHOR
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GDIOBJ_H_
diff --git a/include/wx/cocoa/icon.h b/include/wx/cocoa/icon.h
index 79178d01aa..d1e338c45d 100644
--- a/include/wx/cocoa/icon.h
+++ b/include/wx/cocoa/icon.h
@@ -6,7 +6,7 @@
 // Created:     2003/08/11
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COCOA_ICON_H__
diff --git a/include/wx/cocoa/listbox.h b/include/wx/cocoa/listbox.h
index 5bd2427989..8b94556762 100644
--- a/include/wx/cocoa/listbox.h
+++ b/include/wx/cocoa/listbox.h
@@ -6,7 +6,7 @@
 // Created:     2003/03/16
 // RCS-ID:      $Id:
 // Copyright:   (c) 2003 David Elliott
-// Licence:   	wxWindows license
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_LISTBOX_H__
diff --git a/include/wx/cocoa/log.h b/include/wx/cocoa/log.h
index 3770559fa9..bc47f83d03 100644
--- a/include/wx/cocoa/log.h
+++ b/include/wx/cocoa/log.h
@@ -6,7 +6,7 @@
 // Created:     2004/02/07
 // RCS-ID:      $Id$
 // Copyright:   (c) 2004 David Elliott
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COCOA_LOG_H__
diff --git a/include/wx/cocoa/mbarman.h b/include/wx/cocoa/mbarman.h
index 70dc7d3d61..b9c63e9e21 100644
--- a/include/wx/cocoa/mbarman.h
+++ b/include/wx/cocoa/mbarman.h
@@ -6,7 +6,7 @@
 // Created:     2003/09/04
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_MBARMAN_H__
diff --git a/include/wx/cocoa/mdi.h b/include/wx/cocoa/mdi.h
index e2e3b6e772..ff6e628937 100644
--- a/include/wx/cocoa/mdi.h
+++ b/include/wx/cocoa/mdi.h
@@ -6,7 +6,7 @@
 // Created:     2003/09/08
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_MDI_H__
diff --git a/include/wx/cocoa/menu.h b/include/wx/cocoa/menu.h
index 819a36ddf9..8b7c2c0554 100644
--- a/include/wx/cocoa/menu.h
+++ b/include/wx/cocoa/menu.h
@@ -6,7 +6,7 @@
 // Created:     2002/12/09
 // RCS-ID:      $Id: 
 // Copyright:   (c) 2002 David Elliott
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_MENU_H__
diff --git a/include/wx/cocoa/menuitem.h b/include/wx/cocoa/menuitem.h
index 75e66b1d4c..b312bc7489 100644
--- a/include/wx/cocoa/menuitem.h
+++ b/include/wx/cocoa/menuitem.h
@@ -6,7 +6,7 @@
 // Created:     2002/12/13
 // RCS-ID:      $Id: 
 // Copyright:   (c) 2002 David Elliott
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COCOA_MENUITEM_H_
diff --git a/include/wx/cocoa/notebook.h b/include/wx/cocoa/notebook.h
index fb2a8153e1..a252aa8e7c 100644
--- a/include/wx/cocoa/notebook.h
+++ b/include/wx/cocoa/notebook.h
@@ -6,7 +6,7 @@
 // Created:     2004/04/08
 // RCS-ID:      $Id$
 // Copyright:   (c) 2004 David Elliott
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COCOA_NOTEBOOK_H__
diff --git a/include/wx/cocoa/pen.h b/include/wx/cocoa/pen.h
index 01d4ef5d91..71e376857f 100644
--- a/include/wx/cocoa/pen.h
+++ b/include/wx/cocoa/pen.h
@@ -6,7 +6,7 @@
 // Created:     2003/08/02 (stubs from 22.03.2003)
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_PEN_H__
diff --git a/include/wx/cocoa/radiobox.h b/include/wx/cocoa/radiobox.h
index 959f672e19..2f46f3705c 100644
--- a/include/wx/cocoa/radiobox.h
+++ b/include/wx/cocoa/radiobox.h
@@ -6,7 +6,7 @@
 // Created:     2003/03/18
 // RCS-ID:      $Id:
 // Copyright:   (c) 2003 David Elliott
-// Licence:   	wxWindows license
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_RADIOBOX_H__
diff --git a/include/wx/cocoa/radiobut.h b/include/wx/cocoa/radiobut.h
index 4a0be4f61e..cac347da8e 100644
--- a/include/wx/cocoa/radiobut.h
+++ b/include/wx/cocoa/radiobut.h
@@ -6,7 +6,7 @@
 // Created:     2003/03/18
 // RCS-ID:      $Id:
 // Copyright:   (c) 2003 David Elliott
-// Licence:   	wxWindows license
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_RADIOBUT_H__
diff --git a/include/wx/cocoa/region.h b/include/wx/cocoa/region.h
index 652b5c8b47..c3b4a52f03 100644
--- a/include/wx/cocoa/region.h
+++ b/include/wx/cocoa/region.h
@@ -6,7 +6,7 @@
 // Created:     2004/04/12
 // RCS-ID:      $Id$
 // Copyright:   (c) 2004 David Elliott
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COCOA_REGION_H__
diff --git a/include/wx/cocoa/slider.h b/include/wx/cocoa/slider.h
index e1a9193f03..82b4ea275d 100644
--- a/include/wx/cocoa/slider.h
+++ b/include/wx/cocoa/slider.h
@@ -6,7 +6,7 @@
 // Created:     2003/06/19
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_SLIDER_H__
diff --git a/include/wx/cocoa/spinbutt.h b/include/wx/cocoa/spinbutt.h
index 20f1e70c85..e911e1b52b 100644
--- a/include/wx/cocoa/spinbutt.h
+++ b/include/wx/cocoa/spinbutt.h
@@ -6,7 +6,7 @@
 // Created:     2003/07/14
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_SPINBUTT_H__
diff --git a/include/wx/cocoa/statbmp.h b/include/wx/cocoa/statbmp.h
index 74e166ec90..c05365f2f7 100644
--- a/include/wx/cocoa/statbmp.h
+++ b/include/wx/cocoa/statbmp.h
@@ -6,7 +6,7 @@
 // Created:     2003/03/16
 // RCS-ID:      $Id:
 // Copyright:   (c) 2003 David Elliott
-// Licence:   	wxWindows license
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_STATBMP_H__
diff --git a/include/wx/cocoa/statbox.h b/include/wx/cocoa/statbox.h
index 0682b1dff2..d878d27b4d 100644
--- a/include/wx/cocoa/statbox.h
+++ b/include/wx/cocoa/statbox.h
@@ -6,7 +6,7 @@
 // Created:     2003/03/18
 // RCS-ID:      $Id:
 // Copyright:   (c) 2003 David Elliott
-// Licence:   	wxWindows license
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_STATBOX_H__
diff --git a/include/wx/cocoa/statline.h b/include/wx/cocoa/statline.h
index e04dbe527e..96f7754d8d 100644
--- a/include/wx/cocoa/statline.h
+++ b/include/wx/cocoa/statline.h
@@ -6,7 +6,7 @@
 // Created:     2003/03/18
 // RCS-ID:      $Id:
 // Copyright:   (c) 2003 David Elliott
-// Licence:   	wxWindows license
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_STATLINE_H__
diff --git a/include/wx/cocoa/stattext.h b/include/wx/cocoa/stattext.h
index 39c6cb0383..139f4370b3 100644
--- a/include/wx/cocoa/stattext.h
+++ b/include/wx/cocoa/stattext.h
@@ -6,7 +6,7 @@
 // Created:     2003/02/15
 // RCS-ID:      $Id: 
 // Copyright:   (c) 2003 David Elliott
-// Licence:   	wxWindows license
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_STATTEXT_H__
diff --git a/include/wx/cocoa/string.h b/include/wx/cocoa/string.h
index be1067101d..a7e714282f 100644
--- a/include/wx/cocoa/string.h
+++ b/include/wx/cocoa/string.h
@@ -6,7 +6,7 @@
 // Created:     2003/04/13
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_STRING_H__
diff --git a/include/wx/cocoa/textctrl.h b/include/wx/cocoa/textctrl.h
index abca3292db..7d91e4912a 100644
--- a/include/wx/cocoa/textctrl.h
+++ b/include/wx/cocoa/textctrl.h
@@ -6,7 +6,7 @@
 // Created:     2003/03/16
 // RCS-ID:      $Id: 
 // Copyright:   (c) 2003 David Elliott
-// Licence:   	wxWindows license
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_TEXTCTRL_H__
diff --git a/include/wx/cocoa/toolbar.h b/include/wx/cocoa/toolbar.h
index d8ccd336b9..fe7be92b61 100644
--- a/include/wx/cocoa/toolbar.h
+++ b/include/wx/cocoa/toolbar.h
@@ -6,7 +6,7 @@
 // Created:     2003/08/17
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_TOOLBAR_H__
diff --git a/include/wx/cocoa/toplevel.h b/include/wx/cocoa/toplevel.h
index 779028ca15..1d2bf3050a 100644
--- a/include/wx/cocoa/toplevel.h
+++ b/include/wx/cocoa/toplevel.h
@@ -6,7 +6,7 @@
 // Created:     2002/12/08
 // RCS-ID:      $Id$
 // Copyright:   (c) 2002 David Elliott
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_TOPLEVEL_H__
diff --git a/include/wx/cocoa/window.h b/include/wx/cocoa/window.h
index 30e1a12dda..fc4b097079 100644
--- a/include/wx/cocoa/window.h
+++ b/include/wx/cocoa/window.h
@@ -6,7 +6,7 @@
 // Created:     2002/12/26
 // RCS-ID:      $Id: 
 // Copyright:   (c) 2002 David Elliott
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_WINDOW_H__
diff --git a/include/wx/colordlg.h b/include/wx/colordlg.h
index f08d224b5b..3c5cef8a6a 100644
--- a/include/wx/colordlg.h
+++ b/include/wx/colordlg.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COLORDLG_H_BASE_
diff --git a/include/wx/combobox.h b/include/wx/combobox.h
index fa705b0c10..ff4980c551 100644
--- a/include/wx/combobox.h
+++ b/include/wx/combobox.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     24.12.00
 // RCS-ID:      $Id$
-// Copyright:   (c) 1996-2000 wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) 1996-2000 wxWidgets team
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COMBOBOX_H_BASE_
diff --git a/include/wx/confbase.h b/include/wx/confbase.h
index 699a9e0ace..130f6836ef 100644
--- a/include/wx/confbase.h
+++ b/include/wx/confbase.h
@@ -8,7 +8,7 @@
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997 Karsten Ballüder   Ballueder@usa.net
 //                       Vadim Zeitlin      <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef   _WX_CONFBASE_H_
diff --git a/include/wx/containr.h b/include/wx/containr.h
index 99049e718c..ca1fad02ae 100644
--- a/include/wx/containr.h
+++ b/include/wx/containr.h
@@ -7,7 +7,7 @@
 // Created:     06.08.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CONTAINR_H_
@@ -98,7 +98,7 @@ protected:
     DECLARE_NO_COPY_CLASS(wxControlContainer)
 };
 
-// this function is for wxWindows internal use only
+// this function is for wxWidgets internal use only
 extern bool wxSetFocusToChild(wxWindow *win, wxWindow **child);
 
 // ----------------------------------------------------------------------------
diff --git a/include/wx/control.h b/include/wx/control.h
index b891236e4a..d3c7c8f896 100644
--- a/include/wx/control.h
+++ b/include/wx/control.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     26.07.99
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CONTROL_H_BASE_
diff --git a/include/wx/cshelp.h b/include/wx/cshelp.h
index eb21207da1..d9c8343474 100644
--- a/include/wx/cshelp.h
+++ b/include/wx/cshelp.h
@@ -6,7 +6,7 @@
 // Created:     08/09/2000
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Julian Smart, Vadim Zeitlin
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CSHELPH__
diff --git a/include/wx/ctrlsub.h b/include/wx/ctrlsub.h
index 70270f8220..7ae43369b4 100644
--- a/include/wx/ctrlsub.h
+++ b/include/wx/ctrlsub.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     22.10.99
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CTRLSUB_H_BASE_
diff --git a/include/wx/dataobj.h b/include/wx/dataobj.h
index 838f25f33b..fff561008c 100644
--- a/include/wx/dataobj.h
+++ b/include/wx/dataobj.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     26.05.99
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows Team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets Team
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DATAOBJ_H_BASE_
diff --git a/include/wx/datetime.h b/include/wx/datetime.h
index 6e45b0fcd4..25d7c95019 100644
--- a/include/wx/datetime.h
+++ b/include/wx/datetime.h
@@ -7,7 +7,7 @@
 // Created:     10.02.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DATETIME_H
diff --git a/include/wx/datstrm.h b/include/wx/datstrm.h
index 18738669d8..fa4e5f6610 100644
--- a/include/wx/datstrm.h
+++ b/include/wx/datstrm.h
@@ -6,7 +6,7 @@
 // Created:     28/06/1998
 // RCS-ID:      $Id$
 // Copyright:   (c) Guilhem Lavaux
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DATSTREAM_H_
diff --git a/include/wx/db.h b/include/wx/db.h
index 771874678c..60a301d782 100644
--- a/include/wx/db.h
+++ b/include/wx/db.h
@@ -19,16 +19,16 @@
 // Created:     9.96
 // RCS-ID:      $Id$
 // Copyright:   (c) 1996 Remstar International, Inc.
-// Licence:     wxWindows licence, plus:
+// Licence:     wxWidgets licence, plus:
 // Notice:      This class library and its intellectual design are free of charge for use,
 //              modification, enhancement, debugging under the following conditions:
 //              1) These classes may only be used as part of the implementation of a
-//                 wxWindows-based application
-//              2) All enhancements and bug fixes are to be submitted back to the wxWindows
-//                 user groups free of all charges for use with the wxWindows library.
+//                 wxWidgets-based application
+//              2) All enhancements and bug fixes are to be submitted back to the wxWidgets
+//                 user groups free of all charges for use with the wxWidgets library.
 //              3) These classes may not be distributed as part of any other class library,
 //                 DLL, text (written or electronic), other than a complete distribution of
-//                 the wxWindows GUI development toolkit.
+//                 the wxWidgets GUI development toolkit.
 //
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -71,7 +71,7 @@
     // you cannot use the iODBC headers, you must use the VC headers,
     // plus the odbcinst.h header - gt Nov 2 2000
     //
-    // Must add "odbccp32.lib" in \wx2\wxWindows\src\makevc.env to the WINLIBS= line
+    // Must add "odbccp32.lib" in \wx2\wxWidgets\src\makevc.env to the WINLIBS= line
     //
     #include "sql.h"
     #include "sqlext.h"
diff --git a/include/wx/dbgrid.h b/include/wx/dbgrid.h
index 954655b1c9..da476d1442 100644
--- a/include/wx/dbgrid.h
+++ b/include/wx/dbgrid.h
@@ -6,7 +6,7 @@
 // Created:
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 The Computer Surgery (roger@computer-surgery.co.uk)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 // Branched From : dbgrid.h,v 1.19 2001/03/28 11:16:01
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/include/wx/dbkeyg.h b/include/wx/dbkeyg.h
index d6187688b9..94975d23da 100644
--- a/include/wx/dbkeyg.h
+++ b/include/wx/dbkeyg.h
@@ -6,7 +6,7 @@
 // Created:     
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 The Computer Surgery (roger@computer-surgery.co.uk)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 //
 // NOTE : There is no CPP file to go along with this
 //
diff --git a/include/wx/dbtable.h b/include/wx/dbtable.h
index 625270b5ff..c6187156f8 100644
--- a/include/wx/dbtable.h
+++ b/include/wx/dbtable.h
@@ -8,16 +8,16 @@
 // Created:     9.96
 // RCS-ID:      $Id$
 // Copyright:   (c) 1996 Remstar International, Inc.
-// Licence:     wxWindows licence, plus:
+// Licence:     wxWidgets licence, plus:
 // Notice:      This class library and its intellectual design are free of charge for use,
 //              modification, enhancement, debugging under the following conditions:
 //              1) These classes may only be used as part of the implementation of a
-//                 wxWindows-based application
-//              2) All enhancements and bug fixes are to be submitted back to the wxWindows
-//                 user groups free of all charges for use with the wxWindows library.
+//                 wxWidgets-based application
+//              2) All enhancements and bug fixes are to be submitted back to the wxWidgets
+//                 user groups free of all charges for use with the wxWidgets library.
 //              3) These classes may not be distributed as part of any other class library,
 //                 DLL, text (written or electronic), other than a complete distribution of
-//                 the wxWindows GUI development toolkit.
+//                 the wxWidgets GUI development toolkit.
 ///////////////////////////////////////////////////////////////////////////////
 
 /*
diff --git a/include/wx/dc.h b/include/wx/dc.h
index 911c146d73..747915383b 100644
--- a/include/wx/dc.h
+++ b/include/wx/dc.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     05/25/99
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DC_H_BASE_
diff --git a/include/wx/dcbuffer.h b/include/wx/dcbuffer.h
index 1b5d728020..736fedf2bc 100644
--- a/include/wx/dcbuffer.h
+++ b/include/wx/dcbuffer.h
@@ -6,7 +6,7 @@
 // Created:     16/03/02
 // RCS-ID:      $Id$
 // Copyright:   (c) Ron Lee
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCBUFFER_H_
diff --git a/include/wx/dcmirror.h b/include/wx/dcmirror.h
index 5b3a13988c..236b694823 100644
--- a/include/wx/dcmirror.h
+++ b/include/wx/dcmirror.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     21.07.2003
 // RCS-ID:      $Id$
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCMIRROR_H_
diff --git a/include/wx/debug.h b/include/wx/debug.h
index f353646e8b..e08835bf74 100644
--- a/include/wx/debug.h
+++ b/include/wx/debug.h
@@ -6,7 +6,7 @@
 *  Created:     29/01/98 
 *  RCS-ID:      $Id$ 
 *  Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr> 
-*  Licence:     wxWindows licence 
+*  Licence:     wxWidgets licence 
 */
 
 /* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
diff --git a/include/wx/defs.h b/include/wx/defs.h
index 1a77bf608f..2a109d6798 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -6,7 +6,7 @@
 *  Created:     01/02/97
 *  RCS-ID:      $Id$
 *  Copyright:   (c)
-*  Licence:     wxWindows licence
+*  Licence:     wxWidgets licence
 */
 
 /* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
@@ -97,7 +97,7 @@
 #endif /*  __BORLANDC__ */
 
 /*  ---------------------------------------------------------------------------- */
-/*  wxWindows version and compatibility defines */
+/*  wxWidgets version and compatibility defines */
 /*  ---------------------------------------------------------------------------- */
 
 #include "wx/version.h"
@@ -548,7 +548,7 @@ enum
 };
 
 /*  ---------------------------------------------------------------------------- */
-/*  standard wxWindows types */
+/*  standard wxWidgets types */
 /*  ---------------------------------------------------------------------------- */
 
 /*  the type for screen and DC coordinates */
@@ -581,7 +581,7 @@ typedef wxUint8 wxByte;
 /*  16bit */
 #ifdef SIZEOF_SHORT
     #if SIZEOF_SHORT != 2
-        #error "wxWindows assumes sizeof(short) == 2, please fix the code"
+        #error "wxWidgets assumes sizeof(short) == 2, please fix the code"
     #endif
 #else
     #define SIZEOF_SHORT 2
@@ -671,7 +671,7 @@ typedef wxUint16 wxWord;
             typedef long wxInt32;
             typedef unsigned long wxUint32;
         #elif
-            /*  wxWindows is not ready for 128bit systems yet... */
+            /*  wxWidgets is not ready for 128bit systems yet... */
             #error "Unknown sizeof(int) value, what are you compiling for?"
         #endif
     #else /*  !defined(SIZEOF_INT) */
@@ -717,7 +717,7 @@ typedef wxUint32 wxDword;
 #else
     /*
        This should never happen for the current architectures but if you're
-       using one where it does, please contact wx-dev@lists.wxwindows.org.
+       using one where it does, please contact wx-dev@lists.wxwidgets.org.
      */
     #error "Pointers can't be stored inside integer types."
 #endif
@@ -1976,7 +1976,7 @@ enum wxUpdateUI
 #endif
 
 /*  --------------------------------------------------------------------------- */
-/*  macros that enable wxWindows apps to be compiled in absence of the */
+/*  macros that enable wxWidgets apps to be compiled in absence of the */
 /*  sytem headers, although some platform specific types are used in the */
 /*  platform specific (implementation) parts of the headers */
 /*  --------------------------------------------------------------------------- */
@@ -2069,8 +2069,8 @@ typedef struct klass *WX_##klass
 #warning "Objective-C types will not be checked by the compiler."
 /*  NOTE: typedef struct objc_object *id; */
 /*  IOW, we're declaring these using the id type without using that name, */
-/*  since "id" is used extensively not only within wxWindows itself, but */
-/*  also in wxWindows application code.  The following works fine when */
+/*  since "id" is used extensively not only within wxWidgets itself, but */
+/*  also in wxWidgets application code.  The following works fine when */
 /*  compiling C(++) code, and works without typesafety for Obj-C(++) code */
 #define DECLARE_WXCOCOA_OBJC_CLASS(klass) \
 typedef struct objc_object *WX_##klass
@@ -2100,7 +2100,7 @@ DECLARE_WXCOCOA_OBJC_CLASS(NSTextStorage);
 DECLARE_WXCOCOA_OBJC_CLASS(NSThread);
 DECLARE_WXCOCOA_OBJC_CLASS(NSWindow);
 DECLARE_WXCOCOA_OBJC_CLASS(NSView);
-typedef WX_NSView WXWidget; /*  wxWindows BASE definition */
+typedef WX_NSView WXWidget; /*  wxWidgets BASE definition */
 #endif /*  __WXCOCOA__ */
 
 #ifdef __WXMSW__
@@ -2379,8 +2379,8 @@ typedef struct window_t *WXWidget;
 #endif /*  MGL */
 
 /*  This is required because of clashing macros in windows.h, which may be */
-/*  included before or after wxWindows classes, and therefore must be */
-/*  disabled here before any significant wxWindows headers are included. */
+/*  included before or after wxWidgets classes, and therefore must be */
+/*  disabled here before any significant wxWidgets headers are included. */
 #ifdef __WXMSW__
 #ifdef GetClassInfo
 #undef GetClassInfo
diff --git a/include/wx/dialog.h b/include/wx/dialog.h
index c40e2399a3..99672e2ee3 100644
--- a/include/wx/dialog.h
+++ b/include/wx/dialog.h
@@ -6,7 +6,7 @@
 // Created:     29.06.99
 // RCS-ID:      $Id$
 // Copyright:   (c) Vadim Zeitlin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DIALOG_H_BASE_
diff --git a/include/wx/dialup.h b/include/wx/dialup.h
index 1e1ee8c733..782defae1f 100644
--- a/include/wx/dialup.h
+++ b/include/wx/dialup.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/dialup.h
-// Purpose:     Network related wxWindows classes and functions
+// Purpose:     Network related wxWidgets classes and functions
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     07.07.99
 // RCS-ID:      $Id$
 // Copyright:   (c) Vadim Zeitlin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DIALUP_H
diff --git a/include/wx/dir.h b/include/wx/dir.h
index 4a49f7c6bc..179127bca7 100644
--- a/include/wx/dir.h
+++ b/include/wx/dir.h
@@ -6,7 +6,7 @@
 // Created:     08.12.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DIR_H_
diff --git a/include/wx/display.h b/include/wx/display.h
index 083ae2b954..d2dcd0f602 100644
--- a/include/wx/display.h
+++ b/include/wx/display.h
@@ -5,8 +5,8 @@
 // Modified by: Vadim Zeitlin (resolution changes, display modes, ...)
 // Created:     06/21/02
 // RCS-ID:      $Id$
-// Copyright:   (c) 2002-2003 wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) 2002-2003 wxWidgets team
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DISPLAY_H_BASE_
diff --git a/include/wx/dlimpexp.h b/include/wx/dlimpexp.h
index 92eabb7b6d..8ca00d85ac 100644
--- a/include/wx/dlimpexp.h
+++ b/include/wx/dlimpexp.h
@@ -5,8 +5,8 @@
  * Modified by:
  * Created:     16.10.2003 (extracted from wx/defs.h)
  * RCS-ID:      $Id$
- * Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
- * Licence:     wxWindows licence
+ * Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
+ * Licence:     wxWidgets licence
  */
 
 /*
@@ -57,7 +57,7 @@
 #endif
 
 /*
-   We support building wxWindows as a set of several libraries but we don't
+   We support building wxWidgets as a set of several libraries but we don't
    support arbitrary combinations of libs/DLLs: either we build all of them as
    DLLs (in which case WXMAKINGDLL is defined) or none (it isn't).
 
diff --git a/include/wx/dnd.h b/include/wx/dnd.h
index eb7eea590a..4739a37139 100644
--- a/include/wx/dnd.h
+++ b/include/wx/dnd.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     26.05.99
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows Team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets Team
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DND_H_BASE_
diff --git a/include/wx/docmdi.h b/include/wx/docmdi.h
index c8e94f3159..5c1670c250 100644
--- a/include/wx/docmdi.h
+++ b/include/wx/docmdi.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c)
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DOCMDI_H_
diff --git a/include/wx/docview.h b/include/wx/docview.h
index 11989e4c1a..01c762cf7f 100644
--- a/include/wx/docview.h
+++ b/include/wx/docview.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DOCH__
@@ -97,7 +97,7 @@ public:
     virtual wxInputStream& LoadObject(wxInputStream& stream);
 #endif
 
-    // Called by wxWindows
+    // Called by wxWidgets
     virtual bool OnSaveDocument(const wxString& filename);
     virtual bool OnOpenDocument(const wxString& filename);
     virtual bool OnNewDocument();
diff --git a/include/wx/dynarray.h b/include/wx/dynarray.h
index a59e853236..27e46db363 100644
--- a/include/wx/dynarray.h
+++ b/include/wx/dynarray.h
@@ -6,7 +6,7 @@
 // Created:     12.09.97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef   _DYNARRAY_H
@@ -612,7 +612,7 @@ private:                                                                 \
 // same except that they use an additional __declspec(dllexport) or equivalent
 // under Windows if needed.
 //
-// The first (just EXPORTED) macros do it if wxWindows was compiled as a DLL
+// The first (just EXPORTED) macros do it if wxWidgets was compiled as a DLL
 // and so must be used used inside the library. The second kind (USER_EXPORTED)
 // allow the user code to do it when it wants. This is needed if you have a dll
 // that wants to export a wxArray daubed with your own import/export goo.
diff --git a/include/wx/dynlib.h b/include/wx/dynlib.h
index 32b569ccdb..66125b7c28 100644
--- a/include/wx/dynlib.h
+++ b/include/wx/dynlib.h
@@ -6,7 +6,7 @@
 // Created:     20/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Guilhem Lavaux
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DYNLIB_H__
@@ -170,7 +170,7 @@ public:
     static wxString CanonicalizeName(const wxString& name,
                                      wxDynamicLibraryCategory cat = wxDL_LIBRARY);
 
-    // return name of wxWindows plugin (adds compiler and version info
+    // return name of wxWidgets plugin (adds compiler and version info
     // to the filename):
     static wxString
     CanonicalizePluginName(const wxString& name,
diff --git a/include/wx/dynload.h b/include/wx/dynload.h
index 8f119b49bb..c5f3585ec6 100644
--- a/include/wx/dynload.h
+++ b/include/wx/dynload.h
@@ -7,7 +7,7 @@
 // Created:      03/12/01
 // RCS-ID:       $Id$
 // Copyright:    (c) 2001 Ron Lee <ron@debian.org>
-// Licence:      wxWindows licence
+// Licence:      wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DYNAMICLOADER_H__
diff --git a/include/wx/effects.h b/include/wx/effects.h
index a051c857fe..c835f6721d 100644
--- a/include/wx/effects.h
+++ b/include/wx/effects.h
@@ -7,7 +7,7 @@
 // Created:     25/4/2000
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/include/wx/encconv.h b/include/wx/encconv.h
index d99eaea5e2..abb8cb0cdb 100644
--- a/include/wx/encconv.h
+++ b/include/wx/encconv.h
@@ -4,7 +4,7 @@
 //              font encodings
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
-// Licence:     wxWindows Licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_ENCCONV_H_
@@ -87,7 +87,7 @@ class WXDLLIMPEXP_BASE wxEncodingConverter : public wxObject
             //
             // Returns FALSE if given conversion is impossible, TRUE otherwise
             // (conversion may be impossible either if you try to convert
-            // to Unicode with non-Unicode build of wxWindows or if input
+            // to Unicode with non-Unicode build of wxWidgets or if input
             // or output encoding is not supported.)
             bool Init(wxFontEncoding input_enc, wxFontEncoding output_enc, int method = wxCONVERT_STRICT);
 
diff --git a/include/wx/encinfo.h b/include/wx/encinfo.h
index a5e7af1b03..1083e8d5a8 100644
--- a/include/wx/encinfo.h
+++ b/include/wx/encinfo.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     19.09.2003 (extracted from wx/fontenc.h)
 // RCS-ID:      $Id$
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_ENCINFO_H_
diff --git a/include/wx/event.h b/include/wx/event.h
index 4c915163a3..a9e301ba5d 100644
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_EVENT_H__
@@ -59,17 +59,17 @@ typedef int wxEventType;
 // handler only a function with proper parameter list can be given.
 #define wxStaticCastEvent(type, val) wx_static_cast(type, val)
 
-// in previous versions of wxWindows the event types used to be constants
+// in previous versions of wxWidgets the event types used to be constants
 // which created difficulties with custom/user event types definition
 //
-// starting from wxWindows 2.4 the event types are now dynamically assigned
+// starting from wxWidgets 2.4 the event types are now dynamically assigned
 // using wxNewEventType() which solves this problem, however at price of
 // several incompatibilities:
 //
 //  a) event table macros declaration changed, it now uses wxEventTableEntry
 //     ctor instead of initialisation from an agregate - the macro
 //     DECLARE_EVENT_TABLE_ENTRY may be used to write code which can compile
-//     with all versions of wxWindows
+//     with all versions of wxWidgets
 //
 //  b) event types can't be used as switch() cases as they're not really
 //     constant any more - there is no magic solution here, you just have to
@@ -315,7 +315,7 @@ enum Propagation_state
 };
 
 /*
- * wxWindows events, covering all interesting things that might happen
+ * wxWidgets events, covering all interesting things that might happen
  * (button clicking, resizing, setting text in widgets, etc.).
  *
  * For each completely new event type, derive a new event class.
@@ -1574,7 +1574,7 @@ public:
     // time we should update
     static void ResetUpdateTime();
 
-    // Specify how wxWindows will send update events: to
+    // Specify how wxWidgets will send update events: to
     // all windows, or only to those which specify that they
     // will process the events.
     static void SetMode(wxUpdateUIMode mode) { sm_updateMode = mode; }
@@ -1931,7 +1931,7 @@ public:
 
     virtual wxEvent *Clone() const { return new wxIdleEvent(*this); }
 
-    // Specify how wxWindows will send idle events: to
+    // Specify how wxWidgets will send idle events: to
     // all windows, or only to those which specify that they
     // will process the events.
     static void SetMode(wxIdleMode mode) { sm_idleMode = mode; }
@@ -2145,7 +2145,7 @@ protected:
 };
 
 // ----------------------------------------------------------------------------
-// wxEvtHandler: the base class for all objects handling wxWindows events
+// wxEvtHandler: the base class for all objects handling wxWidgets events
 // ----------------------------------------------------------------------------
 
 class WXDLLIMPEXP_BASE wxEvtHandler : public wxObject
diff --git a/include/wx/evtloop.h b/include/wx/evtloop.h
index 084bc9f162..54336ed2e1 100644
--- a/include/wx/evtloop.h
+++ b/include/wx/evtloop.h
@@ -6,7 +6,7 @@
 // Created:     01.06.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_EVTLOOP_H_
diff --git a/include/wx/except.h b/include/wx/except.h
index a80bbc34f7..ef861f02b9 100644
--- a/include/wx/except.h
+++ b/include/wx/except.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     17.09.2003
 // RCS-ID:      $Id$
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_EXCEPT_H_
diff --git a/include/wx/fdrepdlg.h b/include/wx/fdrepdlg.h
index 9f047c2672..6efa1c3a68 100644
--- a/include/wx/fdrepdlg.h
+++ b/include/wx/fdrepdlg.h
@@ -6,7 +6,7 @@
 // Created:     23/03/2001
 // RCS-ID:
 // Copyright:   (c) Markus Greither
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FINDREPLACEDLG_H_
diff --git a/include/wx/features.h b/include/wx/features.h
index d4a19c9748..9e3472861b 100644
--- a/include/wx/features.h
+++ b/include/wx/features.h
@@ -1,13 +1,13 @@
 /**
 *  Name:        wx/features.h
 *  Purpose:     test macros for the features which might be available in some
-*               wxWindows ports but not others
+*               wxWidgets ports but not others
 *  Author:      Vadim Zeitlin
 *  Modified by: Ryan Norton (Converted to C)
 *  Created:     18.03.02
 *  RCS-ID:      $Id$
-*  Copyright:   (c) 2002 Vadim Zeitlin <vadim@wxwindows.org>
-*  Licence:     wxWindows licence
+*  Copyright:   (c) 2002 Vadim Zeitlin <vadim@wxwidgets.org>
+*  Licence:     wxWidgets licence
 */
 
 /* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
diff --git a/include/wx/ffile.h b/include/wx/ffile.h
index 8f8ffde014..3600d511f8 100644
--- a/include/wx/ffile.h
+++ b/include/wx/ffile.h
@@ -6,7 +6,7 @@
 // Created:     14.07.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef   _WX_FFILE_H_
diff --git a/include/wx/file.h b/include/wx/file.h
index 2bc1542698..dbc56beeb9 100644
--- a/include/wx/file.h
+++ b/include/wx/file.h
@@ -7,7 +7,7 @@
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FILEH__
diff --git a/include/wx/fileconf.h b/include/wx/fileconf.h
index ea5eab4493..371dae13c7 100644
--- a/include/wx/fileconf.h
+++ b/include/wx/fileconf.h
@@ -7,7 +7,7 @@
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997 Karsten Ballüder   &  Vadim Zeitlin
 //                       Ballueder@usa.net     <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef   _FILECONF_H
diff --git a/include/wx/filedlg.h b/include/wx/filedlg.h
index 23eccc3bc7..6cd4614943 100644
--- a/include/wx/filedlg.h
+++ b/include/wx/filedlg.h
@@ -6,7 +6,7 @@
 // Created:     8/17/99
 // Copyright:   (c) Robert Roebling
 // RCS-ID:
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FILEDLG_H_BASE_
diff --git a/include/wx/filefn.h b/include/wx/filefn.h
index 65e3396aa0..1550d6015c 100644
--- a/include/wx/filefn.h
+++ b/include/wx/filefn.h
@@ -6,7 +6,7 @@
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef   _FILEFN_H_
diff --git a/include/wx/filename.h b/include/wx/filename.h
index cbd601e663..10ade9a914 100644
--- a/include/wx/filename.h
+++ b/include/wx/filename.h
@@ -6,7 +6,7 @@
 // Created:     28.12.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef   _WX_FILENAME_H_
diff --git a/include/wx/filesys.h b/include/wx/filesys.h
index 73ffd59d62..d37a4b2975 100644
--- a/include/wx/filesys.h
+++ b/include/wx/filesys.h
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
 // RCS-ID:      $Id$
-// Licence:     wxWindows Licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __FILESYS_H__
diff --git a/include/wx/flags.h b/include/wx/flags.h
index d0b7c82c8b..76378fed3b 100644
--- a/include/wx/flags.h
+++ b/include/wx/flags.h
@@ -6,7 +6,7 @@
 // Created:     27/07/03
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SETH__
diff --git a/include/wx/fmappriv.h b/include/wx/fmappriv.h
index 9c183e338e..724b78a454 100644
--- a/include/wx/fmappriv.h
+++ b/include/wx/fmappriv.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     21.06.2003 (extracted from common/fontmap.cpp)
 // RCS-ID:      $Id$
-// Copyright:   (c) 1999-2003 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
+// Copyright:   (c) 1999-2003 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FMAPPRIV_H_
@@ -25,7 +25,7 @@ enum { wxFONTENCODING_UNKNOWN = -2 };
 // the config paths we use
 #if wxUSE_CONFIG
 
-#define FONTMAPPER_ROOT_PATH wxT("/wxWindows/FontMapper")
+#define FONTMAPPER_ROOT_PATH wxT("/wxWidgets/FontMapper")
 #define FONTMAPPER_CHARSET_PATH wxT("Charsets")
 #define FONTMAPPER_CHARSET_ALIAS_PATH wxT("Aliases")
 
diff --git a/include/wx/font.h b/include/wx/font.h
index a8781d4db4..ce95d40b39 100644
--- a/include/wx/font.h
+++ b/include/wx/font.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     20.09.99
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FONT_H_BASE_
diff --git a/include/wx/fontdlg.h b/include/wx/fontdlg.h
index 421716d761..bffb70fc21 100644
--- a/include/wx/fontdlg.h
+++ b/include/wx/fontdlg.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     12.05.02
 // RCS-ID:      $Id$
-// Copyright:   (c) 1997-2002 wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) 1997-2002 wxWidgets team
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FONTDLG_H_BASE_
diff --git a/include/wx/fontenc.h b/include/wx/fontenc.h
index 0f4b1ca9bc..643dd54d37 100644
--- a/include/wx/fontenc.h
+++ b/include/wx/fontenc.h
@@ -6,7 +6,7 @@
 // Created:     29.03.00
 // RCS-ID:      $Id$
 // Copyright:   (c) Vadim Zeitlin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FONTENC_H_
diff --git a/include/wx/fontenum.h b/include/wx/fontenum.h
index 6da6a74784..797da7438c 100644
--- a/include/wx/fontenum.h
+++ b/include/wx/fontenum.h
@@ -7,7 +7,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart, Vadim Zeitlin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FONTENUM_H_
diff --git a/include/wx/fontmap.h b/include/wx/fontmap.h
index bc14a74cbb..143346f4aa 100644
--- a/include/wx/fontmap.h
+++ b/include/wx/fontmap.h
@@ -6,7 +6,7 @@
 // Created:     04.11.99
 // RCS-ID:      $Id$
 // Copyright:   (c) Vadim Zeitlin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FONTMAPPER_H_
@@ -35,7 +35,7 @@ class WXDLLIMPEXP_BASE wxFontMapper;
 #endif // wxUSE_GUI
 
 // ============================================================================
-// wxFontMapper manages user-definable correspondence between wxWindows font
+// wxFontMapper manages user-definable correspondence between wxWidgets font
 // encodings and the fonts present on the machine.
 //
 // This is a singleton class, font mapper objects can only be accessed using
@@ -263,7 +263,7 @@ class WXDLLIMPEXP_BASE wxFontMapper : public wxFontMapperBase
 // global variables
 // ----------------------------------------------------------------------------
 
-// the default font mapper for wxWindows programs do NOT use! This is for
+// the default font mapper for wxWidgets programs do NOT use! This is for
 // backward compatibility, use wxFontMapper::Get() instead
 #define wxTheFontMapper (wxFontMapper::Get())
 
diff --git a/include/wx/fontutil.h b/include/wx/fontutil.h
index 1f4f5c3c34..bc49a23d62 100644
--- a/include/wx/fontutil.h
+++ b/include/wx/fontutil.h
@@ -5,11 +5,11 @@
 // Modified by:
 // Created:     05.11.99
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
-// General note: this header is private to wxWindows and is not supposed to be
+// General note: this header is private to wxWidgets and is not supposed to be
 // included by user code. The functions declared here are implemented in
 // msw/fontutil.cpp for Windows, unix/fontutil.cpp for GTK/Motif &c.
 
diff --git a/include/wx/frame.h b/include/wx/frame.h
index 8f60343fb1..b3cbe59f7c 100644
--- a/include/wx/frame.h
+++ b/include/wx/frame.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     15.11.99
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FRAME_H_BASE_
diff --git a/include/wx/fs_inet.h b/include/wx/fs_inet.h
index 818dd7eb99..4518dc60ee 100644
--- a/include/wx/fs_inet.h
+++ b/include/wx/fs_inet.h
@@ -3,7 +3,7 @@
 // Purpose:     HTTP and FTP file system
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
-// Licence:     wxWindows Licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FS_INET_H_
diff --git a/include/wx/fs_mem.h b/include/wx/fs_mem.h
index a941c894f8..d18fcce426 100644
--- a/include/wx/fs_mem.h
+++ b/include/wx/fs_mem.h
@@ -3,7 +3,7 @@
 // Purpose:     in-memory file system
 // Author:      Vaclav Slavik
 // Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows Licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FS_MEM_H_
diff --git a/include/wx/fs_zip.h b/include/wx/fs_zip.h
index ae111492db..e7e6d63315 100644
--- a/include/wx/fs_zip.h
+++ b/include/wx/fs_zip.h
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
 // CVS-ID:      $Id$
-// Licence:     wxWindows Licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FS_ZIP_H_
diff --git a/include/wx/gauge.h b/include/wx/gauge.h
index ddabd1d88e..ba1623f1cd 100644
--- a/include/wx/gauge.h
+++ b/include/wx/gauge.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     20.02.01
 // RCS-ID:      $Id$
-// Copyright:   (c) 1996-2001 wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) 1996-2001 wxWidgets team
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GAUGE_H_BASE_
diff --git a/include/wx/gbsizer.h b/include/wx/gbsizer.h
index a0fe51142b..8b0934162d 100644
--- a/include/wx/gbsizer.h
+++ b/include/wx/gbsizer.h
@@ -8,7 +8,7 @@
 // Created:     03-Nov-2003
 // RCS-ID:      $Id$
 // Copyright:   (c) Robin Dunn
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WXGBSIZER_H__
diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
index c3fe25e346..9f79e3ba98 100644
--- a/include/wx/gdicmn.h
+++ b/include/wx/gdicmn.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GDICMNH__
diff --git a/include/wx/generic/accel.h b/include/wx/generic/accel.h
index 1d05a92a99..c2f061e176 100644
--- a/include/wx/generic/accel.h
+++ b/include/wx/generic/accel.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GENERIC_ACCEL_H_
diff --git a/include/wx/generic/calctrl.h b/include/wx/generic/calctrl.h
index f7d3d6abbc..cde6763369 100644
--- a/include/wx/generic/calctrl.h
+++ b/include/wx/generic/calctrl.h
@@ -6,7 +6,7 @@
 // Created:     29.12.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/include/wx/generic/caret.h b/include/wx/generic/caret.h
index 21effecb58..4780bc4f49 100644
--- a/include/wx/generic/caret.h
+++ b/include/wx/generic/caret.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     25.05.99
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CARET_H_
diff --git a/include/wx/generic/choicdgg.h b/include/wx/generic/choicdgg.h
index 3038a2dff5..22f9e4d9f7 100644
--- a/include/wx/generic/choicdgg.h
+++ b/include/wx/generic/choicdgg.h
@@ -5,8 +5,8 @@
 // Modified by: 03.11.00: VZ to add wxArrayString and multiple sel functions
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __CHOICEDLGH_G__
diff --git a/include/wx/generic/colrdlgg.h b/include/wx/generic/colrdlgg.h
index 1b5bae611b..d219de8512 100644
--- a/include/wx/generic/colrdlgg.h
+++ b/include/wx/generic/colrdlgg.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __COLORDLGH_G__
diff --git a/include/wx/generic/dcpsg.h b/include/wx/generic/dcpsg.h
index 2af1c78c46..93eeb351cb 100644
--- a/include/wx/generic/dcpsg.h
+++ b/include/wx/generic/dcpsg.h
@@ -5,7 +5,7 @@
 // Modified by:
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCPSG_H_
diff --git a/include/wx/generic/dirctrlg.h b/include/wx/generic/dirctrlg.h
index 43dc914c23..3dff3ffd8c 100644
--- a/include/wx/generic/dirctrlg.h
+++ b/include/wx/generic/dirctrlg.h
@@ -9,7 +9,7 @@
 // Created:     21/3/2000
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling, Harm van der Heijden, Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DIRCTRL_H_
diff --git a/include/wx/generic/dirdlgg.h b/include/wx/generic/dirdlgg.h
index 3133ca5ab6..1a8a959c6a 100644
--- a/include/wx/generic/dirdlgg.h
+++ b/include/wx/generic/dirdlgg.h
@@ -9,7 +9,7 @@
 // Created:     21/3/2000
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling, Harm van der Heijden, Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DIRDLGG_H_
diff --git a/include/wx/generic/dragimgg.h b/include/wx/generic/dragimgg.h
index 9c4c55aca1..88a238ddb1 100644
--- a/include/wx/generic/dragimgg.h
+++ b/include/wx/generic/dragimgg.h
@@ -7,7 +7,7 @@
 // Created:     29/2/2000
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DRAGIMGG_H_
@@ -30,7 +30,7 @@
   void MyTreeCtrl::OnBeginDrag(wxTreeEvent& event)
   {
 #ifdef __WXMSW__
-    ::UpdateWindow((HWND) GetHWND()); // We need to implement this in wxWindows
+    ::UpdateWindow((HWND) GetHWND()); // We need to implement this in wxWidgets
 #endif
 
     CaptureMouse();
diff --git a/include/wx/generic/fdrepdlg.h b/include/wx/generic/fdrepdlg.h
index 3a7bfdb38d..572527f23b 100644
--- a/include/wx/generic/fdrepdlg.h
+++ b/include/wx/generic/fdrepdlg.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     25/05/2001
 // RCS-ID:
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/include/wx/generic/filedlgg.h b/include/wx/generic/filedlgg.h
index 0038969774..673ff4a538 100644
--- a/include/wx/generic/filedlgg.h
+++ b/include/wx/generic/filedlgg.h
@@ -6,7 +6,7 @@
 // Created:     8/17/99
 // Copyright:   (c) Robert Roebling
 // RCS-ID:      $Id$
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FILEDLGG_H_
diff --git a/include/wx/generic/fontdlgg.h b/include/wx/generic/fontdlgg.h
index bc62532311..12a1dbdf3a 100644
--- a/include/wx/generic/fontdlgg.h
+++ b/include/wx/generic/fontdlgg.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c)
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GENERIC_FONTDLGG_H
diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h
index 0f458be803..e01baeaafc 100644
--- a/include/wx/generic/grid.h
+++ b/include/wx/generic/grid.h
@@ -6,7 +6,7 @@
 // Created:     1/08/1999
 // RCS-ID:      $Id$
 // Copyright:   (c) Michael Bedward
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/defs.h"
diff --git a/include/wx/generic/gridctrl.h b/include/wx/generic/gridctrl.h
index 3a717e2fd8..2f982c5c33 100644
--- a/include/wx/generic/gridctrl.h
+++ b/include/wx/generic/gridctrl.h
@@ -6,7 +6,7 @@
 // Created:     11/04/2001
 // RCS-ID:      $Id$
 // Copyright:   (c) The Computer Surgery (paul@compsurg.co.uk)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GENERIC_GRIDCTRL_H_
diff --git a/include/wx/generic/gridsel.h b/include/wx/generic/gridsel.h
index 55af91488c..de64949e15 100644
--- a/include/wx/generic/gridsel.h
+++ b/include/wx/generic/gridsel.h
@@ -6,7 +6,7 @@
 // Created:     20/02/2000
 // RCS-ID:      $$
 // Copyright:   (c) Stefan Neis
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/defs.h"
diff --git a/include/wx/generic/helpext.h b/include/wx/generic/helpext.h
index b3af81566e..5a0f473062 100644
--- a/include/wx/generic/helpext.h
+++ b/include/wx/generic/helpext.h
@@ -1,5 +1,5 @@
 /*-*- c++ -*-********************************************************
- * helpext.h - an external help controller for wxWindows             *
+ * helpext.h - an external help controller for wxWidgets             *
  *                                                                  *
  * (C) 1998 by Karsten Ballüder (Ballueder@usa.net)                 *
  *                                                                  *
diff --git a/include/wx/generic/imaglist.h b/include/wx/generic/imaglist.h
index 3eef4e40cc..b93217f190 100644
--- a/include/wx/generic/imaglist.h
+++ b/include/wx/generic/imaglist.h
@@ -5,7 +5,7 @@
 // Created:     01/02/97
 // Id:
 // Copyright:   (c) 1998 Robert Roebling and Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __IMAGELISTH_G__
diff --git a/include/wx/generic/laywin.h b/include/wx/generic/laywin.h
index ca0ec2f74a..948fa1efb0 100644
--- a/include/wx/generic/laywin.h
+++ b/include/wx/generic/laywin.h
@@ -9,7 +9,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_LAYWIN_H_G_
diff --git a/include/wx/generic/listctrl.h b/include/wx/generic/listctrl.h
index 961bd9901d..a8caab5e28 100644
--- a/include/wx/generic/listctrl.h
+++ b/include/wx/generic/listctrl.h
@@ -5,7 +5,7 @@
 // Created:     01/02/97
 // Id:
 // Copyright:   (c) 1998 Robert Roebling and Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __LISTCTRLH_G__
diff --git a/include/wx/generic/logg.h b/include/wx/generic/logg.h
index 5d4a9a008e..1eefe6c5fa 100644
--- a/include/wx/generic/logg.h
+++ b/include/wx/generic/logg.h
@@ -6,7 +6,7 @@
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef   _WX_LOGG_H_
@@ -45,7 +45,7 @@ private:
 #endif // wxUSE_TEXTCTRL
 
 // ----------------------------------------------------------------------------
-// GUI log target, the default one for wxWindows programs
+// GUI log target, the default one for wxWidgets programs
 // ----------------------------------------------------------------------------
 
 #if wxUSE_LOGGUI
diff --git a/include/wx/generic/mdig.h b/include/wx/generic/mdig.h
index 6a9ecbf146..7169e26d53 100644
--- a/include/wx/generic/mdig.h
+++ b/include/wx/generic/mdig.h
@@ -6,7 +6,7 @@
 // Created:     29/07/2002
 // RCS-ID:      $Id$
 // Copyright:   (c) Hans Van Leemputten
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MDIG_H_
diff --git a/include/wx/generic/msgdlgg.h b/include/wx/generic/msgdlgg.h
index 521f5586fa..4ba9c8be6d 100644
--- a/include/wx/generic/msgdlgg.h
+++ b/include/wx/generic/msgdlgg.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c)
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __MSGDLGH_G__
diff --git a/include/wx/generic/notebook.h b/include/wx/generic/notebook.h
index f55b0db48f..bbaa7444f3 100644
--- a/include/wx/generic/notebook.h
+++ b/include/wx/generic/notebook.h
@@ -5,7 +5,7 @@
 // Modified by:
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_NOTEBOOK_H_
diff --git a/include/wx/generic/numdlgg.h b/include/wx/generic/numdlgg.h
index ce9ea55e86..700844b68e 100644
--- a/include/wx/generic/numdlgg.h
+++ b/include/wx/generic/numdlgg.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     07.02.04 (extracted from textdlgg.cpp)
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __NUMDLGH_G__
diff --git a/include/wx/generic/paletteg.h b/include/wx/generic/paletteg.h
index 3ff00fbf20..2aa5b4259e 100644
--- a/include/wx/generic/paletteg.h
+++ b/include/wx/generic/paletteg.h
@@ -5,7 +5,7 @@
 // Created:     01/02/97
 // Id:
 // Copyright:   (c) 1998 Robert Roebling and Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/generic/panelg.h b/include/wx/generic/panelg.h
index 28852dd454..d56616c53a 100644
--- a/include/wx/generic/panelg.h
+++ b/include/wx/generic/panelg.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GENERIC_PANEL_H_
diff --git a/include/wx/generic/printps.h b/include/wx/generic/printps.h
index bb60929d0f..09ac77f4b0 100644
--- a/include/wx/generic/printps.h
+++ b/include/wx/generic/printps.h
@@ -7,7 +7,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __PRINTPSH__
diff --git a/include/wx/generic/prntdlgg.h b/include/wx/generic/prntdlgg.h
index d0114adf29..79ba6ae63b 100644
--- a/include/wx/generic/prntdlgg.h
+++ b/include/wx/generic/prntdlgg.h
@@ -7,7 +7,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __PRINTDLGH_G_
diff --git a/include/wx/generic/progdlgg.h b/include/wx/generic/progdlgg.h
index ee59cb9426..7109d201e9 100644
--- a/include/wx/generic/progdlgg.h
+++ b/include/wx/generic/progdlgg.h
@@ -6,7 +6,7 @@
 // Created:     09.05.1999
 // RCS-ID:      $Id$
 // Copyright:   (c) Karsten Ballüder
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ////////////////////////////////////////////////////
 
 #ifndef __PROGDLGH_G__
diff --git a/include/wx/generic/region.h b/include/wx/generic/region.h
index 9be316fc10..b0e5b44309 100644
--- a/include/wx/generic/region.h
+++ b/include/wx/generic/region.h
@@ -6,7 +6,7 @@
 // Created:     2004/04/12
 // RCS-ID:      $Id$
 // Copyright:   (c) 2004 David Elliott
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GENERIC_REGION_H__
diff --git a/include/wx/generic/sashwin.h b/include/wx/generic/sashwin.h
index 1c9a5b5b93..73e51009c4 100644
--- a/include/wx/generic/sashwin.h
+++ b/include/wx/generic/sashwin.h
@@ -8,7 +8,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SASHWIN_H_G_
diff --git a/include/wx/generic/scrolwin.h b/include/wx/generic/scrolwin.h
index 4d0d0e3307..32c5c4e294 100644
--- a/include/wx/generic/scrolwin.h
+++ b/include/wx/generic/scrolwin.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GENERIC_SCROLLWIN_H_
diff --git a/include/wx/generic/spinctlg.h b/include/wx/generic/spinctlg.h
index 2d4e3e400d..14c8ff6f6a 100644
--- a/include/wx/generic/spinctlg.h
+++ b/include/wx/generic/spinctlg.h
@@ -6,7 +6,7 @@
 // Created:     28.10.99
 // RCS-ID:      $Id$
 // Copyright:   (c) Vadim Zeitlin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GENERIC_SPINCTRL_H_
diff --git a/include/wx/generic/splitter.h b/include/wx/generic/splitter.h
index 61e4c08008..eb83d299c2 100644
--- a/include/wx/generic/splitter.h
+++ b/include/wx/generic/splitter.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __SPLITTERH_G__
@@ -49,7 +49,7 @@ enum
 //    The MFC splitter window manages scrollbars as well so is able to
 //    put sash buttons on the scrollbars, but we probably don't want to go down
 //    this path.
-// 2) for wxWindows 2.0, we must find a way to set the WS_CLIPCHILDREN style
+// 2) for wxWidgets 2.0, we must find a way to set the WS_CLIPCHILDREN style
 //    to prevent flickering. (WS_CLIPCHILDREN doesn't work in all cases so can't be
 //    standard).
 
diff --git a/include/wx/generic/statline.h b/include/wx/generic/statline.h
index 3ba19ec310..092cdde6a6 100644
--- a/include/wx/generic/statline.h
+++ b/include/wx/generic/statline.h
@@ -5,7 +5,7 @@
 // Created:     28.06.99
 // Version:     $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GENERIC_STATLINE_H_
diff --git a/include/wx/generic/statusbr.h b/include/wx/generic/statusbr.h
index 5fc9df0a92..77d837eec6 100644
--- a/include/wx/generic/statusbr.h
+++ b/include/wx/generic/statusbr.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GENERIC_STATUSBR_H_
diff --git a/include/wx/generic/tabg.h b/include/wx/generic/tabg.h
index 905fad790e..6c97b3a383 100644
--- a/include/wx/generic/tabg.h
+++ b/include/wx/generic/tabg.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __TABGH_G__
diff --git a/include/wx/generic/textdlgg.h b/include/wx/generic/textdlgg.h
index 876389d0e7..6fbf9079ae 100644
--- a/include/wx/generic/textdlgg.h
+++ b/include/wx/generic/textdlgg.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __TEXTDLGH_G__
diff --git a/include/wx/generic/timer.h b/include/wx/generic/timer.h
index 83a6e5c2e2..7b3c3d7ff6 100644
--- a/include/wx/generic/timer.h
+++ b/include/wx/generic/timer.h
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Copyright:   (c) Vaclav Slavik
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/generic/treectlg.h b/include/wx/generic/treectlg.h
index 68fb89b8b2..3b838baff1 100644
--- a/include/wx/generic/treectlg.h
+++ b/include/wx/generic/treectlg.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997,1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _GENERIC_TREECTRL_H_
diff --git a/include/wx/generic/wizard.h b/include/wx/generic/wizard.h
index be0b991c38..e3cee23583 100644
--- a/include/wx/generic/wizard.h
+++ b/include/wx/generic/wizard.h
@@ -6,7 +6,7 @@
 // Created:     28.09.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ----------------------------------------------------------------------------
diff --git a/include/wx/geometry.h b/include/wx/geometry.h
index 18fa889e1b..fdec849352 100644
--- a/include/wx/geometry.h
+++ b/include/wx/geometry.h
@@ -6,7 +6,7 @@
 // Created:     08/05/99
 // RCS-ID:
 // Copyright:   (c) 1999 Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GEOMETRY_H_
diff --git a/include/wx/gifdecod.h b/include/wx/gifdecod.h
index e524466c0d..4c95a274e3 100644
--- a/include/wx/gifdecod.h
+++ b/include/wx/gifdecod.h
@@ -5,7 +5,7 @@
 // Version:     3.02
 // CVS-ID:      $Id$
 // Copyright:   (c) 1999 Guillermo Rodriguez Garcia
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GIFDECOD_H
diff --git a/include/wx/gtk/app.h b/include/wx/gtk/app.h
index 3fb0e93c8a..19eb401889 100644
--- a/include/wx/gtk/app.h
+++ b/include/wx/gtk/app.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKAPPH__
diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h
index 51cc2fed09..521592bfa8 100644
--- a/include/wx/gtk/bitmap.h
+++ b/include/wx/gtk/bitmap.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/gtk/bmpbuttn.h b/include/wx/gtk/bmpbuttn.h
index c71501e59a..3b9da9a189 100644
--- a/include/wx/gtk/bmpbuttn.h
+++ b/include/wx/gtk/bmpbuttn.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/gtk/brush.h b/include/wx/gtk/brush.h
index de6bf6f62a..0cb55d0e16 100644
--- a/include/wx/gtk/brush.h
+++ b/include/wx/gtk/brush.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/gtk/button.h b/include/wx/gtk/button.h
index 3a55ddec52..8c016d3b87 100644
--- a/include/wx/gtk/button.h
+++ b/include/wx/gtk/button.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKBUTTONH__
diff --git a/include/wx/gtk/checkbox.h b/include/wx/gtk/checkbox.h
index 0fefb3c67c..d3cb7dc59e 100644
--- a/include/wx/gtk/checkbox.h
+++ b/include/wx/gtk/checkbox.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKCHECKBOXH__
diff --git a/include/wx/gtk/checklst.h b/include/wx/gtk/checklst.h
index b2afb54cf3..6cc3de0ec9 100644
--- a/include/wx/gtk/checklst.h
+++ b/include/wx/gtk/checklst.h
@@ -5,7 +5,7 @@
 // Modified by:
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKCHECKLISTH__
diff --git a/include/wx/gtk/choice.h b/include/wx/gtk/choice.h
index 17ae9edeb2..a93591cd6a 100644
--- a/include/wx/gtk/choice.h
+++ b/include/wx/gtk/choice.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKCHOICEH__
diff --git a/include/wx/gtk/clipbrd.h b/include/wx/gtk/clipbrd.h
index 38f7c427c9..1d8a9a3c35 100644
--- a/include/wx/gtk/clipbrd.h
+++ b/include/wx/gtk/clipbrd.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/gtk/colour.h b/include/wx/gtk/colour.h
index 788466d8e9..8cb486e3c6 100644
--- a/include/wx/gtk/colour.h
+++ b/include/wx/gtk/colour.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/gtk/combobox.h b/include/wx/gtk/combobox.h
index 39bbb7ed54..7fc49ca383 100644
--- a/include/wx/gtk/combobox.h
+++ b/include/wx/gtk/combobox.h
@@ -5,7 +5,7 @@
 // Created:     01/02/97
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/gtk/control.h b/include/wx/gtk/control.h
index be6f36bc1c..038bf5ba44 100644
--- a/include/wx/gtk/control.h
+++ b/include/wx/gtk/control.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKCONTROLH__
diff --git a/include/wx/gtk/cursor.h b/include/wx/gtk/cursor.h
index 5886b6e20f..3e2929c6d4 100644
--- a/include/wx/gtk/cursor.h
+++ b/include/wx/gtk/cursor.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/gtk/dataform.h b/include/wx/gtk/dataform.h
index 00b2c9f0c0..dc52e99699 100644
--- a/include/wx/gtk/dataform.h
+++ b/include/wx/gtk/dataform.h
@@ -6,7 +6,7 @@
 // Created:     19.10.99 (extracted from gtk/dataobj.h)
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GTK_DATAFORM_H
diff --git a/include/wx/gtk/dataobj.h b/include/wx/gtk/dataobj.h
index fa14819b17..fb079efeeb 100644
--- a/include/wx/gtk/dataobj.h
+++ b/include/wx/gtk/dataobj.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998, 1999 Vadim Zeitlin, Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GTK_DATAOBJ_H_
diff --git a/include/wx/gtk/dataobj2.h b/include/wx/gtk/dataobj2.h
index dc7bc94bb7..9a074dcfb1 100644
--- a/include/wx/gtk/dataobj2.h
+++ b/include/wx/gtk/dataobj2.h
@@ -5,7 +5,7 @@
 // Created:     19.10.99 (extracted from gtk/dataobj.h)
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998, 1999 Vadim Zeitlin, Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GTK_DATAOBJ2_H_
diff --git a/include/wx/gtk/dc.h b/include/wx/gtk/dc.h
index 1bc4d18c56..61c12d681d 100644
--- a/include/wx/gtk/dc.h
+++ b/include/wx/gtk/dc.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/gtk/dcclient.h b/include/wx/gtk/dcclient.h
index fc7e52885e..2faee6d873 100644
--- a/include/wx/gtk/dcclient.h
+++ b/include/wx/gtk/dcclient.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKDCCLIENTH__
diff --git a/include/wx/gtk/dcmemory.h b/include/wx/gtk/dcmemory.h
index 8658a250eb..c56ee584e4 100644
--- a/include/wx/gtk/dcmemory.h
+++ b/include/wx/gtk/dcmemory.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/gtk/dcscreen.h b/include/wx/gtk/dcscreen.h
index b1cc81a7e6..11efd6630c 100644
--- a/include/wx/gtk/dcscreen.h
+++ b/include/wx/gtk/dcscreen.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKDCSCREENH__
diff --git a/include/wx/gtk/dialog.h b/include/wx/gtk/dialog.h
index 9f30a1c8d8..9b617d9083 100644
--- a/include/wx/gtk/dialog.h
+++ b/include/wx/gtk/dialog.h
@@ -5,7 +5,7 @@
 // Created:
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:           wxWindows licence
+// Licence:           wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKDIALOGH__
diff --git a/include/wx/gtk/dnd.h b/include/wx/gtk/dnd.h
index c2210c23a3..003c015074 100644
--- a/include/wx/gtk/dnd.h
+++ b/include/wx/gtk/dnd.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin, Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/gtk/filedlg.h b/include/wx/gtk/filedlg.h
index 2b3fd479f7..ec80911b6e 100644
--- a/include/wx/gtk/filedlg.h
+++ b/include/wx/gtk/filedlg.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/gtk/font.h b/include/wx/gtk/font.h
index 9d66ddc909..afc557fe9b 100644
--- a/include/wx/gtk/font.h
+++ b/include/wx/gtk/font.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKFONTH__
diff --git a/include/wx/gtk/fontdlg.h b/include/wx/gtk/fontdlg.h
index 901f458fa2..df377c2510 100644
--- a/include/wx/gtk/fontdlg.h
+++ b/include/wx/gtk/fontdlg.h
@@ -5,7 +5,7 @@
 // Created:
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTK_FONTDLGH__
diff --git a/include/wx/gtk/frame.h b/include/wx/gtk/frame.h
index 3befcf231f..5d2327f007 100644
--- a/include/wx/gtk/frame.h
+++ b/include/wx/gtk/frame.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/gtk/gauge.h b/include/wx/gtk/gauge.h
index 5652b6b5cb..4a3710a14c 100644
--- a/include/wx/gtk/gauge.h
+++ b/include/wx/gtk/gauge.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/gtk/gdiobj.h b/include/wx/gtk/gdiobj.h
index d87d6b9542..2c17e8572d 100644
--- a/include/wx/gtk/gdiobj.h
+++ b/include/wx/gtk/gdiobj.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/gtk/glcanvas.h b/include/wx/gtk/glcanvas.h
index 96ca1ffffd..fe7c581b25 100644
--- a/include/wx/gtk/glcanvas.h
+++ b/include/wx/gtk/glcanvas.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        glcanvas.h
-// Purpose:     wxGLCanvas, for using OpenGL/Mesa with wxWindows and GTK
+// Purpose:     wxGLCanvas, for using OpenGL/Mesa with wxWidgets and GTK
 // Author:      Robert Roebling
 // Modified by:
 // Created:     17/8/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/include/wx/gtk/icon.h b/include/wx/gtk/icon.h
index c784b646e4..f55707a19c 100644
--- a/include/wx/gtk/icon.h
+++ b/include/wx/gtk/icon.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/gtk/listbox.h b/include/wx/gtk/listbox.h
index ff8d595c6c..26ff2e27a7 100644
--- a/include/wx/gtk/listbox.h
+++ b/include/wx/gtk/listbox.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/gtk/mdi.h b/include/wx/gtk/mdi.h
index 69104769f2..30a3edcd85 100644
--- a/include/wx/gtk/mdi.h
+++ b/include/wx/gtk/mdi.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/gtk/menu.h b/include/wx/gtk/menu.h
index a154a64e21..9fa2899752 100644
--- a/include/wx/gtk/menu.h
+++ b/include/wx/gtk/menu.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKMENUH__
diff --git a/include/wx/gtk/menuitem.h b/include/wx/gtk/menuitem.h
index 790aa61847..f166d2e96e 100644
--- a/include/wx/gtk/menuitem.h
+++ b/include/wx/gtk/menuitem.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKMENUITEMH__
diff --git a/include/wx/gtk/minifram.h b/include/wx/gtk/minifram.h
index 6c2e4cedf3..4dae1eefe3 100644
--- a/include/wx/gtk/minifram.h
+++ b/include/wx/gtk/minifram.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKMINIFRAMEH__
diff --git a/include/wx/gtk/msgdlg.h b/include/wx/gtk/msgdlg.h
index 7ca2daea90..b8f2c9b823 100644
--- a/include/wx/gtk/msgdlg.h
+++ b/include/wx/gtk/msgdlg.h
@@ -6,7 +6,7 @@
 // Created:     2003/02/28
 // RCS-ID:      $Id$
 // Copyright:   (c) Vaclav Slavik, 2003
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __MSGDLG_H__
diff --git a/include/wx/gtk/notebook.h b/include/wx/gtk/notebook.h
index 664eb5f199..e4df5ef560 100644
--- a/include/wx/gtk/notebook.h
+++ b/include/wx/gtk/notebook.h
@@ -5,7 +5,7 @@
 // Modified by:
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKNOTEBOOKH__
diff --git a/include/wx/gtk/pen.h b/include/wx/gtk/pen.h
index e71e01253f..800117d71b 100644
--- a/include/wx/gtk/pen.h
+++ b/include/wx/gtk/pen.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/gtk/popupwin.h b/include/wx/gtk/popupwin.h
index e40673b4e6..ab7ecfdd1d 100644
--- a/include/wx/gtk/popupwin.h
+++ b/include/wx/gtk/popupwin.h
@@ -5,7 +5,7 @@
 // Created:
 // Id:          $Id$
 // Copyright:   (c) 2001 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKPOPUPWINH__
diff --git a/include/wx/gtk/private.h b/include/wx/gtk/private.h
index d63519da52..2de9a3c540 100644
--- a/include/wx/gtk/private.h
+++ b/include/wx/gtk/private.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     12.03.02
 // RCS-ID:      $Id$
-// Copyright:   (c) 2002 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
+// Copyright:   (c) 2002 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GTK_PRIVATE_H_
diff --git a/include/wx/gtk/radiobox.h b/include/wx/gtk/radiobox.h
index 882bda0357..c5db4b748c 100644
--- a/include/wx/gtk/radiobox.h
+++ b/include/wx/gtk/radiobox.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/gtk/radiobut.h b/include/wx/gtk/radiobut.h
index 39c442216f..3336a550cc 100644
--- a/include/wx/gtk/radiobut.h
+++ b/include/wx/gtk/radiobut.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/gtk/region.h b/include/wx/gtk/region.h
index 90356ba2ea..13ac5c70ff 100644
--- a/include/wx/gtk/region.h
+++ b/include/wx/gtk/region.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GTK_REGION_H_
diff --git a/include/wx/gtk/scrolbar.h b/include/wx/gtk/scrolbar.h
index 8ce5e82897..f9bbf68de0 100644
--- a/include/wx/gtk/scrolbar.h
+++ b/include/wx/gtk/scrolbar.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/gtk/scrolwin.h b/include/wx/gtk/scrolwin.h
index 8209f2d61a..855398183e 100644
--- a/include/wx/gtk/scrolwin.h
+++ b/include/wx/gtk/scrolwin.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GTK_SCROLLWIN_H_
@@ -90,7 +90,7 @@ public:
     virtual void GetScrollPixelsPerUnit(int *x_unit, int *y_unit) const;
 
     // Enable/disable Windows scrolling in either direction.
-    // If TRUE, wxWindows scrolls the canvas and only a bit of
+    // If TRUE, wxWidgets scrolls the canvas and only a bit of
     // the canvas is invalidated; no Clear() is necessary.
     // If FALSE, the whole canvas is invalidated and a Clear() is
     // necessary. Disable for when the scroll increment is used
@@ -156,7 +156,7 @@ public:
     // Calculate scroll increment
     virtual int CalcScrollInc(wxScrollWinEvent& event);
 
-    // Overridden from wxWindows due callback being static
+    // Overridden from wxWidgets due callback being static
     virtual void SetScrollPos( int orient, int pos, bool refresh = TRUE );
 
 #if WXWIN_COMPATIBILITY_2_2
diff --git a/include/wx/gtk/slider.h b/include/wx/gtk/slider.h
index bd4af3fcad..e4c4817140 100644
--- a/include/wx/gtk/slider.h
+++ b/include/wx/gtk/slider.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKSLIDERH__
diff --git a/include/wx/gtk/spinbutt.h b/include/wx/gtk/spinbutt.h
index dfe3c40c05..585808718c 100644
--- a/include/wx/gtk/spinbutt.h
+++ b/include/wx/gtk/spinbutt.h
@@ -5,7 +5,7 @@
 // Modified by:
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GTK_SPINBUTT_H_
diff --git a/include/wx/gtk/spinctrl.h b/include/wx/gtk/spinctrl.h
index 425f31f335..e8721664ca 100644
--- a/include/wx/gtk/spinctrl.h
+++ b/include/wx/gtk/spinctrl.h
@@ -5,7 +5,7 @@
 // Modified by:
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKSPINCTRLH__
diff --git a/include/wx/gtk/statbmp.h b/include/wx/gtk/statbmp.h
index 00677618de..7445e99c3d 100644
--- a/include/wx/gtk/statbmp.h
+++ b/include/wx/gtk/statbmp.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/gtk/statbox.h b/include/wx/gtk/statbox.h
index f0f1b2ff0e..55a394bf62 100644
--- a/include/wx/gtk/statbox.h
+++ b/include/wx/gtk/statbox.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/gtk/statline.h b/include/wx/gtk/statline.h
index 803ae2018a..a6a274196d 100644
--- a/include/wx/gtk/statline.h
+++ b/include/wx/gtk/statline.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/gtk/stattext.h b/include/wx/gtk/stattext.h
index eb9ee2a86e..1df26f4833 100644
--- a/include/wx/gtk/stattext.h
+++ b/include/wx/gtk/stattext.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/gtk/tbargtk.h b/include/wx/gtk/tbargtk.h
index 340d70d665..f9bf606a30 100644
--- a/include/wx/gtk/tbargtk.h
+++ b/include/wx/gtk/tbargtk.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GTK_TBARGTK_H_
diff --git a/include/wx/gtk/textctrl.h b/include/wx/gtk/textctrl.h
index 7ca89491e6..5e34888f44 100644
--- a/include/wx/gtk/textctrl.h
+++ b/include/wx/gtk/textctrl.h
@@ -5,7 +5,7 @@
 // Created:     01/02/97
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKTEXTCTRLH__
diff --git a/include/wx/gtk/timer.h b/include/wx/gtk/timer.h
index 5d006be202..260313cef6 100644
--- a/include/wx/gtk/timer.h
+++ b/include/wx/gtk/timer.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/gtk/tooltip.h b/include/wx/gtk/tooltip.h
index 39b2f82fa0..dab271c27b 100644
--- a/include/wx/gtk/tooltip.h
+++ b/include/wx/gtk/tooltip.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKTOOLTIPH__
diff --git a/include/wx/gtk/toplevel.h b/include/wx/gtk/toplevel.h
index e95ee0f11c..6b8cbcb13b 100644
--- a/include/wx/gtk/toplevel.h
+++ b/include/wx/gtk/toplevel.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/gtk/treectrl.h b/include/wx/gtk/treectrl.h
index 2d715c2c1d..9c6dd83266 100644
--- a/include/wx/gtk/treectrl.h
+++ b/include/wx/gtk/treectrl.h
@@ -6,7 +6,7 @@
 // Created:     08/08/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Denis Pershin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TREECTRL_H_
@@ -101,7 +101,7 @@ public:
 
   // conversion to/from either real (system-dependent) tree item id or
   // to "long" which used to be the type for tree item ids in previous
-  // versions of wxWindows
+  // versions of wxWidgets
 
   // for wxTreeCtrl usage only
   wxTreeItemId(GtkTreeItem *itemId) { m_itemId = itemId; }
@@ -356,7 +356,7 @@ public:
     // ----------
 
     // these methods are deprecated and will be removed in future versions of
-    // wxWindows, they're here for compatibility only, don't use them in new
+    // wxWidgets, they're here for compatibility only, don't use them in new
     // code (the comments indicate why these methods are now useless and how to
     // replace them)
 
diff --git a/include/wx/gtk/win_gtk.h b/include/wx/gtk/win_gtk.h
index 6bd073219b..c2fa1d7510 100644
--- a/include/wx/gtk/win_gtk.h
+++ b/include/wx/gtk/win_gtk.h
@@ -1,10 +1,10 @@
 /* ///////////////////////////////////////////////////////////////////////////
 // Name:        win_gtk.h
-// Purpose:     wxWindows's GTK base widget = GtkPizza
+// Purpose:     wxWidgets's GTK base widget = GtkPizza
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////// */
 
 
diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h
index f5c690f5bc..0141ee72a6 100644
--- a/include/wx/gtk/window.h
+++ b/include/wx/gtk/window.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -201,7 +201,7 @@ public:
 
     // see the docs in src/gtk/window.cpp
     GtkWidget           *m_widget;          // mostly the widget seen by the rest of GTK
-    GtkWidget           *m_wxwindow;        // mostly the client area as per wxWindows
+    GtkWidget           *m_wxwindow;        // mostly the client area as per wxWidgets
 
     // this widget will be queried for GTK's focus events
     GtkWidget           *m_focusWidget;
@@ -210,7 +210,7 @@ public:
     GtkIMMulticontext   *m_imContext;
 #else
 #if HAVE_XIM
-    // XIM support for wxWindows
+    // XIM support for wxWidgets
     GdkIC               *m_ic;
     GdkICAttr           *m_icattr;
 #endif
diff --git a/include/wx/gtk1/app.h b/include/wx/gtk1/app.h
index 3fb0e93c8a..19eb401889 100644
--- a/include/wx/gtk1/app.h
+++ b/include/wx/gtk1/app.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKAPPH__
diff --git a/include/wx/gtk1/bitmap.h b/include/wx/gtk1/bitmap.h
index 51cc2fed09..521592bfa8 100644
--- a/include/wx/gtk1/bitmap.h
+++ b/include/wx/gtk1/bitmap.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/gtk1/bmpbuttn.h b/include/wx/gtk1/bmpbuttn.h
index c71501e59a..3b9da9a189 100644
--- a/include/wx/gtk1/bmpbuttn.h
+++ b/include/wx/gtk1/bmpbuttn.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/gtk1/brush.h b/include/wx/gtk1/brush.h
index de6bf6f62a..0cb55d0e16 100644
--- a/include/wx/gtk1/brush.h
+++ b/include/wx/gtk1/brush.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/gtk1/button.h b/include/wx/gtk1/button.h
index 3a55ddec52..8c016d3b87 100644
--- a/include/wx/gtk1/button.h
+++ b/include/wx/gtk1/button.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKBUTTONH__
diff --git a/include/wx/gtk1/checkbox.h b/include/wx/gtk1/checkbox.h
index 0fefb3c67c..d3cb7dc59e 100644
--- a/include/wx/gtk1/checkbox.h
+++ b/include/wx/gtk1/checkbox.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKCHECKBOXH__
diff --git a/include/wx/gtk1/checklst.h b/include/wx/gtk1/checklst.h
index b2afb54cf3..6cc3de0ec9 100644
--- a/include/wx/gtk1/checklst.h
+++ b/include/wx/gtk1/checklst.h
@@ -5,7 +5,7 @@
 // Modified by:
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKCHECKLISTH__
diff --git a/include/wx/gtk1/choice.h b/include/wx/gtk1/choice.h
index 17ae9edeb2..a93591cd6a 100644
--- a/include/wx/gtk1/choice.h
+++ b/include/wx/gtk1/choice.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKCHOICEH__
diff --git a/include/wx/gtk1/clipbrd.h b/include/wx/gtk1/clipbrd.h
index 38f7c427c9..1d8a9a3c35 100644
--- a/include/wx/gtk1/clipbrd.h
+++ b/include/wx/gtk1/clipbrd.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/gtk1/colour.h b/include/wx/gtk1/colour.h
index 788466d8e9..8cb486e3c6 100644
--- a/include/wx/gtk1/colour.h
+++ b/include/wx/gtk1/colour.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/gtk1/combobox.h b/include/wx/gtk1/combobox.h
index 39bbb7ed54..7fc49ca383 100644
--- a/include/wx/gtk1/combobox.h
+++ b/include/wx/gtk1/combobox.h
@@ -5,7 +5,7 @@
 // Created:     01/02/97
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/gtk1/control.h b/include/wx/gtk1/control.h
index be6f36bc1c..038bf5ba44 100644
--- a/include/wx/gtk1/control.h
+++ b/include/wx/gtk1/control.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKCONTROLH__
diff --git a/include/wx/gtk1/cursor.h b/include/wx/gtk1/cursor.h
index 5886b6e20f..3e2929c6d4 100644
--- a/include/wx/gtk1/cursor.h
+++ b/include/wx/gtk1/cursor.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/gtk1/dataform.h b/include/wx/gtk1/dataform.h
index 00b2c9f0c0..dc52e99699 100644
--- a/include/wx/gtk1/dataform.h
+++ b/include/wx/gtk1/dataform.h
@@ -6,7 +6,7 @@
 // Created:     19.10.99 (extracted from gtk/dataobj.h)
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GTK_DATAFORM_H
diff --git a/include/wx/gtk1/dataobj.h b/include/wx/gtk1/dataobj.h
index fa14819b17..fb079efeeb 100644
--- a/include/wx/gtk1/dataobj.h
+++ b/include/wx/gtk1/dataobj.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998, 1999 Vadim Zeitlin, Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GTK_DATAOBJ_H_
diff --git a/include/wx/gtk1/dataobj2.h b/include/wx/gtk1/dataobj2.h
index dc7bc94bb7..9a074dcfb1 100644
--- a/include/wx/gtk1/dataobj2.h
+++ b/include/wx/gtk1/dataobj2.h
@@ -5,7 +5,7 @@
 // Created:     19.10.99 (extracted from gtk/dataobj.h)
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998, 1999 Vadim Zeitlin, Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GTK_DATAOBJ2_H_
diff --git a/include/wx/gtk1/dc.h b/include/wx/gtk1/dc.h
index 1bc4d18c56..61c12d681d 100644
--- a/include/wx/gtk1/dc.h
+++ b/include/wx/gtk1/dc.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/gtk1/dcclient.h b/include/wx/gtk1/dcclient.h
index fc7e52885e..2faee6d873 100644
--- a/include/wx/gtk1/dcclient.h
+++ b/include/wx/gtk1/dcclient.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKDCCLIENTH__
diff --git a/include/wx/gtk1/dcmemory.h b/include/wx/gtk1/dcmemory.h
index 8658a250eb..c56ee584e4 100644
--- a/include/wx/gtk1/dcmemory.h
+++ b/include/wx/gtk1/dcmemory.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/gtk1/dcscreen.h b/include/wx/gtk1/dcscreen.h
index b1cc81a7e6..11efd6630c 100644
--- a/include/wx/gtk1/dcscreen.h
+++ b/include/wx/gtk1/dcscreen.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKDCSCREENH__
diff --git a/include/wx/gtk1/dialog.h b/include/wx/gtk1/dialog.h
index 9f30a1c8d8..9b617d9083 100644
--- a/include/wx/gtk1/dialog.h
+++ b/include/wx/gtk1/dialog.h
@@ -5,7 +5,7 @@
 // Created:
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:           wxWindows licence
+// Licence:           wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKDIALOGH__
diff --git a/include/wx/gtk1/dnd.h b/include/wx/gtk1/dnd.h
index c2210c23a3..003c015074 100644
--- a/include/wx/gtk1/dnd.h
+++ b/include/wx/gtk1/dnd.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin, Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/gtk1/filedlg.h b/include/wx/gtk1/filedlg.h
index 2b3fd479f7..ec80911b6e 100644
--- a/include/wx/gtk1/filedlg.h
+++ b/include/wx/gtk1/filedlg.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/gtk1/font.h b/include/wx/gtk1/font.h
index 9d66ddc909..afc557fe9b 100644
--- a/include/wx/gtk1/font.h
+++ b/include/wx/gtk1/font.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKFONTH__
diff --git a/include/wx/gtk1/fontdlg.h b/include/wx/gtk1/fontdlg.h
index 901f458fa2..df377c2510 100644
--- a/include/wx/gtk1/fontdlg.h
+++ b/include/wx/gtk1/fontdlg.h
@@ -5,7 +5,7 @@
 // Created:
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTK_FONTDLGH__
diff --git a/include/wx/gtk1/frame.h b/include/wx/gtk1/frame.h
index 3befcf231f..5d2327f007 100644
--- a/include/wx/gtk1/frame.h
+++ b/include/wx/gtk1/frame.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/gtk1/gauge.h b/include/wx/gtk1/gauge.h
index 5652b6b5cb..4a3710a14c 100644
--- a/include/wx/gtk1/gauge.h
+++ b/include/wx/gtk1/gauge.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/gtk1/gdiobj.h b/include/wx/gtk1/gdiobj.h
index d87d6b9542..2c17e8572d 100644
--- a/include/wx/gtk1/gdiobj.h
+++ b/include/wx/gtk1/gdiobj.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/gtk1/glcanvas.h b/include/wx/gtk1/glcanvas.h
index 96ca1ffffd..fe7c581b25 100644
--- a/include/wx/gtk1/glcanvas.h
+++ b/include/wx/gtk1/glcanvas.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        glcanvas.h
-// Purpose:     wxGLCanvas, for using OpenGL/Mesa with wxWindows and GTK
+// Purpose:     wxGLCanvas, for using OpenGL/Mesa with wxWidgets and GTK
 // Author:      Robert Roebling
 // Modified by:
 // Created:     17/8/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/include/wx/gtk1/icon.h b/include/wx/gtk1/icon.h
index c784b646e4..f55707a19c 100644
--- a/include/wx/gtk1/icon.h
+++ b/include/wx/gtk1/icon.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/gtk1/listbox.h b/include/wx/gtk1/listbox.h
index ff8d595c6c..26ff2e27a7 100644
--- a/include/wx/gtk1/listbox.h
+++ b/include/wx/gtk1/listbox.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/gtk1/mdi.h b/include/wx/gtk1/mdi.h
index 69104769f2..30a3edcd85 100644
--- a/include/wx/gtk1/mdi.h
+++ b/include/wx/gtk1/mdi.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/gtk1/menu.h b/include/wx/gtk1/menu.h
index a154a64e21..9fa2899752 100644
--- a/include/wx/gtk1/menu.h
+++ b/include/wx/gtk1/menu.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKMENUH__
diff --git a/include/wx/gtk1/menuitem.h b/include/wx/gtk1/menuitem.h
index 790aa61847..f166d2e96e 100644
--- a/include/wx/gtk1/menuitem.h
+++ b/include/wx/gtk1/menuitem.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKMENUITEMH__
diff --git a/include/wx/gtk1/minifram.h b/include/wx/gtk1/minifram.h
index 6c2e4cedf3..4dae1eefe3 100644
--- a/include/wx/gtk1/minifram.h
+++ b/include/wx/gtk1/minifram.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKMINIFRAMEH__
diff --git a/include/wx/gtk1/msgdlg.h b/include/wx/gtk1/msgdlg.h
index 7ca2daea90..b8f2c9b823 100644
--- a/include/wx/gtk1/msgdlg.h
+++ b/include/wx/gtk1/msgdlg.h
@@ -6,7 +6,7 @@
 // Created:     2003/02/28
 // RCS-ID:      $Id$
 // Copyright:   (c) Vaclav Slavik, 2003
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __MSGDLG_H__
diff --git a/include/wx/gtk1/notebook.h b/include/wx/gtk1/notebook.h
index 664eb5f199..e4df5ef560 100644
--- a/include/wx/gtk1/notebook.h
+++ b/include/wx/gtk1/notebook.h
@@ -5,7 +5,7 @@
 // Modified by:
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKNOTEBOOKH__
diff --git a/include/wx/gtk1/pen.h b/include/wx/gtk1/pen.h
index e71e01253f..800117d71b 100644
--- a/include/wx/gtk1/pen.h
+++ b/include/wx/gtk1/pen.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/gtk1/popupwin.h b/include/wx/gtk1/popupwin.h
index e40673b4e6..ab7ecfdd1d 100644
--- a/include/wx/gtk1/popupwin.h
+++ b/include/wx/gtk1/popupwin.h
@@ -5,7 +5,7 @@
 // Created:
 // Id:          $Id$
 // Copyright:   (c) 2001 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKPOPUPWINH__
diff --git a/include/wx/gtk1/private.h b/include/wx/gtk1/private.h
index d63519da52..2de9a3c540 100644
--- a/include/wx/gtk1/private.h
+++ b/include/wx/gtk1/private.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     12.03.02
 // RCS-ID:      $Id$
-// Copyright:   (c) 2002 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
+// Copyright:   (c) 2002 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GTK_PRIVATE_H_
diff --git a/include/wx/gtk1/radiobox.h b/include/wx/gtk1/radiobox.h
index 882bda0357..c5db4b748c 100644
--- a/include/wx/gtk1/radiobox.h
+++ b/include/wx/gtk1/radiobox.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/gtk1/radiobut.h b/include/wx/gtk1/radiobut.h
index 39c442216f..3336a550cc 100644
--- a/include/wx/gtk1/radiobut.h
+++ b/include/wx/gtk1/radiobut.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/gtk1/region.h b/include/wx/gtk1/region.h
index 90356ba2ea..13ac5c70ff 100644
--- a/include/wx/gtk1/region.h
+++ b/include/wx/gtk1/region.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GTK_REGION_H_
diff --git a/include/wx/gtk1/scrolbar.h b/include/wx/gtk1/scrolbar.h
index 8ce5e82897..f9bbf68de0 100644
--- a/include/wx/gtk1/scrolbar.h
+++ b/include/wx/gtk1/scrolbar.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/gtk1/scrolwin.h b/include/wx/gtk1/scrolwin.h
index 8209f2d61a..855398183e 100644
--- a/include/wx/gtk1/scrolwin.h
+++ b/include/wx/gtk1/scrolwin.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GTK_SCROLLWIN_H_
@@ -90,7 +90,7 @@ public:
     virtual void GetScrollPixelsPerUnit(int *x_unit, int *y_unit) const;
 
     // Enable/disable Windows scrolling in either direction.
-    // If TRUE, wxWindows scrolls the canvas and only a bit of
+    // If TRUE, wxWidgets scrolls the canvas and only a bit of
     // the canvas is invalidated; no Clear() is necessary.
     // If FALSE, the whole canvas is invalidated and a Clear() is
     // necessary. Disable for when the scroll increment is used
@@ -156,7 +156,7 @@ public:
     // Calculate scroll increment
     virtual int CalcScrollInc(wxScrollWinEvent& event);
 
-    // Overridden from wxWindows due callback being static
+    // Overridden from wxWidgets due callback being static
     virtual void SetScrollPos( int orient, int pos, bool refresh = TRUE );
 
 #if WXWIN_COMPATIBILITY_2_2
diff --git a/include/wx/gtk1/slider.h b/include/wx/gtk1/slider.h
index bd4af3fcad..e4c4817140 100644
--- a/include/wx/gtk1/slider.h
+++ b/include/wx/gtk1/slider.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKSLIDERH__
diff --git a/include/wx/gtk1/spinbutt.h b/include/wx/gtk1/spinbutt.h
index dfe3c40c05..585808718c 100644
--- a/include/wx/gtk1/spinbutt.h
+++ b/include/wx/gtk1/spinbutt.h
@@ -5,7 +5,7 @@
 // Modified by:
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GTK_SPINBUTT_H_
diff --git a/include/wx/gtk1/spinctrl.h b/include/wx/gtk1/spinctrl.h
index 425f31f335..e8721664ca 100644
--- a/include/wx/gtk1/spinctrl.h
+++ b/include/wx/gtk1/spinctrl.h
@@ -5,7 +5,7 @@
 // Modified by:
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKSPINCTRLH__
diff --git a/include/wx/gtk1/statbmp.h b/include/wx/gtk1/statbmp.h
index 00677618de..7445e99c3d 100644
--- a/include/wx/gtk1/statbmp.h
+++ b/include/wx/gtk1/statbmp.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/gtk1/statbox.h b/include/wx/gtk1/statbox.h
index f0f1b2ff0e..55a394bf62 100644
--- a/include/wx/gtk1/statbox.h
+++ b/include/wx/gtk1/statbox.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/gtk1/statline.h b/include/wx/gtk1/statline.h
index 803ae2018a..a6a274196d 100644
--- a/include/wx/gtk1/statline.h
+++ b/include/wx/gtk1/statline.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/gtk1/stattext.h b/include/wx/gtk1/stattext.h
index eb9ee2a86e..1df26f4833 100644
--- a/include/wx/gtk1/stattext.h
+++ b/include/wx/gtk1/stattext.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/gtk1/tbargtk.h b/include/wx/gtk1/tbargtk.h
index 340d70d665..f9bf606a30 100644
--- a/include/wx/gtk1/tbargtk.h
+++ b/include/wx/gtk1/tbargtk.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GTK_TBARGTK_H_
diff --git a/include/wx/gtk1/textctrl.h b/include/wx/gtk1/textctrl.h
index 7ca89491e6..5e34888f44 100644
--- a/include/wx/gtk1/textctrl.h
+++ b/include/wx/gtk1/textctrl.h
@@ -5,7 +5,7 @@
 // Created:     01/02/97
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKTEXTCTRLH__
diff --git a/include/wx/gtk1/timer.h b/include/wx/gtk1/timer.h
index 5d006be202..260313cef6 100644
--- a/include/wx/gtk1/timer.h
+++ b/include/wx/gtk1/timer.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/gtk1/tooltip.h b/include/wx/gtk1/tooltip.h
index 39b2f82fa0..dab271c27b 100644
--- a/include/wx/gtk1/tooltip.h
+++ b/include/wx/gtk1/tooltip.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKTOOLTIPH__
diff --git a/include/wx/gtk1/toplevel.h b/include/wx/gtk1/toplevel.h
index e95ee0f11c..6b8cbcb13b 100644
--- a/include/wx/gtk1/toplevel.h
+++ b/include/wx/gtk1/toplevel.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/gtk1/treectrl.h b/include/wx/gtk1/treectrl.h
index 2d715c2c1d..9c6dd83266 100644
--- a/include/wx/gtk1/treectrl.h
+++ b/include/wx/gtk1/treectrl.h
@@ -6,7 +6,7 @@
 // Created:     08/08/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Denis Pershin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TREECTRL_H_
@@ -101,7 +101,7 @@ public:
 
   // conversion to/from either real (system-dependent) tree item id or
   // to "long" which used to be the type for tree item ids in previous
-  // versions of wxWindows
+  // versions of wxWidgets
 
   // for wxTreeCtrl usage only
   wxTreeItemId(GtkTreeItem *itemId) { m_itemId = itemId; }
@@ -356,7 +356,7 @@ public:
     // ----------
 
     // these methods are deprecated and will be removed in future versions of
-    // wxWindows, they're here for compatibility only, don't use them in new
+    // wxWidgets, they're here for compatibility only, don't use them in new
     // code (the comments indicate why these methods are now useless and how to
     // replace them)
 
diff --git a/include/wx/gtk1/win_gtk.h b/include/wx/gtk1/win_gtk.h
index 6bd073219b..c2fa1d7510 100644
--- a/include/wx/gtk1/win_gtk.h
+++ b/include/wx/gtk1/win_gtk.h
@@ -1,10 +1,10 @@
 /* ///////////////////////////////////////////////////////////////////////////
 // Name:        win_gtk.h
-// Purpose:     wxWindows's GTK base widget = GtkPizza
+// Purpose:     wxWidgets's GTK base widget = GtkPizza
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////// */
 
 
diff --git a/include/wx/gtk1/window.h b/include/wx/gtk1/window.h
index f5c690f5bc..0141ee72a6 100644
--- a/include/wx/gtk1/window.h
+++ b/include/wx/gtk1/window.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -201,7 +201,7 @@ public:
 
     // see the docs in src/gtk/window.cpp
     GtkWidget           *m_widget;          // mostly the widget seen by the rest of GTK
-    GtkWidget           *m_wxwindow;        // mostly the client area as per wxWindows
+    GtkWidget           *m_wxwindow;        // mostly the client area as per wxWidgets
 
     // this widget will be queried for GTK's focus events
     GtkWidget           *m_focusWidget;
@@ -210,7 +210,7 @@ public:
     GtkIMMulticontext   *m_imContext;
 #else
 #if HAVE_XIM
-    // XIM support for wxWindows
+    // XIM support for wxWidgets
     GdkIC               *m_ic;
     GdkICAttr           *m_icattr;
 #endif
diff --git a/include/wx/hash.h b/include/wx/hash.h
index 194302ae7a..95840eb631 100644
--- a/include/wx/hash.h
+++ b/include/wx/hash.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_HASH_H__
diff --git a/include/wx/hashmap.h b/include/wx/hashmap.h
index ee6c142032..4f608dd5b1 100644
--- a/include/wx/hashmap.h
+++ b/include/wx/hashmap.h
@@ -6,7 +6,7 @@
 // Created:     29/01/2002
 // RCS-ID:      $Id$
 // Copyright:   (c) Mattia Barbon
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_HASHMAP_H_
diff --git a/include/wx/hashset.h b/include/wx/hashset.h
index 3cc80a8f5d..ae254ad6ea 100644
--- a/include/wx/hashset.h
+++ b/include/wx/hashset.h
@@ -6,7 +6,7 @@
 // Created:     11/08/2003
 // RCS-ID:      $Id$
 // Copyright:   (c) Mattia Barbon
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_HASHSET_H_
diff --git a/include/wx/helpbase.h b/include/wx/helpbase.h
index dc7da84c07..6c8563f014 100644
--- a/include/wx/helpbase.h
+++ b/include/wx/helpbase.h
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_HELPBASEH__
diff --git a/include/wx/helphtml.h b/include/wx/helphtml.h
index b4fae9b7ae..6766434438 100644
--- a/include/wx/helphtml.h
+++ b/include/wx/helphtml.h
@@ -6,7 +6,7 @@
 // Created:     2003-05-24
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_HELPHTML_H_
diff --git a/include/wx/html/forcelnk.h b/include/wx/html/forcelnk.h
index 42cb66f95f..67feb65125 100644
--- a/include/wx/html/forcelnk.h
+++ b/include/wx/html/forcelnk.h
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) Vaclav Slavik
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 /*
diff --git a/include/wx/html/helpctrl.h b/include/wx/html/helpctrl.h
index 06e6bdc7ee..f6d6aacf97 100644
--- a/include/wx/html/helpctrl.h
+++ b/include/wx/html/helpctrl.h
@@ -6,7 +6,7 @@
 // Author:      Harm van der Heijden and Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) Harm van der Heijden and Vaclav Slavik
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_HELPCTRL_H_
diff --git a/include/wx/html/helpdata.h b/include/wx/html/helpdata.h
index f03914cc18..7d76b32625 100644
--- a/include/wx/html/helpdata.h
+++ b/include/wx/html/helpdata.h
@@ -6,7 +6,7 @@
 // Author:      Harm van der Heijden and Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) Harm van der Heijden and Vaclav Slavik
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_HELPDATA_H_
diff --git a/include/wx/html/helpfrm.h b/include/wx/html/helpfrm.h
index 0b18da854e..2f499556df 100644
--- a/include/wx/html/helpfrm.h
+++ b/include/wx/html/helpfrm.h
@@ -6,7 +6,7 @@
 // Author:      Harm van der Heijden and Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) Harm van der Heijden and Vaclav Slavik
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_HELPFRM_H_
diff --git a/include/wx/html/htmlcell.h b/include/wx/html/htmlcell.h
index 3edeabacc3..1126c3e269 100644
--- a/include/wx/html/htmlcell.h
+++ b/include/wx/html/htmlcell.h
@@ -5,7 +5,7 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999-2003 Vaclav Slavik
-// Licence:     wxWindows Licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/html/htmldefs.h b/include/wx/html/htmldefs.h
index 04697b31f3..035491b9fd 100644
--- a/include/wx/html/htmldefs.h
+++ b/include/wx/html/htmldefs.h
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
-// Licence:     wxWindows Licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/html/htmlfilt.h b/include/wx/html/htmlfilt.h
index 39435ac74f..527368ee30 100644
--- a/include/wx/html/htmlfilt.h
+++ b/include/wx/html/htmlfilt.h
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
-// Licence:     wxWindows Licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/html/htmlpars.h b/include/wx/html/htmlpars.h
index 3188d4925a..af07d92fe7 100644
--- a/include/wx/html/htmlpars.h
+++ b/include/wx/html/htmlpars.h
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
-// Licence:     wxWindows Licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/html/htmlproc.h b/include/wx/html/htmlproc.h
index 4b148ecbca..c3ed535644 100644
--- a/include/wx/html/htmlproc.h
+++ b/include/wx/html/htmlproc.h
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vaclav Slavik
-// Licence:     wxWindows Licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/html/htmltag.h b/include/wx/html/htmltag.h
index f09efd74b1..d0e772e57a 100644
--- a/include/wx/html/htmltag.h
+++ b/include/wx/html/htmltag.h
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
-// Licence:     wxWindows Licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/html/htmlwin.h b/include/wx/html/htmlwin.h
index 0e4fab1eda..d05a6389c3 100644
--- a/include/wx/html/htmlwin.h
+++ b/include/wx/html/htmlwin.h
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
-// Licence:     wxWindows Licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/html/htmprint.h b/include/wx/html/htmprint.h
index 1ebf5a728a..3255dba4b9 100644
--- a/include/wx/html/htmprint.h
+++ b/include/wx/html/htmprint.h
@@ -5,7 +5,7 @@
 // Created:     25/09/99
 // RCS-ID:      $Id$
 // Copyright:   (c)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_HTMPRINT_H_
@@ -106,7 +106,7 @@ enum {
 
 //--------------------------------------------------------------------------------
 // wxHtmlPrintout
-//                  This class is derived from standard wxWindows printout class
+//                  This class is derived from standard wxWidgets printout class
 //                  and is used to print HTML documents.
 //--------------------------------------------------------------------------------
 
diff --git a/include/wx/html/m_templ.h b/include/wx/html/m_templ.h
index 7dc0e16227..1ee4a8e81d 100644
--- a/include/wx/html/m_templ.h
+++ b/include/wx/html/m_templ.h
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) Vaclav Slavik
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 /*
diff --git a/include/wx/html/webkit.h b/include/wx/html/webkit.h
index b0656d9222..7059855c20 100755
--- a/include/wx/html/webkit.h
+++ b/include/wx/html/webkit.h
@@ -6,7 +6,7 @@
 // Created:     2004-4-16
 // RCS-ID:      $Id$
 // Copyright:   (c) Jethro Grassie / Kevin Ollivier
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_WEBKIT_H
diff --git a/include/wx/html/winpars.h b/include/wx/html/winpars.h
index e7417a9434..4487c87c93 100644
--- a/include/wx/html/winpars.h
+++ b/include/wx/html/winpars.h
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
-// Licence:     wxWindows Licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/htmllbox.h b/include/wx/htmllbox.h
index 48e944e1ef..8194548e17 100644
--- a/include/wx/htmllbox.h
+++ b/include/wx/htmllbox.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     31.05.03
 // RCS-ID:      $Id$
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_HTMLLBOX_H_
diff --git a/include/wx/iconbndl.h b/include/wx/iconbndl.h
index f73684f75d..869f93e3c2 100644
--- a/include/wx/iconbndl.h
+++ b/include/wx/iconbndl.h
@@ -6,7 +6,7 @@
 // Created:     23.03.02
 // RCS-ID:      $Id$
 // Copyright:   (c) Mattia Barbon
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_ICONBNDL_H_
diff --git a/include/wx/iconloc.h b/include/wx/iconloc.h
index bc1c359a45..262cfb4036 100644
--- a/include/wx/iconloc.h
+++ b/include/wx/iconloc.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     21.06.2003
 // RCS-ID:      $Id$
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_ICONLOC_H_
diff --git a/include/wx/imagbmp.h b/include/wx/imagbmp.h
index 8865193d9d..a506be804e 100644
--- a/include/wx/imagbmp.h
+++ b/include/wx/imagbmp.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling, Chris Elliott
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling, Chris Elliott
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_IMAGBMP_H_
diff --git a/include/wx/image.h b/include/wx/image.h
index 91217cd666..afb94f2ef4 100644
--- a/include/wx/image.h
+++ b/include/wx/image.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_IMAGE_H_
diff --git a/include/wx/imaggif.h b/include/wx/imaggif.h
index 2a6affdda7..e2be75a93b 100644
--- a/include/wx/imaggif.h
+++ b/include/wx/imaggif.h
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik & Guillermo Rodriguez Garcia
 // RCS-ID:      $Id$
 // Copyright:   (c) Guillermo Rodriguez Garcia
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_IMAGGIF_H_
diff --git a/include/wx/imagiff.h b/include/wx/imagiff.h
index 93c3822466..119c06caef 100644
--- a/include/wx/imagiff.h
+++ b/include/wx/imagiff.h
@@ -4,7 +4,7 @@
 // Author:      Steffen Gutmann
 // RCS-ID:      $Id$
 // Copyright:   (c) Steffen Gutmann, 2002
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_IMAGE_IFF_H_
diff --git a/include/wx/imagjpeg.h b/include/wx/imagjpeg.h
index 07a1095c1b..154b29cbec 100644
--- a/include/wx/imagjpeg.h
+++ b/include/wx/imagjpeg.h
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) Vaclav Slavik
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_IMAGJPEG_H_
diff --git a/include/wx/imagpcx.h b/include/wx/imagpcx.h
index 76807996b2..6c68cda46d 100644
--- a/include/wx/imagpcx.h
+++ b/include/wx/imagpcx.h
@@ -4,7 +4,7 @@
 // Author:      Guillermo Rodriguez Garcia <guille@iies.es>
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Guillermo Rodriguez Garcia
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_IMAGPCX_H_
diff --git a/include/wx/imagpng.h b/include/wx/imagpng.h
index 2e0d07be7c..8ff6049382 100644
--- a/include/wx/imagpng.h
+++ b/include/wx/imagpng.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_IMAGPNG_H_
diff --git a/include/wx/imagpnm.h b/include/wx/imagpnm.h
index 2d1222ed3b..4a41f8a809 100644
--- a/include/wx/imagpnm.h
+++ b/include/wx/imagpnm.h
@@ -4,7 +4,7 @@
 // Author:      Sylvain Bougnoux
 // RCS-ID:      $Id$
 // Copyright:   (c) Sylvain Bougnoux
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_IMAGPNM_H_
diff --git a/include/wx/imagtiff.h b/include/wx/imagtiff.h
index e027ff0b64..2ad05614ac 100644
--- a/include/wx/imagtiff.h
+++ b/include/wx/imagtiff.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_IMAGTIFF_H_
diff --git a/include/wx/imagxpm.h b/include/wx/imagxpm.h
index c4ae5e262b..8447fdb1b3 100644
--- a/include/wx/imagxpm.h
+++ b/include/wx/imagxpm.h
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vaclav Slavik
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_IMAGXPM_H_
diff --git a/include/wx/init.h b/include/wx/init.h
index 5824719e26..6f7894eb42 100644
--- a/include/wx/init.h
+++ b/include/wx/init.h
@@ -1,12 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        wx/init.h
-// Purpose:     wxWindows initialization and finalization functions
+// Purpose:     wxWidgets initialization and finalization functions
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     29.06.2003
 // RCS-ID:      $Id$
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_INIT_H_
@@ -19,7 +19,7 @@
 // ----------------------------------------------------------------------------
 
 // do common initialization, return true if ok (in this case wxEntryCleanup
-// must be called later), otherwise the program can't use wxWindows at all
+// must be called later), otherwise the program can't use wxWidgets at all
 //
 // this function also creates wxTheApp as a side effect, if IMPLEMENT_APP
 // hadn't been used a dummy default application object is created
diff --git a/include/wx/intl.h b/include/wx/intl.h
index 8a72c61796..513f4e12d8 100644
--- a/include/wx/intl.h
+++ b/include/wx/intl.h
@@ -1,13 +1,13 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/intl.h
-// Purpose:     Internationalization and localisation for wxWindows
+// Purpose:     Internationalization and localisation for wxWidgets
 // Author:      Vadim Zeitlin
 // Modified by: Michael N. Filippov <michael@idisys.iae.nsk.su>
 //              (2003/09/30 - plural forms support)
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_INTL_H_
diff --git a/include/wx/iosfwrap.h b/include/wx/iosfwrap.h
index 396a1f6d77..3e9e99a115 100644
--- a/include/wx/iosfwrap.h
+++ b/include/wx/iosfwrap.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     18.12.2002
 // RCS-ID:      $Id$
-// Copyright:   wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   wxWidgets team
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #if wxUSE_STD_IOSTREAM
diff --git a/include/wx/ioswrap.h b/include/wx/ioswrap.h
index 8fb05a1579..518f6b7ee2 100644
--- a/include/wx/ioswrap.h
+++ b/include/wx/ioswrap.h
@@ -6,7 +6,7 @@
 // Created:     03.02.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #if wxUSE_STD_IOSTREAM
diff --git a/include/wx/ipc.h b/include/wx/ipc.h
index c096924fec..f6aa8567c3 100644
--- a/include/wx/ipc.h
+++ b/include/wx/ipc.h
@@ -6,7 +6,7 @@
 // Created:     15.04.02
 // RCS-ID:      $Id$
 // Copyright:   (c) 2002 Vadim Zeitlin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Set wxUSE_DDE_FOR_IPC to 1 to use DDE for IPC under Windows. If it is set to
diff --git a/include/wx/ipcbase.h b/include/wx/ipcbase.h
index 61969b4de3..6d3f034fe7 100644
--- a/include/wx/ipcbase.h
+++ b/include/wx/ipcbase.h
@@ -6,7 +6,7 @@
 // Created:     4/1/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_IPCBASEH__
diff --git a/include/wx/layout.h b/include/wx/layout.h
index d321287720..26ca1119ef 100644
--- a/include/wx/layout.h
+++ b/include/wx/layout.h
@@ -6,7 +6,7 @@
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_LAYOUTH__
diff --git a/include/wx/list.h b/include/wx/list.h
index 6be233d821..c53d437a7b 100644
--- a/include/wx/list.h
+++ b/include/wx/list.h
@@ -6,7 +6,7 @@
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 /*
diff --git a/include/wx/listbase.h b/include/wx/listbase.h
index 93fe3666ff..f9d9f3a9b2 100644
--- a/include/wx/listbase.h
+++ b/include/wx/listbase.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     04.12.99
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_LISTBASE_H_BASE_
diff --git a/include/wx/listbook.h b/include/wx/listbook.h
index fe6b1ba3bb..824656b619 100644
--- a/include/wx/listbook.h
+++ b/include/wx/listbook.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     19.08.03
 // RCS-ID:      $Id$
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_LISTBOOK_H_
diff --git a/include/wx/listbox.h b/include/wx/listbox.h
index 66f39ed4bf..8293a10791 100644
--- a/include/wx/listbox.h
+++ b/include/wx/listbox.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     22.10.99
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_LISTBOX_H_BASE_
diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h
index 86f7d56b01..3c9d8a6077 100644
--- a/include/wx/listctrl.h
+++ b/include/wx/listctrl.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     04.12.99
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_LISTCTRL_H_BASE_
diff --git a/include/wx/listimpl.cpp b/include/wx/listimpl.cpp
index eeab9cf2b0..280ad61cf7 100644
--- a/include/wx/listimpl.cpp
+++ b/include/wx/listimpl.cpp
@@ -6,7 +6,7 @@
 // Created:     16/11/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin
-// Licence:     wxWindows license
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if wxUSE_STL
diff --git a/include/wx/log.h b/include/wx/log.h
index eb7a58c98a..dcb6927b60 100644
--- a/include/wx/log.h
+++ b/include/wx/log.h
@@ -6,7 +6,7 @@
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_LOG_H_
diff --git a/include/wx/longlong.h b/include/wx/longlong.h
index 9b4a314929..163a98abc1 100644
--- a/include/wx/longlong.h
+++ b/include/wx/longlong.h
@@ -7,7 +7,7 @@
 // Created:     10.02.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_LONGLONG_H
@@ -47,7 +47,7 @@
         #pragma warning "Your compiler does not appear to support 64 bit "\
                         "integers, using emulation class instead.\n" \
                         "Please report your compiler version to " \
-                        "wx-dev@lists.wxwindows.org!"
+                        "wx-dev@lists.wxwidgets.org!"
     #endif
 
     #define wxUSE_LONGLONG_WX 1
diff --git a/include/wx/mac/aga.h b/include/wx/mac/aga.h
index 5868b3f8ee..b354afe3d2 100644
--- a/include/wx/mac/aga.h
+++ b/include/wx/mac/aga.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/mac/carbon/accel.h b/include/wx/mac/carbon/accel.h
index 25acc73bea..b576000a8f 100644
--- a/include/wx/mac/carbon/accel.h
+++ b/include/wx/mac/carbon/accel.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_ACCEL_H_
diff --git a/include/wx/mac/carbon/aga.h b/include/wx/mac/carbon/aga.h
index 5868b3f8ee..b354afe3d2 100644
--- a/include/wx/mac/carbon/aga.h
+++ b/include/wx/mac/carbon/aga.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/mac/carbon/app.h b/include/wx/mac/carbon/app.h
index 15391015a8..de72040f3a 100644
--- a/include/wx/mac/carbon/app.h
+++ b/include/wx/mac/carbon/app.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_APP_H_
diff --git a/include/wx/mac/carbon/apptbase.h b/include/wx/mac/carbon/apptbase.h
index 84c68cd0ee..0411dcf09a 100644
--- a/include/wx/mac/carbon/apptbase.h
+++ b/include/wx/mac/carbon/apptbase.h
@@ -5,8 +5,8 @@
 // Modified by: Stefan Csomor
 // Created:     23.06.2003
 // RCS-ID:      $Id$
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MAC_APPTBASE_H_
diff --git a/include/wx/mac/carbon/apptrait.h b/include/wx/mac/carbon/apptrait.h
index 88b424ab1a..2e7da7b290 100644
--- a/include/wx/mac/carbon/apptrait.h
+++ b/include/wx/mac/carbon/apptrait.h
@@ -5,8 +5,8 @@
 // Modified by: Stefan Csomor
 // Created:     23.06.2003
 // RCS-ID:      $Id$
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MAC_APPTRAIT_H_
diff --git a/include/wx/mac/carbon/bitmap.h b/include/wx/mac/carbon/bitmap.h
index a8e2439362..428c0e19a9 100644
--- a/include/wx/mac/carbon/bitmap.h
+++ b/include/wx/mac/carbon/bitmap.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_BITMAP_H_
diff --git a/include/wx/mac/carbon/bmpbuttn.h b/include/wx/mac/carbon/bmpbuttn.h
index 648b7472c0..9ac9fa4076 100644
--- a/include/wx/mac/carbon/bmpbuttn.h
+++ b/include/wx/mac/carbon/bmpbuttn.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_BMPBUTTN_H_
diff --git a/include/wx/mac/carbon/brush.h b/include/wx/mac/carbon/brush.h
index 7684cf241e..ac1a9ea8f7 100644
--- a/include/wx/mac/carbon/brush.h
+++ b/include/wx/mac/carbon/brush.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_BRUSH_H_
diff --git a/include/wx/mac/carbon/button.h b/include/wx/mac/carbon/button.h
index 713b93da96..a561972e58 100644
--- a/include/wx/mac/carbon/button.h
+++ b/include/wx/mac/carbon/button.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_BUTTON_H_
diff --git a/include/wx/mac/carbon/checkbox.h b/include/wx/mac/carbon/checkbox.h
index 7dcfeb8f9b..cb75a1b851 100644
--- a/include/wx/mac/carbon/checkbox.h
+++ b/include/wx/mac/carbon/checkbox.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CHECKBOX_H_
diff --git a/include/wx/mac/carbon/checklst.h b/include/wx/mac/carbon/checklst.h
index df3f235c38..630715e0a3 100644
--- a/include/wx/mac/carbon/checklst.h
+++ b/include/wx/mac/carbon/checklst.h
@@ -7,7 +7,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CHECKLST_H_
diff --git a/include/wx/mac/carbon/chkconf.h b/include/wx/mac/carbon/chkconf.h
index e7c5d596c5..c35ffb506b 100644
--- a/include/wx/mac/carbon/chkconf.h
+++ b/include/wx/mac/carbon/chkconf.h
@@ -6,7 +6,7 @@
  * Created:     01/02/97
  * RCS-ID:      $Id$
  * Copyright:   (c) Julian Smart
- * Licence:     wxWindows licence
+ * Licence:     wxWidgets licence
  */
 
 #ifndef _WX_MAC_CHKCONF_H_
diff --git a/include/wx/mac/carbon/choice.h b/include/wx/mac/carbon/choice.h
index 7e9b5abcc0..99e2a8762d 100644
--- a/include/wx/mac/carbon/choice.h
+++ b/include/wx/mac/carbon/choice.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CHOICE_H_
diff --git a/include/wx/mac/carbon/clipbrd.h b/include/wx/mac/carbon/clipbrd.h
index 34bb3e3129..0a3c433e4b 100644
--- a/include/wx/mac/carbon/clipbrd.h
+++ b/include/wx/mac/carbon/clipbrd.h
@@ -2,14 +2,14 @@
 // Name:        clipbrd.h
 // Purpose:     Clipboard functionality.
 //              Note: this functionality is under review, and
-//              is derived from wxWindows 1.xx code. Please contact
-//              the wxWindows developers for further information.
+//              is derived from wxWidgets 1.xx code. Please contact
+//              the wxWidgets developers for further information.
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CLIPBRD_H_
diff --git a/include/wx/mac/carbon/colordlg.h b/include/wx/mac/carbon/colordlg.h
index 443ba6fd68..1acae2b35b 100644
--- a/include/wx/mac/carbon/colordlg.h
+++ b/include/wx/mac/carbon/colordlg.h
@@ -7,7 +7,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COLORDLG_H_
diff --git a/include/wx/mac/carbon/colour.h b/include/wx/mac/carbon/colour.h
index 158e631d64..c7e927302a 100644
--- a/include/wx/mac/carbon/colour.h
+++ b/include/wx/mac/carbon/colour.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COLOUR_H_
diff --git a/include/wx/mac/carbon/combobox.h b/include/wx/mac/carbon/combobox.h
index 14d9b055a3..400029d0ec 100644
--- a/include/wx/mac/carbon/combobox.h
+++ b/include/wx/mac/carbon/combobox.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COMBOBOX_H_
diff --git a/include/wx/mac/carbon/config_xcode.h b/include/wx/mac/carbon/config_xcode.h
index f05fb2b245..fd2bc6ae78 100644
--- a/include/wx/mac/carbon/config_xcode.h
+++ b/include/wx/mac/carbon/config_xcode.h
@@ -5,8 +5,8 @@
 // Modified by: 
 // Created:     29.04.04
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // from config.log confdefs
@@ -67,10 +67,10 @@
 #define HAVE_X11_XKBLIB_H 1
 #define HAVE_X11_XLIB_H 1
 #define ICONV_CONST const
-#define PACKAGE_BUGREPORT "wx-dev@lists.wxwindows.org"
-#define PACKAGE_NAME "wxWindows"
-#define PACKAGE_STRING "wxWindows 2.5.1"
-#define PACKAGE_TARNAME "wxwindows"
+#define PACKAGE_BUGREPORT "wx-dev@lists.wxwidgets.org"
+#define PACKAGE_NAME "wxWidgets"
+#define PACKAGE_STRING "wxWidgets 2.5.1"
+#define PACKAGE_TARNAME "wxwidgets"
 #define PACKAGE_VERSION "2.5.1"
 #define SIZEOF_CHAR 1
 #define SIZEOF_INT 4
diff --git a/include/wx/mac/carbon/control.h b/include/wx/mac/carbon/control.h
index 201ce9f0ed..459836ab56 100644
--- a/include/wx/mac/carbon/control.h
+++ b/include/wx/mac/carbon/control.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CONTROL_H_
diff --git a/include/wx/mac/carbon/cursor.h b/include/wx/mac/carbon/cursor.h
index c8414a4ee0..c24987759e 100644
--- a/include/wx/mac/carbon/cursor.h
+++ b/include/wx/mac/carbon/cursor.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CURSOR_H_
diff --git a/include/wx/mac/carbon/dataform.h b/include/wx/mac/carbon/dataform.h
index 6e8846c6da..cd623abee3 100644
--- a/include/wx/mac/carbon/dataform.h
+++ b/include/wx/mac/carbon/dataform.h
@@ -6,7 +6,7 @@
 // Created:     10/21/99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MAC_DATAFORM_H
diff --git a/include/wx/mac/carbon/dataobj.h b/include/wx/mac/carbon/dataobj.h
index 15b58e3a37..074ada9014 100644
--- a/include/wx/mac/carbon/dataobj.h
+++ b/include/wx/mac/carbon/dataobj.h
@@ -6,7 +6,7 @@
 // Created:     10/21/99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998, 1999 Vadim Zeitlin, Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MAC_DATAOBJ_H_
diff --git a/include/wx/mac/carbon/dataobj2.h b/include/wx/mac/carbon/dataobj2.h
index 64b0ac084a..f0f457b562 100644
--- a/include/wx/mac/carbon/dataobj2.h
+++ b/include/wx/mac/carbon/dataobj2.h
@@ -6,7 +6,7 @@
 // Created:     10/21/99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998, 1999 Vadim Zeitlin, Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GTK_DATAOBJ2_H_
diff --git a/include/wx/mac/carbon/dc.h b/include/wx/mac/carbon/dc.h
index 5fc2601e55..564f295883 100644
--- a/include/wx/mac/carbon/dc.h
+++ b/include/wx/mac/carbon/dc.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DC_H_
diff --git a/include/wx/mac/carbon/dcclient.h b/include/wx/mac/carbon/dcclient.h
index 8e01314084..a7d6b87240 100644
--- a/include/wx/mac/carbon/dcclient.h
+++ b/include/wx/mac/carbon/dcclient.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCCLIENT_H_
diff --git a/include/wx/mac/carbon/dcmemory.h b/include/wx/mac/carbon/dcmemory.h
index c8ea44e5ad..0d8b1402bb 100644
--- a/include/wx/mac/carbon/dcmemory.h
+++ b/include/wx/mac/carbon/dcmemory.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCMEMORY_H_
diff --git a/include/wx/mac/carbon/dcprint.h b/include/wx/mac/carbon/dcprint.h
index 0e2b5bcf0d..345be35fb9 100644
--- a/include/wx/mac/carbon/dcprint.h
+++ b/include/wx/mac/carbon/dcprint.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCPRINT_H_
diff --git a/include/wx/mac/carbon/dcscreen.h b/include/wx/mac/carbon/dcscreen.h
index ab83b37618..53e9c79e67 100644
--- a/include/wx/mac/carbon/dcscreen.h
+++ b/include/wx/mac/carbon/dcscreen.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCSCREEN_H_
diff --git a/include/wx/mac/carbon/dialog.h b/include/wx/mac/carbon/dialog.h
index 490cd0af5c..0f8593aae9 100644
--- a/include/wx/mac/carbon/dialog.h
+++ b/include/wx/mac/carbon/dialog.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DIALOG_H_
diff --git a/include/wx/mac/carbon/dirdlg.h b/include/wx/mac/carbon/dirdlg.h
index 734292ade3..556f03b51d 100644
--- a/include/wx/mac/carbon/dirdlg.h
+++ b/include/wx/mac/carbon/dirdlg.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DIRDLG_H_
diff --git a/include/wx/mac/carbon/display.h b/include/wx/mac/carbon/display.h
index 060c9c7ef4..9f9da55551 100644
--- a/include/wx/mac/carbon/display.h
+++ b/include/wx/mac/carbon/display.h
@@ -5,8 +5,8 @@
 // Modified by: Royce Mitchell III
 // Created:     06/21/02
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MAC_DISPLAY_H_
diff --git a/include/wx/mac/carbon/dnd.h b/include/wx/mac/carbon/dnd.h
index 989a977628..626c1dbc03 100644
--- a/include/wx/mac/carbon/dnd.h
+++ b/include/wx/mac/carbon/dnd.h
@@ -4,7 +4,7 @@
 // Author:      Stefan Csomor
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DND_H_
diff --git a/include/wx/mac/carbon/filedlg.h b/include/wx/mac/carbon/filedlg.h
index 4cc0387a08..dade16105f 100644
--- a/include/wx/mac/carbon/filedlg.h
+++ b/include/wx/mac/carbon/filedlg.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FILEDLG_H_
diff --git a/include/wx/mac/carbon/font.h b/include/wx/mac/carbon/font.h
index 5968f65705..d18f99e5d4 100644
--- a/include/wx/mac/carbon/font.h
+++ b/include/wx/mac/carbon/font.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FONT_H_
diff --git a/include/wx/mac/carbon/fontdlg.h b/include/wx/mac/carbon/fontdlg.h
index 3d654b56c8..aefc2de26e 100644
--- a/include/wx/mac/carbon/fontdlg.h
+++ b/include/wx/mac/carbon/fontdlg.h
@@ -7,7 +7,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FONTDLG_H_
diff --git a/include/wx/mac/carbon/frame.h b/include/wx/mac/carbon/frame.h
index 1620419b9b..87fedd3a08 100644
--- a/include/wx/mac/carbon/frame.h
+++ b/include/wx/mac/carbon/frame.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FRAME_H_
diff --git a/include/wx/mac/carbon/gauge.h b/include/wx/mac/carbon/gauge.h
index 4eb5db3a69..e509afadf8 100644
--- a/include/wx/mac/carbon/gauge.h
+++ b/include/wx/mac/carbon/gauge.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GAUGE_H_
diff --git a/include/wx/mac/carbon/gdiobj.h b/include/wx/mac/carbon/gdiobj.h
index 1ad618bf84..ba1caca3d0 100644
--- a/include/wx/mac/carbon/gdiobj.h
+++ b/include/wx/mac/carbon/gdiobj.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GDIOBJ_H_
diff --git a/include/wx/mac/carbon/glcanvas.h b/include/wx/mac/carbon/glcanvas.h
index 135ef4c71b..2eeb5c379a 100644
--- a/include/wx/mac/carbon/glcanvas.h
+++ b/include/wx/mac/carbon/glcanvas.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        glcanvas.h
-// Purpose:     wxGLCanvas, for using OpenGL with wxWindows under Macintosh
+// Purpose:     wxGLCanvas, for using OpenGL with wxWidgets under Macintosh
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/include/wx/mac/carbon/helpxxxx.h b/include/wx/mac/carbon/helpxxxx.h
index a33c0737a5..3a64d04462 100644
--- a/include/wx/mac/carbon/helpxxxx.h
+++ b/include/wx/mac/carbon/helpxxxx.h
@@ -7,7 +7,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_HELPXXXX_H_
diff --git a/include/wx/mac/carbon/icon.h b/include/wx/mac/carbon/icon.h
index bdc0ff755f..2a1c001690 100644
--- a/include/wx/mac/carbon/icon.h
+++ b/include/wx/mac/carbon/icon.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_ICON_H_
diff --git a/include/wx/mac/carbon/imaglist.h b/include/wx/mac/carbon/imaglist.h
index e8fbf6e713..2f80215710 100644
--- a/include/wx/mac/carbon/imaglist.h
+++ b/include/wx/mac/carbon/imaglist.h
@@ -8,7 +8,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_IMAGLIST_H_
diff --git a/include/wx/mac/carbon/joystick.h b/include/wx/mac/carbon/joystick.h
index 6db596e3b3..627c0f8a70 100644
--- a/include/wx/mac/carbon/joystick.h
+++ b/include/wx/mac/carbon/joystick.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_JOYSTICK_H_
diff --git a/include/wx/mac/carbon/listbox.h b/include/wx/mac/carbon/listbox.h
index 54d17f73fb..71b8dca912 100644
--- a/include/wx/mac/carbon/listbox.h
+++ b/include/wx/mac/carbon/listbox.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/mac/carbon/listctrl.h b/include/wx/mac/carbon/listctrl.h
index 196f97add1..713d01ad7e 100644
--- a/include/wx/mac/carbon/listctrl.h
+++ b/include/wx/mac/carbon/listctrl.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_LISTCTRL_H_
@@ -57,7 +57,7 @@
     which item. Each image in an image list can contain a mask, and can be made out
     of either a bitmap, two bitmaps or an icon. See ImagList.h for more details.
 
-    Notifications are passed via the wxWindows 2.0 event system.
+    Notifications are passed via the wxWidgets 2.0 event system.
 
     See the sample wxListCtrl app for API usage.
 
@@ -285,7 +285,7 @@ class WXDLLEXPORT wxListCtrl: public wxControl
   // Returns the item or -1 if unsuccessful.
   long GetNextItem(long item, int geometry = wxLIST_NEXT_ALL, int state = wxLIST_STATE_DONTCARE) const ;
 
-  // Implementation: converts wxWindows style to MSW style.
+  // Implementation: converts wxWidgets style to MSW style.
   // Can be a single style flag or a bit list.
   // oldStyle is 'normalised' so that it doesn't contain
   // conflicting styles.
diff --git a/include/wx/mac/carbon/mdi.h b/include/wx/mac/carbon/mdi.h
index 1114ee525d..febc243f29 100644
--- a/include/wx/mac/carbon/mdi.h
+++ b/include/wx/mac/carbon/mdi.h
@@ -8,7 +8,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MDI_H_
@@ -57,7 +57,7 @@ public:
   // Mac OS activate event
   virtual void MacActivate(long timestamp, bool activating);
 
-  // wxWindows activate event
+  // wxWidgets activate event
   void OnActivate(wxActivateEvent& event);
   void OnSysColourChanged(wxSysColourChangedEvent& event);
 
diff --git a/include/wx/mac/carbon/menu.h b/include/wx/mac/carbon/menu.h
index 5718b3950b..b9c6d7b687 100644
--- a/include/wx/mac/carbon/menu.h
+++ b/include/wx/mac/carbon/menu.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MENU_H_
diff --git a/include/wx/mac/carbon/menuitem.h b/include/wx/mac/carbon/menuitem.h
index 7e78a57f63..98aa5745b5 100644
--- a/include/wx/mac/carbon/menuitem.h
+++ b/include/wx/mac/carbon/menuitem.h
@@ -6,7 +6,7 @@
 // Created:     11.11.97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef   _MENUITEM_H
diff --git a/include/wx/mac/carbon/metafile.h b/include/wx/mac/carbon/metafile.h
index 2b528efeca..02c76aa61b 100644
--- a/include/wx/mac/carbon/metafile.h
+++ b/include/wx/mac/carbon/metafile.h
@@ -8,7 +8,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/mac/carbon/mimetype.h b/include/wx/mac/carbon/mimetype.h
index a65acd964c..884836e98c 100644
--- a/include/wx/mac/carbon/mimetype.h
+++ b/include/wx/mac/carbon/mimetype.h
@@ -6,7 +6,7 @@
 // Created:     23.09.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence (part of wxExtra library)
+// Licence:     wxWidgets licence (part of wxExtra library)
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _MIMETYPE_IMPL_H
diff --git a/include/wx/mac/carbon/minifram.h b/include/wx/mac/carbon/minifram.h
index 7f43f953b3..7f41821ce1 100644
--- a/include/wx/mac/carbon/minifram.h
+++ b/include/wx/mac/carbon/minifram.h
@@ -8,7 +8,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MINIFRAM_H_
diff --git a/include/wx/mac/carbon/msgdlg.h b/include/wx/mac/carbon/msgdlg.h
index 1a869f0855..49afc5d218 100644
--- a/include/wx/mac/carbon/msgdlg.h
+++ b/include/wx/mac/carbon/msgdlg.h
@@ -7,7 +7,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MSGBOXDLG_H_
diff --git a/include/wx/mac/carbon/notebook.h b/include/wx/mac/carbon/notebook.h
index 63356daf75..de84c12a65 100644
--- a/include/wx/mac/carbon/notebook.h
+++ b/include/wx/mac/carbon/notebook.h
@@ -5,7 +5,7 @@
 // Modified by:
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_NOTEBOOK_H_
diff --git a/include/wx/mac/carbon/palette.h b/include/wx/mac/carbon/palette.h
index 74f9a4dd30..ad4a3d222d 100644
--- a/include/wx/mac/carbon/palette.h
+++ b/include/wx/mac/carbon/palette.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PALETTE_H_
diff --git a/include/wx/mac/carbon/pen.h b/include/wx/mac/carbon/pen.h
index 50afa0d9c4..f3b4ddffde 100644
--- a/include/wx/mac/carbon/pen.h
+++ b/include/wx/mac/carbon/pen.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PEN_H_
diff --git a/include/wx/mac/carbon/pnghand.h b/include/wx/mac/carbon/pnghand.h
index 19271c4705..0dab2fa1a6 100644
--- a/include/wx/mac/carbon/pnghand.h
+++ b/include/wx/mac/carbon/pnghand.h
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/include/wx/mac/carbon/printdlg.h b/include/wx/mac/carbon/printdlg.h
index 6bb45dad2f..3c6281940c 100644
--- a/include/wx/mac/carbon/printdlg.h
+++ b/include/wx/mac/carbon/printdlg.h
@@ -8,7 +8,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PRINTDLG_H_
diff --git a/include/wx/mac/carbon/printmac.h b/include/wx/mac/carbon/printmac.h
index c5eb431026..844f2d0db2 100644
--- a/include/wx/mac/carbon/printmac.h
+++ b/include/wx/mac/carbon/printmac.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PRINTWIN_H_
diff --git a/include/wx/mac/carbon/private.h b/include/wx/mac/carbon/private.h
index 9ba1547d01..024fad2ac5 100644
--- a/include/wx/mac/carbon/private.h
+++ b/include/wx/mac/carbon/private.h
@@ -1,14 +1,14 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        private.h
 // Purpose:     Private declarations: as this header is only included by
-//              wxWindows itself, it may contain identifiers which don't start
+//              wxWidgets itself, it may contain identifiers which don't start
 //              with "wx".
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PRIVATE_H_
diff --git a/include/wx/mac/carbon/private/print.h b/include/wx/mac/carbon/private/print.h
index cf46612db9..b8db2f6edd 100644
--- a/include/wx/mac/carbon/private/print.h
+++ b/include/wx/mac/carbon/private/print.h
@@ -6,7 +6,7 @@
 // Created:     03/02/99
 // RCS-ID:      $Id: 
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MAC_PRIVATE_PRINT_H_
diff --git a/include/wx/mac/carbon/radiobox.h b/include/wx/mac/carbon/radiobox.h
index c9642e2deb..a3e5f38802 100644
--- a/include/wx/mac/carbon/radiobox.h
+++ b/include/wx/mac/carbon/radiobox.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_RADIOBOX_H_
@@ -58,7 +58,7 @@ public:
              const wxValidator& val = wxDefaultValidator,
              const wxString& name = wxRadioBoxNameStr);
 
-// Specific functions (in wxWindows2 reference)
+// Specific functions (in wxWidgets2 reference)
     virtual void SetSelection(int item);
     virtual int GetSelection() const;
 
diff --git a/include/wx/mac/carbon/radiobut.h b/include/wx/mac/carbon/radiobut.h
index c0732eb32f..33f4030600 100644
--- a/include/wx/mac/carbon/radiobut.h
+++ b/include/wx/mac/carbon/radiobut.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_RADIOBUT_H_
diff --git a/include/wx/mac/carbon/region.h b/include/wx/mac/carbon/region.h
index ab04dd8975..7bfa096d09 100644
--- a/include/wx/mac/carbon/region.h
+++ b/include/wx/mac/carbon/region.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_REGION_H_
diff --git a/include/wx/mac/carbon/scrolbar.h b/include/wx/mac/carbon/scrolbar.h
index 728049089a..eba51e47f9 100644
--- a/include/wx/mac/carbon/scrolbar.h
+++ b/include/wx/mac/carbon/scrolbar.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SCROLBAR_H_
diff --git a/include/wx/mac/carbon/slider.h b/include/wx/mac/carbon/slider.h
index b0f65bd36b..f40538e0af 100644
--- a/include/wx/mac/carbon/slider.h
+++ b/include/wx/mac/carbon/slider.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SLIDER_H_
diff --git a/include/wx/mac/carbon/sound.h b/include/wx/mac/carbon/sound.h
index 18a84d101b..70c25c2016 100644
--- a/include/wx/mac/carbon/sound.h
+++ b/include/wx/mac/carbon/sound.h
@@ -7,7 +7,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SOUND_H_
diff --git a/include/wx/mac/carbon/spinbutt.h b/include/wx/mac/carbon/spinbutt.h
index 8c9295a5d2..a91b0cd87b 100644
--- a/include/wx/mac/carbon/spinbutt.h
+++ b/include/wx/mac/carbon/spinbutt.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SPINBUTT_H_
diff --git a/include/wx/mac/carbon/spinctrl.h b/include/wx/mac/carbon/spinctrl.h
index 9ffd5d1ee2..e7c941b14a 100755
--- a/include/wx/mac/carbon/spinctrl.h
+++ b/include/wx/mac/carbon/spinctrl.h
@@ -6,7 +6,7 @@
 // Created:     28.10.99
 // RCS-ID:      $Id$
 // Copyright:   (c) Vadim Zeitlin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MAC_SPINCTRL_H_
diff --git a/include/wx/mac/carbon/statbmp.h b/include/wx/mac/carbon/statbmp.h
index 8a16726c57..146987f0a1 100644
--- a/include/wx/mac/carbon/statbmp.h
+++ b/include/wx/mac/carbon/statbmp.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STATBMP_H_
diff --git a/include/wx/mac/carbon/statbox.h b/include/wx/mac/carbon/statbox.h
index 6dd85bf43d..f916e09f62 100644
--- a/include/wx/mac/carbon/statbox.h
+++ b/include/wx/mac/carbon/statbox.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STATBOX_H_
diff --git a/include/wx/mac/carbon/statline.h b/include/wx/mac/carbon/statline.h
index 911e9f535c..43a8a54df9 100644
--- a/include/wx/mac/carbon/statline.h
+++ b/include/wx/mac/carbon/statline.h
@@ -5,7 +5,7 @@
 // Created:     28.06.99
 // Version:     $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GENERIC_STATLINE_H_
diff --git a/include/wx/mac/carbon/stattext.h b/include/wx/mac/carbon/stattext.h
index c5f41c02c4..c1119e7dfb 100644
--- a/include/wx/mac/carbon/stattext.h
+++ b/include/wx/mac/carbon/stattext.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STATTEXT_H_
diff --git a/include/wx/mac/carbon/statusbr.h b/include/wx/mac/carbon/statusbr.h
index 5fb70f4058..ce973fac67 100644
--- a/include/wx/mac/carbon/statusbr.h
+++ b/include/wx/mac/carbon/statusbr.h
@@ -7,7 +7,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef   _WX_STATBAR_H_
diff --git a/include/wx/mac/carbon/tabctrl.h b/include/wx/mac/carbon/tabctrl.h
index 7a6e14300a..bd2e4c1b55 100644
--- a/include/wx/mac/carbon/tabctrl.h
+++ b/include/wx/mac/carbon/tabctrl.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TABCTRL_H_
diff --git a/include/wx/mac/carbon/taskbarosx.h b/include/wx/mac/carbon/taskbarosx.h
index 9c921c063d..644d89fb1b 100644
--- a/include/wx/mac/carbon/taskbarosx.h
+++ b/include/wx/mac/carbon/taskbarosx.h
@@ -6,7 +6,7 @@
 // Created:     04/04/2003
 // RCS-ID:      $Id$
 // Copyright:   (c) Ryan Norton, 2003
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////
 
 #ifndef _TASKBAR_H_
diff --git a/include/wx/mac/carbon/textctrl.h b/include/wx/mac/carbon/textctrl.h
index a8e14fc864..d14d79e406 100644
--- a/include/wx/mac/carbon/textctrl.h
+++ b/include/wx/mac/carbon/textctrl.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TEXTCTRL_H_
diff --git a/include/wx/mac/carbon/tglbtn.h b/include/wx/mac/carbon/tglbtn.h
index 9b2a592e77..fce4711053 100644
--- a/include/wx/mac/carbon/tglbtn.h
+++ b/include/wx/mac/carbon/tglbtn.h
@@ -7,7 +7,7 @@
 // Created:     08.02.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2004 Stefan Csomor
-// License:     wxWindows License
+// License:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TOGGLEBUTTON_H_
diff --git a/include/wx/mac/carbon/timer.h b/include/wx/mac/carbon/timer.h
index 1d01ea91a4..519c978771 100644
--- a/include/wx/mac/carbon/timer.h
+++ b/include/wx/mac/carbon/timer.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TIMER_H_
diff --git a/include/wx/mac/carbon/toolbar.h b/include/wx/mac/carbon/toolbar.h
index 1aab6d801d..ed2247b61a 100644
--- a/include/wx/mac/carbon/toolbar.h
+++ b/include/wx/mac/carbon/toolbar.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TOOLBAR_H_
diff --git a/include/wx/mac/carbon/tooltip.h b/include/wx/mac/carbon/tooltip.h
index 7bf4ecf440..aab4b80b0b 100644
--- a/include/wx/mac/carbon/tooltip.h
+++ b/include/wx/mac/carbon/tooltip.h
@@ -6,7 +6,7 @@
 // Created:     31.01.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Robert Roebling, Vadim Zeitlin, Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/mac/carbon/toplevel.h b/include/wx/mac/carbon/toplevel.h
index bf854094b9..f43b6b7146 100644
--- a/include/wx/mac/carbon/toplevel.h
+++ b/include/wx/mac/carbon/toplevel.h
@@ -6,7 +6,7 @@
 // Created:     20.09.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MSW_TOPLEVEL_H_
diff --git a/include/wx/mac/carbon/treectrl.h b/include/wx/mac/carbon/treectrl.h
index 306a0105a5..7077070bd4 100644
--- a/include/wx/mac/carbon/treectrl.h
+++ b/include/wx/mac/carbon/treectrl.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TREECTRL_H_
diff --git a/include/wx/mac/carbon/uma.h b/include/wx/mac/carbon/uma.h
index eae90070f6..91f023fc99 100644
--- a/include/wx/mac/carbon/uma.h
+++ b/include/wx/mac/carbon/uma.h
@@ -6,7 +6,7 @@
 // Created:     03/02/99
 // RCS-ID:      $Id:
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef H_UMA
diff --git a/include/wx/mac/carbon/window.h b/include/wx/mac/carbon/window.h
index 1867a32c8f..3ada877748 100644
--- a/include/wx/mac/carbon/window.h
+++ b/include/wx/mac/carbon/window.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_WINDOW_H_
@@ -220,7 +220,7 @@ public:
     virtual wxInt16         MacControlUserPaneFocusProc(wxInt16 action) ;
     virtual void            MacControlUserPaneBackgroundProc(void* info) ;
 
-    // translate wxWindows coords into ones suitable to be passed to
+    // translate wxWidgets coords into ones suitable to be passed to
     // the CreateControl calls
     //
     // returns TRUE if non default coords are returned, FALSE otherwise
diff --git a/include/wx/mac/classic/accel.h b/include/wx/mac/classic/accel.h
index 25acc73bea..b576000a8f 100644
--- a/include/wx/mac/classic/accel.h
+++ b/include/wx/mac/classic/accel.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_ACCEL_H_
diff --git a/include/wx/mac/classic/aga.h b/include/wx/mac/classic/aga.h
index 5868b3f8ee..b354afe3d2 100644
--- a/include/wx/mac/classic/aga.h
+++ b/include/wx/mac/classic/aga.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/mac/classic/app.h b/include/wx/mac/classic/app.h
index efc50cbea2..537828f35a 100644
--- a/include/wx/mac/classic/app.h
+++ b/include/wx/mac/classic/app.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_APP_H_
diff --git a/include/wx/mac/classic/apptbase.h b/include/wx/mac/classic/apptbase.h
index 84c68cd0ee..0411dcf09a 100644
--- a/include/wx/mac/classic/apptbase.h
+++ b/include/wx/mac/classic/apptbase.h
@@ -5,8 +5,8 @@
 // Modified by: Stefan Csomor
 // Created:     23.06.2003
 // RCS-ID:      $Id$
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MAC_APPTBASE_H_
diff --git a/include/wx/mac/classic/apptrait.h b/include/wx/mac/classic/apptrait.h
index 88b424ab1a..2e7da7b290 100644
--- a/include/wx/mac/classic/apptrait.h
+++ b/include/wx/mac/classic/apptrait.h
@@ -5,8 +5,8 @@
 // Modified by: Stefan Csomor
 // Created:     23.06.2003
 // RCS-ID:      $Id$
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MAC_APPTRAIT_H_
diff --git a/include/wx/mac/classic/bitmap.h b/include/wx/mac/classic/bitmap.h
index a8e2439362..428c0e19a9 100644
--- a/include/wx/mac/classic/bitmap.h
+++ b/include/wx/mac/classic/bitmap.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_BITMAP_H_
diff --git a/include/wx/mac/classic/bmpbuttn.h b/include/wx/mac/classic/bmpbuttn.h
index 28a91ed93f..40cfb47d63 100644
--- a/include/wx/mac/classic/bmpbuttn.h
+++ b/include/wx/mac/classic/bmpbuttn.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_BMPBUTTN_H_
diff --git a/include/wx/mac/classic/brush.h b/include/wx/mac/classic/brush.h
index 12e60e06d1..cdb489c0c6 100644
--- a/include/wx/mac/classic/brush.h
+++ b/include/wx/mac/classic/brush.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_BRUSH_H_
diff --git a/include/wx/mac/classic/button.h b/include/wx/mac/classic/button.h
index 23e9044f00..824f0a9e44 100644
--- a/include/wx/mac/classic/button.h
+++ b/include/wx/mac/classic/button.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_BUTTON_H_
diff --git a/include/wx/mac/classic/checkbox.h b/include/wx/mac/classic/checkbox.h
index a426cb734b..5c4e4a1dd1 100644
--- a/include/wx/mac/classic/checkbox.h
+++ b/include/wx/mac/classic/checkbox.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CHECKBOX_H_
diff --git a/include/wx/mac/classic/checklst.h b/include/wx/mac/classic/checklst.h
index 35f3bd885d..31e66d2083 100644
--- a/include/wx/mac/classic/checklst.h
+++ b/include/wx/mac/classic/checklst.h
@@ -7,7 +7,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CHECKLST_H_
diff --git a/include/wx/mac/classic/chkconf.h b/include/wx/mac/classic/chkconf.h
index e7c5d596c5..c35ffb506b 100644
--- a/include/wx/mac/classic/chkconf.h
+++ b/include/wx/mac/classic/chkconf.h
@@ -6,7 +6,7 @@
  * Created:     01/02/97
  * RCS-ID:      $Id$
  * Copyright:   (c) Julian Smart
- * Licence:     wxWindows licence
+ * Licence:     wxWidgets licence
  */
 
 #ifndef _WX_MAC_CHKCONF_H_
diff --git a/include/wx/mac/classic/choice.h b/include/wx/mac/classic/choice.h
index 4c10bab315..936d6e683e 100644
--- a/include/wx/mac/classic/choice.h
+++ b/include/wx/mac/classic/choice.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CHOICE_H_
diff --git a/include/wx/mac/classic/clipbrd.h b/include/wx/mac/classic/clipbrd.h
index 34bb3e3129..0a3c433e4b 100644
--- a/include/wx/mac/classic/clipbrd.h
+++ b/include/wx/mac/classic/clipbrd.h
@@ -2,14 +2,14 @@
 // Name:        clipbrd.h
 // Purpose:     Clipboard functionality.
 //              Note: this functionality is under review, and
-//              is derived from wxWindows 1.xx code. Please contact
-//              the wxWindows developers for further information.
+//              is derived from wxWidgets 1.xx code. Please contact
+//              the wxWidgets developers for further information.
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CLIPBRD_H_
diff --git a/include/wx/mac/classic/colordlg.h b/include/wx/mac/classic/colordlg.h
index 443ba6fd68..1acae2b35b 100644
--- a/include/wx/mac/classic/colordlg.h
+++ b/include/wx/mac/classic/colordlg.h
@@ -7,7 +7,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COLORDLG_H_
diff --git a/include/wx/mac/classic/colour.h b/include/wx/mac/classic/colour.h
index 158e631d64..c7e927302a 100644
--- a/include/wx/mac/classic/colour.h
+++ b/include/wx/mac/classic/colour.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COLOUR_H_
diff --git a/include/wx/mac/classic/combobox.h b/include/wx/mac/classic/combobox.h
index 68b3b02820..1e81ee03f0 100644
--- a/include/wx/mac/classic/combobox.h
+++ b/include/wx/mac/classic/combobox.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COMBOBOX_H_
diff --git a/include/wx/mac/classic/control.h b/include/wx/mac/classic/control.h
index cc588f3861..24668e790a 100644
--- a/include/wx/mac/classic/control.h
+++ b/include/wx/mac/classic/control.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CONTROL_H_
diff --git a/include/wx/mac/classic/cursor.h b/include/wx/mac/classic/cursor.h
index c8414a4ee0..c24987759e 100644
--- a/include/wx/mac/classic/cursor.h
+++ b/include/wx/mac/classic/cursor.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CURSOR_H_
diff --git a/include/wx/mac/classic/dataform.h b/include/wx/mac/classic/dataform.h
index 6e8846c6da..cd623abee3 100644
--- a/include/wx/mac/classic/dataform.h
+++ b/include/wx/mac/classic/dataform.h
@@ -6,7 +6,7 @@
 // Created:     10/21/99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MAC_DATAFORM_H
diff --git a/include/wx/mac/classic/dataobj.h b/include/wx/mac/classic/dataobj.h
index 15b58e3a37..074ada9014 100644
--- a/include/wx/mac/classic/dataobj.h
+++ b/include/wx/mac/classic/dataobj.h
@@ -6,7 +6,7 @@
 // Created:     10/21/99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998, 1999 Vadim Zeitlin, Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MAC_DATAOBJ_H_
diff --git a/include/wx/mac/classic/dataobj2.h b/include/wx/mac/classic/dataobj2.h
index 64b0ac084a..f0f457b562 100644
--- a/include/wx/mac/classic/dataobj2.h
+++ b/include/wx/mac/classic/dataobj2.h
@@ -6,7 +6,7 @@
 // Created:     10/21/99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998, 1999 Vadim Zeitlin, Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GTK_DATAOBJ2_H_
diff --git a/include/wx/mac/classic/dc.h b/include/wx/mac/classic/dc.h
index 5fc2601e55..564f295883 100644
--- a/include/wx/mac/classic/dc.h
+++ b/include/wx/mac/classic/dc.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DC_H_
diff --git a/include/wx/mac/classic/dcclient.h b/include/wx/mac/classic/dcclient.h
index 8e01314084..a7d6b87240 100644
--- a/include/wx/mac/classic/dcclient.h
+++ b/include/wx/mac/classic/dcclient.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCCLIENT_H_
diff --git a/include/wx/mac/classic/dcmemory.h b/include/wx/mac/classic/dcmemory.h
index c8ea44e5ad..0d8b1402bb 100644
--- a/include/wx/mac/classic/dcmemory.h
+++ b/include/wx/mac/classic/dcmemory.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCMEMORY_H_
diff --git a/include/wx/mac/classic/dcprint.h b/include/wx/mac/classic/dcprint.h
index 0e2b5bcf0d..345be35fb9 100644
--- a/include/wx/mac/classic/dcprint.h
+++ b/include/wx/mac/classic/dcprint.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCPRINT_H_
diff --git a/include/wx/mac/classic/dcscreen.h b/include/wx/mac/classic/dcscreen.h
index ab83b37618..53e9c79e67 100644
--- a/include/wx/mac/classic/dcscreen.h
+++ b/include/wx/mac/classic/dcscreen.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCSCREEN_H_
diff --git a/include/wx/mac/classic/dialog.h b/include/wx/mac/classic/dialog.h
index 490cd0af5c..0f8593aae9 100644
--- a/include/wx/mac/classic/dialog.h
+++ b/include/wx/mac/classic/dialog.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DIALOG_H_
diff --git a/include/wx/mac/classic/dirdlg.h b/include/wx/mac/classic/dirdlg.h
index 734292ade3..556f03b51d 100644
--- a/include/wx/mac/classic/dirdlg.h
+++ b/include/wx/mac/classic/dirdlg.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DIRDLG_H_
diff --git a/include/wx/mac/classic/display.h b/include/wx/mac/classic/display.h
index 060c9c7ef4..9f9da55551 100644
--- a/include/wx/mac/classic/display.h
+++ b/include/wx/mac/classic/display.h
@@ -5,8 +5,8 @@
 // Modified by: Royce Mitchell III
 // Created:     06/21/02
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MAC_DISPLAY_H_
diff --git a/include/wx/mac/classic/dnd.h b/include/wx/mac/classic/dnd.h
index 989a977628..626c1dbc03 100644
--- a/include/wx/mac/classic/dnd.h
+++ b/include/wx/mac/classic/dnd.h
@@ -4,7 +4,7 @@
 // Author:      Stefan Csomor
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DND_H_
diff --git a/include/wx/mac/classic/filedlg.h b/include/wx/mac/classic/filedlg.h
index 4cc0387a08..dade16105f 100644
--- a/include/wx/mac/classic/filedlg.h
+++ b/include/wx/mac/classic/filedlg.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FILEDLG_H_
diff --git a/include/wx/mac/classic/font.h b/include/wx/mac/classic/font.h
index 78aa2f4d5f..10ea2a9ed9 100644
--- a/include/wx/mac/classic/font.h
+++ b/include/wx/mac/classic/font.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FONT_H_
diff --git a/include/wx/mac/classic/fontdlg.h b/include/wx/mac/classic/fontdlg.h
index 3d654b56c8..aefc2de26e 100644
--- a/include/wx/mac/classic/fontdlg.h
+++ b/include/wx/mac/classic/fontdlg.h
@@ -7,7 +7,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FONTDLG_H_
diff --git a/include/wx/mac/classic/frame.h b/include/wx/mac/classic/frame.h
index f92f7196fc..475388d23b 100644
--- a/include/wx/mac/classic/frame.h
+++ b/include/wx/mac/classic/frame.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FRAME_H_
diff --git a/include/wx/mac/classic/gauge.h b/include/wx/mac/classic/gauge.h
index 4eb5db3a69..e509afadf8 100644
--- a/include/wx/mac/classic/gauge.h
+++ b/include/wx/mac/classic/gauge.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GAUGE_H_
diff --git a/include/wx/mac/classic/gdiobj.h b/include/wx/mac/classic/gdiobj.h
index 1ad618bf84..ba1caca3d0 100644
--- a/include/wx/mac/classic/gdiobj.h
+++ b/include/wx/mac/classic/gdiobj.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GDIOBJ_H_
diff --git a/include/wx/mac/classic/glcanvas.h b/include/wx/mac/classic/glcanvas.h
index 6f044609c3..767f04131c 100644
--- a/include/wx/mac/classic/glcanvas.h
+++ b/include/wx/mac/classic/glcanvas.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        glcanvas.h
-// Purpose:     wxGLCanvas, for using OpenGL with wxWindows under Macintosh
+// Purpose:     wxGLCanvas, for using OpenGL with wxWidgets under Macintosh
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/include/wx/mac/classic/helpxxxx.h b/include/wx/mac/classic/helpxxxx.h
index a33c0737a5..3a64d04462 100644
--- a/include/wx/mac/classic/helpxxxx.h
+++ b/include/wx/mac/classic/helpxxxx.h
@@ -7,7 +7,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_HELPXXXX_H_
diff --git a/include/wx/mac/classic/icon.h b/include/wx/mac/classic/icon.h
index bdc0ff755f..2a1c001690 100644
--- a/include/wx/mac/classic/icon.h
+++ b/include/wx/mac/classic/icon.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_ICON_H_
diff --git a/include/wx/mac/classic/imaglist.h b/include/wx/mac/classic/imaglist.h
index e8fbf6e713..2f80215710 100644
--- a/include/wx/mac/classic/imaglist.h
+++ b/include/wx/mac/classic/imaglist.h
@@ -8,7 +8,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_IMAGLIST_H_
diff --git a/include/wx/mac/classic/joystick.h b/include/wx/mac/classic/joystick.h
index 6db596e3b3..627c0f8a70 100644
--- a/include/wx/mac/classic/joystick.h
+++ b/include/wx/mac/classic/joystick.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_JOYSTICK_H_
diff --git a/include/wx/mac/classic/listbox.h b/include/wx/mac/classic/listbox.h
index 77c0f27209..3a89b972b2 100644
--- a/include/wx/mac/classic/listbox.h
+++ b/include/wx/mac/classic/listbox.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/mac/classic/listctrl.h b/include/wx/mac/classic/listctrl.h
index 196f97add1..713d01ad7e 100644
--- a/include/wx/mac/classic/listctrl.h
+++ b/include/wx/mac/classic/listctrl.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_LISTCTRL_H_
@@ -57,7 +57,7 @@
     which item. Each image in an image list can contain a mask, and can be made out
     of either a bitmap, two bitmaps or an icon. See ImagList.h for more details.
 
-    Notifications are passed via the wxWindows 2.0 event system.
+    Notifications are passed via the wxWidgets 2.0 event system.
 
     See the sample wxListCtrl app for API usage.
 
@@ -285,7 +285,7 @@ class WXDLLEXPORT wxListCtrl: public wxControl
   // Returns the item or -1 if unsuccessful.
   long GetNextItem(long item, int geometry = wxLIST_NEXT_ALL, int state = wxLIST_STATE_DONTCARE) const ;
 
-  // Implementation: converts wxWindows style to MSW style.
+  // Implementation: converts wxWidgets style to MSW style.
   // Can be a single style flag or a bit list.
   // oldStyle is 'normalised' so that it doesn't contain
   // conflicting styles.
diff --git a/include/wx/mac/classic/mdi.h b/include/wx/mac/classic/mdi.h
index 1114ee525d..febc243f29 100644
--- a/include/wx/mac/classic/mdi.h
+++ b/include/wx/mac/classic/mdi.h
@@ -8,7 +8,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MDI_H_
@@ -57,7 +57,7 @@ public:
   // Mac OS activate event
   virtual void MacActivate(long timestamp, bool activating);
 
-  // wxWindows activate event
+  // wxWidgets activate event
   void OnActivate(wxActivateEvent& event);
   void OnSysColourChanged(wxSysColourChangedEvent& event);
 
diff --git a/include/wx/mac/classic/menu.h b/include/wx/mac/classic/menu.h
index 854a70d107..e7a23bf876 100644
--- a/include/wx/mac/classic/menu.h
+++ b/include/wx/mac/classic/menu.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MENU_H_
diff --git a/include/wx/mac/classic/menuitem.h b/include/wx/mac/classic/menuitem.h
index 7e78a57f63..98aa5745b5 100644
--- a/include/wx/mac/classic/menuitem.h
+++ b/include/wx/mac/classic/menuitem.h
@@ -6,7 +6,7 @@
 // Created:     11.11.97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef   _MENUITEM_H
diff --git a/include/wx/mac/classic/metafile.h b/include/wx/mac/classic/metafile.h
index 2b528efeca..02c76aa61b 100644
--- a/include/wx/mac/classic/metafile.h
+++ b/include/wx/mac/classic/metafile.h
@@ -8,7 +8,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/mac/classic/mimetype.h b/include/wx/mac/classic/mimetype.h
index a65acd964c..884836e98c 100644
--- a/include/wx/mac/classic/mimetype.h
+++ b/include/wx/mac/classic/mimetype.h
@@ -6,7 +6,7 @@
 // Created:     23.09.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence (part of wxExtra library)
+// Licence:     wxWidgets licence (part of wxExtra library)
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _MIMETYPE_IMPL_H
diff --git a/include/wx/mac/classic/minifram.h b/include/wx/mac/classic/minifram.h
index 7f43f953b3..7f41821ce1 100644
--- a/include/wx/mac/classic/minifram.h
+++ b/include/wx/mac/classic/minifram.h
@@ -8,7 +8,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MINIFRAM_H_
diff --git a/include/wx/mac/classic/msgdlg.h b/include/wx/mac/classic/msgdlg.h
index 1a869f0855..49afc5d218 100644
--- a/include/wx/mac/classic/msgdlg.h
+++ b/include/wx/mac/classic/msgdlg.h
@@ -7,7 +7,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MSGBOXDLG_H_
diff --git a/include/wx/mac/classic/notebook.h b/include/wx/mac/classic/notebook.h
index 7f3724805c..465bbfd0b6 100644
--- a/include/wx/mac/classic/notebook.h
+++ b/include/wx/mac/classic/notebook.h
@@ -5,7 +5,7 @@
 // Modified by:
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_NOTEBOOK_H_
diff --git a/include/wx/mac/classic/palette.h b/include/wx/mac/classic/palette.h
index 74f9a4dd30..ad4a3d222d 100644
--- a/include/wx/mac/classic/palette.h
+++ b/include/wx/mac/classic/palette.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PALETTE_H_
diff --git a/include/wx/mac/classic/pen.h b/include/wx/mac/classic/pen.h
index 50afa0d9c4..f3b4ddffde 100644
--- a/include/wx/mac/classic/pen.h
+++ b/include/wx/mac/classic/pen.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PEN_H_
diff --git a/include/wx/mac/classic/pnghand.h b/include/wx/mac/classic/pnghand.h
index 19271c4705..0dab2fa1a6 100644
--- a/include/wx/mac/classic/pnghand.h
+++ b/include/wx/mac/classic/pnghand.h
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/include/wx/mac/classic/printdlg.h b/include/wx/mac/classic/printdlg.h
index 6bb45dad2f..3c6281940c 100644
--- a/include/wx/mac/classic/printdlg.h
+++ b/include/wx/mac/classic/printdlg.h
@@ -8,7 +8,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PRINTDLG_H_
diff --git a/include/wx/mac/classic/printmac.h b/include/wx/mac/classic/printmac.h
index c5eb431026..844f2d0db2 100644
--- a/include/wx/mac/classic/printmac.h
+++ b/include/wx/mac/classic/printmac.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PRINTWIN_H_
diff --git a/include/wx/mac/classic/private.h b/include/wx/mac/classic/private.h
index 2f0c5cb7e0..bba9746c3e 100644
--- a/include/wx/mac/classic/private.h
+++ b/include/wx/mac/classic/private.h
@@ -1,14 +1,14 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        private.h
 // Purpose:     Private declarations: as this header is only included by
-//              wxWindows itself, it may contain identifiers which don't start
+//              wxWidgets itself, it may contain identifiers which don't start
 //              with "wx".
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PRIVATE_H_
diff --git a/include/wx/mac/classic/private/print.h b/include/wx/mac/classic/private/print.h
index d406494902..da81d6bfc1 100644
--- a/include/wx/mac/classic/private/print.h
+++ b/include/wx/mac/classic/private/print.h
@@ -6,7 +6,7 @@
 // Created:     03/02/99
 // RCS-ID:      $Id: 
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MAC_PRIVATE_PRINT_H_
diff --git a/include/wx/mac/classic/radiobox.h b/include/wx/mac/classic/radiobox.h
index c9642e2deb..a3e5f38802 100644
--- a/include/wx/mac/classic/radiobox.h
+++ b/include/wx/mac/classic/radiobox.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_RADIOBOX_H_
@@ -58,7 +58,7 @@ public:
              const wxValidator& val = wxDefaultValidator,
              const wxString& name = wxRadioBoxNameStr);
 
-// Specific functions (in wxWindows2 reference)
+// Specific functions (in wxWidgets2 reference)
     virtual void SetSelection(int item);
     virtual int GetSelection() const;
 
diff --git a/include/wx/mac/classic/radiobut.h b/include/wx/mac/classic/radiobut.h
index 22fe9c1bda..8f8ae95d5f 100644
--- a/include/wx/mac/classic/radiobut.h
+++ b/include/wx/mac/classic/radiobut.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_RADIOBUT_H_
diff --git a/include/wx/mac/classic/region.h b/include/wx/mac/classic/region.h
index ab04dd8975..7bfa096d09 100644
--- a/include/wx/mac/classic/region.h
+++ b/include/wx/mac/classic/region.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_REGION_H_
diff --git a/include/wx/mac/classic/scrolbar.h b/include/wx/mac/classic/scrolbar.h
index 633b615ced..ca5b6e8921 100644
--- a/include/wx/mac/classic/scrolbar.h
+++ b/include/wx/mac/classic/scrolbar.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SCROLBAR_H_
diff --git a/include/wx/mac/classic/slider.h b/include/wx/mac/classic/slider.h
index 9599a60c10..13725cbd5e 100644
--- a/include/wx/mac/classic/slider.h
+++ b/include/wx/mac/classic/slider.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SLIDER_H_
diff --git a/include/wx/mac/classic/sound.h b/include/wx/mac/classic/sound.h
index 18a84d101b..70c25c2016 100644
--- a/include/wx/mac/classic/sound.h
+++ b/include/wx/mac/classic/sound.h
@@ -7,7 +7,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SOUND_H_
diff --git a/include/wx/mac/classic/spinbutt.h b/include/wx/mac/classic/spinbutt.h
index 3b33a8d5ad..3215f5d0f1 100644
--- a/include/wx/mac/classic/spinbutt.h
+++ b/include/wx/mac/classic/spinbutt.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SPINBUTT_H_
diff --git a/include/wx/mac/classic/spinctrl.h b/include/wx/mac/classic/spinctrl.h
index 9ffd5d1ee2..e7c941b14a 100755
--- a/include/wx/mac/classic/spinctrl.h
+++ b/include/wx/mac/classic/spinctrl.h
@@ -6,7 +6,7 @@
 // Created:     28.10.99
 // RCS-ID:      $Id$
 // Copyright:   (c) Vadim Zeitlin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MAC_SPINCTRL_H_
diff --git a/include/wx/mac/classic/statbmp.h b/include/wx/mac/classic/statbmp.h
index 8a16726c57..146987f0a1 100644
--- a/include/wx/mac/classic/statbmp.h
+++ b/include/wx/mac/classic/statbmp.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STATBMP_H_
diff --git a/include/wx/mac/classic/statbox.h b/include/wx/mac/classic/statbox.h
index 9f73a539ed..1294a916e0 100644
--- a/include/wx/mac/classic/statbox.h
+++ b/include/wx/mac/classic/statbox.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STATBOX_H_
diff --git a/include/wx/mac/classic/statline.h b/include/wx/mac/classic/statline.h
index 911e9f535c..43a8a54df9 100644
--- a/include/wx/mac/classic/statline.h
+++ b/include/wx/mac/classic/statline.h
@@ -5,7 +5,7 @@
 // Created:     28.06.99
 // Version:     $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GENERIC_STATLINE_H_
diff --git a/include/wx/mac/classic/stattext.h b/include/wx/mac/classic/stattext.h
index 17ecf98ad0..f9652c232f 100644
--- a/include/wx/mac/classic/stattext.h
+++ b/include/wx/mac/classic/stattext.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STATTEXT_H_
diff --git a/include/wx/mac/classic/statusbr.h b/include/wx/mac/classic/statusbr.h
index 959c4e618d..3db0001392 100644
--- a/include/wx/mac/classic/statusbr.h
+++ b/include/wx/mac/classic/statusbr.h
@@ -7,7 +7,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef   _WX_STATBAR_H_
diff --git a/include/wx/mac/classic/tabctrl.h b/include/wx/mac/classic/tabctrl.h
index 7a6e14300a..bd2e4c1b55 100644
--- a/include/wx/mac/classic/tabctrl.h
+++ b/include/wx/mac/classic/tabctrl.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TABCTRL_H_
diff --git a/include/wx/mac/classic/taskbarosx.h b/include/wx/mac/classic/taskbarosx.h
index 9c921c063d..644d89fb1b 100644
--- a/include/wx/mac/classic/taskbarosx.h
+++ b/include/wx/mac/classic/taskbarosx.h
@@ -6,7 +6,7 @@
 // Created:     04/04/2003
 // RCS-ID:      $Id$
 // Copyright:   (c) Ryan Norton, 2003
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////
 
 #ifndef _TASKBAR_H_
diff --git a/include/wx/mac/classic/textctrl.h b/include/wx/mac/classic/textctrl.h
index df3a964339..f7ec538561 100644
--- a/include/wx/mac/classic/textctrl.h
+++ b/include/wx/mac/classic/textctrl.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TEXTCTRL_H_
diff --git a/include/wx/mac/classic/tglbtn.h b/include/wx/mac/classic/tglbtn.h
index 5ab29aa84c..8280042a15 100644
--- a/include/wx/mac/classic/tglbtn.h
+++ b/include/wx/mac/classic/tglbtn.h
@@ -7,7 +7,7 @@
 // Created:     08.02.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2004 Stefan Csomor
-// License:     wxWindows License
+// License:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TOGGLEBUTTON_H_
diff --git a/include/wx/mac/classic/timer.h b/include/wx/mac/classic/timer.h
index 1d01ea91a4..519c978771 100644
--- a/include/wx/mac/classic/timer.h
+++ b/include/wx/mac/classic/timer.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TIMER_H_
diff --git a/include/wx/mac/classic/toolbar.h b/include/wx/mac/classic/toolbar.h
index 1849125750..9c14c86b17 100644
--- a/include/wx/mac/classic/toolbar.h
+++ b/include/wx/mac/classic/toolbar.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TOOLBAR_H_
diff --git a/include/wx/mac/classic/tooltip.h b/include/wx/mac/classic/tooltip.h
index 7bf4ecf440..aab4b80b0b 100644
--- a/include/wx/mac/classic/tooltip.h
+++ b/include/wx/mac/classic/tooltip.h
@@ -6,7 +6,7 @@
 // Created:     31.01.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Robert Roebling, Vadim Zeitlin, Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/mac/classic/toplevel.h b/include/wx/mac/classic/toplevel.h
index ffb0bcd288..0d5a6bf74d 100644
--- a/include/wx/mac/classic/toplevel.h
+++ b/include/wx/mac/classic/toplevel.h
@@ -6,7 +6,7 @@
 // Created:     20.09.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MSW_TOPLEVEL_H_
diff --git a/include/wx/mac/classic/treectrl.h b/include/wx/mac/classic/treectrl.h
index 306a0105a5..7077070bd4 100644
--- a/include/wx/mac/classic/treectrl.h
+++ b/include/wx/mac/classic/treectrl.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TREECTRL_H_
diff --git a/include/wx/mac/classic/uma.h b/include/wx/mac/classic/uma.h
index c862427f62..49084acc72 100644
--- a/include/wx/mac/classic/uma.h
+++ b/include/wx/mac/classic/uma.h
@@ -6,7 +6,7 @@
 // Created:     03/02/99
 // RCS-ID:      $Id:
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef H_UMA
diff --git a/include/wx/mac/classic/window.h b/include/wx/mac/classic/window.h
index 807e261863..ad0124e4f1 100644
--- a/include/wx/mac/classic/window.h
+++ b/include/wx/mac/classic/window.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_WINDOW_H_
@@ -161,7 +161,7 @@ public:
     wxWindowMac *FindItem(long id) const;
     wxWindowMac *FindItemByHWND(WXHWND hWnd, bool controlOnly = FALSE) const;
 
-    // Make a Windows extended style from the given wxWindows window style
+    // Make a Windows extended style from the given wxWidgets window style
     static WXDWORD MakeExtendedStyle(long style,
                                      bool eliminateBorders = TRUE);
     // Determine whether 3D effects are wanted
diff --git a/include/wx/mac/setup0.h b/include/wx/mac/setup0.h
index 04a97dd14f..4c5bdd7945 100644
--- a/include/wx/mac/setup0.h
+++ b/include/wx/mac/setup0.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SETUP_H_
@@ -80,7 +80,7 @@
 // Generic comment about debugging settings: they are very useful if you don't
 // use any other memory leak detection tools such as Purify/BoundsChecker, but
 // are probably redundant otherwise. Also, Visual C++ CRT has the same features
-// as wxWindows memory debugging subsystem built in since version 5.0 and you
+// as wxWidgets memory debugging subsystem built in since version 5.0 and you
 // may prefer to use it instead of built in memory debugging code because it is
 // faster and more fool proof.
 //
@@ -155,7 +155,7 @@
 // Unicode support
 // ----------------------------------------------------------------------------
 
-// Set wxUSE_UNICODE to 1 to compile wxWindows in Unicode mode: wxChar will be
+// Set wxUSE_UNICODE to 1 to compile wxWidgets in Unicode mode: wxChar will be
 // defined as wchar_t, wxString will use Unicode internally. If you set this
 // to 1, you must use wxT() macro for all literal strings in the program.
 //
@@ -233,7 +233,7 @@
 // Recommended setting: 0 unless you do plan to develop MT applications
 #define wxUSE_THREADS 1
 
-// If enabled (1), compiles wxWindows streams classes
+// If enabled (1), compiles wxWidgets streams classes
 #define wxUSE_STREAMS       1
 
 // Use standard C++ streams if 1. If 0, use wxWin streams implementation.
@@ -380,7 +380,7 @@
 
 // If enabled, the code written by Apple will be used to write, in a portable
 // way, float on the disk. See extended.c for the license which is different
-// from wxWindows one.
+// from wxWidgets one.
 //
 // Default is 1.
 //
@@ -464,7 +464,7 @@
 // Recommended setting: 0
 #define wxUSE_TIPWINDOW    0
 
-// Each of the settings below corresponds to one wxWindows control. They are
+// Each of the settings below corresponds to one wxWidgets control. They are
 // all switched on by default but may be disabled if you are sure that your
 // program (including any standard dialogs it can show!) doesn't need them and
 // if you desperately want to save some space. If you use any of these you must
diff --git a/include/wx/math.h b/include/wx/math.h
index 15a1021b1a..c847a7875c 100644
--- a/include/wx/math.h
+++ b/include/wx/math.h
@@ -6,7 +6,7 @@
 // Created:     02/02/03
 // RCS-ID:      
 // Copyright:   (c)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MATH_H_
diff --git a/include/wx/matrix.h b/include/wx/matrix.h
index c2698b3058..79cd94a360 100644
--- a/include/wx/matrix.h
+++ b/include/wx/matrix.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart, Chris Breeze
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MATRIXH__
diff --git a/include/wx/memconf.h b/include/wx/memconf.h
index c0d46e7fee..242d5d7cd4 100644
--- a/include/wx/memconf.h
+++ b/include/wx/memconf.h
@@ -8,14 +8,14 @@
 // Created:     22.01.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 /*
  * NB: I don't see how this class may possibly be useful to the application
  *     program (as the settings are lost on program termination), but it is
- *     handy to have it inside wxWindows. So for now let's say that this class
- *     is private and should only be used by wxWindows itself - this might
+ *     handy to have it inside wxWidgets. So for now let's say that this class
+ *     is private and should only be used by wxWidgets itself - this might
  *     change in the future.
  */
 
diff --git a/include/wx/memory.h b/include/wx/memory.h
index 3b58cb55d9..03c1d45f59 100644
--- a/include/wx/memory.h
+++ b/include/wx/memory.h
@@ -6,7 +6,7 @@
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MEMORYH__
diff --git a/include/wx/memtext.h b/include/wx/memtext.h
index 44567134b8..5b47260caf 100644
--- a/include/wx/memtext.h
+++ b/include/wx/memtext.h
@@ -3,8 +3,8 @@
 // Purpose:     wxMemoryText allows to use wxTextBuffer without a file
 // Created:     14.11.01
 // Author:      Morten Hanssen
-// Copyright:   (c) 2001 wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) 2001 wxWidgets team
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MEMTEXT_H
diff --git a/include/wx/menu.h b/include/wx/menu.h
index f23b6ac400..490932a999 100644
--- a/include/wx/menu.h
+++ b/include/wx/menu.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     26.10.99
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MENU_H_BASE_
diff --git a/include/wx/menuitem.h b/include/wx/menuitem.h
index e35a5372ad..0f4b2816f3 100644
--- a/include/wx/menuitem.h
+++ b/include/wx/menuitem.h
@@ -6,7 +6,7 @@
 // Created:     25.10.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MENUITEM_H_BASE_
diff --git a/include/wx/metafile.h b/include/wx/metafile.h
index ba83cfa3e2..7220f53601 100644
--- a/include/wx/metafile.h
+++ b/include/wx/metafile.h
@@ -1,12 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        wx/metafile.h
 // Purpose:     wxMetaFile class declaration
-// Author:      wxWindows team
+// Author:      wxWidgets team
 // Modified by:
 // Created:     13.01.00
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_METAFILE_H_BASE_
diff --git a/include/wx/mgl/app.h b/include/wx/mgl/app.h
index d0bedefdf4..d745d2878b 100644
--- a/include/wx/mgl/app.h
+++ b/include/wx/mgl/app.h
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_APP_H__
diff --git a/include/wx/mgl/bitmap.h b/include/wx/mgl/bitmap.h
index 35cebd4e22..4df4dbf777 100644
--- a/include/wx/mgl/bitmap.h
+++ b/include/wx/mgl/bitmap.h
@@ -3,7 +3,7 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/mgl/brush.h b/include/wx/mgl/brush.h
index 7787c2c407..5c66e7ab13 100644
--- a/include/wx/mgl/brush.h
+++ b/include/wx/mgl/brush.h
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/mgl/clipbrd.h b/include/wx/mgl/clipbrd.h
index 7e1ee2ddfa..f006a4549f 100644
--- a/include/wx/mgl/clipbrd.h
+++ b/include/wx/mgl/clipbrd.h
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/mgl/colour.h b/include/wx/mgl/colour.h
index ac3c8e2a16..78c233b8f3 100644
--- a/include/wx/mgl/colour.h
+++ b/include/wx/mgl/colour.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COLOUR_H_
diff --git a/include/wx/mgl/cursor.h b/include/wx/mgl/cursor.h
index d7ec246c75..ac71374b47 100644
--- a/include/wx/mgl/cursor.h
+++ b/include/wx/mgl/cursor.h
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/mgl/dc.h b/include/wx/mgl/dc.h
index aa9d55875f..53d51c1cd6 100644
--- a/include/wx/mgl/dc.h
+++ b/include/wx/mgl/dc.h
@@ -5,7 +5,7 @@
 // Created:     2001/03/09
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DC_H_
diff --git a/include/wx/mgl/dcclient.h b/include/wx/mgl/dcclient.h
index deb5905bd5..19b0f3b2ab 100644
--- a/include/wx/mgl/dcclient.h
+++ b/include/wx/mgl/dcclient.h
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_DCCLIENT_H__
diff --git a/include/wx/mgl/dcmemory.h b/include/wx/mgl/dcmemory.h
index 96ad1a3c1c..61c1db674a 100644
--- a/include/wx/mgl/dcmemory.h
+++ b/include/wx/mgl/dcmemory.h
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/mgl/dcscreen.h b/include/wx/mgl/dcscreen.h
index 1bc300e86e..426fac3f3c 100644
--- a/include/wx/mgl/dcscreen.h
+++ b/include/wx/mgl/dcscreen.h
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_DCSCREEN_H__
diff --git a/include/wx/mgl/font.h b/include/wx/mgl/font.h
index 6a105bf6fc..5b6da25e6d 100644
--- a/include/wx/mgl/font.h
+++ b/include/wx/mgl/font.h
@@ -3,7 +3,7 @@
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_FONT_H__
diff --git a/include/wx/mgl/fontutil.h b/include/wx/mgl/fontutil.h
index dd286a712c..dbb4193e89 100644
--- a/include/wx/mgl/fontutil.h
+++ b/include/wx/mgl/fontutil.h
@@ -5,7 +5,7 @@
 // Created:     2001/05/01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MGL_FONTUTIL_H_
diff --git a/include/wx/mgl/gdiobj.h b/include/wx/mgl/gdiobj.h
index d148b14306..6281cee51d 100644
--- a/include/wx/mgl/gdiobj.h
+++ b/include/wx/mgl/gdiobj.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GDIOBJ_H_
diff --git a/include/wx/mgl/icon.h b/include/wx/mgl/icon.h
index 40ed949c92..bd1cfca058 100644
--- a/include/wx/mgl/icon.h
+++ b/include/wx/mgl/icon.h
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/mgl/palette.h b/include/wx/mgl/palette.h
index a11f8bf9a5..c940cbc3a6 100644
--- a/include/wx/mgl/palette.h
+++ b/include/wx/mgl/palette.h
@@ -5,7 +5,7 @@
 // Created:     2001/03/11
 // Id:          $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/mgl/pen.h b/include/wx/mgl/pen.h
index 3b69b3d054..2fee55127f 100644
--- a/include/wx/mgl/pen.h
+++ b/include/wx/mgl/pen.h
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/mgl/popupwin.h b/include/wx/mgl/popupwin.h
index 3f7e4d77be..3985aa998b 100644
--- a/include/wx/mgl/popupwin.h
+++ b/include/wx/mgl/popupwin.h
@@ -5,7 +5,7 @@
 // Created:     06.01.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_POPUPWIN_H_
diff --git a/include/wx/mgl/private.h b/include/wx/mgl/private.h
index 5406f24752..d263eb6451 100644
--- a/include/wx/mgl/private.h
+++ b/include/wx/mgl/private.h
@@ -1,13 +1,13 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        private.h
 // Purpose:     Private declarations: as this header is only included by
-//              wxWindows itself, it may contain identifiers which don't start
+//              wxWidgets itself, it may contain identifiers which don't start
 //              with "wx".
 // Author:      Vaclav Slavik
 // Created:     2001/04/07
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PRIVATE_H_
diff --git a/include/wx/mgl/region.h b/include/wx/mgl/region.h
index ec8f4474a2..c974097b6d 100644
--- a/include/wx/mgl/region.h
+++ b/include/wx/mgl/region.h
@@ -5,7 +5,7 @@
 // Created:     2001/03/12
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_REGION_H_
diff --git a/include/wx/mgl/toplevel.h b/include/wx/mgl/toplevel.h
index f7c47f5c6b..e0a2c9223b 100644
--- a/include/wx/mgl/toplevel.h
+++ b/include/wx/mgl/toplevel.h
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/mgl/window.h b/include/wx/mgl/window.h
index 7758b50e97..cd88d8902e 100644
--- a/include/wx/mgl/window.h
+++ b/include/wx/mgl/window.h
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_WINDOW_H_
diff --git a/include/wx/mimetype.h b/include/wx/mimetype.h
index 5aa2438f8c..716a5af0e1 100644
--- a/include/wx/mimetype.h
+++ b/include/wx/mimetype.h
@@ -7,7 +7,7 @@
 // Created:     23.09.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence (part of wxExtra library)
+// Licence:     wxWidgets licence (part of wxExtra library)
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MIMETYPE_H_
@@ -387,7 +387,7 @@ private:
 // global variables
 // ----------------------------------------------------------------------------
 
-// the default mime manager for wxWindows programs
+// the default mime manager for wxWidgets programs
 WXDLLIMPEXP_DATA_BASE(extern wxMimeTypesManager *) wxTheMimeTypesManager;
 
 #endif // wxUSE_MIMETYPE
diff --git a/include/wx/module.h b/include/wx/module.h
index f21da18583..2abaef6aa2 100644
--- a/include/wx/module.h
+++ b/include/wx/module.h
@@ -6,7 +6,7 @@
 // Created:     04/11/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Wolfram Gloger and Guilhem Lavaux
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MODULE_H_
diff --git a/include/wx/motif/accel.h b/include/wx/motif/accel.h
index 41dea67575..11764faeb6 100644
--- a/include/wx/motif/accel.h
+++ b/include/wx/motif/accel.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_ACCEL_H_
diff --git a/include/wx/motif/app.h b/include/wx/motif/app.h
index 1007941b48..7aad137972 100644
--- a/include/wx/motif/app.h
+++ b/include/wx/motif/app.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_APP_H_
diff --git a/include/wx/motif/bmpbuttn.h b/include/wx/motif/bmpbuttn.h
index af3237a0df..8a8e54c29f 100644
--- a/include/wx/motif/bmpbuttn.h
+++ b/include/wx/motif/bmpbuttn.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_BMPBUTTN_H_
diff --git a/include/wx/motif/bmpmotif.h b/include/wx/motif/bmpmotif.h
index 1e88d23c75..feda62da90 100644
--- a/include/wx/motif/bmpmotif.h
+++ b/include/wx/motif/bmpmotif.h
@@ -6,7 +6,7 @@
 // Created:     25/03/2003
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_BMPMOTIF_H_
diff --git a/include/wx/motif/button.h b/include/wx/motif/button.h
index 32958d5753..cf0b7ed651 100644
--- a/include/wx/motif/button.h
+++ b/include/wx/motif/button.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_BUTTON_H_
diff --git a/include/wx/motif/checkbox.h b/include/wx/motif/checkbox.h
index cbb6fd7d37..48d2741593 100644
--- a/include/wx/motif/checkbox.h
+++ b/include/wx/motif/checkbox.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CHECKBOX_H_
diff --git a/include/wx/motif/checklst.h b/include/wx/motif/checklst.h
index f097bd739f..17fe1324d6 100644
--- a/include/wx/motif/checklst.h
+++ b/include/wx/motif/checklst.h
@@ -7,7 +7,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CHECKLST_H_
diff --git a/include/wx/motif/choice.h b/include/wx/motif/choice.h
index 8a01c3cb23..a7feb61ce4 100644
--- a/include/wx/motif/choice.h
+++ b/include/wx/motif/choice.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CHOICE_H_
diff --git a/include/wx/motif/clipbrd.h b/include/wx/motif/clipbrd.h
index f4e98c9899..fa55b05659 100644
--- a/include/wx/motif/clipbrd.h
+++ b/include/wx/motif/clipbrd.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CLIPBRD_H_
diff --git a/include/wx/motif/colour.h b/include/wx/motif/colour.h
index 8912ad3cf7..644b427234 100644
--- a/include/wx/motif/colour.h
+++ b/include/wx/motif/colour.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COLOUR_H_
diff --git a/include/wx/motif/combobox.h b/include/wx/motif/combobox.h
index d0b5b2532c..e39c008cc8 100644
--- a/include/wx/motif/combobox.h
+++ b/include/wx/motif/combobox.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COMBOBOX_H_
diff --git a/include/wx/motif/control.h b/include/wx/motif/control.h
index 9fde5ab454..e7a03efb53 100644
--- a/include/wx/motif/control.h
+++ b/include/wx/motif/control.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CONTROL_H_
diff --git a/include/wx/motif/cursor.h b/include/wx/motif/cursor.h
index 2cfc1ff3d1..c453840257 100644
--- a/include/wx/motif/cursor.h
+++ b/include/wx/motif/cursor.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CURSOR_H_
diff --git a/include/wx/motif/dataform.h b/include/wx/motif/dataform.h
index eebf507e23..59b0cbf3ae 100644
--- a/include/wx/motif/dataform.h
+++ b/include/wx/motif/dataform.h
@@ -6,7 +6,7 @@
 // Created:     19.10.99 (extracted from motif/dataobj.h)
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MOTIF_DATAFORM_H
diff --git a/include/wx/motif/dataobj.h b/include/wx/motif/dataobj.h
index 6a59078483..dff3b7c913 100644
--- a/include/wx/motif/dataobj.h
+++ b/include/wx/motif/dataobj.h
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MOTIF_DATAOBJ_H_
diff --git a/include/wx/motif/dataobj2.h b/include/wx/motif/dataobj2.h
index 840586a1e5..75ddcbd961 100644
--- a/include/wx/motif/dataobj2.h
+++ b/include/wx/motif/dataobj2.h
@@ -5,7 +5,7 @@
 // Created:     27.04.03
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Mattia Barbon
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MOTIF_DATAOBJ2_H_
diff --git a/include/wx/motif/dc.h b/include/wx/motif/dc.h
index f726723241..0d97507c97 100644
--- a/include/wx/motif/dc.h
+++ b/include/wx/motif/dc.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DC_H_
diff --git a/include/wx/motif/dcclient.h b/include/wx/motif/dcclient.h
index ed8539615b..f1fabe8b23 100644
--- a/include/wx/motif/dcclient.h
+++ b/include/wx/motif/dcclient.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCCLIENT_H_
diff --git a/include/wx/motif/dcmemory.h b/include/wx/motif/dcmemory.h
index c6fa2faf9d..580fceb4ba 100644
--- a/include/wx/motif/dcmemory.h
+++ b/include/wx/motif/dcmemory.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCMEMORY_H_
diff --git a/include/wx/motif/dcprint.h b/include/wx/motif/dcprint.h
index 91812557e6..21b367632a 100644
--- a/include/wx/motif/dcprint.h
+++ b/include/wx/motif/dcprint.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCPRINT_H_
diff --git a/include/wx/motif/dcscreen.h b/include/wx/motif/dcscreen.h
index 16b498aa71..2d4d16c7d1 100644
--- a/include/wx/motif/dcscreen.h
+++ b/include/wx/motif/dcscreen.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCSCREEN_H_
diff --git a/include/wx/motif/dialog.h b/include/wx/motif/dialog.h
index 1f10207ba8..f2fff31b0d 100644
--- a/include/wx/motif/dialog.h
+++ b/include/wx/motif/dialog.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DIALOG_H_
diff --git a/include/wx/motif/dnd.h b/include/wx/motif/dnd.h
index 1af3bacce2..1ce5305c84 100644
--- a/include/wx/motif/dnd.h
+++ b/include/wx/motif/dnd.h
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin, Robert Roebling, Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/motif/filedlg.h b/include/wx/motif/filedlg.h
index df9bc061f0..e4c90aab88 100644
--- a/include/wx/motif/filedlg.h
+++ b/include/wx/motif/filedlg.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FILEDLG_H_
diff --git a/include/wx/motif/font.h b/include/wx/motif/font.h
index 80d1a4f841..cab80dd808 100644
--- a/include/wx/motif/font.h
+++ b/include/wx/motif/font.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FONT_H_
diff --git a/include/wx/motif/frame.h b/include/wx/motif/frame.h
index 4cb7f953c8..d6d7ffe5e8 100644
--- a/include/wx/motif/frame.h
+++ b/include/wx/motif/frame.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MOTIF_FRAME_H_
diff --git a/include/wx/motif/gauge.h b/include/wx/motif/gauge.h
index b5f5dd4cd3..becf64ecfc 100644
--- a/include/wx/motif/gauge.h
+++ b/include/wx/motif/gauge.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GAUGE_H_
diff --git a/include/wx/motif/gdiobj.h b/include/wx/motif/gdiobj.h
index 14293b5841..699d1cf7b0 100644
--- a/include/wx/motif/gdiobj.h
+++ b/include/wx/motif/gdiobj.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GDIOBJ_H_
diff --git a/include/wx/motif/icon.h b/include/wx/motif/icon.h
index eba9735f4d..ef55819d54 100644
--- a/include/wx/motif/icon.h
+++ b/include/wx/motif/icon.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_ICON_H_
diff --git a/include/wx/motif/listbox.h b/include/wx/motif/listbox.h
index 07c77df706..3d35c9b4e0 100644
--- a/include/wx/motif/listbox.h
+++ b/include/wx/motif/listbox.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_LISTBOX_H_
diff --git a/include/wx/motif/mdi.h b/include/wx/motif/mdi.h
index 91106240ee..4ec642ca96 100644
--- a/include/wx/motif/mdi.h
+++ b/include/wx/motif/mdi.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MDI_H_
diff --git a/include/wx/motif/menu.h b/include/wx/motif/menu.h
index eb26667a36..081d9dec79 100644
--- a/include/wx/motif/menu.h
+++ b/include/wx/motif/menu.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MOTIF_MENU_H_
diff --git a/include/wx/motif/menuitem.h b/include/wx/motif/menuitem.h
index 2a6cbe3cc8..41076f6620 100644
--- a/include/wx/motif/menuitem.h
+++ b/include/wx/motif/menuitem.h
@@ -6,7 +6,7 @@
 // Created:     11.11.97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MOTIF_MENUITEM_H
diff --git a/include/wx/motif/minifram.h b/include/wx/motif/minifram.h
index dcfb2d3173..49179b5674 100644
--- a/include/wx/motif/minifram.h
+++ b/include/wx/motif/minifram.h
@@ -8,7 +8,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MINIFRAM_H_
diff --git a/include/wx/motif/msgdlg.h b/include/wx/motif/msgdlg.h
index b8724d271f..94a3d544b9 100644
--- a/include/wx/motif/msgdlg.h
+++ b/include/wx/motif/msgdlg.h
@@ -7,7 +7,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MSGBOXDLG_H_
diff --git a/include/wx/motif/palette.h b/include/wx/motif/palette.h
index bff484a85e..ab0f0dcc0b 100644
--- a/include/wx/motif/palette.h
+++ b/include/wx/motif/palette.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PALETTE_H_
diff --git a/include/wx/motif/popupwin.h b/include/wx/motif/popupwin.h
index e115d68825..e4c54feab7 100644
--- a/include/wx/motif/popupwin.h
+++ b/include/wx/motif/popupwin.h
@@ -6,7 +6,7 @@
 // Created:     28.08.03
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Mattia Barbon
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MOTIF_POPUPWIN_H_
diff --git a/include/wx/motif/print.h b/include/wx/motif/print.h
index 64b50ef0a6..0193a501c7 100644
--- a/include/wx/motif/print.h
+++ b/include/wx/motif/print.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PRINT_H_
diff --git a/include/wx/motif/private.h b/include/wx/motif/private.h
index e7901129e3..3c9bf6ac72 100644
--- a/include/wx/motif/private.h
+++ b/include/wx/motif/private.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PRIVATE_H_
@@ -117,7 +117,7 @@ wxString wxXmStringToString( const XmString& xmString );
 XmString wxStringToXmString( const wxString& string );
 XmString wxStringToXmString( const char* string );
 
-// XmString made easy to use in wxWindows (and has an added benefit of
+// XmString made easy to use in wxWidgets (and has an added benefit of
 // cleaning up automatically)
 class wxXmString
 {
diff --git a/include/wx/motif/radiobox.h b/include/wx/motif/radiobox.h
index d1e91a0bfc..6d6f262e3f 100644
--- a/include/wx/motif/radiobox.h
+++ b/include/wx/motif/radiobox.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_RADIOBOX_H_
diff --git a/include/wx/motif/radiobut.h b/include/wx/motif/radiobut.h
index 8ccf2dad87..4f06ffd1c1 100644
--- a/include/wx/motif/radiobut.h
+++ b/include/wx/motif/radiobut.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_RADIOBUT_H_
diff --git a/include/wx/motif/region.h b/include/wx/motif/region.h
index dff5fb83f3..af45540523 100644
--- a/include/wx/motif/region.h
+++ b/include/wx/motif/region.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_REGION_H_
@@ -127,7 +127,7 @@ public:
     // Get the internal Region handle
     WXRegion GetXRegion() const;
 
-    // 'Naughty' functions that allow wxWindows to use a list of rects
+    // 'Naughty' functions that allow wxWidgets to use a list of rects
     // instead of the region, in certain circumstances (e.g. when
     // making a region out of the update rectangles).
     // These are used by wxPaintDC::wxPaintDC and wxRegionIterator::Reset.
diff --git a/include/wx/motif/scrolbar.h b/include/wx/motif/scrolbar.h
index 3ab5970f78..11e68086f7 100644
--- a/include/wx/motif/scrolbar.h
+++ b/include/wx/motif/scrolbar.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SCROLBAR_H_
diff --git a/include/wx/motif/slider.h b/include/wx/motif/slider.h
index f46acf7dba..8080028ef9 100644
--- a/include/wx/motif/slider.h
+++ b/include/wx/motif/slider.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SLIDER_H_
diff --git a/include/wx/motif/spinbutt.h b/include/wx/motif/spinbutt.h
index b2bef6bb0c..227cd698aa 100644
--- a/include/wx/motif/spinbutt.h
+++ b/include/wx/motif/spinbutt.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SPINBUTT_H_
diff --git a/include/wx/motif/statbmp.h b/include/wx/motif/statbmp.h
index fc2a64a478..8250e3c1ae 100644
--- a/include/wx/motif/statbmp.h
+++ b/include/wx/motif/statbmp.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STATBMP_H_
diff --git a/include/wx/motif/statbox.h b/include/wx/motif/statbox.h
index 59549a5327..40c8aa0dd8 100644
--- a/include/wx/motif/statbox.h
+++ b/include/wx/motif/statbox.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STATBOX_H_
diff --git a/include/wx/motif/stattext.h b/include/wx/motif/stattext.h
index 1bff85cc95..2828a4e137 100644
--- a/include/wx/motif/stattext.h
+++ b/include/wx/motif/stattext.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STATTEXT_H_
diff --git a/include/wx/motif/textctrl.h b/include/wx/motif/textctrl.h
index c8037713c7..a2ef48ee4e 100644
--- a/include/wx/motif/textctrl.h
+++ b/include/wx/motif/textctrl.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TEXTCTRL_H_
diff --git a/include/wx/motif/tglbtn.h b/include/wx/motif/tglbtn.h
index c67edba376..e472a40d25 100644
--- a/include/wx/motif/tglbtn.h
+++ b/include/wx/motif/tglbtn.h
@@ -7,7 +7,7 @@
 // Created:     10.02.03
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Mattia Barbon
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TOGGLEBUTTON_H_
diff --git a/include/wx/motif/timer.h b/include/wx/motif/timer.h
index 184d6a3e3d..2d5afa8073 100644
--- a/include/wx/motif/timer.h
+++ b/include/wx/motif/timer.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TIMER_H_
diff --git a/include/wx/motif/toolbar.h b/include/wx/motif/toolbar.h
index 6bb1e36d64..13af97b8f5 100644
--- a/include/wx/motif/toolbar.h
+++ b/include/wx/motif/toolbar.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TOOLBAR_H_
diff --git a/include/wx/motif/toplevel.h b/include/wx/motif/toplevel.h
index 35bef8c484..528eb8f4cb 100644
--- a/include/wx/motif/toplevel.h
+++ b/include/wx/motif/toplevel.h
@@ -6,7 +6,7 @@
 // Created:     12/10/2002
 // RCS-ID:      $Id$
 // Copyright:   (c) Mattia Barbon
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __MOTIFTOPLEVELH__
diff --git a/include/wx/motif/window.h b/include/wx/motif/window.h
index c85264e4f3..c96558571c 100644
--- a/include/wx/motif/window.h
+++ b/include/wx/motif/window.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_WINDOW_H_
@@ -211,11 +211,11 @@ protected:
     bool DetachWidget(WXWidget widget);
     
     // How to implement accelerators. If we find a key event, translate to
-    // wxWindows wxKeyEvent form. Find a widget for the window. Now find a
+    // wxWidgets wxKeyEvent form. Find a widget for the window. Now find a
     // wxWindow for the widget. If there isn't one, go up the widget hierarchy
     // trying to find one. Once one is found, call ProcessAccelerator for the
     // window. If it returns TRUE (processed the event), skip the X event,
-    // otherwise carry on up the wxWindows window hierarchy calling
+    // otherwise carry on up the wxWidgets window hierarchy calling
     // ProcessAccelerator. If all return FALSE, process the X event as normal.
     // Eventually we can implement OnCharHook the same way, but concentrate on
     // accelerators for now. ProcessAccelerator must look at the current
diff --git a/include/wx/msgout.h b/include/wx/msgout.h
index cab47aa087..ad8f0390c0 100755
--- a/include/wx/msgout.h
+++ b/include/wx/msgout.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     17.07.02
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MSGOUT_H_
diff --git a/include/wx/mstream.h b/include/wx/mstream.h
index fca461b5dc..ac68e23288 100644
--- a/include/wx/mstream.h
+++ b/include/wx/mstream.h
@@ -6,7 +6,7 @@
 // Created:     11/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Guilhem Lavaux
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_WXMMSTREAM_H__
diff --git a/include/wx/msw/accel.h b/include/wx/msw/accel.h
index b3fa62a00a..121d5e349d 100644
--- a/include/wx/msw/accel.h
+++ b/include/wx/msw/accel.h
@@ -6,7 +6,7 @@
 // Created:     31/7/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_ACCEL_H_
diff --git a/include/wx/msw/app.h b/include/wx/msw/app.h
index 10e1dbd4fb..76006a9510 100644
--- a/include/wx/msw/app.h
+++ b/include/wx/msw/app.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_APP_H_
diff --git a/include/wx/msw/apptbase.h b/include/wx/msw/apptbase.h
index d6843d738d..551a0388e9 100644
--- a/include/wx/msw/apptbase.h
+++ b/include/wx/msw/apptbase.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     22.06.2003
 // RCS-ID:      $Id$
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MSW_APPTBASE_H_
diff --git a/include/wx/msw/apptrait.h b/include/wx/msw/apptrait.h
index 8d01b30662..1305270fb4 100644
--- a/include/wx/msw/apptrait.h
+++ b/include/wx/msw/apptrait.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     21.06.2003
 // RCS-ID:      $Id$
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MSW_APPTRAIT_H_
diff --git a/include/wx/msw/bitmap.h b/include/wx/msw/bitmap.h
index 0af92d4ea2..466a3f0398 100644
--- a/include/wx/msw/bitmap.h
+++ b/include/wx/msw/bitmap.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_BITMAP_H_
diff --git a/include/wx/msw/bmpbuttn.h b/include/wx/msw/bmpbuttn.h
index f1716a5473..99939ad05f 100644
--- a/include/wx/msw/bmpbuttn.h
+++ b/include/wx/msw/bmpbuttn.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_BMPBUTTN_H_
diff --git a/include/wx/msw/brush.h b/include/wx/msw/brush.h
index 4b0b124af4..11089cc0fc 100644
--- a/include/wx/msw/brush.h
+++ b/include/wx/msw/brush.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_BRUSH_H_
diff --git a/include/wx/msw/button.h b/include/wx/msw/button.h
index bb844575e3..efaf3716c1 100644
--- a/include/wx/msw/button.h
+++ b/include/wx/msw/button.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_BUTTON_H_
diff --git a/include/wx/msw/caret.h b/include/wx/msw/caret.h
index f1075aa471..1675672703 100644
--- a/include/wx/msw/caret.h
+++ b/include/wx/msw/caret.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     23.05.99
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CARET_H_
diff --git a/include/wx/msw/checkbox.h b/include/wx/msw/checkbox.h
index 64dedbf487..c2cda64625 100644
--- a/include/wx/msw/checkbox.h
+++ b/include/wx/msw/checkbox.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CHECKBOX_H_
diff --git a/include/wx/msw/checklst.h b/include/wx/msw/checklst.h
index 73385b20da..273cb45678 100644
--- a/include/wx/msw/checklst.h
+++ b/include/wx/msw/checklst.h
@@ -6,7 +6,7 @@
 // Created:     16.11.97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef   __CHECKLST__H_
diff --git a/include/wx/msw/chkconf.h b/include/wx/msw/chkconf.h
index 1dd47b8ea1..fa45a332eb 100644
--- a/include/wx/msw/chkconf.h
+++ b/include/wx/msw/chkconf.h
@@ -6,7 +6,7 @@
  * Created:     01/02/97
  * RCS-ID:      $Id$
  * Copyright:   (c) Julian Smart
- * Licence:     wxWindows licence
+ * Licence:     wxWidgets licence
  */
 
 /* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
diff --git a/include/wx/msw/choice.h b/include/wx/msw/choice.h
index 15b1bb818e..3c4e4b015c 100644
--- a/include/wx/msw/choice.h
+++ b/include/wx/msw/choice.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CHOICE_H_
diff --git a/include/wx/msw/clipbrd.h b/include/wx/msw/clipbrd.h
index 7d8b873c11..306f50ae1e 100644
--- a/include/wx/msw/clipbrd.h
+++ b/include/wx/msw/clipbrd.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CLIPBRD_H_
diff --git a/include/wx/msw/colordlg.h b/include/wx/msw/colordlg.h
index 1f6679b8b9..1432a0dedc 100644
--- a/include/wx/msw/colordlg.h
+++ b/include/wx/msw/colordlg.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COLORDLG_H_
diff --git a/include/wx/msw/colour.h b/include/wx/msw/colour.h
index d9bcb9319d..421ea35a9b 100644
--- a/include/wx/msw/colour.h
+++ b/include/wx/msw/colour.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COLOUR_H_
diff --git a/include/wx/msw/combobox.h b/include/wx/msw/combobox.h
index cd0880a81f..757f00b4bd 100644
--- a/include/wx/msw/combobox.h
+++ b/include/wx/msw/combobox.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COMBOBOX_H_
diff --git a/include/wx/msw/control.h b/include/wx/msw/control.h
index 0856025577..49c170cd0d 100644
--- a/include/wx/msw/control.h
+++ b/include/wx/msw/control.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CONTROL_H_
@@ -97,7 +97,7 @@ protected:
     //     implement MSWGetStyle() this version will disappear.
     //
     // create the control of the given class with the given style (combination
-    // of WS_XXX flags, i.e. Windows style, not wxWindows one), returns
+    // of WS_XXX flags, i.e. Windows style, not wxWidgets one), returns
     // FALSE if creation failed
     //
     // All parameters except classname and style are optional, if the
diff --git a/include/wx/msw/crashrpt.h b/include/wx/msw/crashrpt.h
index 4844c8cbe8..2cee3c1f35 100644
--- a/include/wx/msw/crashrpt.h
+++ b/include/wx/msw/crashrpt.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     13.07.2003
 // RCS-ID:      $Id$
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MSW_SEH_H_
diff --git a/include/wx/msw/cursor.h b/include/wx/msw/cursor.h
index 66f082b141..1f63efc76d 100644
--- a/include/wx/msw/cursor.h
+++ b/include/wx/msw/cursor.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CURSOR_H_
diff --git a/include/wx/msw/dc.h b/include/wx/msw/dc.h
index 8490f2b7d9..6e13a8f6fd 100644
--- a/include/wx/msw/dc.h
+++ b/include/wx/msw/dc.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DC_H_
@@ -258,7 +258,7 @@ protected:
 };
 
 // ----------------------------------------------------------------------------
-// wxDCTemp: a wxDC which doesn't free the given HDC (used by wxWindows
+// wxDCTemp: a wxDC which doesn't free the given HDC (used by wxWidgets
 // only/mainly)
 // ----------------------------------------------------------------------------
 
diff --git a/include/wx/msw/dcclient.h b/include/wx/msw/dcclient.h
index 1b021ba8e9..3b23d4277c 100644
--- a/include/wx/msw/dcclient.h
+++ b/include/wx/msw/dcclient.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCCLIENT_H_
diff --git a/include/wx/msw/dcmemory.h b/include/wx/msw/dcmemory.h
index 19ad43e384..fa5aadc76a 100644
--- a/include/wx/msw/dcmemory.h
+++ b/include/wx/msw/dcmemory.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCMEMORY_H_
diff --git a/include/wx/msw/dcprint.h b/include/wx/msw/dcprint.h
index 68e1e2d10c..c57134e579 100644
--- a/include/wx/msw/dcprint.h
+++ b/include/wx/msw/dcprint.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCPRINT_H_
diff --git a/include/wx/msw/dcscreen.h b/include/wx/msw/dcscreen.h
index f45f903d06..eccf1d7847 100644
--- a/include/wx/msw/dcscreen.h
+++ b/include/wx/msw/dcscreen.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCSCREEN_H_
diff --git a/include/wx/msw/dde.h b/include/wx/msw/dde.h
index dd55e69610..a662dc3a97 100644
--- a/include/wx/msw/dde.h
+++ b/include/wx/msw/dde.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DDE_H_
diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h
index bbe72cdf87..5ff4513ab4 100644
--- a/include/wx/msw/dialog.h
+++ b/include/wx/msw/dialog.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DIALOG_H_
diff --git a/include/wx/msw/dib.h b/include/wx/msw/dib.h
index 011de9e1a2..c11e4e4d72 100644
--- a/include/wx/msw/dib.h
+++ b/include/wx/msw/dib.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     03.03.03 (replaces the old file with the same name)
 // RCS-ID:      $Id$
-// Copyright:   (c) 1997-2003 wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) 1997-2003 wxWidgets team
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MSW_DIB_H_
@@ -104,7 +104,7 @@ public:
     // HBITMAP conversion
     // ------------------
 
-    // these functions are only used by wxWindows internally right now, please
+    // these functions are only used by wxWidgets internally right now, please
     // don't use them directly if possible as they're subject to change
 
 #ifndef __WXWINCE__
diff --git a/include/wx/msw/dirdlg.h b/include/wx/msw/dirdlg.h
index bf31a0063a..8cb5303db7 100644
--- a/include/wx/msw/dirdlg.h
+++ b/include/wx/msw/dirdlg.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DIRDLG_H_
diff --git a/include/wx/msw/display.h b/include/wx/msw/display.h
index a49805f463..fad87cfd0e 100644
--- a/include/wx/msw/display.h
+++ b/include/wx/msw/display.h
@@ -5,8 +5,8 @@
 // Modified by: 
 // Created:     06/21/02
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/include/wx/msw/dragimag.h b/include/wx/msw/dragimag.h
index 88192d97f2..5f75e6b97a 100644
--- a/include/wx/msw/dragimag.h
+++ b/include/wx/msw/dragimag.h
@@ -7,7 +7,7 @@
 // Created:     08/04/99
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DRAGIMAG_H_
@@ -32,7 +32,7 @@
   void MyTreeCtrl::OnBeginDrag(wxTreeEvent& event)
   {
 #ifdef __WXMSW__
-    ::UpdateWindow((HWND) GetHWND()); // We need to implement this in wxWindows
+    ::UpdateWindow((HWND) GetHWND()); // We need to implement this in wxWidgets
 #endif
 
     CaptureMouse();
diff --git a/include/wx/msw/enhmeta.h b/include/wx/msw/enhmeta.h
index b5469627d6..74313bb9c9 100644
--- a/include/wx/msw/enhmeta.h
+++ b/include/wx/msw/enhmeta.h
@@ -6,7 +6,7 @@
 // Created:     13.01.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MSW_ENHMETA_H_
diff --git a/include/wx/msw/fdrepdlg.h b/include/wx/msw/fdrepdlg.h
index 903404224c..f60a0edacf 100644
--- a/include/wx/msw/fdrepdlg.h
+++ b/include/wx/msw/fdrepdlg.h
@@ -2,11 +2,11 @@
 // Name:        wx/msw/fdrepdlg.h
 // Purpose:     wxFindReplaceDialog class
 // Author:      Markus Greither
-// Modified by: 31.07.01: VZ: integrated into wxWindows
+// Modified by: 31.07.01: VZ: integrated into wxWidgets
 // Created:     23/03/2001
 // RCS-ID:
 // Copyright:   (c) Markus Greither
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/include/wx/msw/filedlg.h b/include/wx/msw/filedlg.h
index fe7a4856bb..757796f94e 100644
--- a/include/wx/msw/filedlg.h
+++ b/include/wx/msw/filedlg.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FILEDLG_H_
diff --git a/include/wx/msw/font.h b/include/wx/msw/font.h
index 13674e03c5..3e8746b3bb 100644
--- a/include/wx/msw/font.h
+++ b/include/wx/msw/font.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FONT_H_
diff --git a/include/wx/msw/fontdlg.h b/include/wx/msw/fontdlg.h
index b68bb6ccf2..fe7c3ab207 100644
--- a/include/wx/msw/fontdlg.h
+++ b/include/wx/msw/fontdlg.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MSW_FONTDLG_H_
diff --git a/include/wx/msw/fontenum.h b/include/wx/msw/fontenum.h
index 38b7e08eca..fc1808dfce 100644
--- a/include/wx/msw/fontenum.h
+++ b/include/wx/msw/fontenum.h
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FONTENUM_H_
diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h
index 0680ada270..5f99f8597d 100644
--- a/include/wx/msw/frame.h
+++ b/include/wx/msw/frame.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FRAME_H_
@@ -133,7 +133,7 @@ protected:
 
     virtual bool IsMDIChild() const { return FALSE; }
 
-    // get default (wxWindows) icon for the frame
+    // get default (wxWidgets) icon for the frame
     virtual WXHICON GetDefaultIcon() const;
 
 #if wxUSE_STATUSBAR
diff --git a/include/wx/msw/gauge95.h b/include/wx/msw/gauge95.h
index 6173f60615..981aae0c5f 100644
--- a/include/wx/msw/gauge95.h
+++ b/include/wx/msw/gauge95.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _GAUGE95_H_
diff --git a/include/wx/msw/gdiimage.h b/include/wx/msw/gdiimage.h
index 5598ed0238..2a38740aa9 100644
--- a/include/wx/msw/gdiimage.h
+++ b/include/wx/msw/gdiimage.h
@@ -7,7 +7,7 @@
 // Created:     20.11.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // NB: this is a private header, it is not intended to be directly included by
diff --git a/include/wx/msw/gdiobj.h b/include/wx/msw/gdiobj.h
index 4b085fce52..03dd0814fc 100644
--- a/include/wx/msw/gdiobj.h
+++ b/include/wx/msw/gdiobj.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GDIOBJ_H_
diff --git a/include/wx/msw/glcanvas.h b/include/wx/msw/glcanvas.h
index 3ae12ab890..206685f28f 100644
--- a/include/wx/msw/glcanvas.h
+++ b/include/wx/msw/glcanvas.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/msw/glcanvas.h
-// Purpose:     wxGLCanvas, for using OpenGL with wxWindows under Windows
+// Purpose:     wxGLCanvas, for using OpenGL with wxWidgets under Windows
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/include/wx/msw/helpbest.h b/include/wx/msw/helpbest.h
index 5c735c65d9..7c179f7c4c 100644
--- a/include/wx/msw/helpbest.h
+++ b/include/wx/msw/helpbest.h
@@ -6,7 +6,7 @@
 // Created:     02/04/2001
 // RCS-ID:      $Id$
 // Copyright:   (c) Mattia Barbon
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_HELPBEST_H_
diff --git a/include/wx/msw/helpchm.h b/include/wx/msw/helpchm.h
index 09c621b5f3..b8356bda7d 100644
--- a/include/wx/msw/helpchm.h
+++ b/include/wx/msw/helpchm.h
@@ -6,7 +6,7 @@
 // Created:     16/04/2000
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_HELPCHM_H_
diff --git a/include/wx/msw/helpwin.h b/include/wx/msw/helpwin.h
index da2c7c2fd4..cec79159d9 100644
--- a/include/wx/msw/helpwin.h
+++ b/include/wx/msw/helpwin.h
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_HELPWIN_H_
diff --git a/include/wx/msw/icon.h b/include/wx/msw/icon.h
index ac8695bdb7..34848d8dee 100644
--- a/include/wx/msw/icon.h
+++ b/include/wx/msw/icon.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_ICON_H_
diff --git a/include/wx/msw/imaglist.h b/include/wx/msw/imaglist.h
index 075127ae19..8e2f01580d 100644
--- a/include/wx/msw/imaglist.h
+++ b/include/wx/msw/imaglist.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_IMAGLIST_H_
diff --git a/include/wx/msw/iniconf.h b/include/wx/msw/iniconf.h
index 22e141149e..c864a0bcbb 100644
--- a/include/wx/msw/iniconf.h
+++ b/include/wx/msw/iniconf.h
@@ -6,7 +6,7 @@
 // Created:     27.07.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef   _INICONF_H
diff --git a/include/wx/msw/joystick.h b/include/wx/msw/joystick.h
index f158816b3f..90d9711763 100644
--- a/include/wx/msw/joystick.h
+++ b/include/wx/msw/joystick.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_JOYSTICK_H_
diff --git a/include/wx/msw/listbox.h b/include/wx/msw/listbox.h
index f1c58c0979..6bd5dfe5ed 100644
--- a/include/wx/msw/listbox.h
+++ b/include/wx/msw/listbox.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_LISTBOX_H_
diff --git a/include/wx/msw/listctrl.h b/include/wx/msw/listctrl.h
index 47ddda9e99..e8d5b1ddb4 100644
--- a/include/wx/msw/listctrl.h
+++ b/include/wx/msw/listctrl.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_LISTCTRL_H_
@@ -63,8 +63,8 @@ class WXDLLEXPORT wxImageList;
     which item. Each image in an image list can contain a mask, and can be made out
     of either a bitmap, two bitmaps or an icon. See ImagList.h for more details.
 
-    Notifications are passed via the wxWindows 2.0 event system, or using virtual
-    functions in wxWindows 1.66.
+    Notifications are passed via the wxWidgets 2.0 event system, or using virtual
+    functions in wxWidgets 1.66.
 
     See the sample wxListCtrl app for API usage.
 
diff --git a/include/wx/msw/mdi.h b/include/wx/msw/mdi.h
index 1d5e440809..4d44c01444 100644
--- a/include/wx/msw/mdi.h
+++ b/include/wx/msw/mdi.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MDI_H_
diff --git a/include/wx/msw/menu.h b/include/wx/msw/menu.h
index 3d18cf67e0..c724fc1639 100644
--- a/include/wx/msw/menu.h
+++ b/include/wx/msw/menu.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MENU_H_
@@ -207,7 +207,7 @@ protected:
     WXHMENU       m_hMenu;
 
     // Return the MSW position for a wxMenu which is sometimes different from
-    // the wxWindows position.
+    // the wxWidgets position.
     int MSWPositionForWxMenu(wxMenu *menu, int wxpos);
 #if wxUSE_ACCEL
     // the accelerator table for all accelerators in all our menus
diff --git a/include/wx/msw/menuitem.h b/include/wx/msw/menuitem.h
index 6cd72cb989..1745502900 100644
--- a/include/wx/msw/menuitem.h
+++ b/include/wx/msw/menuitem.h
@@ -6,7 +6,7 @@
 // Created:     11.11.97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef   _MENUITEM_H
diff --git a/include/wx/msw/metafile.h b/include/wx/msw/metafile.h
index 8b8afe2bd3..3de0dfd549 100644
--- a/include/wx/msw/metafile.h
+++ b/include/wx/msw/metafile.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_METAFIILE_H_
diff --git a/include/wx/msw/microwin.h b/include/wx/msw/microwin.h
index 69bb4e1385..401b452d95 100644
--- a/include/wx/msw/microwin.h
+++ b/include/wx/msw/microwin.h
@@ -6,7 +6,7 @@
 // Created:     2001-05-31
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 */
 
diff --git a/include/wx/msw/mimetype.h b/include/wx/msw/mimetype.h
index 041ddcfd58..038eb4cf7d 100644
--- a/include/wx/msw/mimetype.h
+++ b/include/wx/msw/mimetype.h
@@ -6,7 +6,7 @@
 // Created:     23.09.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence (part of wxExtra library)
+// Licence:     wxWidgets licence (part of wxExtra library)
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _MIMETYPE_IMPL_H
diff --git a/include/wx/msw/minifram.h b/include/wx/msw/minifram.h
index ac32099044..961183ba2b 100644
--- a/include/wx/msw/minifram.h
+++ b/include/wx/msw/minifram.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MINIFRAM_H_
diff --git a/include/wx/msw/missing.h b/include/wx/msw/missing.h
index 04ef9d8298..215de853c8 100644
--- a/include/wx/msw/missing.h
+++ b/include/wx/msw/missing.h
@@ -5,7 +5,7 @@
 // Created:     2002/04/23
 // RCS-ID:      $Id$
 // Copyright:   (c) 2002 Mattia Barbon
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MISSING_H_
diff --git a/include/wx/msw/msgdlg.h b/include/wx/msw/msgdlg.h
index a82784cff6..1d236153cc 100644
--- a/include/wx/msw/msgdlg.h
+++ b/include/wx/msw/msgdlg.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MSGBOXDLG_H_
diff --git a/include/wx/msw/mslu.h b/include/wx/msw/mslu.h
index e8700dd40c..8d57024f9c 100644
--- a/include/wx/msw/mslu.h
+++ b/include/wx/msw/mslu.h
@@ -6,7 +6,7 @@
 // Created:     2002/02/17
 // RCS-ID:      $Id$
 // Copyright:   (c) 2002 Vaclav Slavik
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MSLU_H_
diff --git a/include/wx/msw/msvcrt.h b/include/wx/msw/msvcrt.h
index 70fc382929..5dc0b1b027 100644
--- a/include/wx/msw/msvcrt.h
+++ b/include/wx/msw/msvcrt.h
@@ -7,7 +7,7 @@
 // Created:     31.01.1999
 // RCS-ID:      $Id$
 // Copyright:   (c) Vadim Zeitlin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // the goal of this file is to define wxCrtSetDbgFlag() macro which may be
diff --git a/include/wx/msw/notebook.h b/include/wx/msw/notebook.h
index 6e19b04fa3..a4e27458c6 100644
--- a/include/wx/msw/notebook.h
+++ b/include/wx/msw/notebook.h
@@ -5,7 +5,7 @@
 // Modified by: Vadim Zeitlin for Windows version
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _NOTEBOOK_H
diff --git a/include/wx/msw/ole/access.h b/include/wx/msw/ole/access.h
index 42eba96b7a..aa84ee1e6e 100644
--- a/include/wx/msw/ole/access.h
+++ b/include/wx/msw/ole/access.h
@@ -6,7 +6,7 @@
 // Created:     2003-02-12
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef   _WX_ACCESS_H_
diff --git a/include/wx/msw/ole/automtn.h b/include/wx/msw/ole/automtn.h
index 81ef363be2..9b38de6d9b 100644
--- a/include/wx/msw/ole/automtn.h
+++ b/include/wx/msw/ole/automtn.h
@@ -6,7 +6,7 @@
 // Created:     11/6/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998, Julian Smart
-// Licence:     wxWindows Licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/include/wx/msw/ole/dataform.h b/include/wx/msw/ole/dataform.h
index 634ab463e0..e6608222f9 100644
--- a/include/wx/msw/ole/dataform.h
+++ b/include/wx/msw/ole/dataform.h
@@ -6,7 +6,7 @@
 // Created:     19.10.99 (extracted from msw/ole/dataobj.h)
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef   _WX_MSW_OLE_DATAFORM_H
diff --git a/include/wx/msw/ole/dataobj.h b/include/wx/msw/ole/dataobj.h
index f686ef4bb7..18bb6ddd2f 100644
--- a/include/wx/msw/ole/dataobj.h
+++ b/include/wx/msw/ole/dataobj.h
@@ -6,7 +6,7 @@
 // Created:     10.05.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef   _WX_MSW_OLE_DATAOBJ_H
diff --git a/include/wx/msw/ole/dataobj2.h b/include/wx/msw/ole/dataobj2.h
index f69c376127..99a3c680fc 100644
--- a/include/wx/msw/ole/dataobj2.h
+++ b/include/wx/msw/ole/dataobj2.h
@@ -7,7 +7,7 @@
 // Created:     21.10.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MSW_OLE_DATAOBJ2_H
diff --git a/include/wx/msw/ole/dropsrc.h b/include/wx/msw/ole/dropsrc.h
index bdc972b732..70f3e9a65a 100644
--- a/include/wx/msw/ole/dropsrc.h
+++ b/include/wx/msw/ole/dropsrc.h
@@ -6,7 +6,7 @@
 // Created:     06.03.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef   _WX_OLEDROPSRC_H
diff --git a/include/wx/msw/ole/droptgt.h b/include/wx/msw/ole/droptgt.h
index 55e0040d73..6c08553cd0 100644
--- a/include/wx/msw/ole/droptgt.h
+++ b/include/wx/msw/ole/droptgt.h
@@ -6,7 +6,7 @@
 // Created:     06.03.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef   _WX_OLEDROPTGT_H
diff --git a/include/wx/msw/ole/oleutils.h b/include/wx/msw/ole/oleutils.h
index 9f71b28de5..c0c6bc3e6c 100644
--- a/include/wx/msw/ole/oleutils.h
+++ b/include/wx/msw/ole/oleutils.h
@@ -6,7 +6,7 @@
 // Created:     19.02.1998
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef   _WX_OLEUTILS_H
diff --git a/include/wx/msw/ole/uuid.h b/include/wx/msw/ole/uuid.h
index c194a4e417..5c97e4c8a9 100644
--- a/include/wx/msw/ole/uuid.h
+++ b/include/wx/msw/ole/uuid.h
@@ -6,7 +6,7 @@
 // Created:     11.07.97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 //
 // Notes:       you should link your project with RPCRT4.LIB!
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/include/wx/msw/palette.h b/include/wx/msw/palette.h
index 7a0270a6aa..17ecee357d 100644
--- a/include/wx/msw/palette.h
+++ b/include/wx/msw/palette.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PALETTE_H_
diff --git a/include/wx/msw/pen.h b/include/wx/msw/pen.h
index e53c21f3bd..387a192cfe 100644
--- a/include/wx/msw/pen.h
+++ b/include/wx/msw/pen.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PEN_H_
diff --git a/include/wx/msw/popupwin.h b/include/wx/msw/popupwin.h
index 3a1f9f1732..2e50ef613b 100644
--- a/include/wx/msw/popupwin.h
+++ b/include/wx/msw/popupwin.h
@@ -6,7 +6,7 @@
 // Created:     06.01.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MSW_POPUPWIN_H_
diff --git a/include/wx/msw/printdlg.h b/include/wx/msw/printdlg.h
index 041b389a8e..af95e321c9 100644
--- a/include/wx/msw/printdlg.h
+++ b/include/wx/msw/printdlg.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PRINTDLG_H_
diff --git a/include/wx/msw/printwin.h b/include/wx/msw/printwin.h
index f14cb044a4..c62440f8a3 100644
--- a/include/wx/msw/printwin.h
+++ b/include/wx/msw/printwin.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PRINTWIN_H_
diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index a2ef6bcba4..1bd4f43c81 100644
--- a/include/wx/msw/private.h
+++ b/include/wx/msw/private.h
@@ -1,14 +1,14 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        private.h
 // Purpose:     Private declarations: as this header is only included by
-//              wxWindows itself, it may contain identifiers which don't start
+//              wxWidgets itself, it may contain identifiers which don't start
 //              with "wx".
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PRIVATE_H_
@@ -245,7 +245,7 @@ inline void wxCopyRECTToRect(const RECT& r, wxRect& rect)
 extern void HIMETRICToPixel(LONG *x, LONG *y);
 extern void PixelToHIMETRIC(LONG *x, LONG *y);
 
-// Windows convention of the mask is opposed to the wxWindows one, so we need
+// Windows convention of the mask is opposed to the wxWidgets one, so we need
 // to invert the mask each time we pass one/get one to/from Windows
 extern HBITMAP wxInvertMask(HBITMAP hbmpMask, int w = 0, int h = 0);
 
diff --git a/include/wx/msw/radiobox.h b/include/wx/msw/radiobox.h
index 49c1cf0771..06603d9fe2 100644
--- a/include/wx/msw/radiobox.h
+++ b/include/wx/msw/radiobox.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_RADIOBOX_H_
diff --git a/include/wx/msw/radiobut.h b/include/wx/msw/radiobut.h
index da92a8e18f..207ea21dbb 100644
--- a/include/wx/msw/radiobut.h
+++ b/include/wx/msw/radiobut.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_RADIOBUT_H_
diff --git a/include/wx/msw/regconf.h b/include/wx/msw/regconf.h
index 3c83e70c98..6a11bfcb3d 100644
--- a/include/wx/msw/regconf.h
+++ b/include/wx/msw/regconf.h
@@ -6,7 +6,7 @@
 // Created:     27.04.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef   _REGCONF_H
diff --git a/include/wx/msw/region.h b/include/wx/msw/region.h
index df0762fee5..c8da106e50 100644
--- a/include/wx/msw/region.h
+++ b/include/wx/msw/region.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) 1997-2002 wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) 1997-2002 wxWidgets team
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_REGION_H_
diff --git a/include/wx/msw/registry.h b/include/wx/msw/registry.h
index 4a8c26ac6f..0cbe88f4c1 100644
--- a/include/wx/msw/registry.h
+++ b/include/wx/msw/registry.h
@@ -6,7 +6,7 @@
 // Created:     03.04.198
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef   _REGISTRY_H
diff --git a/include/wx/msw/scrolbar.h b/include/wx/msw/scrolbar.h
index 04e231de77..cd2cf6643d 100644
--- a/include/wx/msw/scrolbar.h
+++ b/include/wx/msw/scrolbar.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SCROLBAR_H_
diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index 8e63f7dc56..369d377d62 100644
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SETUP_H_
@@ -67,7 +67,7 @@
 // Generic comment about debugging settings: they are very useful if you don't
 // use any other memory leak detection tools such as Purify/BoundsChecker, but
 // are probably redundant otherwise. Also, Visual C++ CRT has the same features
-// as wxWindows memory debugging subsystem built in since version 5.0 and you
+// as wxWidgets memory debugging subsystem built in since version 5.0 and you
 // may prefer to use it instead of built in memory debugging code because it is
 // faster and more fool proof.
 //
@@ -136,7 +136,7 @@
 // Unicode support
 // ----------------------------------------------------------------------------
 
-// Set wxUSE_UNICODE to 1 to compile wxWindows in Unicode mode: wxChar will be
+// Set wxUSE_UNICODE to 1 to compile wxWidgets in Unicode mode: wxChar will be
 // defined as wchar_t, wxString will use Unicode internally. If you set this
 // to 1, you must use wxT() macro for all literal strings in the program.
 //
@@ -151,7 +151,7 @@
     #define wxUSE_UNICODE 0
 #endif
 
-// Set wxUSE_UNICODE_MSLU to 1 if you want to compile wxWindows in Unicode mode
+// Set wxUSE_UNICODE_MSLU to 1 if you want to compile wxWidgets in Unicode mode
 // and be able to run compiled apps under Windows 9x as well as NT/2000/XP.
 // This setting enables use of unicows.dll from MSLU (MS Layer for Unicode, see
 // http://www.microsoft.com/globaldev/handson/dev/mslu_announce.mspx). Note
@@ -253,7 +253,7 @@
 // Recommended setting: 0 unless you do plan to develop MT applications
 #define wxUSE_THREADS 1
 
-// If enabled (1), compiles wxWindows streams classes
+// If enabled (1), compiles wxWidgets streams classes
 #define wxUSE_STREAMS       1
 
 // Use standard C++ streams if 1. If 0, use wxWin streams implementation.
@@ -400,7 +400,7 @@
 
 // If enabled, the code written by Apple will be used to write, in a portable
 // way, float on the disk. See extended.c for the license which is different
-// from wxWindows one.
+// from wxWidgets one.
 //
 // Default is 1.
 //
@@ -494,7 +494,7 @@
 // Recommended setting: 1 (may be set to 0)
 #define wxUSE_TIPWINDOW    1
 
-// Each of the settings below corresponds to one wxWindows control. They are
+// Each of the settings below corresponds to one wxWidgets control. They are
 // all switched on by default but may be disabled if you are sure that your
 // program (including any standard dialogs it can show!) doesn't need them and
 // if you desperately want to save some space. If you use any of these you must
@@ -1006,7 +1006,7 @@
 // Windows-only settings
 // ----------------------------------------------------------------------------
 
-// Set this to 1 if you want to use wxWindows and MFC in the same program. This
+// Set this to 1 if you want to use wxWidgets and MFC in the same program. This
 // will override some other settings (see below)
 //
 // Default is 0.
diff --git a/include/wx/msw/setup_microwin.h b/include/wx/msw/setup_microwin.h
index 9ef05acb32..aa251e9c81 100644
--- a/include/wx/msw/setup_microwin.h
+++ b/include/wx/msw/setup_microwin.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SETUP_H_
@@ -72,7 +72,7 @@
 // Generic comment about debugging settings: they are very useful if you don't
 // use any other memory leak detection tools such as Purify/BoundsChecker, but
 // are probably redundant otherwise. Also, Visual C++ CRT has the same features
-// as wxWindows memory debugging subsystem built in since version 5.0 and you
+// as wxWidgets memory debugging subsystem built in since version 5.0 and you
 // may prefer to use it instead of built in memory debugging code because it is
 // faster and more fool proof.
 //
@@ -141,7 +141,7 @@
 // Unicode support
 // ----------------------------------------------------------------------------
 
-// Set wxUSE_UNICODE to 1 to compile wxWindows in Unicode mode: wxChar will be
+// Set wxUSE_UNICODE to 1 to compile wxWidgets in Unicode mode: wxChar will be
 // defined as wchar_t, wxString will use Unicode internally. If you set this
 // to 1, you must use wxT() macro for all literal strings in the program.
 //
@@ -154,7 +154,7 @@
 // Recommended setting: 0 (unless you only plan to use Windows NT/2000)
 #define wxUSE_UNICODE 0
 
-// Set wxUSE_UNICODE_MSLU to 1 if you want to compile wxWindows in Unicode mode
+// Set wxUSE_UNICODE_MSLU to 1 if you want to compile wxWidgets in Unicode mode
 // and be able to run compiled apps under Windows 9x as well as NT/2000/XP. This
 // setting enables use of unicows.dll from MSLU (MS Layer for Unicode, see
 // http://www.microsoft.com/globaldev/Articles/mslu_announce.asp). Note that you
@@ -218,7 +218,7 @@
 // Recommended setting: 0 unless you do plan to develop MT applications
 #define wxUSE_THREADS 0
 
-// If enabled (1), compiles wxWindows streams classes
+// If enabled (1), compiles wxWidgets streams classes
 #define wxUSE_STREAMS       1
 
 // Use standard C++ streams if 1. If 0, use wxWin streams implementation.
@@ -360,7 +360,7 @@
 
 // If enabled, the code written by Apple will be used to write, in a portable
 // way, float on the disk. See extended.c for the license which is different
-// from wxWindows one.
+// from wxWidgets one.
 //
 // Default is 1.
 //
@@ -419,7 +419,7 @@
 // Recommended setting: 1 (may be set to 0)
 #define wxUSE_TIPWINDOW    1
 
-// Each of the settings below corresponds to one wxWindows control. They are
+// Each of the settings below corresponds to one wxWidgets control. They are
 // all switched on by default but may be disabled if you are sure that your
 // program (including any standard dialogs it can show!) doesn't need them and
 // if you desperately want to save some space. If you use any of these you must
@@ -897,7 +897,7 @@
 // Windows-only settings
 // ----------------------------------------------------------------------------
 
-// Set this to 1 if you want to use wxWindows and MFC in the same program. This
+// Set this to 1 if you want to use wxWidgets and MFC in the same program. This
 // will override some other settings (see below)
 //
 // Default is 0.
diff --git a/include/wx/msw/slider95.h b/include/wx/msw/slider95.h
index 51befcee29..06e13d4b8d 100644
--- a/include/wx/msw/slider95.h
+++ b/include/wx/msw/slider95.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _SLIDER95_H_
diff --git a/include/wx/msw/slidrmsw.h b/include/wx/msw/slidrmsw.h
index 9409797ccc..ba9a94021d 100644
--- a/include/wx/msw/slidrmsw.h
+++ b/include/wx/msw/slidrmsw.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _SLIDRMSW_H_
diff --git a/include/wx/msw/sound.h b/include/wx/msw/sound.h
index cdfa05d8d4..5b0c07f2ae 100644
--- a/include/wx/msw/sound.h
+++ b/include/wx/msw/sound.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SOUND_H_
diff --git a/include/wx/msw/spinbutt.h b/include/wx/msw/spinbutt.h
index 6e1931bfa3..c62b607874 100644
--- a/include/wx/msw/spinbutt.h
+++ b/include/wx/msw/spinbutt.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SPINBUTT_H_
diff --git a/include/wx/msw/spinctrl.h b/include/wx/msw/spinctrl.h
index 677e2f181a..f7374f400b 100644
--- a/include/wx/msw/spinctrl.h
+++ b/include/wx/msw/spinctrl.h
@@ -6,7 +6,7 @@
 // Created:     22.07.99
 // RCS-ID:      $Id$
 // Copyright:   (c) Vadim Zeitlin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MSW_SPINCTRL_H_
diff --git a/include/wx/msw/statbmp.h b/include/wx/msw/statbmp.h
index e778d2e373..ab40a87b7a 100644
--- a/include/wx/msw/statbmp.h
+++ b/include/wx/msw/statbmp.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STATBMP_H_
diff --git a/include/wx/msw/statbox.h b/include/wx/msw/statbox.h
index decf37139d..f040fa6dcd 100644
--- a/include/wx/msw/statbox.h
+++ b/include/wx/msw/statbox.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STATBOX_H_
diff --git a/include/wx/msw/statbr95.h b/include/wx/msw/statbr95.h
index 66446448db..b41f51da05 100644
--- a/include/wx/msw/statbr95.h
+++ b/include/wx/msw/statbr95.h
@@ -6,7 +6,7 @@
 // Created:     04.04.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef   _STATBR95_H
diff --git a/include/wx/msw/statline.h b/include/wx/msw/statline.h
index 9f711377a3..bb02249c48 100644
--- a/include/wx/msw/statline.h
+++ b/include/wx/msw/statline.h
@@ -5,7 +5,7 @@
 // Created:     28.06.99
 // Version:     $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MSW_STATLINE_H_
diff --git a/include/wx/msw/stattext.h b/include/wx/msw/stattext.h
index 0ceef4c977..e272476d93 100644
--- a/include/wx/msw/stattext.h
+++ b/include/wx/msw/stattext.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STATTEXT_H_
diff --git a/include/wx/msw/tabctrl.h b/include/wx/msw/tabctrl.h
index 90528e05c3..f1b2a51dc7 100644
--- a/include/wx/msw/tabctrl.h
+++ b/include/wx/msw/tabctrl.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TABCTRL_H_
diff --git a/include/wx/msw/taskbar.h b/include/wx/msw/taskbar.h
index 2d056d574e..378753b0d6 100644
--- a/include/wx/msw/taskbar.h
+++ b/include/wx/msw/taskbar.h
@@ -7,7 +7,7 @@
 // Created:     24/3/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////
 
 #ifndef _TASKBAR_H_
diff --git a/include/wx/msw/tbar95.h b/include/wx/msw/tbar95.h
index 03cb30b657..7768c437e6 100644
--- a/include/wx/msw/tbar95.h
+++ b/include/wx/msw/tbar95.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TBAR95_H_
diff --git a/include/wx/msw/tbarmsw.h b/include/wx/msw/tbarmsw.h
index 388b501c08..66b3ea2c9e 100644
--- a/include/wx/msw/tbarmsw.h
+++ b/include/wx/msw/tbarmsw.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TBARMSW_H_
@@ -76,7 +76,7 @@ public:
     // implementation only from now on
     // -------------------------------
 
-    // Handle wxWindows events
+    // Handle wxWidgets events
     void OnPaint(wxPaintEvent& event);
     void OnMouseEvent(wxMouseEvent& event);
 
diff --git a/include/wx/msw/textctrl.h b/include/wx/msw/textctrl.h
index e0928b1174..d8baa2dbed 100644
--- a/include/wx/msw/textctrl.h
+++ b/include/wx/msw/textctrl.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TEXTCTRL_H_
diff --git a/include/wx/msw/timer.h b/include/wx/msw/timer.h
index 9ecd87327c..7e2d20f77f 100644
--- a/include/wx/msw/timer.h
+++ b/include/wx/msw/timer.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TIMER_H_
diff --git a/include/wx/msw/tooltip.h b/include/wx/msw/tooltip.h
index d8fb5c35e5..6df2c91983 100644
--- a/include/wx/msw/tooltip.h
+++ b/include/wx/msw/tooltip.h
@@ -6,7 +6,7 @@
 // Created:     31.01.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Robert Roebling, Vadim Zeitlin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 class WXDLLEXPORT wxToolTip : public wxObject
diff --git a/include/wx/msw/toplevel.h b/include/wx/msw/toplevel.h
index 6684cc6d70..d030cb8478 100644
--- a/include/wx/msw/toplevel.h
+++ b/include/wx/msw/toplevel.h
@@ -6,7 +6,7 @@
 // Created:     20.09.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MSW_TOPLEVEL_H_
@@ -100,7 +100,7 @@ protected:
     // common part of Iconize(), Maximize() and Restore()
     void DoShowWindow(int nShowCmd);
 
-    // translate wxWindows flags to Windows ones
+    // translate wxWidgets flags to Windows ones
     virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle) const;
 
     // choose the right parent to use with CreateWindow()
diff --git a/include/wx/msw/treectrl.h b/include/wx/msw/treectrl.h
index f95ddf6f96..1edc6ce0cb 100644
--- a/include/wx/msw/treectrl.h
+++ b/include/wx/msw/treectrl.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TREECTRL_H_
@@ -378,7 +378,7 @@ public:
 
 #if WXWIN_COMPATIBILITY_2_4
     // these methods are deprecated and will be removed in future versions of
-    // wxWindows, they're here for compatibility only, don't use them in new
+    // wxWidgets, they're here for compatibility only, don't use them in new
     // code (the comments indicate why these methods are now useless and how to
     // replace them)
 
diff --git a/include/wx/msw/uxtheme.h b/include/wx/msw/uxtheme.h
index f85b33bacc..cc62e52848 100644
--- a/include/wx/msw/uxtheme.h
+++ b/include/wx/msw/uxtheme.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     2003
 // RCS-ID:      $Id$
-// Copyright:   (c) 2003 wxWindows Dev-Team
-// License:     wxWindows license
+// Copyright:   (c) 2003 wxWidgets Dev-Team
+// License:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UXTHEME_H_
diff --git a/include/wx/msw/wince/helpwce.h b/include/wx/msw/wince/helpwce.h
index 82e29f1a95..463772e9b0 100644
--- a/include/wx/msw/wince/helpwce.h
+++ b/include/wx/msw/wince/helpwce.h
@@ -6,7 +6,7 @@
 // Created:     2003-07-12
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_HELPWCE_H_
diff --git a/include/wx/msw/wince/libraries.h b/include/wx/msw/wince/libraries.h
index 81c5f23881..58b9b06e4f 100644
--- a/include/wx/msw/wince/libraries.h
+++ b/include/wx/msw/wince/libraries.h
@@ -6,7 +6,7 @@
 // Created:     2004-04-11
 // RCS-ID:      $Id$
 // Copyright:   (c) 2004 Vaclav Slavik
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_LIBRARIES_H_
diff --git a/include/wx/msw/wince/missing.h b/include/wx/msw/wince/missing.h
index 99d6ce7583..84940e32fb 100644
--- a/include/wx/msw/wince/missing.h
+++ b/include/wx/msw/wince/missing.h
@@ -6,7 +6,7 @@
 // Created:     16/11/2002
 // RCS-ID:
 // Copyright:   (c) KOAN SAS ( www.koansoftware.com )
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CE_MISSING_H_
diff --git a/include/wx/msw/wince/setup.h b/include/wx/msw/wince/setup.h
index a836f82a02..c0b40d521c 100644
--- a/include/wx/msw/wince/setup.h
+++ b/include/wx/msw/wince/setup.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SETUP_H_
@@ -67,7 +67,7 @@
 // Generic comment about debugging settings: they are very useful if you don't
 // use any other memory leak detection tools such as Purify/BoundsChecker, but
 // are probably redundant otherwise. Also, Visual C++ CRT has the same features
-// as wxWindows memory debugging subsystem built in since version 5.0 and you
+// as wxWidgets memory debugging subsystem built in since version 5.0 and you
 // may prefer to use it instead of built in memory debugging code because it is
 // faster and more fool proof.
 //
@@ -136,7 +136,7 @@
 // Unicode support
 // ----------------------------------------------------------------------------
 
-// Set wxUSE_UNICODE to 1 to compile wxWindows in Unicode mode: wxChar will be
+// Set wxUSE_UNICODE to 1 to compile wxWidgets in Unicode mode: wxChar will be
 // defined as wchar_t, wxString will use Unicode internally. If you set this
 // to 1, you must use wxT() macro for all literal strings in the program.
 //
@@ -151,7 +151,7 @@
     #define wxUSE_UNICODE 1
 #endif
 
-// Set wxUSE_UNICODE_MSLU to 1 if you want to compile wxWindows in Unicode mode
+// Set wxUSE_UNICODE_MSLU to 1 if you want to compile wxWidgets in Unicode mode
 // and be able to run compiled apps under Windows 9x as well as NT/2000/XP.
 // This setting enables use of unicows.dll from MSLU (MS Layer for Unicode, see
 // http://www.microsoft.com/globaldev/handson/dev/mslu_announce.mspx). Note that
@@ -248,7 +248,7 @@
 // Recommended setting: 0 unless you do plan to develop MT applications
 #define wxUSE_THREADS 1
 
-// If enabled (1), compiles wxWindows streams classes
+// If enabled (1), compiles wxWidgets streams classes
 #define wxUSE_STREAMS       1
 
 // Use standard C++ streams if 1. If 0, use wxWin streams implementation.
@@ -399,7 +399,7 @@
 
 // If enabled, the code written by Apple will be used to write, in a portable
 // way, float on the disk. See extended.c for the license which is different
-// from wxWindows one.
+// from wxWidgets one.
 //
 // Default is 1.
 //
@@ -483,7 +483,7 @@
 // Recommended setting: 1 (may be set to 0)
 #define wxUSE_TIPWINDOW    1
 
-// Each of the settings below corresponds to one wxWindows control. They are
+// Each of the settings below corresponds to one wxWidgets control. They are
 // all switched on by default but may be disabled if you are sure that your
 // program (including any standard dialogs it can show!) doesn't need them and
 // if you desperately want to save some space. If you use any of these you must
@@ -984,7 +984,7 @@
 // Windows-only settings
 // ----------------------------------------------------------------------------
 
-// Set this to 1 if you want to use wxWindows and MFC in the same program. This
+// Set this to 1 if you want to use wxWidgets and MFC in the same program. This
 // will override some other settings (see below)
 //
 // Default is 0.
@@ -1062,9 +1062,9 @@
 #define wxUSE_UXTHEME_AUTO      0
 
 // Set to 1 if you want to maintain a PocketPC-style UI on
-// Windows CE .NET. If 0, wxWindows will use a commandbar
+// Windows CE .NET. If 0, wxWidgets will use a commandbar
 // for the menubar, and a normal separate toolbar as per the
-// desktop implementation. If 1, wxWindows will combine
+// desktop implementation. If 1, wxWidgets will combine
 // the toolbar and menubar as per the PocketPC implementation.
 //
 // Note that at present, the dynamic loading of PocketPC
diff --git a/include/wx/msw/wince/tbarwce.h b/include/wx/msw/wince/tbarwce.h
index b8041224e3..631f81b0e6 100644
--- a/include/wx/msw/wince/tbarwce.h
+++ b/include/wx/msw/wince/tbarwce.h
@@ -6,7 +6,7 @@
 // Created:     2003-07-12
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_BARWCE_H_
diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h
index d40b27c79d..128a03198d 100644
--- a/include/wx/msw/window.h
+++ b/include/wx/msw/window.h
@@ -7,7 +7,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_WINDOW_H_
@@ -32,7 +32,7 @@
 // constants
 // ---------------------------------------------------------------------------
 
-// FIXME does anybody use those? they're unused by wxWindows...
+// FIXME does anybody use those? they're unused by wxWidgets...
 enum
 {
     wxKEY_SHIFT = 1,
@@ -176,7 +176,7 @@ public:
     WXFARPROC MSWGetOldWndProc() const { return m_oldWndProc; }
     void MSWSetOldWndProc(WXFARPROC proc) { m_oldWndProc = proc; }
 
-    // return TRUE if the window is of a standard (i.e. not wxWindows') class
+    // return TRUE if the window is of a standard (i.e. not wxWidgets') class
     //
     // to understand why does it work, look at SubclassWin() code and comments
     bool IsOfStandardClass() const { return m_oldWndProc != NULL; }
@@ -187,21 +187,21 @@ public:
     // MSW only: TRUE if this control is part of the main control
     virtual bool ContainsHWND(WXHWND WXUNUSED(hWnd)) const { return FALSE; };
 
-    // translate wxWindows style flags for this control into the Windows style
+    // translate wxWidgets style flags for this control into the Windows style
     // and optional extended style for the corresponding native control
     //
     // this is the function that should be overridden in the derived classes,
     // but you will mostly use MSWGetCreateWindowFlags() below
     virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const ;
 
-    // get the MSW window flags corresponding to wxWindows ones
+    // get the MSW window flags corresponding to wxWidgets ones
     //
     // the functions returns the flags (WS_XXX) directly and puts the ext
     // (WS_EX_XXX) flags into the provided pointer if not NULL
     WXDWORD MSWGetCreateWindowFlags(WXDWORD *exflags = NULL) const
         { return MSWGetStyle(GetWindowStyle(), exflags); }
 
-    // translate wxWindows coords into Windows ones suitable to be passed to
+    // translate wxWidgets coords into Windows ones suitable to be passed to
     // ::CreateWindow()
     //
     // returns TRUE if non default coords are returned, FALSE otherwise
diff --git a/include/wx/msw/winundef.h b/include/wx/msw/winundef.h
index ece9c4c92a..5cacd2a37d 100644
--- a/include/wx/msw/winundef.h
+++ b/include/wx/msw/winundef.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     16.05.99
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 /* THIS SHOULD NOT BE USED since you might include it once e.g. in window.h,
diff --git a/include/wx/msw/wrapcctl.h b/include/wx/msw/wrapcctl.h
index 2e508081c4..faf3c8ebab 100644
--- a/include/wx/msw/wrapcctl.h
+++ b/include/wx/msw/wrapcctl.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     03.08.2003
 // RCS-ID:      $Id$
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MSW_WRAPCCTL_H_
diff --git a/include/wx/msw/wrapwin.h b/include/wx/msw/wrapwin.h
index 04b9d59ed3..5cd923c50c 100644
--- a/include/wx/msw/wrapwin.h
+++ b/include/wx/msw/wrapwin.h
@@ -5,7 +5,7 @@
 // Created:     2003/07/22
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vaclav Slavik
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_WRAPWIN_H_
diff --git a/include/wx/notebook.h b/include/wx/notebook.h
index 4264acdf56..db1773c260 100644
--- a/include/wx/notebook.h
+++ b/include/wx/notebook.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     01.02.01
 // RCS-ID:      $Id$
-// Copyright:   (c) 1996-2000 wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) 1996-2000 wxWidgets team
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_NOTEBOOK_H_BASE_
diff --git a/include/wx/numdlg.h b/include/wx/numdlg.h
index d8235e927d..2b55ba143f 100644
--- a/include/wx/numdlg.h
+++ b/include/wx/numdlg.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     07.02.04 (extracted from wx/textdlg.h)
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_NUMDLGDLG_H_BASE_
diff --git a/include/wx/object.h b/include/wx/object.h
index be84989431..3bfcef9c01 100644
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -7,7 +7,7 @@
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997 Julian Smart
 //              (c) 2001 Ron Lee <ron@debian.org>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_OBJECTH__
@@ -416,7 +416,7 @@ inline void* wxCheckCast(void *ptr)
 #endif // WXDEBUG && wxUSE_MEMORY_TRACING
 
 // ----------------------------------------------------------------------------
-// wxObject: the root class of wxWindows object hierarchy
+// wxObject: the root class of wxWidgets object hierarchy
 // ----------------------------------------------------------------------------
 
 class WXDLLIMPEXP_BASE wxObject
diff --git a/include/wx/os2/accel.h b/include/wx/os2/accel.h
index 1614b06818..d2bbda40c0 100644
--- a/include/wx/os2/accel.h
+++ b/include/wx/os2/accel.h
@@ -6,7 +6,7 @@
 // Created:     10/13/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_ACCEL_H_
diff --git a/include/wx/os2/app.h b/include/wx/os2/app.h
index 37fcdf23d6..ebe980aa5e 100644
--- a/include/wx/os2/app.h
+++ b/include/wx/os2/app.h
@@ -6,7 +6,7 @@
 // Created:     10/13/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_APP_H_
diff --git a/include/wx/os2/apptbase.h b/include/wx/os2/apptbase.h
index 934ef281e5..6841e24fdb 100644
--- a/include/wx/os2/apptbase.h
+++ b/include/wx/os2/apptbase.h
@@ -6,7 +6,7 @@
 // Created:     22.09.2003
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Stefan Neis <Stefan.Neis@t-online.de>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_OS2_APPTBASE_H_
diff --git a/include/wx/os2/apptrait.h b/include/wx/os2/apptrait.h
index 2ac1f4a891..2050f29a6f 100644
--- a/include/wx/os2/apptrait.h
+++ b/include/wx/os2/apptrait.h
@@ -6,7 +6,7 @@
 // Created:     22.09.2003
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Stefan Neis <Stefan.Neis@t-online.de>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_OS2_APPTRAIT_H_
diff --git a/include/wx/os2/bitmap.h b/include/wx/os2/bitmap.h
index ca736176ea..248dc6deb4 100644
--- a/include/wx/os2/bitmap.h
+++ b/include/wx/os2/bitmap.h
@@ -6,7 +6,7 @@
 // Created:     11/28/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_BITMAP_H_
diff --git a/include/wx/os2/bmpbuttn.h b/include/wx/os2/bmpbuttn.h
index 2185eea285..857a4f34a9 100644
--- a/include/wx/os2/bmpbuttn.h
+++ b/include/wx/os2/bmpbuttn.h
@@ -6,7 +6,7 @@
 // Created:     10/13/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_BMPBUTTN_H_
diff --git a/include/wx/os2/brush.h b/include/wx/os2/brush.h
index 3f6720cec8..07fcf1dc0f 100644
--- a/include/wx/os2/brush.h
+++ b/include/wx/os2/brush.h
@@ -6,7 +6,7 @@
 // Created:     10/13/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_BRUSH_H_
diff --git a/include/wx/os2/button.h b/include/wx/os2/button.h
index ba408a4214..ebb18cc31c 100644
--- a/include/wx/os2/button.h
+++ b/include/wx/os2/button.h
@@ -6,7 +6,7 @@
 // Created:     10/13/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_BUTTON_H_
diff --git a/include/wx/os2/checkbox.h b/include/wx/os2/checkbox.h
index c2ea188dab..b2156a5abd 100644
--- a/include/wx/os2/checkbox.h
+++ b/include/wx/os2/checkbox.h
@@ -6,7 +6,7 @@
 // Created:     10/13/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CHECKBOX_H_
diff --git a/include/wx/os2/checklst.h b/include/wx/os2/checklst.h
index d2d75ec498..8d53b00974 100644
--- a/include/wx/os2/checklst.h
+++ b/include/wx/os2/checklst.h
@@ -7,7 +7,7 @@
 // Created:     10/13/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CHECKLST_H_
diff --git a/include/wx/os2/choice.h b/include/wx/os2/choice.h
index 9293bdab9f..b648566181 100644
--- a/include/wx/os2/choice.h
+++ b/include/wx/os2/choice.h
@@ -6,7 +6,7 @@
 // Created:     10/13/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CHOICE_H_
diff --git a/include/wx/os2/clipbrd.h b/include/wx/os2/clipbrd.h
index f637d8de70..9e0ff63f78 100644
--- a/include/wx/os2/clipbrd.h
+++ b/include/wx/os2/clipbrd.h
@@ -2,14 +2,14 @@
 // Name:        clipbrd.h
 // Purpose:     Clipboard functionality.
 //              Note: this functionality is under review, and
-//              is derived from wxWindows 1.xx code. Please contact
-//              the wxWindows developers for further information.
+//              is derived from wxWidgets 1.xx code. Please contact
+//              the wxWidgets developers for further information.
 // Author:      David Webster
 // Modified by:
 // Created:     10/13/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CLIPBRD_H_
diff --git a/include/wx/os2/colour.h b/include/wx/os2/colour.h
index 889a8ef798..ea5f740ed2 100644
--- a/include/wx/os2/colour.h
+++ b/include/wx/os2/colour.h
@@ -6,7 +6,7 @@
 // Created:     10/13/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COLOUR_H_
diff --git a/include/wx/os2/combobox.h b/include/wx/os2/combobox.h
index e1373b9bdc..25f9e37db7 100644
--- a/include/wx/os2/combobox.h
+++ b/include/wx/os2/combobox.h
@@ -6,7 +6,7 @@
 // Created:     10/13/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COMBOBOX_H_
diff --git a/include/wx/os2/control.h b/include/wx/os2/control.h
index 396cf35fef..dc4996c85c 100644
--- a/include/wx/os2/control.h
+++ b/include/wx/os2/control.h
@@ -6,7 +6,7 @@
 // Created:     09/17/99
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CONTROL_H_
diff --git a/include/wx/os2/cursor.h b/include/wx/os2/cursor.h
index eee0aeba20..239c87e366 100644
--- a/include/wx/os2/cursor.h
+++ b/include/wx/os2/cursor.h
@@ -6,7 +6,7 @@
 // Created:     10/13/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CURSOR_H_
diff --git a/include/wx/os2/dataform.h b/include/wx/os2/dataform.h
index 18336bb540..c58ec935be 100644
--- a/include/wx/os2/dataform.h
+++ b/include/wx/os2/dataform.h
@@ -6,7 +6,7 @@
 // Created:     10/21/99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_OS2_DATAFORM_H
diff --git a/include/wx/os2/dataobj.h b/include/wx/os2/dataobj.h
index 15488112c8..15628a9c17 100644
--- a/include/wx/os2/dataobj.h
+++ b/include/wx/os2/dataobj.h
@@ -6,7 +6,7 @@
 // Created:     10/21/99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998, 1999 Vadim Zeitlin, Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MAC_DATAOBJ_H_
diff --git a/include/wx/os2/dataobj2.h b/include/wx/os2/dataobj2.h
index f29e99c4e1..e4aa1fced4 100644
--- a/include/wx/os2/dataobj2.h
+++ b/include/wx/os2/dataobj2.h
@@ -6,7 +6,7 @@
 // Created:     10/21/99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998, 1999 Vadim Zeitlin, Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MAC_DATAOBJ2_H_
diff --git a/include/wx/os2/dc.h b/include/wx/os2/dc.h
index fd832ef932..a4df43ffaf 100644
--- a/include/wx/os2/dc.h
+++ b/include/wx/os2/dc.h
@@ -6,7 +6,7 @@
 // Created:     08/26/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DC_H_
diff --git a/include/wx/os2/dcclient.h b/include/wx/os2/dcclient.h
index f202a3b34b..a884c23ab4 100644
--- a/include/wx/os2/dcclient.h
+++ b/include/wx/os2/dcclient.h
@@ -6,7 +6,7 @@
 // Created:     09/12/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCCLIENT_H_
diff --git a/include/wx/os2/dcmemory.h b/include/wx/os2/dcmemory.h
index f0484a8dee..627027cb2d 100644
--- a/include/wx/os2/dcmemory.h
+++ b/include/wx/os2/dcmemory.h
@@ -6,7 +6,7 @@
 // Created:     09/09/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCMEMORY_H_
diff --git a/include/wx/os2/dcprint.h b/include/wx/os2/dcprint.h
index c91a88849e..b6719862f6 100644
--- a/include/wx/os2/dcprint.h
+++ b/include/wx/os2/dcprint.h
@@ -6,7 +6,7 @@
 // Created:     09/12/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCPRINT_H_
diff --git a/include/wx/os2/dcscreen.h b/include/wx/os2/dcscreen.h
index 0d3c694e54..40daeab671 100644
--- a/include/wx/os2/dcscreen.h
+++ b/include/wx/os2/dcscreen.h
@@ -6,7 +6,7 @@
 // Created:     10/14/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCSCREEN_H_
diff --git a/include/wx/os2/dialog.h b/include/wx/os2/dialog.h
index 89671430e9..680ee9bd41 100644
--- a/include/wx/os2/dialog.h
+++ b/include/wx/os2/dialog.h
@@ -6,7 +6,7 @@
 // Created:     10/14/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DIALOG_H_
diff --git a/include/wx/os2/dirdlg.h b/include/wx/os2/dirdlg.h
index 677dd03e76..96d885c311 100644
--- a/include/wx/os2/dirdlg.h
+++ b/include/wx/os2/dirdlg.h
@@ -6,7 +6,7 @@
 // Created:     10/14/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DIRDLG_H_
diff --git a/include/wx/os2/dnd.h b/include/wx/os2/dnd.h
index 2750c04c16..db1c83ee5f 100644
--- a/include/wx/os2/dnd.h
+++ b/include/wx/os2/dnd.h
@@ -6,7 +6,7 @@
 // Created:     10/21/99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/os2/filedlg.h b/include/wx/os2/filedlg.h
index c19e3a1dfd..cbb4958d4a 100644
--- a/include/wx/os2/filedlg.h
+++ b/include/wx/os2/filedlg.h
@@ -6,7 +6,7 @@
 // Created:     10/05/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FILEDLG_H_
diff --git a/include/wx/os2/font.h b/include/wx/os2/font.h
index 11792862cf..25b5be6516 100644
--- a/include/wx/os2/font.h
+++ b/include/wx/os2/font.h
@@ -6,7 +6,7 @@
 // Created:     10/06/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FONT_H_
diff --git a/include/wx/os2/fontdlg.h b/include/wx/os2/fontdlg.h
index 4dff23ca4b..9a836ab5f5 100644
--- a/include/wx/os2/fontdlg.h
+++ b/include/wx/os2/fontdlg.h
@@ -7,7 +7,7 @@
 // Created:     10/06/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FONTDLG_H_
diff --git a/include/wx/os2/frame.h b/include/wx/os2/frame.h
index f8bd78661c..8f3a2dab96 100644
--- a/include/wx/os2/frame.h
+++ b/include/wx/os2/frame.h
@@ -6,7 +6,7 @@
 // Created:     10/27/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FRAME_H_
diff --git a/include/wx/os2/gauge.h b/include/wx/os2/gauge.h
index 1b308d2c43..a445711fc3 100644
--- a/include/wx/os2/gauge.h
+++ b/include/wx/os2/gauge.h
@@ -6,7 +6,7 @@
 // Created:     10/06/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GAUGE_H_
diff --git a/include/wx/os2/gdiimage.h b/include/wx/os2/gdiimage.h
index 422d3d4b05..2e374a94db 100644
--- a/include/wx/os2/gdiimage.h
+++ b/include/wx/os2/gdiimage.h
@@ -7,7 +7,7 @@
 // Created:     20.11.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // NB: this is a private header, it is not intended to be directly included by
diff --git a/include/wx/os2/gdiobj.h b/include/wx/os2/gdiobj.h
index 8df2166d6a..453cb90929 100644
--- a/include/wx/os2/gdiobj.h
+++ b/include/wx/os2/gdiobj.h
@@ -6,7 +6,7 @@
 // Created:     ??/??/98
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GDIOBJ_H_
diff --git a/include/wx/os2/helpwin.h b/include/wx/os2/helpwin.h
index c38ea9f657..3a44245147 100644
--- a/include/wx/os2/helpwin.h
+++ b/include/wx/os2/helpwin.h
@@ -6,7 +6,7 @@
 // Created:      10/09/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_HELPWIN_H_
diff --git a/include/wx/os2/icon.h b/include/wx/os2/icon.h
index ca57b257cc..b4ecbd07a1 100644
--- a/include/wx/os2/icon.h
+++ b/include/wx/os2/icon.h
@@ -6,7 +6,7 @@
 // Created:     10/09/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_ICON_H_
diff --git a/include/wx/os2/iniconf.h b/include/wx/os2/iniconf.h
index 8d0579796e..c73fd0df06 100644
--- a/include/wx/os2/iniconf.h
+++ b/include/wx/os2/iniconf.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     10/09/99
 // Copyright:   David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef   _INICONF_H
diff --git a/include/wx/os2/joystick.h b/include/wx/os2/joystick.h
index 6e5a4c9236..66826c6ee5 100644
--- a/include/wx/os2/joystick.h
+++ b/include/wx/os2/joystick.h
@@ -6,7 +6,7 @@
 // Created:     10/09/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_JOYSTICK_H_
diff --git a/include/wx/os2/listbox.h b/include/wx/os2/listbox.h
index a1bba2d821..3cefb9e351 100644
--- a/include/wx/os2/listbox.h
+++ b/include/wx/os2/listbox.h
@@ -6,7 +6,7 @@
 // Created:     10/09/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_LISTBOX_H_
diff --git a/include/wx/os2/listctrl.h b/include/wx/os2/listctrl.h
index ea31c34236..4fd063cb7b 100644
--- a/include/wx/os2/listctrl.h
+++ b/include/wx/os2/listctrl.h
@@ -432,7 +432,7 @@ public:
     void UpdateStyle(void);
 
     //
-    // Implementation: converts wxWindows style to MSW style.
+    // Implementation: converts wxWidgets style to MSW style.
     // Can be a single style flag or a bit list.
     // oldStyle is 'normalised' so that it doesn't contain
     // conflicting styles.
diff --git a/include/wx/os2/mdi.h b/include/wx/os2/mdi.h
index a7d61b0cc3..79d653544f 100644
--- a/include/wx/os2/mdi.h
+++ b/include/wx/os2/mdi.h
@@ -8,7 +8,7 @@
 // Created:     10/10/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MDI_H_
diff --git a/include/wx/os2/menu.h b/include/wx/os2/menu.h
index b088026c21..754019518e 100644
--- a/include/wx/os2/menu.h
+++ b/include/wx/os2/menu.h
@@ -6,7 +6,7 @@
 // Created:     10/10/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MENU_H_
diff --git a/include/wx/os2/menuitem.h b/include/wx/os2/menuitem.h
index 019584dee5..35d31c9f04 100644
--- a/include/wx/os2/menuitem.h
+++ b/include/wx/os2/menuitem.h
@@ -6,7 +6,7 @@
 // Created:     11.11.97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef   _MENUITEM_H
diff --git a/include/wx/os2/metafile.h b/include/wx/os2/metafile.h
index 996c190f83..8450670792 100644
--- a/include/wx/os2/metafile.h
+++ b/include/wx/os2/metafile.h
@@ -8,7 +8,7 @@
 // Created:     10/10/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/os2/mimetype.h b/include/wx/os2/mimetype.h
index 475fb05288..f33d1da8d5 100644
--- a/include/wx/os2/mimetype.h
+++ b/include/wx/os2/mimetype.h
@@ -6,7 +6,7 @@
 // Created:     01.21.99
 // RCS-ID:      $Id$
 // Copyright:   adopted from msw port -- (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence (part of wxExtra library)
+// Licence:     wxWidgets licence (part of wxExtra library)
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _MIMETYPE_IMPL_H
diff --git a/include/wx/os2/minifram.h b/include/wx/os2/minifram.h
index 37c24c18d6..cbabd2dbd0 100644
--- a/include/wx/os2/minifram.h
+++ b/include/wx/os2/minifram.h
@@ -8,7 +8,7 @@
 // Created:     10/10/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MINIFRAM_H_
diff --git a/include/wx/os2/msgdlg.h b/include/wx/os2/msgdlg.h
index d5fda7dc58..3d45a4b16a 100644
--- a/include/wx/os2/msgdlg.h
+++ b/include/wx/os2/msgdlg.h
@@ -7,7 +7,7 @@
 // Created:     10/12/99
 // RCS-ID:      $Id$
 // Copyright:   (c) AUTHOR
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MSGBOXDLG_H_
diff --git a/include/wx/os2/notebook.h b/include/wx/os2/notebook.h
index 36b8d1fe88..2c8a257f1d 100644
--- a/include/wx/os2/notebook.h
+++ b/include/wx/os2/notebook.h
@@ -5,7 +5,7 @@
 // Modified by:
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _NOTEBOOK_H
diff --git a/include/wx/os2/palette.h b/include/wx/os2/palette.h
index 9d445157d1..2c3024f584 100644
--- a/include/wx/os2/palette.h
+++ b/include/wx/os2/palette.h
@@ -6,7 +6,7 @@
 // Created:     10/12/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PALETTE_H_
diff --git a/include/wx/os2/pen.h b/include/wx/os2/pen.h
index fe4c3460ef..cb78791e02 100644
--- a/include/wx/os2/pen.h
+++ b/include/wx/os2/pen.h
@@ -6,7 +6,7 @@
 // Created:     10/10/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PEN_H_
diff --git a/include/wx/os2/pnghand.h b/include/wx/os2/pnghand.h
index 49c871a219..666e909e4a 100644
--- a/include/wx/os2/pnghand.h
+++ b/include/wx/os2/pnghand.h
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Microsoft, Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/include/wx/os2/popupwin.h b/include/wx/os2/popupwin.h
index 72ddbab4d7..cbaac8da39 100644
--- a/include/wx/os2/popupwin.h
+++ b/include/wx/os2/popupwin.h
@@ -6,7 +6,7 @@
 // Created:     06.01.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PM_POPUPWIN_H_
diff --git a/include/wx/os2/print.h b/include/wx/os2/print.h
index 23db48af6d..f554b9ed66 100644
--- a/include/wx/os2/print.h
+++ b/include/wx/os2/print.h
@@ -6,7 +6,7 @@
 // Created:     10/14/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PRINT_H_
diff --git a/include/wx/os2/private.h b/include/wx/os2/private.h
index 5a353031c5..a6b8d3d3b8 100644
--- a/include/wx/os2/private.h
+++ b/include/wx/os2/private.h
@@ -1,14 +1,14 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        private.h
 // Purpose:     Private declarations: as this header is only included by
-//              wxWindows itself, it may contain identifiers which don't start
+//              wxWidgets itself, it may contain identifiers which don't start
 //              with "wx".
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PRIVATE_H_
@@ -245,7 +245,7 @@ extern LONG APIENTRY wxSubclassedGenericControlProc(WXHWND hWnd, WXDWORD message
 #define GetHfont()              ((HFONT)GetHFONT())
 #define GetHfontOf(font)        ((HFONT)(font).GetHFONT())
 
-// OS/2 convention of the mask is opposed to the wxWindows one, so we need
+// OS/2 convention of the mask is opposed to the wxWidgets one, so we need
 // to invert the mask each time we pass one/get one to/from Windows
 extern HBITMAP wxInvertMask(HBITMAP hbmpMask, int w = 0, int h = 0);
 
diff --git a/include/wx/os2/radiobox.h b/include/wx/os2/radiobox.h
index 9534ba0ba0..62c01f9f50 100644
--- a/include/wx/os2/radiobox.h
+++ b/include/wx/os2/radiobox.h
@@ -6,7 +6,7 @@
 // Created:     10/12/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_RADIOBOX_H_
diff --git a/include/wx/os2/radiobut.h b/include/wx/os2/radiobut.h
index 34777de036..187c732596 100644
--- a/include/wx/os2/radiobut.h
+++ b/include/wx/os2/radiobut.h
@@ -6,7 +6,7 @@
 // Created:     10/12/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_RADIOBUT_H_
diff --git a/include/wx/os2/region.h b/include/wx/os2/region.h
index 4a60ed3fa0..3fa1a815ed 100644
--- a/include/wx/os2/region.h
+++ b/include/wx/os2/region.h
@@ -6,7 +6,7 @@
 // Created:     10/15/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_REGION_H_
diff --git a/include/wx/os2/scrolbar.h b/include/wx/os2/scrolbar.h
index ea0b911915..87dfc9bdc4 100644
--- a/include/wx/os2/scrolbar.h
+++ b/include/wx/os2/scrolbar.h
@@ -6,7 +6,7 @@
 // Created:     10/15/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SCROLBAR_H_
diff --git a/include/wx/os2/setup0.h b/include/wx/os2/setup0.h
index b505e4ce7b..a53df186f7 100644
--- a/include/wx/os2/setup0.h
+++ b/include/wx/os2/setup0.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SETUP_H_
@@ -228,7 +228,7 @@
                                   // 0 for <iostream>
 
 #define wxUSE_STREAMS       1
-                                  // If enabled (1), compiles wxWindows streams classes
+                                  // If enabled (1), compiles wxWidgets streams classes
 
 #define wxUSE_STD_IOSTREAM  1
                                   // Use standard C++ streams if 1. If 0, use wxWin
diff --git a/include/wx/os2/slider.h b/include/wx/os2/slider.h
index bc74fe3945..24dbb5aebf 100644
--- a/include/wx/os2/slider.h
+++ b/include/wx/os2/slider.h
@@ -6,7 +6,7 @@
 // Created:     10/15/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SLIDER_H_
diff --git a/include/wx/os2/sound.h b/include/wx/os2/sound.h
index c5b39444e4..22530b7d4a 100644
--- a/include/wx/os2/sound.h
+++ b/include/wx/os2/sound.h
@@ -7,7 +7,7 @@
 // Created:     10/17/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SOUND_H_
diff --git a/include/wx/os2/spinbutt.h b/include/wx/os2/spinbutt.h
index 493f7fddfc..31821af0a2 100644
--- a/include/wx/os2/spinbutt.h
+++ b/include/wx/os2/spinbutt.h
@@ -6,7 +6,7 @@
 // Created:     10/15/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SPINBUTT_H_
diff --git a/include/wx/os2/spinctrl.h b/include/wx/os2/spinctrl.h
index 5a0983870b..bc1973af98 100644
--- a/include/wx/os2/spinctrl.h
+++ b/include/wx/os2/spinctrl.h
@@ -6,7 +6,7 @@
 // Created:     10/15/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MSW_SPINCTRL_H_
diff --git a/include/wx/os2/statbmp.h b/include/wx/os2/statbmp.h
index 4f34c65d5f..980a099bfd 100644
--- a/include/wx/os2/statbmp.h
+++ b/include/wx/os2/statbmp.h
@@ -6,7 +6,7 @@
 // Created:     11/27/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STATBMP_H_
diff --git a/include/wx/os2/statbox.h b/include/wx/os2/statbox.h
index ac327c6180..912d29bcac 100644
--- a/include/wx/os2/statbox.h
+++ b/include/wx/os2/statbox.h
@@ -6,7 +6,7 @@
 // Created:     10/15/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STATBOX_H_
diff --git a/include/wx/os2/statline.h b/include/wx/os2/statline.h
index 3b2ff75484..4a98f8a1d5 100644
--- a/include/wx/os2/statline.h
+++ b/include/wx/os2/statline.h
@@ -5,7 +5,7 @@
 // Created:     28.06.99
 // Version:     $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_OS2_STATLINE_H_
diff --git a/include/wx/os2/stattext.h b/include/wx/os2/stattext.h
index b061ae950f..526780eafb 100644
--- a/include/wx/os2/stattext.h
+++ b/include/wx/os2/stattext.h
@@ -6,7 +6,7 @@
 // Created:     10/17/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STATTEXT_H_
diff --git a/include/wx/os2/tabctrl.h b/include/wx/os2/tabctrl.h
index 524af3ed90..9d08f70a17 100644
--- a/include/wx/os2/tabctrl.h
+++ b/include/wx/os2/tabctrl.h
@@ -6,7 +6,7 @@
 // Created:     ??/??/98
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TABCTRL_H_
diff --git a/include/wx/os2/textctrl.h b/include/wx/os2/textctrl.h
index 5e3c487683..739973de92 100644
--- a/include/wx/os2/textctrl.h
+++ b/include/wx/os2/textctrl.h
@@ -6,7 +6,7 @@
 // Created:     10/17/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TEXTCTRL_H_
diff --git a/include/wx/os2/timer.h b/include/wx/os2/timer.h
index 62ab0c423e..c8b579efed 100644
--- a/include/wx/os2/timer.h
+++ b/include/wx/os2/timer.h
@@ -6,7 +6,7 @@
 // Created:     10/17/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TIMER_H_
diff --git a/include/wx/os2/toolbar.h b/include/wx/os2/toolbar.h
index 24adde3e98..6a3fc3438f 100644
--- a/include/wx/os2/toolbar.h
+++ b/include/wx/os2/toolbar.h
@@ -6,7 +6,7 @@
 // Created:     10/17/98
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TOOLBAR_H_
diff --git a/include/wx/os2/tooltip.h b/include/wx/os2/tooltip.h
index 8ec7fd5abc..dfdda0be53 100644
--- a/include/wx/os2/tooltip.h
+++ b/include/wx/os2/tooltip.h
@@ -6,7 +6,7 @@
 // Created:     10/17/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 class wxToolTip : public wxObject
diff --git a/include/wx/os2/toplevel.h b/include/wx/os2/toplevel.h
index 0ab1d94d19..afc401f450 100644
--- a/include/wx/os2/toplevel.h
+++ b/include/wx/os2/toplevel.h
@@ -6,7 +6,7 @@
 // Created:     20.09.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MSW_TOPLEVEL_H_
@@ -131,7 +131,7 @@ protected:
                                 ) const;
 
     //
-    // Translate wxWindows flags into OS flags
+    // Translate wxWidgets flags into OS flags
     //
     virtual WXDWORD OS2GetStyle( long     lFlag
                                 ,WXDWORD* pdwExstyle
diff --git a/include/wx/os2/treectrl.h b/include/wx/os2/treectrl.h
index 4ba60704cd..27066c9e0d 100644
--- a/include/wx/os2/treectrl.h
+++ b/include/wx/os2/treectrl.h
@@ -6,7 +6,7 @@
 // Created:     01/23/03
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TREECTRL_H_
@@ -532,7 +532,7 @@ public:
 
 #if WXWIN_COMPATIBILITY_2_4
     // These methods are deprecated and will be removed in future versions of
-    // wxWindows, they're here for compatibility only, don't use them in new
+    // wxWidgets, they're here for compatibility only, don't use them in new
     // code (the comments indicate why these methods are now useless and how to
     // replace them)
     //
diff --git a/include/wx/os2/window.h b/include/wx/os2/window.h
index fed061bb29..c71601d892 100644
--- a/include/wx/os2/window.h
+++ b/include/wx/os2/window.h
@@ -6,7 +6,7 @@
 // Created:     10/12/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_WINDOW_H_
@@ -40,7 +40,7 @@ class WXDLLEXPORT wxButton;
 // constants
 // ---------------------------------------------------------------------------
 
-// FIXME does anybody use those? they're unused by wxWindows...
+// FIXME does anybody use those? they're unused by wxWidgets...
 enum
 {
     wxKEY_SHIFT = 1,
@@ -197,7 +197,7 @@ public:
     WXFARPROC OS2GetOldWndProc(void) const { return m_fnOldWndProc; }
     void OS2SetOldWndProc(WXFARPROC fnProc) { m_fnOldWndProc = fnProc; }
     //
-    // Return TRUE if the window is of a standard (i.e. not wxWindows') class
+    // Return TRUE if the window is of a standard (i.e. not wxWidgets') class
     //
     bool IsOfStandardClass(void) const { return m_fnOldWndProc != NULL; }
 
@@ -206,7 +206,7 @@ public:
                              ,bool   bControlOnly = FALSE
                             ) const;
 
-    // Make a Windows extended style from the given wxWindows window style ?? applicable to OS/2??
+    // Make a Windows extended style from the given wxWidgets window style ?? applicable to OS/2??
     static WXDWORD MakeExtendedStyle( long lStyle
                                      ,bool bEliminateBorders = TRUE
                                     );
@@ -214,7 +214,7 @@ public:
     // PM only: TRUE if this control is part of the main control
     virtual bool ContainsHWND(WXHWND WXUNUSED(hWnd)) const { return FALSE; };
 
-    // translate wxWindows style flags for this control into the PM style
+    // translate wxWidgets style flags for this control into the PM style
     // and optional extended style for the corresponding native control
     //
     // this is the function that should be overridden in the derived classes,
@@ -223,7 +223,7 @@ public:
                                 ,WXDWORD* pdwExstyle = NULL
                                ) const;
 
-    // get the MSW window flags corresponding to wxWindows ones
+    // get the MSW window flags corresponding to wxWidgets ones
     //
     // the functions returns the flags (WS_XXX) directly and puts the ext
     // (WS_EX_XXX) flags into the provided pointer if not NULL
diff --git a/include/wx/ownerdrw.h b/include/wx/ownerdrw.h
index 6adb938d1b..0e0cc1df08 100644
--- a/include/wx/ownerdrw.h
+++ b/include/wx/ownerdrw.h
@@ -6,7 +6,7 @@
 // Created:     11.11.97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef   _OWNERDRW_H
diff --git a/include/wx/paper.h b/include/wx/paper.h
index 087eb6d5ce..a5853de301 100644
--- a/include/wx/paper.h
+++ b/include/wx/paper.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PAPERH__
diff --git a/include/wx/platform.h b/include/wx/platform.h
index d9670ec48e..6004e3dc54 100644
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -5,8 +5,8 @@
 * Modified by:
 * Created:     29.10.01 (extracted from wx/defs.h)
 * RCS-ID:      $Id$
-* Copyright:   (c) 1997-2001 wxWindows team
-* Licence:     wxWindows licence
+* Copyright:   (c) 1997-2001 wxWidgets team
+* Licence:     wxWidgets licence
 */
 
 /* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
@@ -138,7 +138,7 @@
 
 /*
    adjust the Unicode setting: wxUSE_UNICODE should be defined as 0 or 1
-   and is used by wxWindows, _UNICODE and/or UNICODE may be defined or used by
+   and is used by wxWidgets, _UNICODE and/or UNICODE may be defined or used by
    the system headers so bring these settings in sync
  */
 
diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h
index 18ca40e2f3..3a7193c00d 100644
--- a/include/wx/popupwin.h
+++ b/include/wx/popupwin.h
@@ -6,7 +6,7 @@
 // Created:     06.01.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// License:     wxWindows licence
+// License:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_POPUPWIN_H_BASE_
diff --git a/include/wx/prntbase.h b/include/wx/prntbase.h
index d7ed29ed22..de072784e6 100644
--- a/include/wx/prntbase.h
+++ b/include/wx/prntbase.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PRNTBASEH__
diff --git a/include/wx/process.h b/include/wx/process.h
index 2089c497ac..53dae01c24 100644
--- a/include/wx/process.h
+++ b/include/wx/process.h
@@ -6,7 +6,7 @@
 // Created:     24/06/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Guilhem Lavaux
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PROCESSH__
diff --git a/include/wx/protocol/file.h b/include/wx/protocol/file.h
index ebd8093d93..278b52fb35 100644
--- a/include/wx/protocol/file.h
+++ b/include/wx/protocol/file.h
@@ -6,7 +6,7 @@
 // Created:     1997
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_PROTO_FILE_H__
diff --git a/include/wx/protocol/ftp.h b/include/wx/protocol/ftp.h
index 4fee213c9a..c97b0494d3 100644
--- a/include/wx/protocol/ftp.h
+++ b/include/wx/protocol/ftp.h
@@ -3,11 +3,11 @@
 // Purpose:     FTP protocol
 // Author:      Vadim Zeitlin
 // Modified by: Mark Johnson, wxWindows@mj10777.de 
-//              20000917 : RmDir, GetLastResult, GetList 
+//              20000917 : RmDir, GetLastResult, GetList
 // Created:     07/07/1997
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_FTP_H__
diff --git a/include/wx/protocol/http.h b/include/wx/protocol/http.h
index f87227bc38..89b805ad62 100644
--- a/include/wx/protocol/http.h
+++ b/include/wx/protocol/http.h
@@ -6,7 +6,7 @@
 // Created:     August 1997
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 #ifndef _WX_HTTP_H
 #define _WX_HTTP_H
diff --git a/include/wx/protocol/protocol.h b/include/wx/protocol/protocol.h
index 8d76485032..3956114ab0 100644
--- a/include/wx/protocol/protocol.h
+++ b/include/wx/protocol/protocol.h
@@ -6,7 +6,7 @@
 // Created:     10/07/1997
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PROTOCOL_PROTOCOL_H
diff --git a/include/wx/ptr_scpd.h b/include/wx/ptr_scpd.h
index d0a24daec3..a708633cd9 100644
--- a/include/wx/ptr_scpd.h
+++ b/include/wx/ptr_scpd.h
@@ -6,12 +6,12 @@
 // Created:     06/01/02
 // RCS-ID:      $Id$
 // Copyright:   (c) Jesse Lovelace and original Boost authors (see below)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 //  This class closely follows the implementation of the boost
 //  library scoped_ptr and is an adaption for c++ macro's in 
-//  the wxWindows project. The original authors of the boost
+//  the wxWidgets project. The original authors of the boost
 //  scoped_ptr are given below with their respective copyrights.
 
 //  (C) Copyright Greg Colvin and Beman Dawes 1998, 1999.
diff --git a/include/wx/radiobox.h b/include/wx/radiobox.h
index 0a18908021..d145b7ea49 100644
--- a/include/wx/radiobox.h
+++ b/include/wx/radiobox.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     10.09.00
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_RADIOBOX_H_BASE_
diff --git a/include/wx/radiobut.h b/include/wx/radiobut.h
index 2af9652040..6367f091d5 100644
--- a/include/wx/radiobut.h
+++ b/include/wx/radiobut.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     07.09.00
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_RADIOBUT_H_BASE_
diff --git a/include/wx/rawbmp.h b/include/wx/rawbmp.h
index 2291b6b544..b61c7fd4a1 100644
--- a/include/wx/rawbmp.h
+++ b/include/wx/rawbmp.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     10.03.03
 // RCS-ID:      $Id$
-// Copyright:   (c) 2002 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
+// Copyright:   (c) 2002 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_RAWBMP_H_BASE_
diff --git a/include/wx/recguard.h b/include/wx/recguard.h
index ea4e4995db..db2932d23a 100644
--- a/include/wx/recguard.h
+++ b/include/wx/recguard.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     14.08.2003
 // RCS-ID:      $Id$
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_RECGUARD_H_
diff --git a/include/wx/regex.h b/include/wx/regex.h
index 851ab153b2..fa6f13bbcd 100644
--- a/include/wx/regex.h
+++ b/include/wx/regex.h
@@ -6,7 +6,7 @@
 // Created:     05.02.2000
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Karsten Ballüder <ballueder@gmx.net>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_REGEX_H_
diff --git a/include/wx/renderer.h b/include/wx/renderer.h
index e343989a2a..ae067ddd48 100644
--- a/include/wx/renderer.h
+++ b/include/wx/renderer.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     20.07.2003
 // RCS-ID:      $Id$
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 /*
-   Renderers are used in wxWindows for two similar but different things:
+   Renderers are used in wxWidgets for two similar but different things:
     (a) wxUniversal uses them to draw everything, i.e. all the control
     (b) all the native ports use them to draw generic controls only
 
diff --git a/include/wx/sckaddr.h b/include/wx/sckaddr.h
index bc472331c9..50f89313ef 100644
--- a/include/wx/sckaddr.h
+++ b/include/wx/sckaddr.h
@@ -6,7 +6,7 @@
 // Created:     26/04/1997
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_NETWORK_ADDRESS_H
diff --git a/include/wx/sckipc.h b/include/wx/sckipc.h
index 9a49fb98ca..59d6fca54c 100644
--- a/include/wx/sckipc.h
+++ b/include/wx/sckipc.h
@@ -10,7 +10,7 @@
 // Copyright:   (c) Julian Smart 1993
 //              (c) Guilhem Lavaux 1997, 1998
 //              (c) 2000 Guillermo Rodriguez <guille@iies.es>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SCKIPC_H
diff --git a/include/wx/sckstrm.h b/include/wx/sckstrm.h
index a987d8c15e..d544b3abc9 100644
--- a/include/wx/sckstrm.h
+++ b/include/wx/sckstrm.h
@@ -6,7 +6,7 @@
 // Created:     17/07/97
 // RCS-ID:      $Id$
 // Copyright:   (c)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 #ifndef __SCK_STREAM_H__
 #define __SCK_STREAM_H__
diff --git a/include/wx/scopeguard.h b/include/wx/scopeguard.h
index f595c046c7..af407d74cb 100644
--- a/include/wx/scopeguard.h
+++ b/include/wx/scopeguard.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     03.07.2003
 // RCS-ID:      $Id$
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 /*
diff --git a/include/wx/scrolwin.h b/include/wx/scrolwin.h
index 9ebdc14f1b..7c7084c751 100644
--- a/include/wx/scrolwin.h
+++ b/include/wx/scrolwin.h
@@ -6,7 +6,7 @@
 // Created:     30.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SCROLWIN_H_BASE_
@@ -51,7 +51,7 @@ public:
     virtual void GetScrollPixelsPerUnit(int *pixelsPerUnitX,
                                         int *pixelsPerUnitY) const;
 
-    // Enable/disable Windows scrolling in either direction. If TRUE, wxWindows
+    // Enable/disable Windows scrolling in either direction. If TRUE, wxWidgets
     // scrolls the canvas and only a bit of the canvas is invalidated; no
     // Clear() is necessary. If FALSE, the whole canvas is invalidated and a
     // Clear() is necessary. Disable for when the scroll increment is used to
diff --git a/include/wx/selstore.h b/include/wx/selstore.h
index 5c7ffd1863..3fe976b3f0 100644
--- a/include/wx/selstore.h
+++ b/include/wx/selstore.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     08.06.03 (extracted from src/generic/listctrl.cpp)
 // RCS-ID:      $Id$
-// Copyright:   (c) 2000-2003 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
+// Copyright:   (c) 2000-2003 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SELSTORE_H_
diff --git a/include/wx/settings.h b/include/wx/settings.h
index 4ed8c4c64a..0386b2e6e7 100644
--- a/include/wx/settings.h
+++ b/include/wx/settings.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SETTINGS_H_BASE_
diff --git a/include/wx/sizer.h b/include/wx/sizer.h
index ce907346bb..a8205fab8f 100644
--- a/include/wx/sizer.h
+++ b/include/wx/sizer.h
@@ -6,7 +6,7 @@
 // Created:
 // RCS-ID:      $Id$
 // Copyright:   (c) Robin Dunn, Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WXSIZER_H__
diff --git a/include/wx/slider.h b/include/wx/slider.h
index dfd4a63904..9a3213acec 100644
--- a/include/wx/slider.h
+++ b/include/wx/slider.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     09.02.01
 // RCS-ID:      $Id$
-// Copyright:   (c) 1996-2001 wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) 1996-2001 wxWidgets team
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SLIDER_H_BASE_
diff --git a/include/wx/snglinst.h b/include/wx/snglinst.h
index 9351b9eb5d..0161fdb4b3 100644
--- a/include/wx/snglinst.h
+++ b/include/wx/snglinst.h
@@ -7,7 +7,7 @@
 // Created:     08.06.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SNGLINST_H_
diff --git a/include/wx/socket.h b/include/wx/socket.h
index 864ba4f96d..58c06bcb19 100644
--- a/include/wx/socket.h
+++ b/include/wx/socket.h
@@ -6,7 +6,7 @@
 // Created:     April 1997
 // RCS-ID:      $Id$
 // Copyright:   (c) Guilhem Lavaux
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_NETWORK_SOCKET_H
diff --git a/include/wx/sound.h b/include/wx/sound.h
index 75806a53a3..6d81ac1ef4 100644
--- a/include/wx/sound.h
+++ b/include/wx/sound.h
@@ -6,7 +6,7 @@
 // Created:     2004/02/01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2004, Vaclav Slavik
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SOUND_H_BASE_
diff --git a/include/wx/spinbutt.h b/include/wx/spinbutt.h
index 722ba593ac..0f2e442ed0 100644
--- a/include/wx/spinbutt.h
+++ b/include/wx/spinbutt.h
@@ -6,7 +6,7 @@
 // Created:     23.07.99
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SPINBUTT_H_BASE_
diff --git a/include/wx/spinctrl.h b/include/wx/spinctrl.h
index ce1b7f3553..71e7f418a9 100644
--- a/include/wx/spinctrl.h
+++ b/include/wx/spinctrl.h
@@ -6,7 +6,7 @@
 // Created:     22.07.99
 // RCS-ID:      $Id$
 // Copyright:   (c) Vadim Zeitlin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SPINCTRL_H_
diff --git a/include/wx/stack.h b/include/wx/stack.h
index e359111c40..3edda4fc49 100644
--- a/include/wx/stack.h
+++ b/include/wx/stack.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     30.07.2001
 // Copyright:   (c) 2001 Lindsay Mathieson <lindsay@mathieson.org>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STACK_H_
diff --git a/include/wx/statbmp.h b/include/wx/statbmp.h
index 49bcf7fb93..1a88160d05 100644
--- a/include/wx/statbmp.h
+++ b/include/wx/statbmp.h
@@ -6,7 +6,7 @@
 // Created:     25.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Vadim Zeitlin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STATBMP_H_BASE_
diff --git a/include/wx/statline.h b/include/wx/statline.h
index 7bd1939ceb..b91b7c3ea8 100644
--- a/include/wx/statline.h
+++ b/include/wx/statline.h
@@ -5,7 +5,7 @@
 // Created:     28.06.99
 // Version:     $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STATLINE_H_BASE_
diff --git a/include/wx/statusbr.h b/include/wx/statusbr.h
index 594f9b1659..13b81efef4 100644
--- a/include/wx/statusbr.h
+++ b/include/wx/statusbr.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     05.02.00
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STATUSBR_H_BASE_
diff --git a/include/wx/stopwatch.h b/include/wx/stopwatch.h
index 22d14efec0..d411c4d6f2 100644
--- a/include/wx/stopwatch.h
+++ b/include/wx/stopwatch.h
@@ -4,8 +4,8 @@
 // Author:      Julian Smart (wxTimer), Sylvain Bougnoux (wxStopWatch)
 // Created:     26.06.03 (extracted from wx/timer.h)
 // RCS-ID:      $Id$
-// Copyright:   (c) 1998-2003 wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) 1998-2003 wxWidgets team
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STOPWATCH_H_
diff --git a/include/wx/strconv.h b/include/wx/strconv.h
index 9248f2cb7e..93c8b7a609 100644
--- a/include/wx/strconv.h
+++ b/include/wx/strconv.h
@@ -6,7 +6,7 @@
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Ove Kaaven, Robert Roebling, Vadim Zeitlin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_WXSTRCONVH__
diff --git a/include/wx/stream.h b/include/wx/stream.h
index c868ddb17b..3a17b43f2a 100644
--- a/include/wx/stream.h
+++ b/include/wx/stream.h
@@ -6,7 +6,7 @@
 // Created:     11/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Guilhem Lavaux
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_WXSTREAM_H__
diff --git a/include/wx/string.h b/include/wx/string.h
index bb5144d47b..a9a9f45d8e 100644
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -6,12 +6,12 @@
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 /*
     Efficient string class [more or less] compatible with MFC CString,
-    wxWindows version 1 wxString and std::string and some handy functions
+    wxWidgets version 1 wxString and std::string and some handy functions
     missing from string.h.
 */
 
@@ -1095,7 +1095,7 @@ public:
   void UngetWriteBuf(size_t nLen);
 #endif
 
-  // wxWindows version 1 compatibility functions
+  // wxWidgets version 1 compatibility functions
 
   // use Mid()
   wxString SubString(size_t from, size_t to) const
diff --git a/include/wx/sysopt.h b/include/wx/sysopt.h
index df9579e4ac..bed2b0b4aa 100644
--- a/include/wx/sysopt.h
+++ b/include/wx/sysopt.h
@@ -6,7 +6,7 @@
 // Created:     2001-07-10
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SYSOPT_H_
@@ -17,7 +17,7 @@
 #if wxUSE_SYSTEM_OPTIONS
 
 // ----------------------------------------------------------------------------
-// Enables an application to influence the wxWindows implementation
+// Enables an application to influence the wxWidgets implementation
 // ----------------------------------------------------------------------------
 
 class WXDLLIMPEXP_BASE wxSystemOptions : public wxObject
@@ -25,7 +25,7 @@ class WXDLLIMPEXP_BASE wxSystemOptions : public wxObject
 public:
     wxSystemOptions() { }
 
-    // User-customizable hints to wxWindows or associated libraries
+    // User-customizable hints to wxWidgets or associated libraries
     // These could also be used to influence GetSystem... calls, indeed
     // to implement SetSystemColour/Font/Metric
 
diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h
index 299a018e23..e844837dd9 100644
--- a/include/wx/tbarbase.h
+++ b/include/wx/tbarbase.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TBARBASE_H_
diff --git a/include/wx/textbuf.h b/include/wx/textbuf.h
index 170c28b931..c84bab1d7b 100644
--- a/include/wx/textbuf.h
+++ b/include/wx/textbuf.h
@@ -5,8 +5,8 @@
 //              differences between platforms.
 // Created:     14.11.01
 // Author:      Morten Hanssen, Vadim Zeitlin
-// Copyright:   (c) 1998-2001 wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) 1998-2001 wxWidgets team
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TEXTBUFFER_H
diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h
index a0fc80eb0d..379b2f4341 100644
--- a/include/wx/textctrl.h
+++ b/include/wx/textctrl.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     13.07.99
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TEXTCTRL_H_BASE_
diff --git a/include/wx/textdlg.h b/include/wx/textdlg.h
index 7eb37741fc..1dc0e61f22 100644
--- a/include/wx/textdlg.h
+++ b/include/wx/textdlg.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TEXTDLG_H_BASE_
diff --git a/include/wx/textfile.h b/include/wx/textfile.h
index a898f11543..289b9de4e3 100644
--- a/include/wx/textfile.h
+++ b/include/wx/textfile.h
@@ -8,7 +8,7 @@
 // Created:     03.04.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TEXTFILE_H
diff --git a/include/wx/thread.h b/include/wx/thread.h
index 7d61023195..f2e78a59d0 100644
--- a/include/wx/thread.h
+++ b/include/wx/thread.h
@@ -7,7 +7,7 @@
 // Created:     04/13/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Guilhem Lavaux
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_THREAD_H_
diff --git a/include/wx/thrimpl.cpp b/include/wx/thrimpl.cpp
index 60ead20789..98d682bfbb 100644
--- a/include/wx/thrimpl.cpp
+++ b/include/wx/thrimpl.cpp
@@ -6,7 +6,7 @@
 // Created:     04.06.02 (extracted from src/*/thread.cpp files)
 // RCS-ID:      $Id$
 // Copyright:   (c) Vadim Zeitlin (2002)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // this file is supposed to be included only by the various thread.cpp
diff --git a/include/wx/timer.h b/include/wx/timer.h
index fa4e88b205..ffbb58f6cd 100644
--- a/include/wx/timer.h
+++ b/include/wx/timer.h
@@ -6,8 +6,8 @@
 //              Guillermo Rodriguez (global clean up)
 // Created:     04/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TIMER_H_BASE_
diff --git a/include/wx/tipdlg.h b/include/wx/tipdlg.h
index 97c53eeb24..a9003851bd 100644
--- a/include/wx/tipdlg.h
+++ b/include/wx/tipdlg.h
@@ -6,7 +6,7 @@
 // Created:     28.06.99
 // RCS-ID:      $Id$
 // Copyright:   (c) Vadim Zeitlin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TIPDLG_H_
diff --git a/include/wx/tipwin.h b/include/wx/tipwin.h
index 6866687ec7..5e527f623d 100644
--- a/include/wx/tipwin.h
+++ b/include/wx/tipwin.h
@@ -7,7 +7,7 @@
 // Created:     10.09.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TIPWIN_H_
diff --git a/include/wx/tokenzr.h b/include/wx/tokenzr.h
index dde0752f0b..8bcb5d0561 100644
--- a/include/wx/tokenzr.h
+++ b/include/wx/tokenzr.h
@@ -6,7 +6,7 @@
 // Created:     04/22/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Guilhem Lavaux
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TOKENZRH
diff --git a/include/wx/toolbar.h b/include/wx/toolbar.h
index 736e3b19b7..1e240b7972 100644
--- a/include/wx/toolbar.h
+++ b/include/wx/toolbar.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     20.11.99
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TOOLBAR_H_BASE_
diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h
index cce978d80c..35de68a0a2 100644
--- a/include/wx/toplevel.h
+++ b/include/wx/toplevel.h
@@ -7,8 +7,8 @@
 // Created:     06.08.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-//                       Vaclav Slavik <vaclav@wxwindows.org>
-// Licence:     wxWindows licence
+//                       Vaclav Slavik <vaclav@wxwidgets.org>
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TOPLEVEL_BASE_H_
diff --git a/include/wx/treebase.h b/include/wx/treebase.h
index cc7ba9714d..161e3061ad 100644
--- a/include/wx/treebase.h
+++ b/include/wx/treebase.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997,1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TREEBASE_H_
diff --git a/include/wx/txtstrm.h b/include/wx/txtstrm.h
index 83b2f5a002..84f1874ed0 100644
--- a/include/wx/txtstrm.h
+++ b/include/wx/txtstrm.h
@@ -6,7 +6,7 @@
 // Created:     28/06/1998
 // RCS-ID:      $Id$
 // Copyright:   (c) Guilhem Lavaux
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TXTSTREAM_H_
diff --git a/include/wx/types.h b/include/wx/types.h
index 2c3c965512..37af189de7 100644
--- a/include/wx/types.h
+++ b/include/wx/types.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TYPESH__
diff --git a/include/wx/univ/app.h b/include/wx/univ/app.h
index 1b3b801b53..57016d5e28 100644
--- a/include/wx/univ/app.h
+++ b/include/wx/univ/app.h
@@ -6,7 +6,7 @@
 // Created:     06.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIX_APP_H_
diff --git a/include/wx/univ/bmpbuttn.h b/include/wx/univ/bmpbuttn.h
index 34c09b3e3e..6845fe9c16 100644
--- a/include/wx/univ/bmpbuttn.h
+++ b/include/wx/univ/bmpbuttn.h
@@ -6,7 +6,7 @@
 // Created:     25.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) Vadim Zeitlin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_BMPBUTTN_H_
diff --git a/include/wx/univ/button.h b/include/wx/univ/button.h
index e6bb4f0355..e94e152a8b 100644
--- a/include/wx/univ/button.h
+++ b/include/wx/univ/button.h
@@ -6,7 +6,7 @@
 // Created:     15.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_BUTTON_H_
diff --git a/include/wx/univ/checkbox.h b/include/wx/univ/checkbox.h
index b37ff5b637..029aacaa84 100644
--- a/include/wx/univ/checkbox.h
+++ b/include/wx/univ/checkbox.h
@@ -6,7 +6,7 @@
 // Created:     07.09.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_CHECKBOX_H_
diff --git a/include/wx/univ/checklst.h b/include/wx/univ/checklst.h
index d9a5b32a0a..e19ad5f718 100644
--- a/include/wx/univ/checklst.h
+++ b/include/wx/univ/checklst.h
@@ -6,7 +6,7 @@
 // Created:     12.09.00
 // RCS-ID:      $Id$
 // Copyright:   (c) Vadim Zeitlin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_CHECKLST_H_
diff --git a/include/wx/univ/choice.h b/include/wx/univ/choice.h
index 7e7d852239..75303de92b 100644
--- a/include/wx/univ/choice.h
+++ b/include/wx/univ/choice.h
@@ -6,7 +6,7 @@
 // Created:     30.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_CHOICE_H_
diff --git a/include/wx/univ/colschem.h b/include/wx/univ/colschem.h
index 32e35af467..72e8ec23ee 100644
--- a/include/wx/univ/colschem.h
+++ b/include/wx/univ/colschem.h
@@ -6,7 +6,7 @@
 // Created:     19.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_COLSCHEM_H_
diff --git a/include/wx/univ/combobox.h b/include/wx/univ/combobox.h
index 52fa4b46b8..4096d25d01 100644
--- a/include/wx/univ/combobox.h
+++ b/include/wx/univ/combobox.h
@@ -6,7 +6,7 @@
 // Created:     30.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 /*
@@ -20,7 +20,7 @@
    down list, not just a wxListBox.
 
    So we define a base wxComboControl which can use any control as pop down
-   list and wxComboBox deriving from it which implements the standard wxWindows
+   list and wxComboBox deriving from it which implements the standard wxWidgets
    combobox API. wxComboControl needs to be told somehow which control to use
    and this is done by SetPopupControl(). However, we need something more than
    just a wxControl in this method as, for example, we need to call
diff --git a/include/wx/univ/control.h b/include/wx/univ/control.h
index 710e6307fd..2cf7aba625 100644
--- a/include/wx/univ/control.h
+++ b/include/wx/univ/control.h
@@ -6,7 +6,7 @@
 // Created:     14.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_CONTROL_H_
diff --git a/include/wx/univ/dialog.h b/include/wx/univ/dialog.h
index fe7dfe7003..f3fce059b8 100644
--- a/include/wx/univ/dialog.h
+++ b/include/wx/univ/dialog.h
@@ -5,7 +5,7 @@
 // Created:     2001/09/16
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_DIALOG_H_
diff --git a/include/wx/univ/frame.h b/include/wx/univ/frame.h
index e30d470a49..b309e9b651 100644
--- a/include/wx/univ/frame.h
+++ b/include/wx/univ/frame.h
@@ -6,7 +6,7 @@
 // Created:     19.05.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_FRAME_H_
diff --git a/include/wx/univ/gauge.h b/include/wx/univ/gauge.h
index ae80f68767..aa72726e74 100644
--- a/include/wx/univ/gauge.h
+++ b/include/wx/univ/gauge.h
@@ -6,7 +6,7 @@
 // Created:     20.02.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/include/wx/univ/inpcons.h b/include/wx/univ/inpcons.h
index e370a4f6f6..a099652da6 100644
--- a/include/wx/univ/inpcons.h
+++ b/include/wx/univ/inpcons.h
@@ -6,7 +6,7 @@
 // Created:     14.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_INPCONS_H_
diff --git a/include/wx/univ/inphand.h b/include/wx/univ/inphand.h
index a28e976693..51eaa811a1 100644
--- a/include/wx/univ/inphand.h
+++ b/include/wx/univ/inphand.h
@@ -7,7 +7,7 @@
 // Created:     18.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_INPHAND_H_
diff --git a/include/wx/univ/listbox.h b/include/wx/univ/listbox.h
index acc660541a..6432f220ef 100644
--- a/include/wx/univ/listbox.h
+++ b/include/wx/univ/listbox.h
@@ -6,7 +6,7 @@
 // Created:     30.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_LISTBOX_H_
diff --git a/include/wx/univ/menu.h b/include/wx/univ/menu.h
index 874f5bd896..aed4d3f6f6 100644
--- a/include/wx/univ/menu.h
+++ b/include/wx/univ/menu.h
@@ -6,7 +6,7 @@
 // Created:     05.05.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_MENU_H_
diff --git a/include/wx/univ/menuitem.h b/include/wx/univ/menuitem.h
index c0554556a0..510d723487 100644
--- a/include/wx/univ/menuitem.h
+++ b/include/wx/univ/menuitem.h
@@ -6,7 +6,7 @@
 // Created:     05.05.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_MENUITEM_H_
diff --git a/include/wx/univ/notebook.h b/include/wx/univ/notebook.h
index 4c82009c99..e63b172a3b 100644
--- a/include/wx/univ/notebook.h
+++ b/include/wx/univ/notebook.h
@@ -6,7 +6,7 @@
 // Created:     01.02.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_NOTEBOOK_H_
diff --git a/include/wx/univ/radiobox.h b/include/wx/univ/radiobox.h
index 6072641499..163d4627e4 100644
--- a/include/wx/univ/radiobox.h
+++ b/include/wx/univ/radiobox.h
@@ -6,7 +6,7 @@
 // Created:     11.09.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_RADIOBOX_H_
diff --git a/include/wx/univ/radiobut.h b/include/wx/univ/radiobut.h
index 5d78b3e9a3..2a7240053b 100644
--- a/include/wx/univ/radiobut.h
+++ b/include/wx/univ/radiobut.h
@@ -6,7 +6,7 @@
 // Created:     10.09.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_RADIOBUT_H_
diff --git a/include/wx/univ/renderer.h b/include/wx/univ/renderer.h
index 390338dafd..f55ed02652 100644
--- a/include/wx/univ/renderer.h
+++ b/include/wx/univ/renderer.h
@@ -6,11 +6,11 @@
 // Created:     06.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 /*
-   wxRenderer class is used to draw all wxWindows controls. This is an ABC and
+   wxRenderer class is used to draw all wxWidgets controls. This is an ABC and
    the look of the application is determined by the concrete derivation of
    wxRenderer used in the program.
 
diff --git a/include/wx/univ/scrarrow.h b/include/wx/univ/scrarrow.h
index c1d355fd50..44e477f289 100644
--- a/include/wx/univ/scrarrow.h
+++ b/include/wx/univ/scrarrow.h
@@ -6,7 +6,7 @@
 // Created:     22.01.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_SCRARROW_H_
diff --git a/include/wx/univ/scrolbar.h b/include/wx/univ/scrolbar.h
index 4cfb891169..5af849195b 100644
--- a/include/wx/univ/scrolbar.h
+++ b/include/wx/univ/scrolbar.h
@@ -6,7 +6,7 @@
 // Created:     20.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_SCROLBAR_H_
diff --git a/include/wx/univ/scrthumb.h b/include/wx/univ/scrthumb.h
index c8b0eb255a..27aa0eb042 100644
--- a/include/wx/univ/scrthumb.h
+++ b/include/wx/univ/scrthumb.h
@@ -6,7 +6,7 @@
 // Created:     12.02.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_SCRTHUMB_H_
diff --git a/include/wx/univ/scrtimer.h b/include/wx/univ/scrtimer.h
index 35e3505ab4..195ddd43ad 100644
--- a/include/wx/univ/scrtimer.h
+++ b/include/wx/univ/scrtimer.h
@@ -6,7 +6,7 @@
 // Created:     18.02.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // NB: this class is implemented in scrolbar.cpp
diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h
index 0da4fe15eb..d50643689a 100644
--- a/include/wx/univ/setup0.h
+++ b/include/wx/univ/setup0.h
@@ -6,7 +6,7 @@
 // Created:     14.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_SETUP_H_
@@ -67,7 +67,7 @@
 // Generic comment about debugging settings: they are very useful if you don't
 // use any other memory leak detection tools such as Purify/BoundsChecker, but
 // are probably redundant otherwise. Also, Visual C++ CRT has the same features
-// as wxWindows memory debugging subsystem built in since version 5.0 and you
+// as wxWidgets memory debugging subsystem built in since version 5.0 and you
 // may prefer to use it instead of built in memory debugging code because it is
 // faster and more fool proof.
 //
@@ -140,7 +140,7 @@
 // Unicode support
 // ----------------------------------------------------------------------------
 
-// Set wxUSE_UNICODE to 1 to compile wxWindows in Unicode mode: wxChar will be
+// Set wxUSE_UNICODE to 1 to compile wxWidgets in Unicode mode: wxChar will be
 // defined as wchar_t, wxString will use Unicode internally. If you set this
 // to 1, you must use wxT() macro for all literal strings in the program.
 //
@@ -155,7 +155,7 @@
     #define wxUSE_UNICODE 0
 #endif
 
-// Set wxUSE_UNICODE_MSLU to 1 if you want to compile wxWindows in Unicode mode
+// Set wxUSE_UNICODE_MSLU to 1 if you want to compile wxWidgets in Unicode mode
 // and be able to run compiled apps under Windows 9x as well as NT/2000/XP. This
 // setting enables use of unicows.dll from MSLU (MS Layer for Unicode, see
 // http://www.microsoft.com/globaldev/Articles/mslu_announce.asp). Note that you
@@ -256,7 +256,7 @@
 // Recommended setting: 0 unless you do plan to develop MT applications
 #define wxUSE_THREADS 1
 
-// If enabled (1), compiles wxWindows streams classes
+// If enabled (1), compiles wxWidgets streams classes
 #define wxUSE_STREAMS 1
 
 // Use standard C++ streams if 1. If 0, use wxWin streams implementation.
@@ -432,7 +432,7 @@
 
 // If enabled, the code written by Apple will be used to write, in a portable
 // way, float on the disk. See extended.c for the license which is different
-// from wxWindows one.
+// from wxWidgets one.
 //
 // Default is 1.
 //
@@ -527,7 +527,7 @@
 // Recommended setting: 1 (may be set to 0)
 #define wxUSE_TIPWINDOW    1
 
-// Each of the settings below corresponds to one wxWindows control. They are
+// Each of the settings below corresponds to one wxWidgets control. They are
 // all switched on by default but may be disabled if you are sure that your
 // program (including any standard dialogs it can show!) doesn't need them and
 // if you desperately want to save some space. If you use any of these you must
@@ -1076,7 +1076,7 @@
 // ----------------------------------------------------------------------------
 #if defined(__WINDOWS__)
 
-// Set this to 1 if you want to use wxWindows and MFC in the same program. This
+// Set this to 1 if you want to use wxWidgets and MFC in the same program. This
 // will override some other settings (see below)
 //
 // Default is 0.
diff --git a/include/wx/univ/slider.h b/include/wx/univ/slider.h
index 69fe989edb..77c2abd9e9 100644
--- a/include/wx/univ/slider.h
+++ b/include/wx/univ/slider.h
@@ -6,7 +6,7 @@
 // Created:     09.02.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/include/wx/univ/spinbutt.h b/include/wx/univ/spinbutt.h
index 6f2ec38af0..f01bccb359 100644
--- a/include/wx/univ/spinbutt.h
+++ b/include/wx/univ/spinbutt.h
@@ -6,7 +6,7 @@
 // Created:     21.01.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_SPINBUTT_H_
diff --git a/include/wx/univ/statbmp.h b/include/wx/univ/statbmp.h
index 0a69f1e236..3dccd9066c 100644
--- a/include/wx/univ/statbmp.h
+++ b/include/wx/univ/statbmp.h
@@ -6,7 +6,7 @@
 // Created:     25.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_STATBMP_H_
diff --git a/include/wx/univ/statbox.h b/include/wx/univ/statbox.h
index fd8ff41262..83f0a4f9cc 100644
--- a/include/wx/univ/statbox.h
+++ b/include/wx/univ/statbox.h
@@ -6,7 +6,7 @@
 // Created:     15.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_STATBOX_H_
diff --git a/include/wx/univ/statline.h b/include/wx/univ/statline.h
index 3965165d92..86958ca425 100644
--- a/include/wx/univ/statline.h
+++ b/include/wx/univ/statline.h
@@ -5,7 +5,7 @@
 // Created:     28.06.99
 // Version:     $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/include/wx/univ/stattext.h b/include/wx/univ/stattext.h
index 3c882c69c3..e0b1d9b9ae 100644
--- a/include/wx/univ/stattext.h
+++ b/include/wx/univ/stattext.h
@@ -6,7 +6,7 @@
 // Created:     14.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_STATTEXT_H_
diff --git a/include/wx/univ/statusbr.h b/include/wx/univ/statusbr.h
index 85baa6e44f..c493ae7cc5 100644
--- a/include/wx/univ/statusbr.h
+++ b/include/wx/univ/statusbr.h
@@ -6,7 +6,7 @@
 // Created:     14.10.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_STATUSBR_H_
diff --git a/include/wx/univ/textctrl.h b/include/wx/univ/textctrl.h
index eba0ae2314..815b25ffe8 100644
--- a/include/wx/univ/textctrl.h
+++ b/include/wx/univ/textctrl.h
@@ -6,7 +6,7 @@
 // Created:     15.09.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_TEXTCTRL_H_
diff --git a/include/wx/univ/theme.h b/include/wx/univ/theme.h
index ac22a2c6be..d654a927ae 100644
--- a/include/wx/univ/theme.h
+++ b/include/wx/univ/theme.h
@@ -8,7 +8,7 @@
 // Created:     06.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_THEME_H_
diff --git a/include/wx/univ/toolbar.h b/include/wx/univ/toolbar.h
index 73b35cb0a6..433924df13 100644
--- a/include/wx/univ/toolbar.h
+++ b/include/wx/univ/toolbar.h
@@ -6,7 +6,7 @@
 // Created:     10.09.00
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_TOOLBAR_H_
diff --git a/include/wx/univ/toplevel.h b/include/wx/univ/toplevel.h
index e446186e1f..7b36af81a4 100644
--- a/include/wx/univ/toplevel.h
+++ b/include/wx/univ/toplevel.h
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/univ/window.h b/include/wx/univ/window.h
index b352f7ff07..152787a721 100644
--- a/include/wx/univ/window.h
+++ b/include/wx/univ/window.h
@@ -8,7 +8,7 @@
 // Created:     06.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_WINDOW_H_
diff --git a/include/wx/unix/apptbase.h b/include/wx/unix/apptbase.h
index a4488c6a1b..5615eb5353 100644
--- a/include/wx/unix/apptbase.h
+++ b/include/wx/unix/apptbase.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     23.06.2003
 // RCS-ID:      $Id$
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIX_APPTBASE_H_
diff --git a/include/wx/unix/apptrait.h b/include/wx/unix/apptrait.h
index c0524a2e24..38c2d3633f 100644
--- a/include/wx/unix/apptrait.h
+++ b/include/wx/unix/apptrait.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     23.06.2003
 // RCS-ID:      $Id$
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIX_APPTRAIT_H_
diff --git a/include/wx/unix/displayx11.h b/include/wx/unix/displayx11.h
index 4bb0cdc8f4..9507f55d6e 100644
--- a/include/wx/unix/displayx11.h
+++ b/include/wx/unix/displayx11.h
@@ -5,8 +5,8 @@
 // Modified by: 
 // Created:     12/05/02
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DISPLAYX11_H_
diff --git a/include/wx/unix/execute.h b/include/wx/unix/execute.h
index 9bb61aedd5..e7fb517afb 100644
--- a/include/wx/unix/execute.h
+++ b/include/wx/unix/execute.h
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart, Vadim Zeitlin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIX_EXECUTE_H
diff --git a/include/wx/unix/fontutil.h b/include/wx/unix/fontutil.h
index dd1b79014a..8860f80108 100644
--- a/include/wx/unix/fontutil.h
+++ b/include/wx/unix/fontutil.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     05.11.99
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIX_FONTUTIL_H_
diff --git a/include/wx/unix/joystick.h b/include/wx/unix/joystick.h
index ec38965284..77ccb624c9 100644
--- a/include/wx/unix/joystick.h
+++ b/include/wx/unix/joystick.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __JOYSTICKH__
diff --git a/include/wx/unix/mimetype.h b/include/wx/unix/mimetype.h
index cc6f75f2d7..fc14452e76 100644
--- a/include/wx/unix/mimetype.h
+++ b/include/wx/unix/mimetype.h
@@ -6,7 +6,7 @@
 // Created:     23.09.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence (part of wxExtra library)
+// Licence:     wxWidgets licence (part of wxExtra library)
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _MIMETYPE_IMPL_H
diff --git a/include/wx/unix/pipe.h b/include/wx/unix/pipe.h
index aa0f59f4bc..a3a8e6e7a3 100644
--- a/include/wx/unix/pipe.h
+++ b/include/wx/unix/pipe.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     24.06.2003 (extracted from src/unix/utilsunx.cpp)
 // RCS-ID:      $Id$
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIX_PIPE_H_
diff --git a/include/wx/unix/sound.h b/include/wx/unix/sound.h
index 2d2a349869..6d15ffa7c2 100644
--- a/include/wx/unix/sound.h
+++ b/include/wx/unix/sound.h
@@ -6,7 +6,7 @@
 // Created:     25/10/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart, Vaclav Slavik
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SOUND_H_
@@ -106,10 +106,10 @@ private:
 // ----------------------------------------------------------------------------
 
 // This is interface to sound playing implementation. There are multiple
-// sound architectures in use on Unix platforms and wxWindows can use several
+// sound architectures in use on Unix platforms and wxWidgets can use several
 // of them for playback, depending on their availability at runtime; hence
-// the need for backends. This class is for use by wxWindows and people writing
-// additional backends only, it is _not_ for use by applications! 
+// the need for backends. This class is for use by wxWidgets and people writing
+// additional backends only, it is _not_ for use by applications!
 
 // Structure that holds playback status information
 struct wxSoundPlaybackStatus
@@ -137,7 +137,7 @@ public:
     virtual bool IsAvailable() const = 0;
 
     // Returns true if the backend is capable of playing sound asynchronously.
-    // If false, then wxWindows creates a playback thread and handles async
+    // If false, then wxWidgets creates a playback thread and handles async
     // playback, otherwise it is left up to the backend (will usually be more
     // effective).
     virtual bool HasNativeAsyncPlayback() const = 0;
diff --git a/include/wx/unix/taskbarx11.h b/include/wx/unix/taskbarx11.h
index ce9b661a85..f5270b30e7 100644
--- a/include/wx/unix/taskbarx11.h
+++ b/include/wx/unix/taskbarx11.h
@@ -6,7 +6,7 @@
 // Created:     04/04/2003
 // RCS-ID:      $Id$
 // Copyright:   (c) Vaclav Slavik, 2003
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////
 
 #ifndef _TASKBAR_H_
diff --git a/include/wx/unix/utilsx11.h b/include/wx/unix/utilsx11.h
index 7c182bc7bf..b6c91f7138 100644
--- a/include/wx/unix/utilsx11.h
+++ b/include/wx/unix/utilsx11.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     25.03.02
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIX_UTILSX11_H_
@@ -15,7 +15,7 @@
 #include "wx/defs.h"
 #include "wx/gdicmn.h"
 
-// NB: Content of this header is for wxWindows' private use! It is not
+// NB: Content of this header is for wxWidgets' private use! It is not
 //     part of public API and may be modified or even disappear in the future!
 
 #if defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXX11__)
diff --git a/include/wx/url.h b/include/wx/url.h
index 59d8428060..90576092b1 100644
--- a/include/wx/url.h
+++ b/include/wx/url.h
@@ -6,7 +6,7 @@
 // Created:     20/07/1997
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_URL_H
diff --git a/include/wx/utils.h b/include/wx/utils.h
index 8830abcb6a..c085a19c2c 100644
--- a/include/wx/utils.h
+++ b/include/wx/utils.h
@@ -6,7 +6,7 @@
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UTILSH__
@@ -90,7 +90,7 @@ WXDLLIMPEXP_BASE int wxGetOsVersion(int *majorVsn = (int *) NULL,
 // Return a string with the current date/time
 WXDLLIMPEXP_BASE wxString wxNow();
 
-// Return path where wxWindows is installed (mostly useful in Unices)
+// Return path where wxWidgets is installed (mostly useful in Unices)
 WXDLLIMPEXP_BASE const wxChar *wxGetInstallPrefix();
 // Return path to wxWin data (/usr/share/wx/%{version}) (Unices)
 WXDLLIMPEXP_BASE wxString wxGetDataDir();
@@ -493,7 +493,7 @@ WXDLLIMPEXP_BASE bool wxYield();
 WXDLLIMPEXP_BASE bool wxYieldIfNeeded();
 
 // ----------------------------------------------------------------------------
-// Error message functions used by wxWindows (deprecated, use wxLog)
+// Error message functions used by wxWidgets (deprecated, use wxLog)
 // ----------------------------------------------------------------------------
 
 #if WXWIN_COMPATIBILITY_2_2
diff --git a/include/wx/valgen.h b/include/wx/valgen.h
index 9da6b104c2..2e8da8ca37 100644
--- a/include/wx/valgen.h
+++ b/include/wx/valgen.h
@@ -6,7 +6,7 @@
 // Created:     Jan 22 1999
 // RCS-ID:
 // Copyright:   (c) 1999 Kevin Smith
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_VALGENH__
diff --git a/include/wx/validate.h b/include/wx/validate.h
index 1888c52eb1..7bf0f2b108 100644
--- a/include/wx/validate.h
+++ b/include/wx/validate.h
@@ -6,7 +6,7 @@
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_VALIDATE_H_
@@ -86,7 +86,7 @@ WXDLLEXPORT_DATA(extern const wxValidator) wxDefaultValidator;
 #define wxVALIDATOR_PARAM(val) val
 
 #else // !wxUSE_VALIDATORS
-    // wxWindows is compiled without support for wxValidator, but we still
+    // wxWidgets is compiled without support for wxValidator, but we still
     // want to be able to pass wxDefaultValidator to the functions which take
     // a wxValidator parameter to avoid using "#if wxUSE_VALIDATORS"
     // everywhere
diff --git a/include/wx/valtext.h b/include/wx/valtext.h
index 47ed43d83d..8d48db19e1 100644
--- a/include/wx/valtext.h
+++ b/include/wx/valtext.h
@@ -6,7 +6,7 @@
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_VALTEXTH__
diff --git a/include/wx/variant.h b/include/wx/variant.h
index ef70b0e3ae..fc517d7175 100644
--- a/include/wx/variant.h
+++ b/include/wx/variant.h
@@ -6,7 +6,7 @@
 // Created:     10/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_VARIANT_H_
diff --git a/include/wx/vector.h b/include/wx/vector.h
index 2034a9eaa8..ac8ea14651 100644
--- a/include/wx/vector.h
+++ b/include/wx/vector.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     30.07.2001
 // Copyright:   (c) 2001 Lindsay Mathieson <lindsay@mathieson.org>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_VECTOR_H_
diff --git a/include/wx/version.h b/include/wx/version.h
index 18d2ad26cc..d51647833c 100644
--- a/include/wx/version.h
+++ b/include/wx/version.h
@@ -1,12 +1,12 @@
 /**
 *  Name:        wx/version.h 
-*  Purpose:     wxWindows version numbers 
-*  Author:      Julian Smart 
+*  Purpose:     wxWidgets version numbers 
+*  Author:      Julian Smart
 *  Modified by: Ryan Norton (Converted to C)
 *  Created:     29/01/98 
 *  RCS-ID:      $Id$ 
 *  Copyright:   (c) 1998 Julian Smart 
-*  Licence:     wxWindows licence 
+*  Licence:     wxWidgets licence 
 */
 
 /* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
@@ -21,8 +21,8 @@
 /*      so don't change its format too much or they could break */
 #define wxMAJOR_VERSION    2
 #define wxMINOR_VERSION    5
-#define wxRELEASE_NUMBER   1
-#define wxVERSION_STRING   _T("wxWidgets 2.5.1")
+#define wxRELEASE_NUMBER   2
+#define wxVERSION_STRING   _T("wxWidgets 2.5.2")
 
 /*  nothing to update below this line when updating the version */
 /*  ---------------------------------------------------------------------------- */
diff --git a/include/wx/vidmode.h b/include/wx/vidmode.h
index 70853dc500..3186f0e510 100644
--- a/include/wx/vidmode.h
+++ b/include/wx/vidmode.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     27.09.2003 (extracted from wx/display.h)
 // RCS-ID:      $Id$
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_VMODE_H_
diff --git a/include/wx/vlbox.h b/include/wx/vlbox.h
index 9e5bf64c5b..f6eea8ce98 100644
--- a/include/wx/vlbox.h
+++ b/include/wx/vlbox.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     31.05.03
 // RCS-ID:      $Id$
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_VLBOX_H_
diff --git a/include/wx/volume.h b/include/wx/volume.h
index 32a2a46306..43a1c2ab9d 100644
--- a/include/wx/volume.h
+++ b/include/wx/volume.h
@@ -6,7 +6,7 @@
 // Created:     28 Jan 02
 // RCS-ID:      $Id$
 // Copyright:   (c) 2002 George Policello
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ----------------------------------------------------------------------------
diff --git a/include/wx/vscroll.h b/include/wx/vscroll.h
index d04ba462d4..47acd80326 100644
--- a/include/wx/vscroll.h
+++ b/include/wx/vscroll.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     30.05.03
 // RCS-ID:      $Id$
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_VSCROLL_H_
diff --git a/include/wx/wave.h b/include/wx/wave.h
index 45d5b80944..50392072cc 100644
--- a/include/wx/wave.h
+++ b/include/wx/wave.h
@@ -6,7 +6,7 @@
 // Created:     2004/02/01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2004, Vaclav Slavik
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_WAVE_H_BASE_
@@ -25,7 +25,7 @@
     #warning "wx/wave.h header is deprecated, use wx/sound.h and wxSound"
 #endif
     #include "wx/sound.h"
-    // wxSound used to be called wxWave before wxWindows 2.5.1:
+    // wxSound used to be called wxWave before wxWidgets 2.5.1:
     typedef wxSound wxWave;
 #else
     #error "wx/wave.h is only available in compatibility mode"
diff --git a/include/wx/wfstream.h b/include/wx/wfstream.h
index a0cb69e11e..4ca3e9d40d 100644
--- a/include/wx/wfstream.h
+++ b/include/wx/wfstream.h
@@ -6,7 +6,7 @@
 // Created:     11/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Guilhem Lavaux
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_WXFSTREAM_H__
diff --git a/include/wx/window.h b/include/wx/window.h
index d529e08099..613d4b4d81 100644
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -5,8 +5,8 @@
 // Modified by: Ron Lee
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_WINDOW_H_BASE_
@@ -168,7 +168,7 @@ public:
     // window attributes
     // -----------------
 
-        // NB: in future versions of wxWindows Set/GetTitle() will only work
+        // NB: in future versions of wxWidgets Set/GetTitle() will only work
         //     with the top level windows (such as dialogs and frames) and
         //     Set/GetLabel() only with the other ones (i.e. all controls).
 
diff --git a/include/wx/wizard.h b/include/wx/wizard.h
index 7f9f8d4016..f60ca1e766 100644
--- a/include/wx/wizard.h
+++ b/include/wx/wizard.h
@@ -11,7 +11,7 @@
 // Created:     15.08.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_WIZARD_H_
diff --git a/include/wx/wx.h b/include/wx/wx.h
index 08978f4902..976b9b354b 100644
--- a/include/wx/wx.h
+++ b/include/wx/wx.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/wx.h
-// Purpose:     wxWindows central header including the most often used ones
+// Purpose:     wxWidgets central header including the most often used ones
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_WX_H_
diff --git a/include/wx/wx_cw.h b/include/wx/wx_cw.h
index 7b1e20dc9e..fb7e762126 100644
--- a/include/wx/wx_cw.h
+++ b/include/wx/wx_cw.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx_cw.h
-// Purpose:     wxWindows definitions for CodeWarrior builds
+// Purpose:     wxWidgets definitions for CodeWarrior builds
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     12/10/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CW__
diff --git a/include/wx/wx_cw_cm.h b/include/wx/wx_cw_cm.h
index 9460395178..77ae654dee 100644
--- a/include/wx/wx_cw_cm.h
+++ b/include/wx/wx_cw_cm.h
@@ -68,7 +68,7 @@
 
 #define USE_DEFINE
 
-// in order to avoid problems further down in wxWindows
+// in order to avoid problems further down in wxWidgets
 
 #ifdef __cplusplus
 
diff --git a/include/wx/wx_cw_d.h b/include/wx/wx_cw_d.h
index ef13968623..1d0270334a 100644
--- a/include/wx/wx_cw_d.h
+++ b/include/wx/wx_cw_d.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx_cw_d.h
-// Purpose:     wxWindows definitions for CodeWarrior builds (Debug)
+// Purpose:     wxWidgets definitions for CodeWarrior builds (Debug)
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     12/10/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CW__
diff --git a/include/wx/wx_cwc.h b/include/wx/wx_cwc.h
index 02456ae97b..26fdcd80cc 100644
--- a/include/wx/wx_cwc.h
+++ b/include/wx/wx_cwc.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx_cw.h
-// Purpose:     wxWindows definitions for CodeWarrior builds
+// Purpose:     wxWidgets definitions for CodeWarrior builds
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     12/10/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CW__
diff --git a/include/wx/wx_cwc_d.h b/include/wx/wx_cwc_d.h
index d3e2e4d150..9b450f5631 100644
--- a/include/wx/wx_cwc_d.h
+++ b/include/wx/wx_cwc_d.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx_cw_d.h
-// Purpose:     wxWindows definitions for CodeWarrior builds (Debug)
+// Purpose:     wxWidgets definitions for CodeWarrior builds (Debug)
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     12/10/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CW__
diff --git a/include/wx/wx_cwu_d.h b/include/wx/wx_cwu_d.h
index 5a6123d024..421762181f 100644
--- a/include/wx/wx_cwu_d.h
+++ b/include/wx/wx_cwu_d.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx_cw_d.h
-// Purpose:     wxWindows definitions for CodeWarrior builds (Debug)
+// Purpose:     wxWidgets definitions for CodeWarrior builds (Debug)
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     12/10/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CW__
diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index a883c76893..342469a970 100644
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -5,8 +5,8 @@
  * Modified by: Vadim Zeitlin, Robert Roebling, Ron Lee
  * Created:     1998/06/12
  * RCS-ID:      $Id$
- * Copyright:   (c) 1998-2002 wxWindows dev team
- * Licence:     wxWindows licence
+ * Copyright:   (c) 1998-2002 wxWidgets dev team
+ * Licence:     wxWidgets licence
  */
 
 /* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
@@ -48,7 +48,7 @@
 /*
     Standard headers we need here.
 
-    NB: don't include any wxWindows headers here because almost of them include
+    NB: don't include any wxWidgets headers here because almost of them include
         this one!
  */
 
@@ -178,7 +178,7 @@
         typedef wchar_t wxSChar;
         typedef wchar_t wxUChar;
     #else /* __WCHAR_TYPE__ and gcc < 2.96 */
-        /* VS: wxWindows used to define wxChar as __WCHAR_TYPE__ here. However, */
+        /* VS: wxWidgets used to define wxChar as __WCHAR_TYPE__ here. However, */
         /*     this doesn't work with new GCC 3.x compilers because wchar_t is */
         /*     C++'s builtin type in the new standard. OTOH, old compilers (GCC */
         /*     2.x) won't accept new definition of wx{S,U}Char, therefore we */
@@ -212,7 +212,7 @@
 
 /* although global macros with such names are normally bad, we want to have */
 /* another name for _T() which should be used to avoid confusion between _T() */
-/* and _() in wxWindows sources */
+/* and _() in wxWidgets sources */
 #define wxT(x)       _T(x)
 
 /* Unicode-friendly __FILE__, __DATE__ and __TIME__ analogs */
@@ -629,7 +629,7 @@
     #elif defined(__UNIX__) || defined(__GNUWIN32__)
         #define wxStricmp strcasecmp
         #define wxStrnicmp strncasecmp
-    /* #else -- use wxWindows implementation */
+    /* #else -- use wxWidgets implementation */
     #endif
 #endif /* !defined(wxStricmp) */
 
@@ -717,7 +717,7 @@ WXDLLIMPEXP_BASE bool wxOKlibc(); /* for internal use */
             #define wxVsnprintf_    vswprintf
         #endif
     #else /* ASCII */
-        /* all versions of CodeWarrior supported by wxWindows apparently have */
+        /* all versions of CodeWarrior supported by wxWidgets apparently have */
         /* vsnprintf() */
         #if defined(HAVE_VSNPRINTF) || defined(__MWERKS__) || defined(__WATCOMC__)
             /* assume we have snprintf() too if we have vsnprintf() */
diff --git a/include/wx/wxhtml.h b/include/wx/wxhtml.h
index cc4353fed1..78b9de1525 100644
--- a/include/wx/wxhtml.h
+++ b/include/wx/wxhtml.h
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wxhtml.h
-// Purpose:     wxHTML library for wxWindows
+// Purpose:     wxHTML library for wxWidgets
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
-// Licence:     wxWindows Licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_HTML_H_
diff --git a/include/wx/wxprec.h b/include/wx/wxprec.h
index f0dd44e107..354b2104c2 100644
--- a/include/wx/wxprec.h
+++ b/include/wx/wxprec.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // compiler detection; includes setup.h
diff --git a/include/wx/wxshlb_cw.h b/include/wx/wxshlb_cw.h
index 4c1e54bb43..242399bf3d 100644
--- a/include/wx/wxshlb_cw.h
+++ b/include/wx/wxshlb_cw.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx_cw.h
-// Purpose:     wxWindows definitions for CodeWarrior builds
+// Purpose:     wxWidgets definitions for CodeWarrior builds
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     12/10/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CW__
diff --git a/include/wx/wxshlb_cw_d.h b/include/wx/wxshlb_cw_d.h
index ca26b912a3..04a9440d83 100644
--- a/include/wx/wxshlb_cw_d.h
+++ b/include/wx/wxshlb_cw_d.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx_cw_d.h
-// Purpose:     wxWindows definitions for CodeWarrior builds (Debug)
+// Purpose:     wxWidgets definitions for CodeWarrior builds (Debug)
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     12/10/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CW__
diff --git a/include/wx/wxshlb_cwc.h b/include/wx/wxshlb_cwc.h
index 81785a6a76..2ccb03508e 100644
--- a/include/wx/wxshlb_cwc.h
+++ b/include/wx/wxshlb_cwc.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx_cw.h
-// Purpose:     wxWindows definitions for CodeWarrior builds
+// Purpose:     wxWidgets definitions for CodeWarrior builds
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     12/10/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CW__
diff --git a/include/wx/wxshlb_cwc_d.h b/include/wx/wxshlb_cwc_d.h
index cf8600c0a5..7db6c8467d 100644
--- a/include/wx/wxshlb_cwc_d.h
+++ b/include/wx/wxshlb_cwc_d.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx_cw_d.h
-// Purpose:     wxWindows definitions for CodeWarrior builds (Debug)
+// Purpose:     wxWidgets definitions for CodeWarrior builds (Debug)
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     12/10/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CW__
diff --git a/include/wx/wxshlba_cw.h b/include/wx/wxshlba_cw.h
index c2e6f39e19..f533779e95 100644
--- a/include/wx/wxshlba_cw.h
+++ b/include/wx/wxshlba_cw.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx_cw.h
-// Purpose:     wxWindows definitions for CodeWarrior builds
+// Purpose:     wxWidgets definitions for CodeWarrior builds
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     12/10/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CW__
diff --git a/include/wx/wxshlba_cw_d.h b/include/wx/wxshlba_cw_d.h
index 665ec12977..5727e3c60e 100644
--- a/include/wx/wxshlba_cw_d.h
+++ b/include/wx/wxshlba_cw_d.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx_cw_d.h
-// Purpose:     wxWindows definitions for CodeWarrior builds (Debug)
+// Purpose:     wxWidgets definitions for CodeWarrior builds (Debug)
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     12/10/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CW__
diff --git a/include/wx/wxshlba_cwc.h b/include/wx/wxshlba_cwc.h
index ca3a9be124..51ef632675 100644
--- a/include/wx/wxshlba_cwc.h
+++ b/include/wx/wxshlba_cwc.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx_cw.h
-// Purpose:     wxWindows definitions for CodeWarrior builds
+// Purpose:     wxWidgets definitions for CodeWarrior builds
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     12/10/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CW__
diff --git a/include/wx/wxshlba_cwc_d.h b/include/wx/wxshlba_cwc_d.h
index 4834e5f741..2136b450f8 100644
--- a/include/wx/wxshlba_cwc_d.h
+++ b/include/wx/wxshlba_cwc_d.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx_cw_d.h
-// Purpose:     wxWindows definitions for CodeWarrior builds (Debug)
+// Purpose:     wxWidgets definitions for CodeWarrior builds (Debug)
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     12/10/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CW__
diff --git a/include/wx/x11/app.h b/include/wx/x11/app.h
index 332a8ee06b..1050a07829 100644
--- a/include/wx/x11/app.h
+++ b/include/wx/x11/app.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_APP_H_
diff --git a/include/wx/x11/bitmap.h b/include/wx/x11/bitmap.h
index c7a746e2e7..3f82f8b018 100644
--- a/include/wx/x11/bitmap.h
+++ b/include/wx/x11/bitmap.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart, Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_BITMAP_H_
diff --git a/include/wx/x11/brush.h b/include/wx/x11/brush.h
index 4ea94c15fc..5a4554bdac 100644
--- a/include/wx/x11/brush.h
+++ b/include/wx/x11/brush.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart, Robert Roebling
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_BRUSH_H_
diff --git a/include/wx/x11/clipbrd.h b/include/wx/x11/clipbrd.h
index 981aab4690..ebc36f9574 100644
--- a/include/wx/x11/clipbrd.h
+++ b/include/wx/x11/clipbrd.h
@@ -5,7 +5,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __X11CLIPBOARDH__
diff --git a/include/wx/x11/colour.h b/include/wx/x11/colour.h
index 357d8657d3..1c70700a1a 100644
--- a/include/wx/x11/colour.h
+++ b/include/wx/x11/colour.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart, Robert Roebling
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COLOUR_H_
diff --git a/include/wx/x11/cursor.h b/include/wx/x11/cursor.h
index e914316b8a..5fbc292220 100644
--- a/include/wx/x11/cursor.h
+++ b/include/wx/x11/cursor.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CURSOR_H_
diff --git a/include/wx/x11/dataform.h b/include/wx/x11/dataform.h
index 006f7b0e38..a565c4b41e 100644
--- a/include/wx/x11/dataform.h
+++ b/include/wx/x11/dataform.h
@@ -6,7 +6,7 @@
 // Created:     19.10.99 (extracted from motif/dataobj.h)
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_X11_DATAFORM_H
diff --git a/include/wx/x11/dataobj.h b/include/wx/x11/dataobj.h
index 885dc31145..5b904122ac 100644
--- a/include/wx/x11/dataobj.h
+++ b/include/wx/x11/dataobj.h
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_X11_DATAOBJ_H_
diff --git a/include/wx/x11/dataobj2.h b/include/wx/x11/dataobj2.h
index db3da090d9..ccde8829e4 100644
--- a/include/wx/x11/dataobj2.h
+++ b/include/wx/x11/dataobj2.h
@@ -5,7 +5,7 @@
 // Created:     19.10.99 (extracted from gtk/dataobj.h)
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998, 1999 Vadim Zeitlin, Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_X11_DATAOBJ2_H_
diff --git a/include/wx/x11/dc.h b/include/wx/x11/dc.h
index 04af891660..71cb341840 100644
--- a/include/wx/x11/dc.h
+++ b/include/wx/x11/dc.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DC_H_
diff --git a/include/wx/x11/dcclient.h b/include/wx/x11/dcclient.h
index af67b3ddf2..de67be70f8 100644
--- a/include/wx/x11/dcclient.h
+++ b/include/wx/x11/dcclient.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCCLIENT_H_
diff --git a/include/wx/x11/dcmemory.h b/include/wx/x11/dcmemory.h
index 50259bbdf6..0d122d6f11 100644
--- a/include/wx/x11/dcmemory.h
+++ b/include/wx/x11/dcmemory.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCMEMORY_H_
diff --git a/include/wx/x11/dcprint.h b/include/wx/x11/dcprint.h
index 91812557e6..21b367632a 100644
--- a/include/wx/x11/dcprint.h
+++ b/include/wx/x11/dcprint.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCPRINT_H_
diff --git a/include/wx/x11/dcscreen.h b/include/wx/x11/dcscreen.h
index b1c32801f5..0e6a104205 100644
--- a/include/wx/x11/dcscreen.h
+++ b/include/wx/x11/dcscreen.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCSCREEN_H_
diff --git a/include/wx/x11/dnd.h b/include/wx/x11/dnd.h
index 1af3bacce2..1ce5305c84 100644
--- a/include/wx/x11/dnd.h
+++ b/include/wx/x11/dnd.h
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin, Robert Roebling, Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/include/wx/x11/font.h b/include/wx/x11/font.h
index a4739023f6..ab6f1a1427 100644
--- a/include/wx/x11/font.h
+++ b/include/wx/x11/font.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FONT_H_
diff --git a/include/wx/x11/gdiobj.h b/include/wx/x11/gdiobj.h
index 14293b5841..699d1cf7b0 100644
--- a/include/wx/x11/gdiobj.h
+++ b/include/wx/x11/gdiobj.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GDIOBJ_H_
diff --git a/include/wx/x11/glcanvas.h b/include/wx/x11/glcanvas.h
index 8a409f79e4..cc7332c533 100644
--- a/include/wx/x11/glcanvas.h
+++ b/include/wx/x11/glcanvas.h
@@ -1,13 +1,13 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        glcanvas.h
-// Purpose:     wxGLCanvas, for using OpenGL with wxWindows 2.0 for Motif.
+// Purpose:     wxGLCanvas, for using OpenGL with wxWidgets 2.0 for Motif.
 //              Uses the GLX extension.
 // Author:      Julian Smart and Wolfram Gloger
 // Modified by:
 // Created:     1995, 1999
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart, Wolfram Gloger
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/include/wx/x11/icon.h b/include/wx/x11/icon.h
index c9f867a6a7..86778524c5 100644
--- a/include/wx/x11/icon.h
+++ b/include/wx/x11/icon.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_ICON_H_
diff --git a/include/wx/x11/joystick.h b/include/wx/x11/joystick.h
index b4d3024919..adab387dfe 100644
--- a/include/wx/x11/joystick.h
+++ b/include/wx/x11/joystick.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_JOYSTICK_H_
diff --git a/include/wx/x11/minifram.h b/include/wx/x11/minifram.h
index dcfb2d3173..49179b5674 100644
--- a/include/wx/x11/minifram.h
+++ b/include/wx/x11/minifram.h
@@ -8,7 +8,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MINIFRAM_H_
diff --git a/include/wx/x11/palette.h b/include/wx/x11/palette.h
index 975ec7584c..0612ac1254 100644
--- a/include/wx/x11/palette.h
+++ b/include/wx/x11/palette.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PALETTE_H_
diff --git a/include/wx/x11/pen.h b/include/wx/x11/pen.h
index 7b7937c264..6735f7dbcb 100644
--- a/include/wx/x11/pen.h
+++ b/include/wx/x11/pen.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PEN_H_
diff --git a/include/wx/x11/popupwin.h b/include/wx/x11/popupwin.h
index 3e023e06ce..69a0c15095 100644
--- a/include/wx/x11/popupwin.h
+++ b/include/wx/x11/popupwin.h
@@ -5,7 +5,7 @@
 // Created:
 // Id:          $Id$
 // Copyright:   (c) 2001 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKPOPUPWINH__
diff --git a/include/wx/x11/print.h b/include/wx/x11/print.h
index 64b50ef0a6..0193a501c7 100644
--- a/include/wx/x11/print.h
+++ b/include/wx/x11/print.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PRINT_H_
diff --git a/include/wx/x11/private.h b/include/wx/x11/private.h
index bec9db0561..04df95a90c 100644
--- a/include/wx/x11/private.h
+++ b/include/wx/x11/private.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PRIVATE_H_
@@ -69,7 +69,7 @@ extern bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win, Window windo
 extern Window wxGetWindowParent(Window window);
 
 // Set the window manager decorations according to the
-// given wxWindows style
+// given wxWidgets style
 bool wxSetWMDecorations(Window w, long style);
 bool wxMWMIsRunning(Window w);
 
diff --git a/include/wx/x11/privx.h b/include/wx/x11/privx.h
index 6a9c5336be..ec522ff28d 100644
--- a/include/wx/x11/privx.h
+++ b/include/wx/x11/privx.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PRIVX_H_
diff --git a/include/wx/x11/region.h b/include/wx/x11/region.h
index 0b3c967d3c..2f4b3d7c9c 100644
--- a/include/wx/x11/region.h
+++ b/include/wx/x11/region.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart, Robert Roebling
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_REGION_H_
diff --git a/include/wx/x11/reparent.h b/include/wx/x11/reparent.h
index b98f70c918..ae054a4bba 100644
--- a/include/wx/x11/reparent.h
+++ b/include/wx/x11/reparent.h
@@ -6,7 +6,7 @@
 // Created:     2002-03-09
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_REPARENT_H_
diff --git a/include/wx/x11/textctrl.h b/include/wx/x11/textctrl.h
index 1b8f0143a2..3116737bee 100644
--- a/include/wx/x11/textctrl.h
+++ b/include/wx/x11/textctrl.h
@@ -5,7 +5,7 @@
 // Created:     01/02/97
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __X11TEXTCTRLH__
diff --git a/include/wx/x11/toplevel.h b/include/wx/x11/toplevel.h
index 63ac8769fd..ea5539b56d 100644
--- a/include/wx/x11/toplevel.h
+++ b/include/wx/x11/toplevel.h
@@ -6,7 +6,7 @@
 // Created:     20.09.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2002 Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_X11_TOPLEVEL_H_
diff --git a/include/wx/x11/window.h b/include/wx/x11/window.h
index 057961575f..9e7c63727f 100644
--- a/include/wx/x11/window.h
+++ b/include/wx/x11/window.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_WINDOW_H_
diff --git a/include/wx/xml/xml.h b/include/wx/xml/xml.h
index 5eede8757d..0025a6bbb1 100644
--- a/include/wx/xml/xml.h
+++ b/include/wx/xml/xml.h
@@ -5,7 +5,7 @@
 // Created:     2000/03/05
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -14,7 +14,7 @@
  *                                                                           *
  *  The API defined in this header *WILL* change in the future and backward  *
  *  compatibility will *not* be preserved. If you use these classes in your  *
- *  application, it probably won't compile with future wxWindows releases.   *
+ *  application, it probably won't compile with future wxWidgets releases.   *
  *  Use on your own risk.                                                    *
  *                                                                           *
  * ************************************************************************* */
diff --git a/include/wx/xpmdecod.h b/include/wx/xpmdecod.h
index 807f2ed2d2..63b20bd892 100644
--- a/include/wx/xpmdecod.h
+++ b/include/wx/xpmdecod.h
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // CVS-ID:      $Id$
 // Copyright:   (c) 2001 Vaclav Slavik
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_XPMDECOD_H_
diff --git a/include/wx/xti.h b/include/wx/xti.h
index 7c3cf5552e..f86df5e73b 100644
--- a/include/wx/xti.h
+++ b/include/wx/xti.h
@@ -7,7 +7,7 @@
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997 Julian Smart
 //              (c) 2003 Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_XTIH__
diff --git a/include/wx/xtistrm.h b/include/wx/xtistrm.h
index 8289f676c9..fed2d32d7d 100644
--- a/include/wx/xtistrm.h
+++ b/include/wx/xtistrm.h
@@ -6,7 +6,7 @@
 // Created:     27/07/03
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_XTISTRMH__
diff --git a/include/wx/xtixml.h b/include/wx/xtixml.h
index 7ddda9032e..f5620cdea1 100644
--- a/include/wx/xtixml.h
+++ b/include/wx/xtixml.h
@@ -6,7 +6,7 @@
 // Created:     27/07/03
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_XTIXMLH__
diff --git a/include/wx/zipstrm.h b/include/wx/zipstrm.h
index f6b276b6ec..bac2b1dc03 100644
--- a/include/wx/zipstrm.h
+++ b/include/wx/zipstrm.h
@@ -3,7 +3,7 @@
 // Purpose:     wxZipInputStream for reading files from ZIP archive
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
-// Licence:     wxWindows Licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __ZIPSTREAM_H__
diff --git a/include/wx/zstream.h b/include/wx/zstream.h
index 748abd7b47..f5ec6a5906 100644
--- a/include/wx/zstream.h
+++ b/include/wx/zstream.h
@@ -6,7 +6,7 @@
 // Created:     11/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Guilhem Lavaux
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 #ifndef _WX_WXZSTREAM_H__
 #define _WX_WXZSTREAM_H__
diff --git a/include/wx_pb.h b/include/wx_pb.h
index d8e1e0939a..5b3d9c6f74 100644
--- a/include/wx_pb.h
+++ b/include/wx_pb.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     22.01.02
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #define HAVE_USLEEP 1
diff --git a/locale/af.po b/locale/af.po
index bade11d5f6..9847ef75f2 100644
--- a/locale/af.po
+++ b/locale/af.po
@@ -1,11 +1,11 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: wxWindows-2.5.1\n"
+"Project-Id-Version: wxWidgets-2.5.2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-05-07 14:03+0200\n"
 "PO-Revision-Date: 2004-02-24 16:39+0200\n"
 "Last-Translator: Petri Jooste <rkwjpj@puk.ac.za>\n"
-"Language-Team: wxWindows translators <wx-translators@wxwindows.org>\n"
+"Language-Team: wxWidgets translators <wx-translators@wxwidgets.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -3873,12 +3873,12 @@ msgstr "wxSocket: onbekende gebeurtenis!"
 
 #: ../src/motif/app.cpp:207
 #, c-format
-msgid "wxWindows could not open display for '%s': exiting."
-msgstr "wxWindows kon vertoonskerm nie oopmaak vir '%s': gaan dus uit."
+msgid "wxWidgets could not open display for '%s': exiting."
+msgstr "wxWidgets kon vertoonskerm nie oopmaak vir '%s': gaan dus uit."
 
 #: ../src/x11/app.cpp:176
-msgid "wxWindows could not open display. Exiting."
-msgstr "wxWindows kon vertoonskerm nie oopmaak nie. Gaan dus uit."
+msgid "wxWidgets could not open display. Exiting."
+msgstr "wxWidgets kon vertoonskerm nie oopmaak nie. Gaan dus uit."
 
 #: ../src/common/datetime.cpp:3302
 msgid "yesterday"
diff --git a/locale/ca.po b/locale/ca.po
index a4df148102..9e17b924e3 100644
--- a/locale/ca.po
+++ b/locale/ca.po
@@ -1,11 +1,11 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: wxWindows-2.5.1\n"
+"Project-Id-Version: wxWidgets-2.5.2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-05-07 14:03+0200\n"
 "PO-Revision-Date: 2003-07-22 11:31+0100\n"
 "Last-Translator: Paco Rivière <friviere@wanadoo.es>\n"
-"Language-Team: <wx-translators@wxwindows.org>\n"
+"Language-Team: <wx-translators@wxwidgets.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -3932,12 +3932,12 @@ msgstr "wxSocket: incid
 
 #: ../src/motif/app.cpp:207
 #, c-format
-msgid "wxWindows could not open display for '%s': exiting."
-msgstr "wxWindows no podia obrir l'aplicació per '%s'; s'està sortint."
+msgid "wxWidgets could not open display for '%s': exiting."
+msgstr "wxWidgets no podia obrir l'aplicació per '%s'; s'està sortint."
 
 #: ../src/x11/app.cpp:176
-msgid "wxWindows could not open display. Exiting."
-msgstr "wxWindows no podien obrien l'exhibició. S'està sortint."
+msgid "wxWidgets could not open display. Exiting."
+msgstr "wxWidgets no podien obrien l'exhibició. S'està sortint."
 
 #: ../src/common/datetime.cpp:3302
 msgid "yesterday"
diff --git a/locale/cs.po b/locale/cs.po
index e1e5ae220a..7b2e4ec20f 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -1,11 +1,11 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: wxWindows-2.5.1\n"
+"Project-Id-Version: wxWidgets-2.5.2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-05-07 14:03+0200\n"
 "PO-Revision-Date: 2004-05-06 02:22+0100\n"
 "Last-Translator: Herbert Breunung <herbert_breunung@web.de>\n"
-"Language-Team: wxWindows translators <wx-translators@wxwindows.org>\n"
+"Language-Team: wxWidgets translators <wx-translators@wxwidgets.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -3892,12 +3892,12 @@ msgstr "wxSocket: nezn
 
 #: ../src/motif/app.cpp:207
 #, c-format
-msgid "wxWindows could not open display for '%s': exiting."
-msgstr "wxWindows nemohou otevøít displej pro '%s': ukonèuji."
+msgid "wxWidgets could not open display for '%s': exiting."
+msgstr "wxWidgets nemohou otevøít displej pro '%s': ukonèuji."
 
 #: ../src/x11/app.cpp:176
-msgid "wxWindows could not open display. Exiting."
-msgstr "wxWindows nemohou otevøít displej. Program se nyní ukonèí."
+msgid "wxWidgets could not open display. Exiting."
+msgstr "wxWidgets nemohou otevøít displej. Program se nyní ukonèí."
 
 #: ../src/common/datetime.cpp:3302
 msgid "yesterday"
diff --git a/locale/da.po b/locale/da.po
index d3f40f3edc..0288a80fc2 100644
--- a/locale/da.po
+++ b/locale/da.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: wxWindows-2.5.1\n"
+"Project-Id-Version: wxWidgets-2.5.2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-05-07 14:03+0200\n"
 "PO-Revision-Date: 2002-06-05 10:57+0200\n"
@@ -3902,12 +3902,12 @@ msgstr "wxSocket: ukendt event!"
 
 #: ../src/motif/app.cpp:207
 #, c-format
-msgid "wxWindows could not open display for '%s': exiting."
-msgstr "wxWindows kunne ikke åbne display for '%s': stopper."
+msgid "wxWidgets could not open display for '%s': exiting."
+msgstr "wxWidgets kunne ikke åbne display for '%s': stopper."
 
 #: ../src/x11/app.cpp:176
-msgid "wxWindows could not open display. Exiting."
-msgstr "wxWindows kunne ikke åbne diplay. Stopper."
+msgid "wxWidgets could not open display. Exiting."
+msgstr "wxWidgets kunne ikke åbne diplay. Stopper."
 
 #: ../src/common/datetime.cpp:3302
 msgid "yesterday"
@@ -4302,8 +4302,8 @@ msgstr ""
 #~ msgid "Replace file '%s'?"
 #~ msgstr "Erstat fil '%s'?"
 
-#~ msgid "wxWindows: error finding temporary file name.\n"
-#~ msgstr "wxWindows: fejl ved søgning efter midlertidig filnavn.\n"
+#~ msgid "wxWidgets: error finding temporary file name.\n"
+#~ msgstr "wxWidgets: fejl ved søgning efter midlertidig filnavn.\n"
 
 #~ msgid ""
 #~ "Can't create window of class %s!\n"
diff --git a/locale/de.po b/locale/de.po
index b2ccde7078..a71e50570a 100644
--- a/locale/de.po
+++ b/locale/de.po
@@ -1,11 +1,11 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: wxWindows-2.5.1\n"
+"Project-Id-Version: wxWidgets-2.5.2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-05-07 14:03+0200\n"
 "PO-Revision-Date: 2004-05-06 01:41+0100\n"
 "Last-Translator: Herbert Breunung <herbert_breunung@web.de>\n"
-"Language-Team: wxWindows Team <wx-devel@wxwindows.org>\n"
+"Language-Team: wxWidgets Team <wx-dev@wxwidgets.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -3903,12 +3903,12 @@ msgstr "wxSocket: unbekanntes Ereignis!."
 
 #: ../src/motif/app.cpp:207
 #, c-format
-msgid "wxWindows could not open display for '%s': exiting."
-msgstr "wxWindows konnte 'open display' nicht ausführen für '%s': Abbruch."
+msgid "wxWidgets could not open display for '%s': exiting."
+msgstr "wxWidgets konnte 'open display' nicht ausführen für '%s': Abbruch."
 
 #: ../src/x11/app.cpp:176
-msgid "wxWindows could not open display. Exiting."
-msgstr "wxWindows konnte Display nicht öffnen: Abbruch."
+msgid "wxWidgets could not open display. Exiting."
+msgstr "wxWidgets konnte Display nicht öffnen: Abbruch."
 
 #: ../src/common/datetime.cpp:3302
 msgid "yesterday"
diff --git a/locale/el.po b/locale/el.po
index 1b35363194..b0560bac6b 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: wxWindows 2.5.1\n"
+"Project-Id-Version: wxWidgets 2.5.2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-05-07 14:03+0200\n"
 "PO-Revision-Date: 2003-04-14 21:28+0200\n"
@@ -3973,14 +3973,14 @@ msgstr "wxSocket: 
 
 #: ../src/motif/app.cpp:207
 #, c-format
-msgid "wxWindows could not open display for '%s': exiting."
+msgid "wxWidgets could not open display for '%s': exiting."
 msgstr ""
-"Ç âéëéïèÞêç wxWindows äåí ìðïñåß íá áíïßîåé ôçí áðåéêüíéóç ãéá ôï '%s': "
+"Ç âéëéïèÞêç wxWidgets äåí ìðïñåß íá áíïßîåé ôçí áðåéêüíéóç ãéá ôï '%s': "
 "Ýîïäïò..."
 
 #: ../src/x11/app.cpp:176
-msgid "wxWindows could not open display. Exiting."
-msgstr "Ç âéëéïèÞêç wxWindows äåí ìðïñåß íá áíïßîåé ôçí áðåéêüíéóç. 'Åîïäïò..."
+msgid "wxWidgets could not open display. Exiting."
+msgstr "Ç âéëéïèÞêç wxWidgets äåí ìðïñåß íá áíïßîåé ôçí áðåéêüíéóç. 'Åîïäïò..."
 
 #: ../src/common/datetime.cpp:3302
 msgid "yesterday"
diff --git a/locale/es.po b/locale/es.po
index 6acb1cc547..99c8770773 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -1,11 +1,11 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: wxWindows 2.5.1\n"
+"Project-Id-Version: wxWidgets 2.5.2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-05-07 14:03+0200\n"
 "PO-Revision-Date: 2003-10-01 20:50+0100\n"
 "Last-Translator: JSJ <jsj666@hotmail.com>\n"
-"Language-Team: wxWindows translators <wx-translators@wxwindows.org>\n"
+"Language-Team: wxWidgets translators <wx-translators@wxwidgets.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -3926,12 +3926,12 @@ msgstr "wxSocket: 
 
 #: ../src/motif/app.cpp:207
 #, c-format
-msgid "wxWindows could not open display for '%s': exiting."
-msgstr "wxWindows no pudo abrir el 'display' para '%s': saliendo."
+msgid "wxWidgets could not open display for '%s': exiting."
+msgstr "wxWidgets no pudo abrir el 'display' para '%s': saliendo."
 
 #: ../src/x11/app.cpp:176
-msgid "wxWindows could not open display. Exiting."
-msgstr "wxWindows no pudo abrir el 'display'. Saliendo."
+msgid "wxWidgets could not open display. Exiting."
+msgstr "wxWidgets no pudo abrir el 'display'. Saliendo."
 
 #: ../src/common/datetime.cpp:3302
 msgid "yesterday"
diff --git a/locale/fi.po b/locale/fi.po
index 336c825b03..237773f95a 100644
--- a/locale/fi.po
+++ b/locale/fi.po
@@ -1,11 +1,11 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: wxWindows-2.5.1\n"
+"Project-Id-Version: wxWidgets-2.5.2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-05-07 14:03+0200\n"
 "PO-Revision-Date: 2000-10-22 13:38Finland Daylight Time\n"
 "Last-Translator: Kaj G Backas <kgb@compart.fi>\n"
-"Language-Team: wxWindows translators <wx-translators@wxwindows.org>\n"
+"Language-Team: wxWidgets translators <wx-translators@wxwidgets.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-15\n"
 "Content-Transfer-Encoding: 8-bit\n"
@@ -3936,13 +3936,13 @@ msgstr "wxSocket: tuntematon tapahtuma!"
 
 #: ../src/motif/app.cpp:207
 #, c-format
-msgid "wxWindows could not open display for '%s': exiting."
-msgstr "wxWindows ei voi avata ikkunaa prosessille '%s': lopettaa."
+msgid "wxWidgets could not open display for '%s': exiting."
+msgstr "wxWidgets ei voi avata ikkunaa prosessille '%s': lopettaa."
 
 #: ../src/x11/app.cpp:176
 #, fuzzy
-msgid "wxWindows could not open display. Exiting."
-msgstr "wxWindows ei voi avata ikkunaa prosessille '%s': lopettaa."
+msgid "wxWidgets could not open display. Exiting."
+msgstr "wxWidgets ei voi avata ikkunaa prosessille '%s': lopettaa."
 
 #: ../src/common/datetime.cpp:3302
 msgid "yesterday"
@@ -4337,8 +4337,8 @@ msgstr ""
 #~ msgid "Replace file '%s'?"
 #~ msgstr "Korvataanko tiedosto '%s'?"
 
-#~ msgid "wxWindows: error finding temporary file name.\n"
-#~ msgstr "wxWindows: virhe väliaikaistiedoston etsinnässä.\n"
+#~ msgid "wxWidgets: error finding temporary file name.\n"
+#~ msgstr "wxWidgets: virhe väliaikaistiedoston etsinnässä.\n"
 
 #~ msgid ""
 #~ "Can't create window of class %s!\n"
diff --git a/locale/fr.po b/locale/fr.po
index f5e15b8dca..2d5ceaedb0 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -1,11 +1,11 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: wxWindows-2.5.1\n"
+"Project-Id-Version: wxWidgets-2.5.2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-05-07 14:03+0200\n"
 "PO-Revision-Date: 2002-11-20 21:42+0100\n"
 "Last-Translator: Stephane Junique <pttlapinblanc@chez.com>\n"
-"Language-Team: wxWindows translators <wx-translators@wxwindows.org>\n"
+"Language-Team: wxWidgets translators <wx-translators@wxwidgets.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -3965,13 +3965,13 @@ msgstr "wxSocket: 
 
 #: ../src/motif/app.cpp:207
 #, c-format
-msgid "wxWindows could not open display for '%s': exiting."
+msgid "wxWidgets could not open display for '%s': exiting."
 msgstr ""
-"wxWindows n'a pas pu ouvrir de zone d'affichage (display) pour %s : abandon."
+"wxWidgets n'a pas pu ouvrir de zone d'affichage (display) pour %s : abandon."
 
 #: ../src/x11/app.cpp:176
-msgid "wxWindows could not open display. Exiting."
-msgstr "wxWindows n'a pas pu ouvrir de zone d'affichage (display) : abandon."
+msgid "wxWidgets could not open display. Exiting."
+msgstr "wxWidgets n'a pas pu ouvrir de zone d'affichage (display) : abandon."
 
 #: ../src/common/datetime.cpp:3302
 msgid "yesterday"
diff --git a/locale/hu.po b/locale/hu.po
index 4e4cff2244..783e7f4905 100644
--- a/locale/hu.po
+++ b/locale/hu.po
@@ -1,11 +1,11 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: wxWindows 2.5.2\n"
+"Project-Id-Version: wxWidgets 2.5.2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-05-07 14:03+0200\n"
 "PO-Revision-Date: 2004-03-10 15:11+0100\n"
 "Last-Translator: Vegh Janos <J.Vegh@atomki.hu>\n"
-"Language-Team: wxWindows translators <wx-translators@wxwindows.org>\n"
+"Language-Team: wxWidgets translators <wx-translators@wxwidgets.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -3888,12 +3888,12 @@ msgstr "wxSocket: ismeretlen esem
 
 #: ../src/motif/app.cpp:207
 #, c-format
-msgid "wxWindows could not open display for '%s': exiting."
-msgstr "a wxWindows nem tudott képernyõt nyitni '%s' számára: kilépés."
+msgid "wxWidgets could not open display for '%s': exiting."
+msgstr "a wxWidgets nem tudott képernyõt nyitni '%s' számára: kilépés."
 
 #: ../src/x11/app.cpp:176
-msgid "wxWindows could not open display. Exiting."
-msgstr "A wxWindows nem tudott képernyõt nyitni. Kilépés."
+msgid "wxWidgets could not open display. Exiting."
+msgstr "A wxWidgets nem tudott képernyõt nyitni. Kilépés."
 
 #: ../src/common/datetime.cpp:3302
 msgid "yesterday"
diff --git a/locale/id.po b/locale/id.po
index 29cdc0392e..6f94e446ab 100644
--- a/locale/id.po
+++ b/locale/id.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: wxWindows-2.5.1\n"
+"Project-Id-Version: wxWidgets-2.5.2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-05-07 14:03+0200\n"
 "PO-Revision-Date: 2002-10-22 23:28+0700\n"
@@ -3919,12 +3919,12 @@ msgstr "wxSocket: event tidak dikenal!."
 
 #: ../src/motif/app.cpp:207
 #, c-format
-msgid "wxWindows could not open display for '%s': exiting."
-msgstr "wxWindows tidak bisa membuka tampilan untuk '%s': keluar."
+msgid "wxWidgets could not open display for '%s': exiting."
+msgstr "wxWidgets tidak bisa membuka tampilan untuk '%s': keluar."
 
 #: ../src/x11/app.cpp:176
-msgid "wxWindows could not open display. Exiting."
-msgstr "wxWindows tidak bisa membuka tampilan. Keluar."
+msgid "wxWidgets could not open display. Exiting."
+msgstr "wxWidgets tidak bisa membuka tampilan. Keluar."
 
 #: ../src/common/datetime.cpp:3302
 msgid "yesterday"
diff --git a/locale/it.po b/locale/it.po
index 6c7b2872b4..4554887ec3 100644
--- a/locale/it.po
+++ b/locale/it.po
@@ -1,11 +1,11 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: wxWindows-2.5.1\n"
+"Project-Id-Version: wxWidgets-2.5.2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-05-07 14:03+0200\n"
 "PO-Revision-Date: 2004-05-03 23:09+0100\n"
 "Last-Translator: Marco Cavallini <wx@koansoftware.com>\n"
-"Language-Team: wxWindows translators <wx-translators@wxwindows.org>\n"
+"Language-Team: wxWidgets translators <wx-translators@wxwidgets.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -3910,12 +3910,12 @@ msgstr "wxSocket: evento sconosciuto!."
 
 #: ../src/motif/app.cpp:207
 #, c-format
-msgid "wxWindows could not open display for '%s': exiting."
-msgstr "wxWindows non può aprire il display per '%s': abbandona."
+msgid "wxWidgets could not open display for '%s': exiting."
+msgstr "wxWidgets non può aprire il display per '%s': abbandona."
 
 #: ../src/x11/app.cpp:176
-msgid "wxWindows could not open display. Exiting."
-msgstr "wxWindows non può aprire il display. Abbandona."
+msgid "wxWidgets could not open display. Exiting."
+msgstr "wxWidgets non può aprire il display. Abbandona."
 
 #: ../src/common/datetime.cpp:3302
 msgid "yesterday"
diff --git a/locale/nl.po b/locale/nl.po
index f90ef756d9..c067cc2322 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -1,11 +1,11 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: wxWindows-2.5.1\n"
+"Project-Id-Version: wxWidgets-2.5.2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-05-07 14:03+0200\n"
 "PO-Revision-Date: 2002-11-29 15:12+0100\n"
 "Last-Translator: Dimitri <dimitri@shortcut.nl>\n"
-"Language-Team: wxWindows translators <wx-translators@wxwindows.org>\n"
+"Language-Team: wxWidgets translators <wx-translators@wxwidgets.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -3924,12 +3924,12 @@ msgstr "wxSocket: onbekende gebeurtenis!"
 
 #: ../src/motif/app.cpp:207
 #, c-format
-msgid "wxWindows could not open display for '%s': exiting."
-msgstr "wxWindows kon beeldscherm niet openen voor '%s': afbreken."
+msgid "wxWidgets could not open display for '%s': exiting."
+msgstr "wxWidgets kon beeldscherm niet openen voor '%s': afbreken."
 
 #: ../src/x11/app.cpp:176
-msgid "wxWindows could not open display. Exiting."
-msgstr "wxWindows kon beeldscherm niet openen. Afbreken."
+msgid "wxWidgets could not open display. Exiting."
+msgstr "wxWidgets kon beeldscherm niet openen. Afbreken."
 
 #: ../src/common/datetime.cpp:3302
 msgid "yesterday"
diff --git a/locale/pl.po b/locale/pl.po
index 6b72f9c6b1..aa50672a35 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -1,10 +1,10 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: wxWindows-2.5.1\n"
+"Project-Id-Version: wxWidgets-2.5.2\n"
 "POT-Creation-Date: 2004-05-07 14:03+0200\n"
 "PO-Revision-Date: 2004-05-07 20:05+0100\n"
 "Last-Translator: W³odzimierz ABX Skiba <abx@abx.art.pl>\n"
-"Language-Team: wxWindows translators <wx-translators@wxwindows.org>\n"
+"Language-Team: wxWidgets translators <wx-translators@wxwidgets.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -3980,11 +3980,11 @@ msgstr "wxSocket: nieznane zdarzenie!"
 
 #: ../src/motif/app.cpp:207
 #, c-format
-msgid "wxWindows could not open display for '%s': exiting."
+msgid "wxWidgets could not open display for '%s': exiting."
 msgstr "Nie mo¿na zainicjowaæ wy¶wietlania dla '%s': program koñczy pracê."
 
 #: ../src/x11/app.cpp:176
-msgid "wxWindows could not open display. Exiting."
+msgid "wxWidgets could not open display. Exiting."
 msgstr "Nie mo¿na zainicjowaæ wy¶wietlania. Program koñczy pracê."
 
 #: ../src/common/datetime.cpp:3302
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 70ab444e5b..a35ea2a5d0 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -1,10 +1,10 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: wxWindows-2.5.1\n"
+"Project-Id-Version: wxWidgets-2.5.2\n"
 "POT-Creation-Date: 2004-02-04 18:56+0100\n"
 "PO-Revision-Date: 2004-05-12 17:19-0300\n"
 "Last-Translator: E. A. Tacão <e.a.tacao@terra.com.br>\n"
-"Language-Team: wxWindows translators <wx-translators@lists.wxwidgets.org>\n"
+"Language-Team: wxWidgets translators <wx-translators@lists.wxwidgets.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -3768,12 +3768,12 @@ msgstr "wxSocket: evento desconhecido!"
 
 #: ../src/motif/app.cpp:204
 #, c-format
-msgid "wxWindows could not open display for '%s': exiting."
-msgstr "O wxWindows não pôde abrir o display para '%s': terminando."
+msgid "wxWidgets could not open display for '%s': exiting."
+msgstr "O wxWidgets não pôde abrir o display para '%s': terminando."
 
 #: ../src/x11/app.cpp:176
-msgid "wxWindows could not open display. Exiting."
-msgstr "O wxWindows não pôde abrir o display. Terminando."
+msgid "wxWidgets could not open display. Exiting."
+msgstr "O wxWidgets não pôde abrir o display. Terminando."
 
 #: ../src/common/datetime.cpp:3302
 msgid "yesterday"
diff --git a/locale/ru.po b/locale/ru.po
index 3ff2654704..11b532f89f 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -1,11 +1,11 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: wxWindows-2.5.1\n"
+"Project-Id-Version: wxWidgets-2.5.2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-05-07 14:03+0200\n"
 "PO-Revision-Date: 2004-05-06 09:55+0100\n"
 "Last-Translator: W?odzimierz ABX Skiba <abx@abx.art.pl>\n"
-"Language-Team: wx-translators <wx-translators@wxwindows.org>\n"
+"Language-Team: wx-translators <wx-translators@wxwidgets.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -3919,12 +3919,12 @@ msgstr "wxSocket: 
 
 #: ../src/motif/app.cpp:207
 #, c-format
-msgid "wxWindows could not open display for '%s': exiting."
-msgstr "wxWindows ÎÅ ÓÍÏÇ ÏÔËÒÙÔØ ÄÉÓÐÌÅÊ ÄÌÑ '%s': ×ÙÈÏÄÉÍ."
+msgid "wxWidgets could not open display for '%s': exiting."
+msgstr "wxWidgets ÎÅ ÓÍÏÇ ÏÔËÒÙÔØ ÄÉÓÐÌÅÊ ÄÌÑ '%s': ×ÙÈÏÄÉÍ."
 
 #: ../src/x11/app.cpp:176
-msgid "wxWindows could not open display. Exiting."
-msgstr "wxWindows ÎÅ ÓÍÏÇ ÏÔËÒÙÔØ ÄÉÓÐÌÅÊ. ÷ÙÈÏÄÉÍ."
+msgid "wxWidgets could not open display. Exiting."
+msgstr "wxWidgets ÎÅ ÓÍÏÇ ÏÔËÒÙÔØ ÄÉÓÐÌÅÊ. ÷ÙÈÏÄÉÍ."
 
 #: ../src/common/datetime.cpp:3302
 msgid "yesterday"
diff --git a/locale/sl.po b/locale/sl.po
index 24d1bf01c3..45d387ef20 100644
--- a/locale/sl.po
+++ b/locale/sl.po
@@ -4,7 +4,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: wxWindows 2.5.1\n"
+"Project-Id-Version: wxWidgets 2.5.2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-05-07 14:03+0200\n"
 "PO-Revision-Date: 2001-06-28 12:48+0100\n"
@@ -4779,13 +4779,13 @@ msgstr ""
 # common/docview.cpp:306
 #: ../src/motif/app.cpp:207
 #, fuzzy, c-format
-msgid "wxWindows could not open display for '%s': exiting."
+msgid "wxWidgets could not open display for '%s': exiting."
 msgstr "Ne morem odpreti te datoteke za shranjevanje."
 
 # common/docview.cpp:306
 #: ../src/x11/app.cpp:176
 #, fuzzy
-msgid "wxWindows could not open display. Exiting."
+msgid "wxWidgets could not open display. Exiting."
 msgstr "Ne morem odpreti te datoteke za shranjevanje."
 
 #: ../src/common/datetime.cpp:3302
@@ -5073,5 +5073,5 @@ msgstr ""
 #~ msgstr "Zamenjam datoteko '%s'?"
 
 # common/filefn.cpp:1230
-#~ msgid "wxWindows: error finding temporary file name.\n"
-#~ msgstr "wxWindows: napaki pri iskanju imena zaèasne datoteke.\n"
+#~ msgid "wxWidgets: error finding temporary file name.\n"
+#~ msgstr "wxWidgets: napaki pri iskanju imena zaèasne datoteke.\n"
diff --git a/locale/sv.po b/locale/sv.po
index 6b6795bb7b..7c950e7422 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -1,11 +1,11 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: wxWindows-2.5.1\n"
+"Project-Id-Version: wxWidgets-2.5.2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-05-07 14:03+0200\n"
 "PO-Revision-Date: 2004-02-21 21:19+0100\n"
 "Last-Translator: Jonas Rydberg <jor@mindless.com>\n"
-"Language-Team: wxWindows translators <wx-translators@wxwindows.org>\n"
+"Language-Team: wxWidgets translators <wx-translators@wxwidgets.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -3864,12 +3864,12 @@ msgstr "wxSocket: Ok
 
 #: ../src/motif/app.cpp:207
 #, c-format
-msgid "wxWindows could not open display for '%s': exiting."
-msgstr "wxWindows kunde inte öppna skärm för \"%s\": Avslutar."
+msgid "wxWidgets could not open display for '%s': exiting."
+msgstr "wxWidgets kunde inte öppna skärm för \"%s\": Avslutar."
 
 #: ../src/x11/app.cpp:176
-msgid "wxWindows could not open display. Exiting."
-msgstr "wxWindows kunde inte öppna skärm. Avslutar."
+msgid "wxWidgets could not open display. Exiting."
+msgstr "wxWidgets kunde inte öppna skärm. Avslutar."
 
 #: ../src/common/datetime.cpp:3302
 msgid "yesterday"
diff --git a/locale/tr.po b/locale/tr.po
index b1fd4a5e5e..33e3b5a381 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: wxWindows-2.5.1\n"
+"Project-Id-Version: wxWidgets-2.5.2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-05-07 14:03+0200\n"
 "PO-Revision-Date: 2002-09-16 17:41--800\n"
@@ -3928,13 +3928,13 @@ msgstr "wxSocket: bilinmeyen olay!."
 
 #: ../src/motif/app.cpp:207
 #, c-format
-msgid "wxWindows could not open display for '%s': exiting."
-msgstr "wxWindows '%s' için görüntüyü açamadý: çýkýlýyor."
+msgid "wxWidgets could not open display for '%s': exiting."
+msgstr "wxWidgets '%s' için görüntüyü açamadý: çýkýlýyor."
 
 #: ../src/x11/app.cpp:176
 #, fuzzy
-msgid "wxWindows could not open display. Exiting."
-msgstr "wxWindows '%s' için görüntüyü açamadý: çýkýlýyor."
+msgid "wxWidgets could not open display. Exiting."
+msgstr "wxWidgets '%s' için görüntüyü açamadý: çýkýlýyor."
 
 #: ../src/common/datetime.cpp:3302
 msgid "yesterday"
diff --git a/locale/uk.po b/locale/uk.po
index 906cc7b1c1..7dc7394477 100644
--- a/locale/uk.po
+++ b/locale/uk.po
@@ -1,11 +1,11 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: wxWindows-2.5.1\n"
+"Project-Id-Version: wxWidgets-2.5.2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-05-07 14:03+0200\n"
 "PO-Revision-Date: 2004-03-21 21:44-0300\n"
 "Last-Translator: Ilya Korniyko <k_ilya@ukr.net>\n"
-"Language-Team: wx-translators <wx-translators@wxwindows.org>\n"
+"Language-Team: wx-translators <wx-translators@wxwidgets.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-u\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -3912,12 +3912,12 @@ msgstr "wxSocket: 
 
 #: ../src/motif/app.cpp:207
 #, c-format
-msgid "wxWindows could not open display for '%s': exiting."
-msgstr "wxWindows ÎÅ ÚÍ¦Ç ×¦ÄËÒÉÔÉ ÄÉÓÐÌÅÊ ÄÌÑ '%s': ×ÉÈÏÄÖÕ."
+msgid "wxWidgets could not open display for '%s': exiting."
+msgstr "wxWidgets ÎÅ ÚÍ¦Ç ×¦ÄËÒÉÔÉ ÄÉÓÐÌÅÊ ÄÌÑ '%s': ×ÉÈÏÄÖÕ."
 
 #: ../src/x11/app.cpp:176
-msgid "wxWindows could not open display. Exiting."
-msgstr "wxWindows ÎÅ ÚÍ¦Ç ×¦ÄËÒÉÔÉ ÄÉÓÐÌÅÊ. ÷ÉÈÏÄÖÕ."
+msgid "wxWidgets could not open display. Exiting."
+msgstr "wxWidgets ÎÅ ÚÍ¦Ç ×¦ÄËÒÉÔÉ ÄÉÓÐÌÅÊ. ÷ÉÈÏÄÖÕ."
 
 #: ../src/common/datetime.cpp:3302
 msgid "yesterday"
@@ -4330,7 +4330,7 @@ msgstr ""
 #~ msgstr "ðÏÍÉÌËÁ ÞÉÔÁÎÎÑ ÆÁÊÌÕ '%s'"
 
 #, fuzzy
-#~ msgid "wxWindows: error finding temporary file name.\n"
+#~ msgid "wxWidgets: error finding temporary file name.\n"
 #~ msgstr "ðÏÍÉÌËÁ ÆÏÒÍÕ×ÁÎÎÑ ¦ÍÅΦ ÔÉÍÞÁÓÏ×ÏÇÏ ÆÁÊÌÕ"
 
 #~ msgid ""
diff --git a/locale/wxstd.po b/locale/wxstd.po
index 71fa11b256..84844188ac 100644
--- a/locale/wxstd.po
+++ b/locale/wxstd.po
@@ -3798,11 +3798,11 @@ msgstr ""
 
 #: ../src/motif/app.cpp:207
 #, c-format
-msgid "wxWindows could not open display for '%s': exiting."
+msgid "wxWidgets could not open display for '%s': exiting."
 msgstr ""
 
 #: ../src/x11/app.cpp:176
-msgid "wxWindows could not open display. Exiting."
+msgid "wxWidgets could not open display. Exiting."
 msgstr ""
 
 #: ../src/common/datetime.cpp:3302
diff --git a/locale/zh_CN.po b/locale/zh_CN.po
index 50009457fe..5bcee7e84f 100644
--- a/locale/zh_CN.po
+++ b/locale/zh_CN.po
@@ -1,11 +1,11 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: wxWindows-2.5.2\n"
+"Project-Id-Version: wxWidgets-2.5.2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-05-07 14:03+0200\n"
 "PO-Revision-Date: 2000-11-09 16:09Öйú±ê׼ʱ¼ä\n"
 "Last-Translator: mrfx <mrfx@fm365.com>\n"
-"Language-Team: wxWindows tranlators <wx-translators@wxwindows.org>\n"
+"Language-Team: wxWidgets tranlators <wx-translators@wxwidgets.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=GB2312\n"
 "Content-Transfer-Encoding: 8-bit\n"
@@ -3929,13 +3929,13 @@ msgstr "wxSocket: δ֪
 
 #: ../src/motif/app.cpp:207
 #, c-format
-msgid "wxWindows could not open display for '%s': exiting."
-msgstr "wxWindows ²»ÄÜΪ '%s' ´ò¿ªÏÔʾÉ豸: ÒѾ­´æÔÚ."
+msgid "wxWidgets could not open display for '%s': exiting."
+msgstr "wxWidgets ²»ÄÜΪ '%s' ´ò¿ªÏÔʾÉ豸: ÒѾ­´æÔÚ."
 
 #: ../src/x11/app.cpp:176
 #, fuzzy
-msgid "wxWindows could not open display. Exiting."
-msgstr "wxWindows ²»ÄÜΪ '%s' ´ò¿ªÏÔʾÉ豸: ÒѾ­´æÔÚ."
+msgid "wxWidgets could not open display. Exiting."
+msgstr "wxWidgets ²»ÄÜΪ '%s' ´ò¿ªÏÔʾÉ豸: ÒѾ­´æÔÚ."
 
 #: ../src/common/datetime.cpp:3302
 msgid "yesterday"
@@ -4330,8 +4330,8 @@ msgstr ""
 #~ msgid "Replace file '%s'?"
 #~ msgstr "Ìæ»»Îļþ '%s'?"
 
-#~ msgid "wxWindows: error finding temporary file name.\n"
-#~ msgstr "wxWindows: ²éѯÁÙʱÎļþÃûʱ³ö´í.\n"
+#~ msgid "wxWidgets: error finding temporary file name.\n"
+#~ msgstr "wxWidgets: ²éѯÁÙʱÎļþÃûʱ³ö´í.\n"
 
 #~ msgid ""
 #~ "Can't create window of class %s!\n"
diff --git a/src/cocoa/data.cpp b/src/cocoa/data.cpp
index c2dac0b6eb..6016fbc52f 100644
--- a/src/cocoa/data.cpp
+++ b/src/cocoa/data.cpp
@@ -6,6 +6,6 @@
 // Created:     ??/??/98
 // RCS-ID:      $Id$
 // Copyright:   (c) AUTHOR
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/cocoa/dcscreen.cpp b/src/cocoa/dcscreen.cpp
index 50e5fa00f2..756392f0f9 100644
--- a/src/cocoa/dcscreen.cpp
+++ b/src/cocoa/dcscreen.cpp
@@ -6,7 +6,7 @@
 // Created:     2003/03/16
 // RCS-ID:      $Id:
 // Copyright:   (c) 2002 David Elliott
-// Licence:   	wxWindows license
+// Licence:   	wxWidgets license
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
diff --git a/src/cocoa/font.cpp b/src/cocoa/font.cpp
index 7133060f8f..07da492612 100644
--- a/src/cocoa/font.cpp
+++ b/src/cocoa/font.cpp
@@ -6,7 +6,7 @@
 // Created:     ??/??/98
 // RCS-ID:      $Id$
 // Copyright:   (c) AUTHOR
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/cocoa/fontutil.cpp b/src/cocoa/fontutil.cpp
index 68060c945b..00f870306c 100644
--- a/src/cocoa/fontutil.cpp
+++ b/src/cocoa/fontutil.cpp
@@ -6,7 +6,7 @@
 // Created:     05.11.99
 // RCS-ID:      $Id$
 // Copyright:   (c) Vadim Zeitlin
-// Licence:     wxWindows license
+// Licence:     wxWidgets license
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/cocoa/gdiobj.cpp b/src/cocoa/gdiobj.cpp
index 63697c8354..edd705dc23 100644
--- a/src/cocoa/gdiobj.cpp
+++ b/src/cocoa/gdiobj.cpp
@@ -6,7 +6,7 @@
 // Created:     ??/??/98
 // RCS-ID:      $Id$
 // Copyright:   (c) AUTHOR
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/cocoa/main.cpp b/src/cocoa/main.cpp
index 2acb4871c4..091e4080e7 100644
--- a/src/cocoa/main.cpp
+++ b/src/cocoa/main.cpp
@@ -6,7 +6,7 @@
 // Created:     2002/11/11
 // RCS-ID:      $Id:
 // Copyright:   (c) 2002 David Elliott
-// Licence:   	wxWindows license
+// Licence:   	wxWidgets license
 /////////////////////////////////////////////////////////////////////////////
 /* DFE: ^^^^^ Was that really necessary :-) */
 
diff --git a/src/cocoa/settings.cpp b/src/cocoa/settings.cpp
index 79e530be39..596fe27d17 100644
--- a/src/cocoa/settings.cpp
+++ b/src/cocoa/settings.cpp
@@ -6,7 +6,7 @@
 // Created:     ??/??/98
 // RCS-ID:      $Id$
 // Copyright:   (c) AUTHOR
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/cocoa/utils.cpp b/src/cocoa/utils.cpp
index 320091fbb0..31a52158e3 100644
--- a/src/cocoa/utils.cpp
+++ b/src/cocoa/utils.cpp
@@ -6,7 +6,7 @@
 // Created:     2003/??/??
 // RCS-ID:      $Id:
 // Copyright:   (c) AUTHOR
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/setup.h"
@@ -84,7 +84,7 @@ void wxBell()
 }
 
 #if 0
-// DFE: These aren't even implemented by wxGTK, and no wxWindows code calls
+// DFE: These aren't even implemented by wxGTK, and no wxWidgets code calls
 // them.  If someone needs them, then they'll get a link error
 
 // Consume all events until no more left
diff --git a/src/cocoa/utilsexc.cpp b/src/cocoa/utilsexc.cpp
index d6553a7531..9f5bfcb8b0 100644
--- a/src/cocoa/utilsexc.cpp
+++ b/src/cocoa/utilsexc.cpp
@@ -6,7 +6,7 @@
 // Created:     ??/??/98
 // RCS-ID:      $Id$
 // Copyright:   (c) AUTHOR
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/common/accesscmn.cpp b/src/common/accesscmn.cpp
index 6a5838d077..f51cd62aaf 100644
--- a/src/common/accesscmn.cpp
+++ b/src/common/accesscmn.cpp
@@ -5,7 +5,7 @@
 // Created:     2003-02-12
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ----------------------------------------------------------------------------
diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp
index 81088e7908..061b93b815 100644
--- a/src/common/appbase.cpp
+++ b/src/common/appbase.cpp
@@ -6,7 +6,7 @@
 // Created:     19.06.2003 (extracted from common/appcmn.cpp)
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// License:     wxWindows license
+// License:     wxWidgets license
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -643,7 +643,7 @@ bool DoShowAssertDialog(const wxString& msg)
               wxT("You can also choose [Cancel] to suppress ")
               wxT("further warnings.");
 
-    switch ( ::MessageBox(NULL, msgDlg, _T("wxWindows Debug Alert"),
+    switch ( ::MessageBox(NULL, msgDlg, _T("wxWidgets Debug Alert"),
                           MB_YESNOCANCEL | MB_ICONSTOP ) )
     {
         case IDYES:
diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index 1255c30938..6b99fcfb8c 100644
--- a/src/common/appcmn.cpp
+++ b/src/common/appcmn.cpp
@@ -6,7 +6,7 @@
 // Created:     18.10.99
 // RCS-ID:      $Id$
 // Copyright:   (c) Vadim Zeitlin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -526,7 +526,7 @@ bool wxGUIAppTraitsBase::ShowAssertDialog(const wxString& msg)
               wxT("You can also choose [Cancel] to suppress ")
               wxT("further warnings.");
 
-    switch ( wxMessageBox(msgDlg, wxT("wxWindows Debug Alert"),
+    switch ( wxMessageBox(msgDlg, wxT("wxWidgets Debug Alert"),
                           wxYES_NO | wxCANCEL | wxICON_STOP ) )
     {
         case wxYES:
diff --git a/src/common/artprov.cpp b/src/common/artprov.cpp
index a14428f89e..eb081a66b7 100644
--- a/src/common/artprov.cpp
+++ b/src/common/artprov.cpp
@@ -6,7 +6,7 @@
 // Created:     18/03/2002
 // RCS-ID:      $Id$
 // Copyright:   (c) Vaclav Slavik
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ---------------------------------------------------------------------------
diff --git a/src/common/artstd.cpp b/src/common/artstd.cpp
index 7e8abec577..b184a0ec63 100644
--- a/src/common/artstd.cpp
+++ b/src/common/artstd.cpp
@@ -6,7 +6,7 @@
 // Created:     18/03/2002
 // RCS-ID:      $Id$
 // Copyright:   (c) Vaclav Slavik
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ---------------------------------------------------------------------------
diff --git a/src/common/bmpbase.cpp b/src/common/bmpbase.cpp
index 3db6041ebd..9a901b4c60 100644
--- a/src/common/bmpbase.cpp
+++ b/src/common/bmpbase.cpp
@@ -5,7 +5,7 @@
 // Created:     2001/04/11
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001, Vaclav Slavik
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/common/bookctrl.cpp b/src/common/bookctrl.cpp
index b04136183e..9202c46db0 100644
--- a/src/common/bookctrl.cpp
+++ b/src/common/bookctrl.cpp
@@ -6,7 +6,7 @@
 // Created:     19.08.03
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/common/choiccmn.cpp b/src/common/choiccmn.cpp
index 9fc8861528..ad8eb7b685 100644
--- a/src/common/choiccmn.cpp
+++ b/src/common/choiccmn.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     26.07.99
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/common/clipcmn.cpp b/src/common/clipcmn.cpp
index bbb7b68c67..e1181ce03f 100644
--- a/src/common/clipcmn.cpp
+++ b/src/common/clipcmn.cpp
@@ -6,7 +6,7 @@
 // Created:     28.06.99
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/common/clntdata.cpp b/src/common/clntdata.cpp
index 5291e8fa0c..cc8aafad58 100644
--- a/src/common/clntdata.cpp
+++ b/src/common/clntdata.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     9-Oct-2001
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/common/cmdline.cpp b/src/common/cmdline.cpp
index aa1f4b5edb..9ba2c2a154 100644
--- a/src/common/cmdline.cpp
+++ b/src/common/cmdline.cpp
@@ -6,7 +6,7 @@
 // Created:     05.01.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/common/cmdproc.cpp b/src/common/cmdproc.cpp
index 08f414c171..104bebb063 100644
--- a/src/common/cmdproc.cpp
+++ b/src/common/cmdproc.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     05.11.00
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index 5f75393a5e..1956c43b70 100644
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -939,7 +939,7 @@ void wxPrintDialogData::ConvertFromNative()
     }
 
     // Now convert the DEVMODE object, passed down from the PRINTDLG object,
-    // into wxWindows form.
+    // into wxWidgets form.
     m_printData.ConvertFromNative();
 
     m_printFromPage = pd->nFromPage;
diff --git a/src/common/config.cpp b/src/common/config.cpp
index 535a272f1e..b044960c90 100644
--- a/src/common/config.cpp
+++ b/src/common/config.cpp
@@ -7,7 +7,7 @@
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997 Karsten Ballüder   Ballueder@usa.net
 //                       Vadim Zeitlin      <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ----------------------------------------------------------------------------
diff --git a/src/common/containr.cpp b/src/common/containr.cpp
index 69b8fa56ae..6df39ca62c 100644
--- a/src/common/containr.cpp
+++ b/src/common/containr.cpp
@@ -6,7 +6,7 @@
 // Created:     06.08.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// License:     wxWindows licence
+// License:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/common/cshelp.cpp b/src/common/cshelp.cpp
index a7da4a1cf5..b3fe69aeca 100644
--- a/src/common/cshelp.cpp
+++ b/src/common/cshelp.cpp
@@ -6,7 +6,7 @@
 // Created:     08/09/2000
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Julian Smart, Vadim Zeitlin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/common/ctrlcmn.cpp b/src/common/ctrlcmn.cpp
index de49faed12..cfa7099112 100644
--- a/src/common/ctrlcmn.cpp
+++ b/src/common/ctrlcmn.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     26.07.99
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/common/ctrlsub.cpp b/src/common/ctrlsub.cpp
index 03be03f3dc..12697660b5 100644
--- a/src/common/ctrlsub.cpp
+++ b/src/common/ctrlsub.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     22.10.99
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/common/datacmn.cpp b/src/common/datacmn.cpp
index 4d985031a2..1840c35796 100644
--- a/src/common/datacmn.cpp
+++ b/src/common/datacmn.cpp
@@ -1,12 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        common/datacmn.cpp
-// Purpose:     contains definitions of various global wxWindows variables
+// Purpose:     contains definitions of various global wxWidgets variables
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     10.04.03 (from src/*/data.cpp files)
 // RCS-ID:      $Id$
-// Copyright:   (c) 1997-2002 wxWindows development team
-// License:     wxWindows license
+// Copyright:   (c) 1997-2002 wxWidgets development team
+// License:     wxWidgets license
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/common/datetime.cpp b/src/common/datetime.cpp
index 9c14cc43db..b1668f0d27 100644
--- a/src/common/datetime.cpp
+++ b/src/common/datetime.cpp
@@ -13,7 +13,7 @@
 //               so long as the above copyright and this permission statement
 //               are retained in all copies.
 //
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 /*
diff --git a/src/common/datstrm.cpp b/src/common/datstrm.cpp
index 1580055ca7..2c4f1466de 100644
--- a/src/common/datstrm.cpp
+++ b/src/common/datstrm.cpp
@@ -6,7 +6,7 @@
 // Created:     28/06/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Guilhem Lavaux
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/common/db.cpp b/src/common/db.cpp
index 86b235af2f..e47fe2609a 100644
--- a/src/common/db.cpp
+++ b/src/common/db.cpp
@@ -18,16 +18,16 @@
 // Created:     9.96
 // RCS-ID:      $Id$
 // Copyright:   (c) 1996 Remstar International, Inc.
-// Licence:     wxWindows licence, plus:
+// Licence:     wxWidgets licence, plus:
 // Notice:      This class library and its intellectual design are free of charge for use,
 //              modification, enhancement, debugging under the following conditions:
 //              1) These classes may only be used as part of the implementation of a
-//                 wxWindows-based application
-//              2) All enhancements and bug fixes are to be submitted back to the wxWindows
-//                 user groups free of all charges for use with the wxWindows library.
+//                 wxWidgets-based application
+//              2) All enhancements and bug fixes are to be submitted back to the wxWidgets
+//                 user groups free of all charges for use with the wxWidgets library.
 //              3) These classes may not be distributed as part of any other class library,
 //                 DLL, text (written or electronic), other than a complete distribution of
-//                 the wxWindows GUI development toolkit.
+//                 the wxWidgets GUI development toolkit.
 ///////////////////////////////////////////////////////////////////////////////
 
 /*
@@ -2917,7 +2917,7 @@ wxDbColInf *wxDb::GetColumns(const wxString &tableName, int *numCols, const wxCh
 #ifdef __WXDEBUG__
                         default:
                             wxString errMsg;
-                            errMsg.Printf(wxT("SQL Data type %d currently not supported by wxWindows"), colInf[colNo].sqlDataType);
+                            errMsg.Printf(wxT("SQL Data type %d currently not supported by wxWidgets"), colInf[colNo].sqlDataType);
                             wxLogDebug(errMsg,wxT("ODBC DEBUG MESSAGE"));
 #endif
                     }
diff --git a/src/common/dbgrid.cpp b/src/common/dbgrid.cpp
index 3ded105825..92a9ecf5ee 100644
--- a/src/common/dbgrid.cpp
+++ b/src/common/dbgrid.cpp
@@ -6,7 +6,7 @@
 // Created:
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 The Computer Surgery (roger@computer-surgery.co.uk)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 // Branched From : dbgrid.cpp,v 1.18 2000/12/19 13:00:58
 ///////////////////////////////////////////////////////////////////////////////
@@ -179,7 +179,7 @@ wxDbGridTableBase::~wxDbGridTableBase()
 
     //FIXME: should i remove m_ColInfo and m_data from m_attrProvider if a wxDbGridAttrProvider
 //    if ((provider = dynamic_cast<wxDbGridCellAttrProvider *>(GetAttrProvider())))
-     // Using C casting for now until we can support dynamic_cast with wxWindows
+     // Using C casting for now until we can support dynamic_cast with wxWidgets
     provider = (wxDbGridCellAttrProvider *)(GetAttrProvider());
     if (provider)
     {
@@ -233,7 +233,7 @@ bool wxDbGridTableBase::AssignDbTable(wxDbTable *tab, int count, bool takeOwners
     m_data = tab;
     //FIXME: Remove dynamic_cast before sumision to wxwin
 //    if ((provider = dynamic_cast<wxDbGridCellAttrProvider *> (GetAttrProvider())))
-     // Using C casting for now until we can support dynamic_cast with wxWindows
+     // Using C casting for now until we can support dynamic_cast with wxWidgets
     provider = (wxDbGridCellAttrProvider *)(GetAttrProvider());
     if (provider)
     {
diff --git a/src/common/dbtable.cpp b/src/common/dbtable.cpp
index 60d1821805..69f6589066 100644
--- a/src/common/dbtable.cpp
+++ b/src/common/dbtable.cpp
@@ -8,16 +8,16 @@
 // Created:     9.96
 // RCS-ID:      $Id$
 // Copyright:   (c) 1996 Remstar International, Inc.
-// Licence:     wxWindows licence, plus:
+// Licence:     wxWidgets licence, plus:
 // Notice:      This class library and its intellectual design are free of charge for use,
 //              modification, enhancement, debugging under the following conditions:
 //              1) These classes may only be used as part of the implementation of a
-//                 wxWindows-based application
-//              2) All enhancements and bug fixes are to be submitted back to the wxWindows
-//                 user groups free of all charges for use with the wxWindows library.
+//                 wxWidgets-based application
+//              2) All enhancements and bug fixes are to be submitted back to the wxWidgets
+//                 user groups free of all charges for use with the wxWidgets library.
 //              3) These classes may not be distributed as part of any other class library,
 //                 DLL, text (written or electronic), other than a complete distribution of
-//                 the wxWindows GUI development toolkit.
+//                 the wxWidgets GUI development toolkit.
 ///////////////////////////////////////////////////////////////////////////////
 
 /*
diff --git a/src/common/dcbase.cpp b/src/common/dcbase.cpp
index e44a8063f4..d1d0af41f2 100644
--- a/src/common/dcbase.cpp
+++ b/src/common/dcbase.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     05/25/99
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -672,7 +672,7 @@ void wxDCBase::DrawLabel(const wxString& text,
 }
 
 /*
-Notes for wxWindows DrawEllipticArcRot(...)
+Notes for wxWidgets DrawEllipticArcRot(...)
 
 wxDCBase::DrawEllipticArcRot(...) draws a rotated elliptic arc or an ellipse.
 It uses wxDCBase::CalculateEllipticPoints(...) and wxDCBase::Rotate(...),
diff --git a/src/common/dircmn.cpp b/src/common/dircmn.cpp
index 1fd7429bff..d3f3f90a9c 100644
--- a/src/common/dircmn.cpp
+++ b/src/common/dircmn.cpp
@@ -6,7 +6,7 @@
 // Created:     19.05.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// License:     wxWindows licence
+// License:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp
index 3aa20ce30a..f5576a7af1 100644
--- a/src/common/dlgcmn.cpp
+++ b/src/common/dlgcmn.cpp
@@ -6,7 +6,7 @@
 // Created:     28.06.99
 // RCS-ID:      $Id$
 // Copyright:   (c) Vadim Zeitlin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -114,7 +114,7 @@ wxSizer *wxDialogBase::CreateTextSizer( const wxString& message )
                 break;
 
             case wxT('&'):
-                // this is used as accel mnemonic prefix in the wxWindows
+                // this is used as accel mnemonic prefix in the wxWidgets
                 // controls but in the static messages created by
                 // CreateTextSizer() (used by wxMessageBox, for example), we
                 // don't want this special meaning, so we need to quote it
diff --git a/src/common/dndcmn.cpp b/src/common/dndcmn.cpp
index f3fe62d892..a7570be1e8 100644
--- a/src/common/dndcmn.cpp
+++ b/src/common/dndcmn.cpp
@@ -4,8 +4,8 @@
 // Modified by:
 // Created:     19.10.99
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows Team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets Team
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ----------------------------------------------------------------------------
diff --git a/src/common/dobjcmn.cpp b/src/common/dobjcmn.cpp
index 3f145db321..dad4e0c8aa 100644
--- a/src/common/dobjcmn.cpp
+++ b/src/common/dobjcmn.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     19.10.99
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows Team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets Team
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/common/docmdi.cpp b/src/common/docmdi.cpp
index 5efadc5ce7..9d154ffec6 100644
--- a/src/common/docmdi.cpp
+++ b/src/common/docmdi.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
@@ -180,7 +180,7 @@ void wxDocMDIChildFrame::OnActivate(wxActivateEvent& event)
 void wxDocMDIChildFrame::OnCloseWindow(wxCloseEvent& event)
 {
   // Close view but don't delete the frame while doing so!
-  // ...since it will be deleted by wxWindows if we return TRUE.
+  // ...since it will be deleted by wxWidgets if we return TRUE.
   if (m_childView)
   {
     bool ans = event.CanVeto()
diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index 65e74723ad..b2318aaa1f 100644
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -80,7 +80,7 @@
 #endif
 
 // ----------------------------------------------------------------------------
-// wxWindows macros
+// wxWidgets macros
 // ----------------------------------------------------------------------------
 
 IMPLEMENT_ABSTRACT_CLASS(wxDocument, wxEvtHandler)
diff --git a/src/common/dpycmn.cpp b/src/common/dpycmn.cpp
index 8797f81ecb..4cb8bd9180 100644
--- a/src/common/dpycmn.cpp
+++ b/src/common/dpycmn.cpp
@@ -6,7 +6,7 @@
 // Created:     01.03.03
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// License:     wxWindows licence
+// License:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/common/dseldlg.cpp b/src/common/dseldlg.cpp
index 36068fd617..2072e00278 100644
--- a/src/common/dseldlg.cpp
+++ b/src/common/dseldlg.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     20.02.01
 // RCS-ID:      $Id$
-// Copyright:   (c) 2001 wxWindows team
-// License:     wxWindows licence
+// Copyright:   (c) 2001 wxWidgets team
+// License:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/common/dynarray.cpp b/src/common/dynarray.cpp
index 10c0816ea1..c69cb4cd40 100644
--- a/src/common/dynarray.cpp
+++ b/src/common/dynarray.cpp
@@ -6,7 +6,7 @@
 // Created:     12.09.97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp
index 88f4b124bb..65c3367db7 100644
--- a/src/common/dynlib.cpp
+++ b/src/common/dynlib.cpp
@@ -6,7 +6,7 @@
 // Created:     20/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Guilhem Lavaux
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/common/dynload.cpp b/src/common/dynload.cpp
index 80d809e528..fd1f380d1b 100644
--- a/src/common/dynload.cpp
+++ b/src/common/dynload.cpp
@@ -7,7 +7,7 @@
 // Created:      03/12/01
 // RCS-ID:       $Id$
 // Copyright:    (c) 2001 Ron Lee <ron@debian.org>
-// Licence:      wxWindows licence
+// Licence:      wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
@@ -457,7 +457,7 @@ wxLibrary::wxLibrary(wxDllType handle)
 
     // Some system may use a local heap for library.
     get_first = (t_get_first)GetSymbol(_T("wxGetClassFirst"));
-    // It is a wxWindows DLL.
+    // It is a wxWidgets DLL.
     if (get_first)
         PrepareClasses(get_first());
 }
diff --git a/src/common/effects.cpp b/src/common/effects.cpp
index 454cde2081..de61ddae29 100644
--- a/src/common/effects.cpp
+++ b/src/common/effects.cpp
@@ -6,7 +6,7 @@
 // Created:     25/4/2000
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/common/encconv.cpp b/src/common/encconv.cpp
index d679bd9b3f..7892dbbf8f 100644
--- a/src/common/encconv.cpp
+++ b/src/common/encconv.cpp
@@ -4,7 +4,7 @@
 //              font encodings
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
-// Licence:     wxWindows Licence
+// Licence:     wxWidgets Licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/common/event.cpp b/src/common/event.cpp
index 8b0fb73f57..2b41a8113c 100644
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -338,7 +338,7 @@ int wxNewEventType()
 // ----------------------------------------------------------------------------
 
 /*
- * General wxWindows events, covering
+ * General wxWidgets events, covering
  * all interesting things that might happen (button clicking, resizing,
  * setting text in widgets, etc.).
  *
diff --git a/src/common/execcmn.cpp b/src/common/execcmn.cpp
index a282842090..2b66a331a3 100644
--- a/src/common/execcmn.cpp
+++ b/src/common/execcmn.cpp
@@ -8,7 +8,7 @@
 // Created:     20.08.02
 // RCS-ID:      $Id$
 // Copyright:   (c) 2002 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_WXEXEC_CPP_
diff --git a/src/common/fddlgcmn.cpp b/src/common/fddlgcmn.cpp
index 0a6438576e..e330c26385 100644
--- a/src/common/fddlgcmn.cpp
+++ b/src/common/fddlgcmn.cpp
@@ -6,7 +6,7 @@
 // Created:     01.08.01
 // RCS-ID:
 // Copyright:   (c) 2001 Vadim Zeitlin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/common/ffile.cpp b/src/common/ffile.cpp
index 503e5bfa0d..58a8dcab4d 100644
--- a/src/common/ffile.cpp
+++ b/src/common/ffile.cpp
@@ -6,7 +6,7 @@
 // Created:     14.07.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/common/file.cpp b/src/common/file.cpp
index 3eacce8a6a..c5005d886b 100644
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -7,7 +7,7 @@
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 /*
@@ -145,7 +145,7 @@
     #define ACCESS(access)  , (access)
 #endif // Salford C
 
-// wxWindows
+// wxWidgets
 #ifndef WX_PRECOMP
     #include  "wx/string.h"
     #include  "wx/intl.h"
diff --git a/src/common/fileconf.cpp b/src/common/fileconf.cpp
index f2118e743e..670fa59a51 100644
--- a/src/common/fileconf.cpp
+++ b/src/common/fileconf.cpp
@@ -7,7 +7,7 @@
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997 Karsten Ballüder   &  Vadim Zeitlin
 //                       Ballueder@usa.net     <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 2bb2a42402..ba56ed4355 100644
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -6,7 +6,7 @@
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index a746dd77b6..d7bbe92a0b 100644
--- a/src/common/filename.cpp
+++ b/src/common/filename.cpp
@@ -6,7 +6,7 @@
 // Created:     28.12.2000
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 /*
diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp
index 5e10fd8d44..76c1b604e7 100644
--- a/src/common/filesys.cpp
+++ b/src/common/filesys.cpp
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
 // CVS-ID:      $Id$
-// Licence:     wxWindows Licence
+// Licence:     wxWidgets Licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/common/fldlgcmn.cpp b/src/common/fldlgcmn.cpp
index c9d8e15494..5040de93aa 100644
--- a/src/common/fldlgcmn.cpp
+++ b/src/common/fldlgcmn.cpp
@@ -6,7 +6,7 @@
 // Created:     14.06.03 (extracted from src/*/filedlg.cpp)
 // RCS-ID:
 // Copyright:   (c) Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/common/fmapbase.cpp b/src/common/fmapbase.cpp
index 8aba4bafc8..a926d8e1d7 100644
--- a/src/common/fmapbase.cpp
+++ b/src/common/fmapbase.cpp
@@ -6,7 +6,7 @@
 // Created:     21.06.2003 (extracted from common/fontmap.cpp)
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999-2003 Vadim Zeitlin <vadim@wxwindows.org>
-// License:     wxWindows license
+// License:     wxWidgets license
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/common/fontcmn.cpp b/src/common/fontcmn.cpp
index 7c3412b48d..e0196d4414 100644
--- a/src/common/fontcmn.cpp
+++ b/src/common/fontcmn.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     20.09.99
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/common/fontmap.cpp b/src/common/fontmap.cpp
index 8be47e51c2..6b6b252c06 100644
--- a/src/common/fontmap.cpp
+++ b/src/common/fontmap.cpp
@@ -6,7 +6,7 @@
 // Created:     04.11.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999-2003 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/common/framecmn.cpp b/src/common/framecmn.cpp
index f451627440..fd5a131876 100644
--- a/src/common/framecmn.cpp
+++ b/src/common/framecmn.cpp
@@ -5,7 +5,7 @@
 // Created:     01/02/97
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling and Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/common/fs_inet.cpp b/src/common/fs_inet.cpp
index 8fe70604f9..2f1ed8806f 100644
--- a/src/common/fs_inet.cpp
+++ b/src/common/fs_inet.cpp
@@ -3,7 +3,7 @@
 // Purpose:     HTTP and FTP file system
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
-// Licence:     wxWindows Licence
+// Licence:     wxWidgets Licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/common/fs_mem.cpp b/src/common/fs_mem.cpp
index 782b95d758..19f3abe1af 100644
--- a/src/common/fs_mem.cpp
+++ b/src/common/fs_mem.cpp
@@ -3,7 +3,7 @@
 // Purpose:     in-memory file system
 // Author:      Vaclav Slavik
 // Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows Licence
+// Licence:     wxWidgets Licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/src/common/fs_zip.cpp b/src/common/fs_zip.cpp
index 59c7df889d..68c82abbde 100644
--- a/src/common/fs_zip.cpp
+++ b/src/common/fs_zip.cpp
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
 // CVS-ID:      $Id$
-// Licence:     wxWindows Licence
+// Licence:     wxWidgets Licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/src/common/ftp.cpp b/src/common/ftp.cpp
index 5edc4b2e8b..14f1c7d9d3 100644
--- a/src/common/ftp.cpp
+++ b/src/common/ftp.cpp
@@ -10,7 +10,7 @@
 // Created:     07/07/1997
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/common/gaugecmn.cpp b/src/common/gaugecmn.cpp
index 4b5681f36d..c32028e675 100644
--- a/src/common/gaugecmn.cpp
+++ b/src/common/gaugecmn.cpp
@@ -6,7 +6,7 @@
 // Created:     20.02.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// License:     wxWindows licence
+// License:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/common/gbsizer.cpp b/src/common/gbsizer.cpp
index 85653bc76d..34ad57d700 100644
--- a/src/common/gbsizer.cpp
+++ b/src/common/gbsizer.cpp
@@ -8,7 +8,7 @@
 // Created:     03-Nov-2003
 // RCS-ID:      $Id$
 // Copyright:   (c) Robin Dunn
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index 5af91e126a..4b0dc32753 100644
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/common/geometry.cpp b/src/common/geometry.cpp
index 51fe2842ee..83948c28d7 100644
--- a/src/common/geometry.cpp
+++ b/src/common/geometry.cpp
@@ -6,7 +6,7 @@
 // Created:     08/05/99
 // RCS-ID:
 // Copyright:   (c) 1999 Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/common/gifdecod.cpp b/src/common/gifdecod.cpp
index bf5280b4ef..345fe54d9e 100644
--- a/src/common/gifdecod.cpp
+++ b/src/common/gifdecod.cpp
@@ -5,7 +5,7 @@
 // Version:     3.04
 // RCS-ID:      $Id$
 // Copyright:   (c) Guillermo Rodriguez Garcia
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/common/hash.cpp b/src/common/hash.cpp
index 28ba8276da..fc793af6a3 100644
--- a/src/common/hash.cpp
+++ b/src/common/hash.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/common/hashmap.cpp b/src/common/hashmap.cpp
index 6fa9127e7e..8f941c7275 100644
--- a/src/common/hashmap.cpp
+++ b/src/common/hashmap.cpp
@@ -6,7 +6,7 @@
 // Created:     29/01/2002
 // RCS-ID:      $Id$
 // Copyright:   (c) Mattia Barbon
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/common/helpbase.cpp b/src/common/helpbase.cpp
index e47a7f7f05..e2ca2fc1e8 100644
--- a/src/common/helpbase.cpp
+++ b/src/common/helpbase.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/common/http.cpp b/src/common/http.cpp
index 8e620d15d9..5a63f4ca35 100644
--- a/src/common/http.cpp
+++ b/src/common/http.cpp
@@ -6,7 +6,7 @@
 // Created:     August 1997
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
@@ -227,7 +227,7 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
 
   // If there is no User-Agent defined, define it.
   if (GetHeader(wxT("User-Agent")).IsNull())
-    SetHeader(wxT("User-Agent"), wxT("wxWindows 2.x"));
+    SetHeader(wxT("User-Agent"), wxT("wxWidgets 2.x"));
 
   SaveState();
   SetFlags(wxSOCKET_NONE);
diff --git a/src/common/iconbndl.cpp b/src/common/iconbndl.cpp
index 2fa8344534..4cefbd84b4 100644
--- a/src/common/iconbndl.cpp
+++ b/src/common/iconbndl.cpp
@@ -5,7 +5,7 @@
 // Created:     23.03.2002
 // RCS-ID:      $Id$
 // Copyright:   (c) Mattia barbon
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/common/imagall.cpp b/src/common/imagall.cpp
index 42f2e50f95..9b43e02715 100644
--- a/src/common/imagall.cpp
+++ b/src/common/imagall.cpp
@@ -4,7 +4,7 @@
 // Author:      Sylvain Bougnoux
 // RCS-ID:      $Id$
 // Copyright:   (c) Sylvain Bougnoux
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 /*
diff --git a/src/common/imagbmp.cpp b/src/common/imagbmp.cpp
index 247a300e6d..904e4f4043 100644
--- a/src/common/imagbmp.cpp
+++ b/src/common/imagbmp.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling, Chris Elliott
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling, Chris Elliott
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/common/image.cpp b/src/common/image.cpp
index dbcff9c883..e5cb3a0acb 100644
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/common/imagfill.cpp b/src/common/imagfill.cpp
index 4ef7d0083d..cc00767d59 100644
--- a/src/common/imagfill.cpp
+++ b/src/common/imagfill.cpp
@@ -4,7 +4,7 @@
 // Author:
 // RCS-ID:      $Id$
 // Copyright:
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/src/common/imaggif.cpp b/src/common/imaggif.cpp
index 3a64963f92..950fa3fe21 100644
--- a/src/common/imaggif.cpp
+++ b/src/common/imaggif.cpp
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik & Guillermo Rodriguez Garcia
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik & Guillermo Rodriguez Garcia
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/common/imagiff.cpp b/src/common/imagiff.cpp
index 5722969269..3f5afc5725 100644
--- a/src/common/imagiff.cpp
+++ b/src/common/imagiff.cpp
@@ -4,13 +4,13 @@
 // Author:      Steffen Gutmann, Thomas Meyer
 // RCS-ID:      $Id$
 // Copyright:   (c) Steffen Gutmann, 2002
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Parts of this source are based on the iff loading algorithm found
 // in xviff.c.  Permission by the original author, Thomas Meyer, and
 // by the author of xv, John Bradley for using the iff loading part
-// in wxWindows has been gratefully given.
+// in wxWidgets has been gratefully given.
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "imagiff.h"
@@ -247,7 +247,7 @@ bool wxIFFDecoder::CanRead()
 
 // ReadIFF:
 // Based on xv source code by Thomas Meyer
-// Permission for use in wxWindows has been gratefully given.
+// Permission for use in wxWidgets has been gratefully given.
 
 typedef unsigned char byte;
 #define IFFDEBUG 0
diff --git a/src/common/imagjpeg.cpp b/src/common/imagjpeg.cpp
index 5ecb9f6168..76d85bf4f6 100644
--- a/src/common/imagjpeg.cpp
+++ b/src/common/imagjpeg.cpp
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) Vaclav Slavik
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/common/imagpcx.cpp b/src/common/imagpcx.cpp
index cc45398eaf..720d3f9a44 100644
--- a/src/common/imagpcx.cpp
+++ b/src/common/imagpcx.cpp
@@ -5,7 +5,7 @@
 // Version:     1.1
 // CVS-ID:      $Id$
 // Copyright:   (c) 1999 Guillermo Rodriguez Garcia
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp
index 250fac506a..21853b1010 100644
--- a/src/common/imagpng.cpp
+++ b/src/common/imagpng.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/common/imagpnm.cpp b/src/common/imagpnm.cpp
index cea78ca07e..1dfefaf746 100644
--- a/src/common/imagpnm.cpp
+++ b/src/common/imagpnm.cpp
@@ -4,7 +4,7 @@
 // Author:      Sylvain Bougnoux
 // RCS-ID:      $Id$
 // Copyright:   (c) Sylvain Bougnoux
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/common/imagtiff.cpp b/src/common/imagtiff.cpp
index 0ff3f128f5..f50fb2aa0a 100644
--- a/src/common/imagtiff.cpp
+++ b/src/common/imagtiff.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/common/imagxpm.cpp b/src/common/imagxpm.cpp
index e0db84de12..59cae5bbe2 100644
--- a/src/common/imagxpm.cpp
+++ b/src/common/imagxpm.cpp
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik, Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vaclav Slavik
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 /*
diff --git a/src/common/init.cpp b/src/common/init.cpp
index 407fe5cb3e..21b2e37216 100644
--- a/src/common/init.cpp
+++ b/src/common/init.cpp
@@ -6,7 +6,7 @@
 // Created:     04.10.99
 // RCS-ID:      $Id$
 // Copyright:   (c) Vadim Zeitlin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -319,7 +319,7 @@ static void DoCommonPreCleanup()
     // flush the logged messages if any and install a 'safer' log target: the
     // default one (wxLogGui) can't be used after the resources are freed just
     // below and the user supplied one might be even more unsafe (using any
-    // wxWindows GUI function is unsafe starting from now)
+    // wxWidgets GUI function is unsafe starting from now)
     wxLog::DontCreateOnDemand();
 
     // this will flush the old messages if any
diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 117860d71e..75df27d4ec 100644
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -1,13 +1,13 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/common/intl.cpp
-// Purpose:     Internationalization and localisation for wxWindows
+// Purpose:     Internationalization and localisation for wxWidgets
 // Author:      Vadim Zeitlin
 // Modified by: Michael N. Filippov <michael@idisys.iae.nsk.su>
 //              (2003/09/30 - PluralForms support)
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -55,7 +55,7 @@
   #include <langinfo.h>
 #endif
 
-// wxWindows
+// wxWidgets
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/intl.h"
@@ -1450,7 +1450,7 @@ bool wxLocale::Init(const wxChar *szName,
   // save the old locale to be able to restore it later
   m_pOldLocale = wxSetLocale(this);
 
-  // load the default catalog with wxWindows standard messages
+  // load the default catalog with wxWidgets standard messages
   m_pMsgCat = NULL;
   bool bOk = TRUE;
   if ( bLoadDefault )
@@ -2227,7 +2227,7 @@ wxFontEncoding wxLocale::GetSystemEncoding()
 #if defined(__WIN32__) && !defined(__WXMICROWIN__)
     UINT codepage = ::GetACP();
 
-    // wxWindows only knows about CP1250-1257, 932, 936, 949, 950
+    // wxWidgets only knows about CP1250-1257, 932, 936, 949, 950
     if ( codepage >= 1250 && codepage <= 1257 )
     {
         return (wxFontEncoding)(wxFONTENCODING_CP1250 + codepage - 1250);
diff --git a/src/common/ipcbase.cpp b/src/common/ipcbase.cpp
index af60bef9ac..b804b6ae09 100644
--- a/src/common/ipcbase.cpp
+++ b/src/common/ipcbase.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/common/layout.cpp b/src/common/layout.cpp
index 170ba303a0..3e214c9356 100644
--- a/src/common/layout.cpp
+++ b/src/common/layout.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // =============================================================================
diff --git a/src/common/lboxcmn.cpp b/src/common/lboxcmn.cpp
index 292bec8130..3678abc248 100644
--- a/src/common/lboxcmn.cpp
+++ b/src/common/lboxcmn.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     22.10.99
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/common/list.cpp b/src/common/list.cpp
index e51c364021..1a65b618a4 100644
--- a/src/common/list.cpp
+++ b/src/common/list.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ////////////////////////////////////////////////////////////////////////////////
 
 // =============================================================================
diff --git a/src/common/log.cpp b/src/common/log.cpp
index 9ec3b7ae46..eead893dce 100644
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -6,7 +6,7 @@
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -30,7 +30,7 @@
 
 #if wxUSE_LOG
 
-// wxWindows
+// wxWidgets
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/arrstr.h"
diff --git a/src/common/longlong.cpp b/src/common/longlong.cpp
index 4b08f13d66..4a14f6a26c 100644
--- a/src/common/longlong.cpp
+++ b/src/common/longlong.cpp
@@ -2,13 +2,13 @@
 // Name:        wx/longlong.cpp
 // Purpose:     implementation of wxLongLongNative
 // Author:      Jeffrey C. Ollie <jeff@ollie.clive.ia.us>, Vadim Zeitlin
-// Remarks:     this class is not public in wxWindows 2.0! It is intentionally
+// Remarks:     this class is not public in wxWidgets 2.0! It is intentionally
 //              not documented and is for private use only.
 // Modified by:
 // Created:     10.02.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/common/matrix.cpp b/src/common/matrix.cpp
index d0d16755a3..234744492d 100644
--- a/src/common/matrix.cpp
+++ b/src/common/matrix.cpp
@@ -5,7 +5,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/common/memory.cpp b/src/common/memory.cpp
index f12eb3ae5f..0f6c284aae 100644
--- a/src/common/memory.cpp
+++ b/src/common/memory.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
@@ -117,7 +117,7 @@
 */
 void wxMemStruct::ErrorMsg (const char * mesg)
 {
-  wxLogMessage(wxT("wxWindows memory checking error: %s"), mesg);
+  wxLogMessage(wxT("wxWidgets memory checking error: %s"), mesg);
   PrintNode ();
 }
 
@@ -126,7 +126,7 @@ void wxMemStruct::ErrorMsg (const char * mesg)
 */
 void wxMemStruct::ErrorMsg ()
 {
-  wxLogMessage(wxT("wxWindows over/underwrite memory error:"));
+  wxLogMessage(wxT("wxWidgets over/underwrite memory error:"));
   PrintNode ();
 }
 
diff --git a/src/common/menucmn.cpp b/src/common/menucmn.cpp
index b272d1483d..db6becd80d 100644
--- a/src/common/menucmn.cpp
+++ b/src/common/menucmn.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     26.10.99
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/common/mimecmn.cpp b/src/common/mimecmn.cpp
index e04e17bc47..fc33f0802d 100644
--- a/src/common/mimecmn.cpp
+++ b/src/common/mimecmn.cpp
@@ -7,7 +7,7 @@
 // Created:     23.09.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence (part of wxExtra library)
+// Licence:     wxWidgets licence (part of wxExtra library)
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/common/module.cpp b/src/common/module.cpp
index eee9507ee1..1913dcd7e5 100644
--- a/src/common/module.cpp
+++ b/src/common/module.cpp
@@ -6,7 +6,7 @@
 // Created:     04/11/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Wolfram Gloger and Guilhem Lavaux
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/common/msgout.cpp b/src/common/msgout.cpp
index 3d8d15fd64..2ebef597da 100755
--- a/src/common/msgout.cpp
+++ b/src/common/msgout.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     17.07.02
 // RCS-ID:      $Id$
-// Copyright:   (c) the wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) the wxWidgets team
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/common/mstream.cpp b/src/common/mstream.cpp
index 5aa97dcf21..7532845c74 100644
--- a/src/common/mstream.cpp
+++ b/src/common/mstream.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Guilhem Lavaux
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/common/nbkbase.cpp b/src/common/nbkbase.cpp
index 6beaa057ec..2a8177e50a 100644
--- a/src/common/nbkbase.cpp
+++ b/src/common/nbkbase.cpp
@@ -6,7 +6,7 @@
 // Created:     02.07.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/common/object.cpp b/src/common/object.cpp
index 622569f308..e5661a3ec5 100644
--- a/src/common/object.cpp
+++ b/src/common/object.cpp
@@ -7,7 +7,7 @@
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Julian Smart
 //              (c) 2001 Ron Lee <ron@debian.org>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/common/paper.cpp b/src/common/paper.cpp
index 8aeb3adac2..2a30bb1bc1 100644
--- a/src/common/paper.cpp
+++ b/src/common/paper.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/common/popupcmn.cpp b/src/common/popupcmn.cpp
index 6571388a34..754c118438 100644
--- a/src/common/popupcmn.cpp
+++ b/src/common/popupcmn.cpp
@@ -6,7 +6,7 @@
 // Created:     06.01.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// License:     wxWindows licence
+// License:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp
index 9c24e2d686..6eb789e83a 100644
--- a/src/common/prntbase.cpp
+++ b/src/common/prntbase.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/common/process.cpp b/src/common/process.cpp
index 6e6a931c2f..7e0045f12a 100644
--- a/src/common/process.cpp
+++ b/src/common/process.cpp
@@ -6,7 +6,7 @@
 // Created:     24/06/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Guilhem Lavaux
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/common/protocol.cpp b/src/common/protocol.cpp
index 8d83bc6dbb..8272a3613b 100644
--- a/src/common/protocol.cpp
+++ b/src/common/protocol.cpp
@@ -6,7 +6,7 @@
 // Created:     07/07/1997
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/common/quantize.cpp b/src/common/quantize.cpp
index 55fe0fc032..b9d8c25a5c 100644
--- a/src/common/quantize.cpp
+++ b/src/common/quantize.cpp
@@ -6,7 +6,7 @@
 // Created:     22/6/2000
 // RCS-ID:      $Id$
 // Copyright:   (c) Thomas G. Lane, Vaclav Slavik, Julian Smart
-// Licence:     wxWindows licence + JPEG library licence
+// Licence:     wxWidgets licence + JPEG library licence
 /////////////////////////////////////////////////////////////////////////////
 
 /*
@@ -1578,7 +1578,7 @@ bool wxQuantize::Quantize(const wxImage& src, wxImage& dest,
         delete[] data8bit;
 
 #if wxUSE_PALETTE
-    // Make a wxWindows palette
+    // Make a wxWidgets palette
     if (pPalette)
     {
         unsigned char* r = new unsigned char[256];
diff --git a/src/common/radiocmn.cpp b/src/common/radiocmn.cpp
index c732658d75..4e4d8cbad1 100644
--- a/src/common/radiocmn.cpp
+++ b/src/common/radiocmn.cpp
@@ -6,7 +6,7 @@
 // Created:     03.06.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// License:     wxWindows licence
+// License:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/common/regex.cpp b/src/common/regex.cpp
index 1837bfff30..d08686ce40 100644
--- a/src/common/regex.cpp
+++ b/src/common/regex.cpp
@@ -7,7 +7,7 @@
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Karsten Ballüder <ballueder@gmx.net>
 //                  2001 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/common/rendcmn.cpp b/src/common/rendcmn.cpp
index 2cedd7f4de..b95f586fb4 100644
--- a/src/common/rendcmn.cpp
+++ b/src/common/rendcmn.cpp
@@ -6,7 +6,7 @@
 // Created:     28.07.03
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// License:     wxWindows license
+// License:     wxWidgets license
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/common/rgncmn.cpp b/src/common/rgncmn.cpp
index 581ecbf68e..d26eca7b55 100644
--- a/src/common/rgncmn.cpp
+++ b/src/common/rgncmn.cpp
@@ -6,7 +6,7 @@
 // Created:     27-Mar-2003
 // RCS-ID:      $Id$
 // Copyright:   (c) Robin Dunn
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp
index f158a55768..cfc65703f2 100644
--- a/src/common/sckaddr.cpp
+++ b/src/common/sckaddr.cpp
@@ -6,7 +6,7 @@
 // Created:     26/04/97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/common/sckfile.cpp b/src/common/sckfile.cpp
index 6118f10c01..2d6d094697 100644
--- a/src/common/sckfile.cpp
+++ b/src/common/sckfile.cpp
@@ -6,7 +6,7 @@
 // Created:     20/07/97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "sckfile.h"
diff --git a/src/common/sckipc.cpp b/src/common/sckipc.cpp
index 03e8f0958e..791d15b6eb 100644
--- a/src/common/sckipc.cpp
+++ b/src/common/sckipc.cpp
@@ -11,7 +11,7 @@
 // Copyright:   (c) Julian Smart 1993
 //              (c) Guilhem Lavaux 1997, 1998
 //              (c) 2000 Guillermo Rodriguez <guille@iies.es>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ==========================================================================
diff --git a/src/common/sckstrm.cpp b/src/common/sckstrm.cpp
index a65f0a0c03..2fd15c9a78 100644
--- a/src/common/sckstrm.cpp
+++ b/src/common/sckstrm.cpp
@@ -6,7 +6,7 @@
 // Created:     17/07/97
 // RCS-ID:      $Id$
 // Copyright:   (c)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "sckstrm.h"
diff --git a/src/common/settcmn.cpp b/src/common/settcmn.cpp
index d8d68f8de0..9ca1565a15 100644
--- a/src/common/settcmn.cpp
+++ b/src/common/settcmn.cpp
@@ -3,8 +3,8 @@
 // Purpose:     common (to all ports) wxWindow functions
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index 37c790a4bd..cbf684cdf3 100644
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -7,7 +7,7 @@
 // Created:
 // RCS-ID:      $Id$
 // Copyright:   (c) Robin Dunn, Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index 6e40e90f91..4c12014930 100644
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -6,7 +6,7 @@
 // Copyright:  (C) 1999-1997, Guilhem Lavaux
 //             (C) 2000-1999, Guillermo Rodriguez Garcia
 // RCS_ID:     $Id$
-// License:    see wxWindows licence
+// License:    see wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ==========================================================================
@@ -54,7 +54,7 @@ WX_CHECK_BUILD_OPTIONS("wxNet")
 
 // what to do within waits: we have 2 cases: from the main thread itself we
 // have to call wxYield() to let the events (including the GUI events and the
-// low-level (not wxWindows) events from GSocket) be processed. From another
+// low-level (not wxWidgets) events from GSocket) be processed. From another
 // thread it is enough to just call wxThread::Yield() which will give away the
 // rest of our time slice: the explanation is that the events will be processed
 // by the main thread anyhow, without calling wxYield(), but we don't want to
diff --git a/src/common/statbar.cpp b/src/common/statbar.cpp
index 984a9e1278..e65338a5cd 100644
--- a/src/common/statbar.cpp
+++ b/src/common/statbar.cpp
@@ -6,7 +6,7 @@
 // Created:     14.10.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// License:     wxWindows licence
+// License:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/common/stopwatch.cpp b/src/common/stopwatch.cpp
index c0741a2f53..a43b78cd2d 100644
--- a/src/common/stopwatch.cpp
+++ b/src/common/stopwatch.cpp
@@ -9,8 +9,8 @@
 // Modified by:
 // Created:     20.06.2003 (extracted from common/timercmn.cpp)
 // RCS-ID:      $Id$
-// Copyright:   (c) 1998-2003 wxWindows Team
-// License:     wxWindows license
+// Copyright:   (c) 1998-2003 wxWidgets Team
+// License:     wxWidgets license
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index 223468d3af..f1bd8754fd 100644
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -7,7 +7,7 @@
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Ove Kaaven, Robert Roebling, Vaclav Slavik
 //              (c) 2000-2003 Vadim Zeitlin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -959,7 +959,7 @@ wxMBConv_iconv::wxMBConv_iconv(const wxChar *name)
             {
                 ms_wcCharsetName = NULL;
 
-                // VS: we must not output an error here, since wxWindows will safely
+                // VS: we must not output an error here, since wxWidgets will safely
                 //     fall back to using wxEncodingConverter.
                 wxLogTrace(wxT("strconv"), wxT("Impossible to convert to/from charset '%s' with iconv, falling back to wxEncodingConverter."), name);
                 //wxLogError(
diff --git a/src/common/stream.cpp b/src/common/stream.cpp
index 1f72c00bd6..90833f4c91 100644
--- a/src/common/stream.cpp
+++ b/src/common/stream.cpp
@@ -7,7 +7,7 @@
 // Created:     11/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Guilhem Lavaux
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/common/string.cpp b/src/common/string.cpp
index 9b1de655cd..d5f56bfb3d 100644
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -6,7 +6,7 @@
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/common/sysopt.cpp b/src/common/sysopt.cpp
index aa36947d7b..cc01800a55 100644
--- a/src/common/sysopt.cpp
+++ b/src/common/sysopt.cpp
@@ -6,7 +6,7 @@
 // Created:     2001-07-10
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/common/taskbarcmn.cpp b/src/common/taskbarcmn.cpp
index 61414495e2..961464dd6c 100644
--- a/src/common/taskbarcmn.cpp
+++ b/src/common/taskbarcmn.cpp
@@ -6,7 +6,7 @@
 // Created:     04/04/2003
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart, 2003
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/common/tbarbase.cpp b/src/common/tbarbase.cpp
index d2243fedf2..f04db4ad71 100644
--- a/src/common/tbarbase.cpp
+++ b/src/common/tbarbase.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -41,7 +41,7 @@
 #include "wx/toolbar.h"
 
 // ----------------------------------------------------------------------------
-// wxWindows macros
+// wxWidgets macros
 // ----------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(wxToolBarBase, wxControl)
diff --git a/src/common/textbuf.cpp b/src/common/textbuf.cpp
index e77cf8be0d..54bb5d5c96 100644
--- a/src/common/textbuf.cpp
+++ b/src/common/textbuf.cpp
@@ -3,8 +3,8 @@
 // Purpose:     implementation of wxTextBuffer class
 // Created:     14.11.01
 // Author:      Morten Hanssen, Vadim Zeitlin
-// Copyright:   (c) 1998-2001 wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) 1998-2001 wxWidgets team
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/common/textcmn.cpp b/src/common/textcmn.cpp
index d8f297818c..d60e807f3c 100644
--- a/src/common/textcmn.cpp
+++ b/src/common/textcmn.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     13.07.99
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/common/textfile.cpp b/src/common/textfile.cpp
index 28593b36f5..0e73b1c891 100644
--- a/src/common/textfile.cpp
+++ b/src/common/textfile.cpp
@@ -6,7 +6,7 @@
 // Created:     03.04.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/common/timercmn.cpp b/src/common/timercmn.cpp
index 5fd7fd4767..369e646729 100644
--- a/src/common/timercmn.cpp
+++ b/src/common/timercmn.cpp
@@ -7,7 +7,7 @@
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 //              (c) 1999 Guillermo Rodriguez <guille@iies.es>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/common/tokenzr.cpp b/src/common/tokenzr.cpp
index 937987241c..5c131f1cba 100644
--- a/src/common/tokenzr.cpp
+++ b/src/common/tokenzr.cpp
@@ -6,7 +6,7 @@
 // Created:     04/22/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Guilhem Lavaux
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/common/toplvcmn.cpp b/src/common/toplvcmn.cpp
index 3abc4cb2da..a0ab121877 100644
--- a/src/common/toplvcmn.cpp
+++ b/src/common/toplvcmn.cpp
@@ -5,7 +5,7 @@
 // Created:     01/02/97
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling and Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/common/treebase.cpp b/src/common/treebase.cpp
index 4c07404f5a..85275a54cf 100644
--- a/src/common/treebase.cpp
+++ b/src/common/treebase.cpp
@@ -6,7 +6,7 @@
 // Modified:
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart et al
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // =============================================================================
diff --git a/src/common/txtstrm.cpp b/src/common/txtstrm.cpp
index 27b0b6c6ed..b113fe2d1f 100644
--- a/src/common/txtstrm.cpp
+++ b/src/common/txtstrm.cpp
@@ -6,7 +6,7 @@
 // Created:     28/06/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Guilhem Lavaux
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/common/unzip.c b/src/common/unzip.c
index 04f8a8c0b8..7d56b87490 100644
--- a/src/common/unzip.c
+++ b/src/common/unzip.c
@@ -1,6 +1,6 @@
 /*
 
-This file was altered for needs of wxWindows.
+This file was altered for needs of wxWidgets.
 $Id$
 
 */
diff --git a/src/common/unzip.h b/src/common/unzip.h
index acb137bc66..9ce1e18896 100644
--- a/src/common/unzip.h
+++ b/src/common/unzip.h
@@ -1,6 +1,6 @@
 /*
 
-This file was altered for needs of wxWindows.
+This file was altered for needs of wxWidgets.
 $Id$
 
 */
diff --git a/src/common/url.cpp b/src/common/url.cpp
index 6c0da6ee29..62d7991efb 100644
--- a/src/common/url.cpp
+++ b/src/common/url.cpp
@@ -6,7 +6,7 @@
 // Created:     20/07/1997
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index 449bafe65f..ad2960af0b 100644
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -6,7 +6,7 @@
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -106,8 +106,8 @@
 // ----------------------------------------------------------------------------
 
 #if WXWIN_COMPATIBILITY_2_2
-    const wxChar *wxInternalErrorStr = wxT("wxWindows Internal Error");
-    const wxChar *wxFatalErrorStr = wxT("wxWindows Fatal Error");
+    const wxChar *wxInternalErrorStr = wxT("wxWidgets Internal Error");
+    const wxChar *wxFatalErrorStr = wxT("wxWidgets Fatal Error");
 #endif // WXWIN_COMPATIBILITY_2_2
 
 // ============================================================================
diff --git a/src/common/valgen.cpp b/src/common/valgen.cpp
index b4d296e619..f4445cb229 100644
--- a/src/common/valgen.cpp
+++ b/src/common/valgen.cpp
@@ -6,7 +6,7 @@
 // Created:     Jan 22 1999
 // RCS-ID:
 // Copyright:   (c) 1999 Kevin Smith
-// Licence:           wxWindows licence
+// Licence:           wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/common/validate.cpp b/src/common/validate.cpp
index 64210336a3..1b4f49d68a 100644
--- a/src/common/validate.cpp
+++ b/src/common/validate.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/common/valtext.cpp b/src/common/valtext.cpp
index 0e62b5ded3..dc605b57df 100644
--- a/src/common/valtext.cpp
+++ b/src/common/valtext.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/common/variant.cpp b/src/common/variant.cpp
index 79f7c116a7..679113976e 100644
--- a/src/common/variant.cpp
+++ b/src/common/variant.cpp
@@ -6,7 +6,7 @@
 // Created:     10/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/common/wfstream.cpp b/src/common/wfstream.cpp
index 296f205b2e..fbababe0d1 100644
--- a/src/common/wfstream.cpp
+++ b/src/common/wfstream.cpp
@@ -6,7 +6,7 @@
 // Created:     11/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Guilhem Lavaux
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index 7d18937df3..1d57671166 100644
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     13/07/98
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -215,7 +215,7 @@ bool wxWindowBase::CreateBase(wxWindowBase *parent,
 
     // ids are limited to 16 bits under MSW so if you care about portability,
     // it's not a good idea to use ids out of this range (and negative ids are
-    // reserved for wxWindows own usage)
+    // reserved for wxWidgets own usage)
     wxASSERT_MSG( id == wxID_ANY || (id >= 0 && id < 32767),
                   _T("invalid id value") );
 
@@ -974,7 +974,7 @@ wxColour wxWindowBase::GetBackgroundColour() const
 
         // we must return some valid colour to avoid redoing this every time
         // and also to avoid surprizing the applications written for older
-        // wxWindows versions where GetBackgroundColour() always returned
+        // wxWidgets versions where GetBackgroundColour() always returned
         // something -- so give them something even if it doesn't make sense
         // for this window (e.g. it has a themed background)
         if ( !colBg.Ok() )
@@ -2167,7 +2167,7 @@ void wxWindowBase::OnMiddleClick( wxMouseEvent& event )
 
         wxMessageBox(wxString::Format(
                                       _T(
-                                        "       wxWindows Library (%s port)\nVersion %u.%u.%u%s, compiled at %s %s\n   Copyright (c) 1995-2002 wxWindows team"
+                                        "       wxWidgets Library (%s port)\nVersion %u.%u.%u%s, compiled at %s %s\n   Copyright (c) 1995-2002 wxWidgets team"
                                         ),
                                       port.c_str(),
                                       wxMAJOR_VERSION,
@@ -2181,7 +2181,7 @@ void wxWindowBase::OnMiddleClick( wxMouseEvent& event )
                                       __TDATE__,
                                       __TTIME__
                                      ),
-                     _T("wxWindows information"),
+                     _T("wxWidgets information"),
                      wxICON_INFORMATION | wxOK,
                      (wxWindow *)this);
     }
@@ -2562,13 +2562,13 @@ wxAccStatus wxWindowAccessible::GetName(int childId, wxString* name)
 
     wxString title;
 
-    // If a child, leave wxWindows to call the function on the actual
+    // If a child, leave wxWidgets to call the function on the actual
     // child object.
     if (childId > 0)
         return wxACC_NOT_IMPLEMENTED;
 
     // This will eventually be replaced by specialised
-    // accessible classes, one for each kind of wxWindows
+    // accessible classes, one for each kind of wxWidgets
     // control or window.
     if (GetWindow()->IsKindOf(CLASSINFO(wxButton)))
         title = ((wxButton*) GetWindow())->GetLabel();
@@ -2723,7 +2723,7 @@ wxAccStatus wxWindowAccessible::GetRole(int childId, wxAccRole* role)
     if (!GetWindow())
         return wxACC_FAIL;
 
-    // If a child, leave wxWindows to call the function on the actual
+    // If a child, leave wxWidgets to call the function on the actual
     // child object.
     if (childId > 0)
         return wxACC_NOT_IMPLEMENTED;
@@ -2755,7 +2755,7 @@ wxAccStatus wxWindowAccessible::GetState(int childId, long* state)
     if (!GetWindow())
         return wxACC_FAIL;
 
-    // If a child, leave wxWindows to call the function on the actual
+    // If a child, leave wxWidgets to call the function on the actual
     // child object.
     if (childId > 0)
         return wxACC_NOT_IMPLEMENTED;
diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp
index c09896179c..e85378057c 100644
--- a/src/common/wxchar.cpp
+++ b/src/common/wxchar.cpp
@@ -5,8 +5,8 @@
 // Modified by: Ron Lee
 // Created:     09/04/99
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows copyright
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets copyright
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
@@ -704,7 +704,7 @@ int vwprintf(const wxChar *format, va_list argptr)
    So to use native functions in order to get our semantics we must do the
    following translations in Unicode mode (nothing to do in ANSI mode):
 
-   wxWindows specifier      POSIX specifier
+   wxWidgets specifier      POSIX specifier
    ----------------------------------------
 
    %hc, %C, %hC             %c
diff --git a/src/common/xpmdecod.cpp b/src/common/xpmdecod.cpp
index f8524971a0..662dd49cb4 100644
--- a/src/common/xpmdecod.cpp
+++ b/src/common/xpmdecod.cpp
@@ -4,7 +4,7 @@
 // Author:      John Cristy, Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) John Cristy, Vaclav Slavik
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 /*
diff --git a/src/common/xti.cpp b/src/common/xti.cpp
index 4eb4a9fb31..fe64547aad 100644
--- a/src/common/xti.cpp
+++ b/src/common/xti.cpp
@@ -7,7 +7,7 @@
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997 Julian Smart
 //              (c) 2003 Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/common/xtistrm.cpp b/src/common/xtistrm.cpp
index 6438ed2815..7ba9b7441b 100644
--- a/src/common/xtistrm.cpp
+++ b/src/common/xtistrm.cpp
@@ -6,7 +6,7 @@
 // Created:     27/07/03
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/common/xtixml.cpp b/src/common/xtixml.cpp
index 3bd916c190..79e77061fc 100644
--- a/src/common/xtixml.cpp
+++ b/src/common/xtixml.cpp
@@ -6,7 +6,7 @@
 // Created:     27/07/03
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/common/zipstrm.cpp b/src/common/zipstrm.cpp
index d01d464df2..44b626f9cf 100644
--- a/src/common/zipstrm.cpp
+++ b/src/common/zipstrm.cpp
@@ -3,7 +3,7 @@
 // Purpose:     input stream for ZIP archive access
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
-// Licence:     wxWindows Licence
+// Licence:     wxWidgets Licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/common/zstream.cpp b/src/common/zstream.cpp
index 09d616bab2..595727d0cc 100644
--- a/src/common/zstream.cpp
+++ b/src/common/zstream.cpp
@@ -6,7 +6,7 @@
 // Created:     11/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Guilhem Lavaux
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/generic/accel.cpp b/src/generic/accel.cpp
index a50bed3218..a3f789b3cd 100644
--- a/src/generic/accel.cpp
+++ b/src/generic/accel.cpp
@@ -5,7 +5,7 @@
 // Modified:    VZ pn 31.05.01: use typed lists, Unicode cleanup, Add/Remove
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/generic/busyinfo.cpp b/src/generic/busyinfo.cpp
index 69ebc54ead..cf12f3822f 100644
--- a/src/generic/busyinfo.cpp
+++ b/src/generic/busyinfo.cpp
@@ -3,7 +3,7 @@
 // Purpose:     Information window when app is busy
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
-// Licence:     wxWindows Licence
+// Licence:     wxWidgets Licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/generic/calctrl.cpp b/src/generic/calctrl.cpp
index 7ab4f7799c..0e56465752 100644
--- a/src/generic/calctrl.cpp
+++ b/src/generic/calctrl.cpp
@@ -6,7 +6,7 @@
 // Created:     29.12.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/generic/caret.cpp b/src/generic/caret.cpp
index e2039646c5..1fbb37beeb 100644
--- a/src/generic/caret.cpp
+++ b/src/generic/caret.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     25.05.99
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/generic/choicdgg.cpp b/src/generic/choicdgg.cpp
index 1abec6f0cb..98453ceb5f 100644
--- a/src/generic/choicdgg.cpp
+++ b/src/generic/choicdgg.cpp
@@ -5,8 +5,8 @@
 // Modified by: 03.11.00: VZ to add wxArrayString and multiple sel functions
 // Created:     04/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/generic/colrdlgg.cpp b/src/generic/colrdlgg.cpp
index 38275f47bb..c58d1f9e28 100644
--- a/src/generic/colrdlgg.cpp
+++ b/src/generic/colrdlgg.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/generic/dcpsg.cpp b/src/generic/dcpsg.cpp
index c8e91af7ac..3a702e8ac8 100644
--- a/src/generic/dcpsg.cpp
+++ b/src/generic/dcpsg.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
@@ -1806,7 +1806,7 @@ bool wxPostScriptDC::StartDoc( const wxString& message )
 
     PsPrint( "%!PS-Adobe-2.0\n" );
     PsPrintf( wxT("%%%%Title: %s\n"), m_title.c_str() );
-    PsPrint( "%%Creator: wxWindows PostScript renderer\n" );
+    PsPrint( "%%Creator: wxWidgets PostScript renderer\n" );
     PsPrintf( wxT("%%%%CreationDate: %s\n"), wxNow().c_str() );
     if (m_printData.GetOrientation() == wxLANDSCAPE)
         PsPrint( "%%Orientation: Landscape\n" );
diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index 07359fdbcf..6076ebb692 100644
--- a/src/generic/dirctrlg.cpp
+++ b/src/generic/dirctrlg.cpp
@@ -6,7 +6,7 @@
 // Created:     12/12/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Harm van der Heijden, Robert Roebling and Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/generic/dirdlgg.cpp b/src/generic/dirdlgg.cpp
index 9adf9232db..d56e7b3cf2 100644
--- a/src/generic/dirdlgg.cpp
+++ b/src/generic/dirdlgg.cpp
@@ -6,7 +6,7 @@
 // Created:     12/12/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Harm van der Heijden, Robert Roebling, Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/generic/dragimgg.cpp b/src/generic/dragimgg.cpp
index 5890d2dc9a..cf23c11164 100644
--- a/src/generic/dragimgg.cpp
+++ b/src/generic/dragimgg.cpp
@@ -6,7 +6,7 @@
 // Created:     29/2/2000
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/generic/fdrepdlg.cpp b/src/generic/fdrepdlg.cpp
index df9998ed27..5fa8865f6e 100644
--- a/src/generic/fdrepdlg.cpp
+++ b/src/generic/fdrepdlg.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     05/25/01
 // RCS-ID:
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index 903c2423cc..ad1ad30a43 100644
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -6,7 +6,7 @@
 // Created:     12/12/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
@@ -873,9 +873,9 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
 
     if (wxConfig::Get(FALSE))
     {
-        wxConfig::Get()->Read(wxT("/wxWindows/wxFileDialog/ViewStyle"),
+        wxConfig::Get()->Read(wxT("/wxWidgets/wxFileDialog/ViewStyle"),
                               &ms_lastViewStyle);
-        wxConfig::Get()->Read(wxT("/wxWindows/wxFileDialog/ShowHidden"),
+        wxConfig::Get()->Read(wxT("/wxWidgets/wxFileDialog/ShowHidden"),
                               &ms_lastShowHidden);
     }
 
@@ -1037,9 +1037,9 @@ wxGenericFileDialog::~wxGenericFileDialog()
 {
     if (wxConfig::Get(FALSE))
     {
-        wxConfig::Get()->Write(wxT("/wxWindows/wxFileDialog/ViewStyle"),
+        wxConfig::Get()->Write(wxT("/wxWidgets/wxFileDialog/ViewStyle"),
                                ms_lastViewStyle);
-        wxConfig::Get()->Write(wxT("/wxWindows/wxFileDialog/ShowHidden"),
+        wxConfig::Get()->Write(wxT("/wxWidgets/wxFileDialog/ShowHidden"),
                                ms_lastShowHidden);
     }
 
diff --git a/src/generic/fontdlgg.cpp b/src/generic/fontdlgg.cpp
index 7ba6f4927e..3f748982d5 100644
--- a/src/generic/fontdlgg.cpp
+++ b/src/generic/fontdlgg.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 8947c56632..8dffb7b1ef 100644
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -6,7 +6,7 @@
 // Created:     1/08/1999
 // RCS-ID:      $Id$
 // Copyright:   (c) Michael Bedward (mbedward@ozemail.com.au)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/generic/gridctrl.cpp b/src/generic/gridctrl.cpp
index a7491003d7..e1111a4a0d 100644
--- a/src/generic/gridctrl.cpp
+++ b/src/generic/gridctrl.cpp
@@ -6,7 +6,7 @@
 // Created:     11/04/2001
 // RCS-ID:      $Id$
 // Copyright:   (c) The Computer Surgery (paul@compsurg.co.uk)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/generic/gridsel.cpp b/src/generic/gridsel.cpp
index d7487cb1df..6877aefa6e 100644
--- a/src/generic/gridsel.cpp
+++ b/src/generic/gridsel.cpp
@@ -6,7 +6,7 @@
 // Created:     20/02/1999
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Neis (Stefan.Neis@t-online.de)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/generic/helpext.cpp b/src/generic/helpext.cpp
index 40e3f5b171..08a61921a3 100644
--- a/src/generic/helpext.cpp
+++ b/src/generic/helpext.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        helpext.cpp
-// Purpose:     an external help controller for wxWindows
+// Purpose:     an external help controller for wxWidgets
 // Author:      Karsten Ballueder
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Karsten Ballueder
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/generic/htmllbox.cpp b/src/generic/htmllbox.cpp
index 5cc120f75c..b1ccc84cab 100644
--- a/src/generic/htmllbox.cpp
+++ b/src/generic/htmllbox.cpp
@@ -6,7 +6,7 @@
 // Created:     31.05.03
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// License:     wxWindows license
+// License:     wxWidgets license
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/generic/imaglist.cpp b/src/generic/imaglist.cpp
index ea69fbfaf2..3f80b68916 100644
--- a/src/generic/imaglist.cpp
+++ b/src/generic/imaglist.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/generic/laywin.cpp b/src/generic/laywin.cpp
index 738e819a0d..e5e2f3c478 100644
--- a/src/generic/laywin.cpp
+++ b/src/generic/laywin.cpp
@@ -9,7 +9,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/generic/listbkg.cpp b/src/generic/listbkg.cpp
index b82b9dde2f..b26d18ebd9 100644
--- a/src/generic/listbkg.cpp
+++ b/src/generic/listbkg.cpp
@@ -6,7 +6,7 @@
 // Created:     19.08.03
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -45,7 +45,7 @@
 const wxCoord MARGIN = 5;
 
 // ----------------------------------------------------------------------------
-// various wxWindows macros
+// various wxWidgets macros
 // ----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxListbook, wxControl)
diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 99fec5e45f..e63e7d0516 100644
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -5,7 +5,7 @@
 //              Vadim Zeitlin (virtual list control support)
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 /*
diff --git a/src/generic/logg.cpp b/src/generic/logg.cpp
index 6dafd5d079..ff80ef3650 100644
--- a/src/generic/logg.cpp
+++ b/src/generic/logg.cpp
@@ -7,7 +7,7 @@
 // Created:     20.09.99 (extracted from src/common/log.cpp)
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/generic/mdig.cpp b/src/generic/mdig.cpp
index e0b951be0e..7ae2791b42 100644
--- a/src/generic/mdig.cpp
+++ b/src/generic/mdig.cpp
@@ -6,7 +6,7 @@
 // Created:     29/07/2002
 // RCS-ID:      $Id$
 // Copyright:   (c) Hans Van Leemputten
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================
diff --git a/src/generic/msgdlgg.cpp b/src/generic/msgdlgg.cpp
index 8a3db3ba9d..9a61406358 100644
--- a/src/generic/msgdlgg.cpp
+++ b/src/generic/msgdlgg.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/generic/notebook.cpp b/src/generic/notebook.cpp
index 719d8bba0d..974ca1a298 100644
--- a/src/generic/notebook.cpp
+++ b/src/generic/notebook.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/generic/numdlgg.cpp b/src/generic/numdlgg.cpp
index 624a2f4c7b..41710aed96 100644
--- a/src/generic/numdlgg.cpp
+++ b/src/generic/numdlgg.cpp
@@ -6,7 +6,7 @@
 // Created:     23.07.99
 // RCS-ID:      $Id$
 // Copyright:   (c) Vadim Zeitlin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/generic/paletteg.cpp b/src/generic/paletteg.cpp
index 7121430633..1b2ca8e2ff 100644
--- a/src/generic/paletteg.cpp
+++ b/src/generic/paletteg.cpp
@@ -5,7 +5,7 @@
 // Created:     01/02/97
 // Id:
 // Copyright:   (c) 1998 Robert Roebling and Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/src/generic/panelg.cpp b/src/generic/panelg.cpp
index 9fba59a9fc..6a77e15ff8 100644
--- a/src/generic/panelg.cpp
+++ b/src/generic/panelg.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/generic/printps.cpp b/src/generic/printps.cpp
index aea9ddf5bc..40b499550c 100644
--- a/src/generic/printps.cpp
+++ b/src/generic/printps.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/generic/prntdlgg.cpp b/src/generic/prntdlgg.cpp
index e41ee6da36..cef8bc45ea 100644
--- a/src/generic/prntdlgg.cpp
+++ b/src/generic/prntdlgg.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/generic/progdlgg.cpp b/src/generic/progdlgg.cpp
index a812cb4736..64d188398d 100644
--- a/src/generic/progdlgg.cpp
+++ b/src/generic/progdlgg.cpp
@@ -6,7 +6,7 @@
 // Created:     09.05.1999
 // RCS-ID:      $Id$
 // Copyright:   (c) Karsten Ballüder
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/generic/regiong.cpp b/src/generic/regiong.cpp
index ca1ee59ad5..3027f4a213 100644
--- a/src/generic/regiong.cpp
+++ b/src/generic/regiong.cpp
@@ -6,7 +6,7 @@
 // Created:     2004/04/12
 // RCS-ID:      $Id$
 // Copyright:   (c) 2004 David Elliott
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/generic/region.h"
diff --git a/src/generic/renderg.cpp b/src/generic/renderg.cpp
index fdfb957f7c..6d17491d6f 100644
--- a/src/generic/renderg.cpp
+++ b/src/generic/renderg.cpp
@@ -6,7 +6,7 @@
 // Created:     20.07.2003
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// License:     wxWindows license
+// License:     wxWidgets license
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/generic/sashwin.cpp b/src/generic/sashwin.cpp
index b713f12752..5bff2ebf1e 100644
--- a/src/generic/sashwin.cpp
+++ b/src/generic/sashwin.cpp
@@ -8,7 +8,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp
index 05e5a0c48c..80cf843025 100644
--- a/src/generic/scrlwing.cpp
+++ b/src/generic/scrlwing.cpp
@@ -6,8 +6,8 @@
 //              Ron Lee on 10.4.02:  virtual size / auto scrollbars et al.
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/generic/selstore.cpp b/src/generic/selstore.cpp
index dfd54ae701..e99cc2df42 100644
--- a/src/generic/selstore.cpp
+++ b/src/generic/selstore.cpp
@@ -6,7 +6,7 @@
 // Created:     08.06.03 (extracted from src/generic/listctrl.cpp)
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000-2003 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/generic/spinctlg.cpp b/src/generic/spinctlg.cpp
index 24152c771d..488f789a1e 100644
--- a/src/generic/spinctlg.cpp
+++ b/src/generic/spinctlg.cpp
@@ -6,7 +6,7 @@
 // Created:     29.01.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// License:     wxWindows licence
+// License:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/generic/splash.cpp b/src/generic/splash.cpp
index d498bb4e55..d0530eef56 100644
--- a/src/generic/splash.cpp
+++ b/src/generic/splash.cpp
@@ -6,7 +6,7 @@
 // Created:     28/6/2000
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp
index 1d6a539568..c167c0f6f4 100644
--- a/src/generic/splitter.cpp
+++ b/src/generic/splitter.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/generic/statline.cpp b/src/generic/statline.cpp
index 28fd5b63d5..05bf2a78e2 100644
--- a/src/generic/statline.cpp
+++ b/src/generic/statline.cpp
@@ -5,7 +5,7 @@
 // Created:     28.06.99
 // Version:     $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp
index c12bce49e7..439a6b618c 100644
--- a/src/generic/statusbr.cpp
+++ b/src/generic/statusbr.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/generic/tabg.cpp b/src/generic/tabg.cpp
index 6c6ffa0120..85df61d62b 100644
--- a/src/generic/tabg.cpp
+++ b/src/generic/tabg.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/generic/textdlgg.cpp b/src/generic/textdlgg.cpp
index 6e0ab1e48d..b05b86527a 100644
--- a/src/generic/textdlgg.cpp
+++ b/src/generic/textdlgg.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/generic/timer.cpp b/src/generic/timer.cpp
index 495ca2111c..f0305c1867 100644
--- a/src/generic/timer.cpp
+++ b/src/generic/timer.cpp
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Copyright:   (c) Vaclav Slavik
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/generic/tipdlg.cpp b/src/generic/tipdlg.cpp
index bac3433d8a..a6529a6866 100644
--- a/src/generic/tipdlg.cpp
+++ b/src/generic/tipdlg.cpp
@@ -6,7 +6,7 @@
 // Created:     28.06.99
 // RCS-ID:      $Id$
 // Copyright:   (c) Vadim Zeitlin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/generic/tipwin.cpp b/src/generic/tipwin.cpp
index 17093b2d9e..231274d3bc 100644
--- a/src/generic/tipwin.cpp
+++ b/src/generic/tipwin.cpp
@@ -6,7 +6,7 @@
 // Created:     10.09.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp
index 0f64511b4c..ceff085dfa 100644
--- a/src/generic/treectlg.cpp
+++ b/src/generic/treectlg.cpp
@@ -6,7 +6,7 @@
 // Modified:    22/10/98 - almost total rewrite, simpler interface (VZ)
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling and Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // =============================================================================
@@ -2482,7 +2482,7 @@ void wxGenericTreeCtrl::DrawLine(const wxTreeItemId &item, bool below)
 }
 
 // -----------------------------------------------------------------------------
-// wxWindows callbacks
+// wxWidgets callbacks
 // -----------------------------------------------------------------------------
 
 void wxGenericTreeCtrl::OnPaint( wxPaintEvent &WXUNUSED(event) )
diff --git a/src/generic/vlbox.cpp b/src/generic/vlbox.cpp
index bb58622e9b..de98e9917f 100644
--- a/src/generic/vlbox.cpp
+++ b/src/generic/vlbox.cpp
@@ -6,7 +6,7 @@
 // Created:     31.05.03
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// License:     wxWindows license
+// License:     wxWidgets license
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/generic/vscroll.cpp b/src/generic/vscroll.cpp
index ad0951f3a7..b1de8a67c9 100644
--- a/src/generic/vscroll.cpp
+++ b/src/generic/vscroll.cpp
@@ -6,7 +6,7 @@
 // Created:     30.05.03
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/generic/wizard.cpp b/src/generic/wizard.cpp
index bceae5eb16..e227c571a2 100644
--- a/src/generic/wizard.cpp
+++ b/src/generic/wizard.cpp
@@ -10,7 +10,7 @@
 // Created:     15.08.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index c258135bab..31c0075cd6 100644
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
@@ -551,7 +551,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
         (gtk_minor_version == 2) &&
         (gtk_micro_version < 4))
     {
-        printf( "wxWindows warning: GUI threading disabled due to outdated GTK version\n" );
+        printf( "wxWidgets warning: GUI threading disabled due to outdated GTK version\n" );
     }
     else
     {
diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp
index de3d7c1f67..bdc547ac08 100644
--- a/src/gtk/bitmap.cpp
+++ b/src/gtk/bitmap.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk/bmpbuttn.cpp b/src/gtk/bmpbuttn.cpp
index 17bc64454f..55c431e135 100644
--- a/src/gtk/bmpbuttn.cpp
+++ b/src/gtk/bmpbuttn.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk/brush.cpp b/src/gtk/brush.cpp
index 1c08f89f07..daa94416cb 100644
--- a/src/gtk/brush.cpp
+++ b/src/gtk/brush.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp
index 4638f0a6b1..5f2aa87a80 100644
--- a/src/gtk/button.cpp
+++ b/src/gtk/button.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk/checkbox.cpp b/src/gtk/checkbox.cpp
index e7fe520d4d..5a2c901416 100644
--- a/src/gtk/checkbox.cpp
+++ b/src/gtk/checkbox.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/src/gtk/checklst.cpp b/src/gtk/checklst.cpp
index 45bc4adc20..703a365712 100644
--- a/src/gtk/checklst.cpp
+++ b/src/gtk/checklst.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp
index 54f9b1de42..651bf9d161 100644
--- a/src/gtk/choice.cpp
+++ b/src/gtk/choice.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/src/gtk/clipbrd.cpp b/src/gtk/clipbrd.cpp
index 6faf83eaad..4a918060df 100644
--- a/src/gtk/clipbrd.cpp
+++ b/src/gtk/clipbrd.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk/colour.cpp b/src/gtk/colour.cpp
index 98946e1649..d8176b0b6c 100644
--- a/src/gtk/colour.cpp
+++ b/src/gtk/colour.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index f7950f67bf..5fa5b347cc 100644
--- a/src/gtk/combobox.cpp
+++ b/src/gtk/combobox.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk/control.cpp b/src/gtk/control.cpp
index dfbfe4b9c0..7f5b15bf08 100644
--- a/src/gtk/control.cpp
+++ b/src/gtk/control.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Vadim Zeitlin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk/cursor.cpp b/src/gtk/cursor.cpp
index 4360b9748d..e394b6f942 100644
--- a/src/gtk/cursor.cpp
+++ b/src/gtk/cursor.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk/data.cpp b/src/gtk/data.cpp
index f0626d1448..2303812ae4 100644
--- a/src/gtk/data.cpp
+++ b/src/gtk/data.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
diff --git a/src/gtk/dataobj.cpp b/src/gtk/dataobj.cpp
index aa7455040f..4ba016cbb3 100644
--- a/src/gtk/dataobj.cpp
+++ b/src/gtk/dataobj.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk/dc.cpp b/src/gtk/dc.cpp
index c74bbc81bb..c4ebcde39c 100644
--- a/src/gtk/dc.cpp
+++ b/src/gtk/dc.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index d67e3cc0c0..e590f029e0 100644
--- a/src/gtk/dcclient.cpp
+++ b/src/gtk/dcclient.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Robert Roebling, Chris Breeze
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk/dcmemory.cpp b/src/gtk/dcmemory.cpp
index 0ec10532b7..7a923753f7 100644
--- a/src/gtk/dcmemory.cpp
+++ b/src/gtk/dcmemory.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk/dcscreen.cpp b/src/gtk/dcscreen.cpp
index 1f46868b4e..d313929559 100644
--- a/src/gtk/dcscreen.cpp
+++ b/src/gtk/dcscreen.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk/dialog.cpp b/src/gtk/dialog.cpp
index 644f2a8994..8847044495 100644
--- a/src/gtk/dialog.cpp
+++ b/src/gtk/dialog.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk/dnd.cpp b/src/gtk/dnd.cpp
index 2181646be5..3eaf282f59 100644
--- a/src/gtk/dnd.cpp
+++ b/src/gtk/dnd.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
@@ -115,7 +115,7 @@ static const char * page_xpm[] = {
 // ============================================================================
 
 // ----------------------------------------------------------------------------
-// convert between GTK+ and wxWindows DND constants
+// convert between GTK+ and wxWidgets DND constants
 // ----------------------------------------------------------------------------
 
 static wxDragResult ConvertFromGTK(long action)
diff --git a/src/gtk/evtloop.cpp b/src/gtk/evtloop.cpp
index 9ff74e58c3..7891cbacd3 100644
--- a/src/gtk/evtloop.cpp
+++ b/src/gtk/evtloop.cpp
@@ -6,7 +6,7 @@
 // Created:     10.07.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// License:     wxWindows licence
+// License:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp
index 88b285e8ea..563be8c70b 100644
--- a/src/gtk/filedlg.cpp
+++ b/src/gtk/filedlg.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp
index 3989eea3bf..84319a4f0a 100644
--- a/src/gtk/font.cpp
+++ b/src/gtk/font.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling and Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/gtk/fontdlg.cpp b/src/gtk/fontdlg.cpp
index df4b0eae8a..f456ee444c 100644
--- a/src/gtk/fontdlg.cpp
+++ b/src/gtk/fontdlg.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index 45d8071cdc..668e5f99f4 100644
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -150,7 +150,7 @@ static void gtk_toolbar_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidge
 
 /* Callback for wxFrame. This very strange beast has to be used because
  * C++ has no virtual methods in a constructor. We have to emulate a
- * virtual function here as wxWindows requires different ways to insert
+ * virtual function here as wxWidgets requires different ways to insert
  * a child in container classes. */
 
 static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child )
diff --git a/src/gtk/gauge.cpp b/src/gtk/gauge.cpp
index 7fe754a52e..2d8ed0c4d3 100644
--- a/src/gtk/gauge.cpp
+++ b/src/gtk/gauge.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk/gdiobj.cpp b/src/gtk/gdiobj.cpp
index 63a3ca364c..a4327178f3 100644
--- a/src/gtk/gdiobj.cpp
+++ b/src/gtk/gdiobj.cpp
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk/glcanvas.cpp b/src/gtk/glcanvas.cpp
index 7cd95d0cab..6299e9453a 100644
--- a/src/gtk/glcanvas.cpp
+++ b/src/gtk/glcanvas.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        gtk/glcanvas.cpp
-// Purpose:     wxGLCanvas, for using OpenGL/Mesa with wxWindows and GTK
+// Purpose:     wxGLCanvas, for using OpenGL/Mesa with wxWidgets and GTK
 // Author:      Robert Roebling
 // Modified by:
 // Created:     17/08/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk/gsockgtk.c b/src/gtk/gsockgtk.c
index 0115e520db..d7f4657741 100644
--- a/src/gtk/gsockgtk.c
+++ b/src/gtk/gsockgtk.c
@@ -2,7 +2,7 @@
  * Project: GSocket (Generic Socket) for WX
  * Name:    gsockgtk.c
  * Purpose: GSocket: GTK part
- * Licence: The wxWindows licence
+ * Licence: The wxWidgets licence
  * CVSID:   $Id$
  * -------------------------------------------------------------------------
  */
diff --git a/src/gtk/gsockgtk.cpp b/src/gtk/gsockgtk.cpp
index 0115e520db..d7f4657741 100644
--- a/src/gtk/gsockgtk.cpp
+++ b/src/gtk/gsockgtk.cpp
@@ -2,7 +2,7 @@
  * Project: GSocket (Generic Socket) for WX
  * Name:    gsockgtk.c
  * Purpose: GSocket: GTK part
- * Licence: The wxWindows licence
+ * Licence: The wxWidgets licence
  * CVSID:   $Id$
  * -------------------------------------------------------------------------
  */
diff --git a/src/gtk/icon.cpp b/src/gtk/icon.cpp
index ef9780a56c..a022e70703 100644
--- a/src/gtk/icon.cpp
+++ b/src/gtk/icon.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index 9f06846793..6c6e9579bb 100644
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/src/gtk/main.cpp b/src/gtk/main.cpp
index 96d7e9e4b6..dfae260042 100644
--- a/src/gtk/main.cpp
+++ b/src/gtk/main.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/src/gtk/mdi.cpp b/src/gtk/mdi.cpp
index d2de112f36..99586ff639 100644
--- a/src/gtk/mdi.cpp
+++ b/src/gtk/mdi.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index c8c37a1fcb..38f445633b 100644
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk/minifram.cpp b/src/gtk/minifram.cpp
index 916328b6a5..5682f4d9f0 100644
--- a/src/gtk/minifram.cpp
+++ b/src/gtk/minifram.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk/msgdlg.cpp b/src/gtk/msgdlg.cpp
index 97ce07c616..26d9da5298 100644
--- a/src/gtk/msgdlg.cpp
+++ b/src/gtk/msgdlg.cpp
@@ -6,7 +6,7 @@
 // Created:     2003/02/28
 // RCS-ID:      $Id$
 // Copyright:   (c) Vaclav Slavik, 2003
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp
index ded15fb845..eb9f4181b2 100644
--- a/src/gtk/notebook.cpp
+++ b/src/gtk/notebook.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling, Vadim Zeitlin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk/pen.cpp b/src/gtk/pen.cpp
index ee89ada46a..e21876dc56 100644
--- a/src/gtk/pen.cpp
+++ b/src/gtk/pen.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/src/gtk/popupwin.cpp b/src/gtk/popupwin.cpp
index 4c6a9f8cbc..c6a7a64721 100644
--- a/src/gtk/popupwin.cpp
+++ b/src/gtk/popupwin.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
@@ -118,7 +118,7 @@ gtk_dialog_realized_callback( GtkWidget * WXUNUSED(widget), wxPopupWindow *win )
 
 /* Callback for wxFrame. This very strange beast has to be used because
  * C++ has no virtual methods in a constructor. We have to emulate a
- * virtual function here as wxWindows requires different ways to insert
+ * virtual function here as wxWidgets requires different ways to insert
  * a child in container classes. */
 
 static void wxInsertChildInDialog( wxPopupWindow* parent, wxWindow* child )
diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp
index 3538f3c037..4a482fbeea 100644
--- a/src/gtk/radiobox.cpp
+++ b/src/gtk/radiobox.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk/radiobut.cpp b/src/gtk/radiobut.cpp
index c03a82e438..04a6d4266f 100644
--- a/src/gtk/radiobut.cpp
+++ b/src/gtk/radiobut.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/src/gtk/region.cpp b/src/gtk/region.cpp
index 20746fb14b..d6ae8c12a1 100644
--- a/src/gtk/region.cpp
+++ b/src/gtk/region.cpp
@@ -5,7 +5,7 @@
 // Modified:    VZ at 05.10.00: use AllocExclusive(), comparison fixed
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp
index 7e8587f80d..ca775301d3 100644
--- a/src/gtk/renderer.cpp
+++ b/src/gtk/renderer.cpp
@@ -6,7 +6,7 @@
 // Created:     20.07.2003
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// License:     wxWindows license
+// License:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/gtk/scrolbar.cpp b/src/gtk/scrolbar.cpp
index 6dcd71ec52..46ebc7ca4d 100644
--- a/src/gtk/scrolbar.cpp
+++ b/src/gtk/scrolbar.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/src/gtk/scrolwin.cpp b/src/gtk/scrolwin.cpp
index de2b788576..12db2fc8a4 100644
--- a/src/gtk/scrolwin.cpp
+++ b/src/gtk/scrolwin.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -288,7 +288,7 @@ bool wxScrolledWindow::Create(wxWindow *parent,
     GtkHConnectEvent();
 
     // these handlers block mouse events to any window during scrolling such as
-    // motion events and prevent GTK and wxWindows from fighting over where the
+    // motion events and prevent GTK and wxWidgets from fighting over where the
     // slider should be
 
     gtk_signal_connect( GTK_OBJECT(scrolledWindow->vscrollbar), "button_press_event",
@@ -562,7 +562,7 @@ void wxScrolledWindow::Scroll( int x_pos, int y_pos )
 
         m_targetWindow->ScrollWindow( (old_x-m_xScrollPosition)*m_xScrollPixelsPerLine, 0 );
 
-        // Just update the scrollbar, don't send any wxWindows event
+        // Just update the scrollbar, don't send any wxWidgets event
         GtkHDisconnectEvent();
         gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "value_changed" );
         GtkHConnectEvent();
@@ -581,7 +581,7 @@ void wxScrolledWindow::Scroll( int x_pos, int y_pos )
 
         m_targetWindow->ScrollWindow( 0, (old_y-m_yScrollPosition)*m_yScrollPixelsPerLine );
 
-        // Just update the scrollbar, don't send any wxWindows event
+        // Just update the scrollbar, don't send any wxWidgets event
         GtkVDisconnectEvent();
         gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "value_changed" );
         GtkVConnectEvent();
@@ -783,14 +783,14 @@ void wxScrolledWindow::SetScrollPos( int orient, int pos, bool refresh )
     {
         if (orient == wxHORIZONTAL)
         {
-            // Just update the scrollbar, don't send any wxWindows event
+            // Just update the scrollbar, don't send any wxWidgets event
             GtkHDisconnectEvent();
             gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "value_changed" );
             GtkHConnectEvent();
         }
         else
         {
-            // Just update the scrollbar, don't send any wxWindows event
+            // Just update the scrollbar, don't send any wxWidgets event
             GtkVDisconnectEvent();
             gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "value_changed" );
             GtkVConnectEvent();
diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp
index d838381c99..a525955a9a 100644
--- a/src/gtk/settings.cpp
+++ b/src/gtk/settings.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/src/gtk/slider.cpp b/src/gtk/slider.cpp
index e7079c5c10..582a6d53d7 100644
--- a/src/gtk/slider.cpp
+++ b/src/gtk/slider.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk/spinbutt.cpp b/src/gtk/spinbutt.cpp
index 423947a1d3..8f5b2263d3 100644
--- a/src/gtk/spinbutt.cpp
+++ b/src/gtk/spinbutt.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk/spinctrl.cpp b/src/gtk/spinctrl.cpp
index 45cc31f6b8..7ce9bb3807 100644
--- a/src/gtk/spinctrl.cpp
+++ b/src/gtk/spinctrl.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
@@ -216,7 +216,7 @@ void wxSpinCtrl::SetValue( int value )
 
 void wxSpinCtrl::SetSelection(long from, long to)
 {
-    // translate from wxWindows conventions to GTK+ ones: (-1, -1) means the
+    // translate from wxWidgets conventions to GTK+ ones: (-1, -1) means the
     // entire range
     if ( from == -1 && to == -1 )
     {
diff --git a/src/gtk/statbmp.cpp b/src/gtk/statbmp.cpp
index 48a8dafe73..6312440917 100644
--- a/src/gtk/statbmp.cpp
+++ b/src/gtk/statbmp.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:           wxWindows licence
+// Licence:           wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk/statbox.cpp b/src/gtk/statbox.cpp
index 879e2bc579..dc58e8de9e 100644
--- a/src/gtk/statbox.cpp
+++ b/src/gtk/statbox.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk/statline.cpp b/src/gtk/statline.cpp
index 3f95edd803..522d3bc8a3 100644
--- a/src/gtk/statline.cpp
+++ b/src/gtk/statline.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp
index bfca9d9409..64c754c9bd 100644
--- a/src/gtk/stattext.cpp
+++ b/src/gtk/stattext.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp
index 3360929f68..b3436728a0 100644
--- a/src/gtk/tbargtk.cpp
+++ b/src/gtk/tbargtk.cpp
@@ -5,7 +5,7 @@
 // Modified:    13.12.99 by VZ to derive from wxToolBarBase
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -50,7 +50,7 @@ extern wxCursor   g_globalCursor;
 // private functions
 // ----------------------------------------------------------------------------
 
-// translate wxWindows toolbar style flags to GTK orientation and style
+// translate wxWidgets toolbar style flags to GTK orientation and style
 static void GetGtkStyle(long style,
                         GtkOrientation *orient, GtkToolbarStyle *gtkStyle)
 {
diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index d36febec6b..590e88f272 100644
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling, Vadim Zeitlin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
@@ -543,7 +543,7 @@ void wxTextCtrl::SetValue( const wxString &value )
     }
 
     // GRG, Jun/2000: Changed this after a lot of discussion in
-    //   the lists. wxWindows 2.2 will have a set of flags to
+    //   the lists. wxWidgets 2.2 will have a set of flags to
     //   customize this behaviour.
     SetInsertionPoint(0);
 
diff --git a/src/gtk/threadno.cpp b/src/gtk/threadno.cpp
index 8907b7d39d..54274d432d 100644
--- a/src/gtk/threadno.cpp
+++ b/src/gtk/threadno.cpp
@@ -6,7 +6,7 @@
 // Created:     04/22/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Wolfram Gloger (1996, 1997); Guilhem Lavaux (1998)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk/threadsgi.cpp b/src/gtk/threadsgi.cpp
index cc65251bb0..57596edb67 100644
--- a/src/gtk/threadsgi.cpp
+++ b/src/gtk/threadsgi.cpp
@@ -6,7 +6,7 @@
 // Created:     04/22/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Wolfram Gloger (1996, 1997); Guilhem Lavaux (1998)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "thread.h"
diff --git a/src/gtk/timer.cpp b/src/gtk/timer.cpp
index 3b28f1d1c2..d56255b481 100644
--- a/src/gtk/timer.cpp
+++ b/src/gtk/timer.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/src/gtk/tooltip.cpp b/src/gtk/tooltip.cpp
index 5dd9d17137..c1ad517ed9 100644
--- a/src/gtk/tooltip.cpp
+++ b/src/gtk/tooltip.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index b4a0ed8489..9f93cc7772 100644
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -265,7 +265,7 @@ static void gtk_window_draw_callback( GtkWidget *widget, GdkRectangle *rect, wxW
 
 /* Callback for wxTopLevelWindowGTK. This very strange beast has to be used because
  * C++ has no virtual methods in a constructor. We have to emulate a
- * virtual function here as wxWindows requires different ways to insert
+ * virtual function here as wxWidgets requires different ways to insert
  * a child in container classes. */
 
 static void wxInsertChildInTopLevelWindow( wxTopLevelWindowGTK* parent, wxWindow* child )
diff --git a/src/gtk/treegtk.cpp b/src/gtk/treegtk.cpp
index 8c2dd7b4a4..e00310eacf 100644
--- a/src/gtk/treegtk.cpp
+++ b/src/gtk/treegtk.cpp
@@ -6,7 +6,7 @@
 // Created:     07/05/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Denis Pershin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp
index cef8dbe54e..dc1d99dd9b 100644
--- a/src/gtk/utilsgtk.cpp
+++ b/src/gtk/utilsgtk.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
diff --git a/src/gtk/utilsres.cpp b/src/gtk/utilsres.cpp
index 69c6097176..65297fd402 100644
--- a/src/gtk/utilsres.cpp
+++ b/src/gtk/utilsres.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 //#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
@@ -28,7 +28,7 @@
 bool wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file )
 {
     wxString filename( file );
-    if (filename.IsEmpty()) filename = wxT(".wxWindows");
+    if (filename.IsEmpty()) filename = wxT(".wxWidgets");
     
     wxFileConfig conf( wxTheApp->GetAppName(), wxTheApp->GetVendorName(), filename );
     
@@ -64,7 +64,7 @@ bool wxWriteResource(const wxString& section, const wxString& entry, int value,
 bool wxGetResource(const wxString& section, const wxString& entry, wxChar **value, const wxString& file )
 {
     wxString filename( file );
-    if (filename.IsEmpty()) filename = wxT(".wxWindows");
+    if (filename.IsEmpty()) filename = wxT(".wxWidgets");
 
     wxFileConfig conf( wxTheApp->GetAppName(), wxTheApp->GetVendorName(), filename );
 
diff --git a/src/gtk/win_gtk.c b/src/gtk/win_gtk.c
index fecb23b7f5..5416e3f177 100644
--- a/src/gtk/win_gtk.c
+++ b/src/gtk/win_gtk.c
@@ -1,12 +1,12 @@
 /* ///////////////////////////////////////////////////////////////////////////
 // Name:        win_gtk.c
-// Purpose:     Native GTK+ widget for wxWindows, based on GtkLayout and
+// Purpose:     Native GTK+ widget for wxWidgets, based on GtkLayout and
 //              GtkFixed. It makes use of the gravity window property and
 //              therefore does not work with GTK 1.0.
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////// */
 
 #ifdef VMS
diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 859efed9c5..8946429c73 100644
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -95,7 +95,7 @@ extern GtkContainerClass *pizza_parent_class;
 
 /*
    I have been asked several times about writing some documentation about
-   the GTK port of wxWindows, especially its internal structures. Obviously,
+   the GTK port of wxWidgets, especially its internal structures. Obviously,
    you cannot understand wxGTK without knowing a little about the GTK, but
    some more information about what the wxWindow, which is the base class
    for all other window classes, does seems required as well.
@@ -129,14 +129,14 @@ extern GtkContainerClass *pizza_parent_class;
 
    6) Display a border (sunken, raised, simple or none).
 
-   Normally one might expect, that one wxWindows window would always correspond
+   Normally one might expect, that one wxWidgets window would always correspond
    to one GTK widget. Under GTK, there is no such allround widget that has all
    the functionality. Moreover, the GTK defines a client area as a different
    widget from the actual widget you are handling. Last but not least some
    special classes (e.g. wxFrame) handle different categories of widgets and
    still have the possibility to draw something in the client area.
    It was therefore required to write a special purpose GTK widget, that would
-   represent a client area in the sense of wxWindows capable to do the jobs
+   represent a client area in the sense of wxWidgets capable to do the jobs
    2), 3) and 4). I have written this class and it resides in win_gtk.c of
    this directory.
 
@@ -165,18 +165,18 @@ extern GtkContainerClass *pizza_parent_class;
    one is (in the GTK sense) a child of the GtkScrolledWindow.
 
    If the m_wxwindow field is set, then all input to this widget is inter-
-   cepted and sent to the wxWindows class. If not, all input to the widget
+   cepted and sent to the wxWidgets class. If not, all input to the widget
    that gets pointed to by m_widget gets intercepted and sent to the class.
 
    II)
 
-   The design of scrolling in wxWindows is markedly different from that offered
+   The design of scrolling in wxWidgets is markedly different from that offered
    by the GTK itself and therefore we cannot simply take it as it is. In GTK,
    clicking on a scrollbar belonging to scrolled window will inevitably move
-   the window. In wxWindows, the scrollbar will only emit an event, send this
+   the window. In wxWidgets, the scrollbar will only emit an event, send this
    to (normally) a wxScrolledWindow and that class will call ScrollWindow()
    which actually moves the window and its subchildren. Note that GtkPizza
-   memorizes how much it has been scrolled but that wxWindows forgets this
+   memorizes how much it has been scrolled but that wxWidgets forgets this
    so that the two coordinates systems have to be kept in synch. This is done
    in various places using the pizza->xoffset and pizza->yoffset values.
 
@@ -1555,7 +1555,7 @@ static gint gtk_window_button_press_callback( GtkWidget *widget,
     if (gdk_event->button == 1)
     {
         // note that GDK generates triple click events which are not supported
-        // by wxWindows but still have to be passed to the app as otherwise
+        // by wxWidgets but still have to be passed to the app as otherwise
         // clicks would simply go missing
         switch (gdk_event->type)
         {
@@ -2688,7 +2688,7 @@ bool wxWindowGTK::Create( wxWindow *parent,
     gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "changed" );
 
     // these handlers block mouse events to any window during scrolling such as
-    // motion events and prevent GTK and wxWindows from fighting over where the
+    // motion events and prevent GTK and wxWidgets from fighting over where the
     // slider should be
 
     gtk_signal_connect( GTK_OBJECT(scrolledWindow->vscrollbar), "button_press_event",
@@ -2809,7 +2809,7 @@ void wxWindowGTK::PostCreation()
     {
         if (!m_noExpose)
         {
-            // these get reported to wxWindows -> wxPaintEvent
+            // these get reported to wxWidgets -> wxPaintEvent
 
             gtk_pizza_set_external( GTK_PIZZA(m_wxwindow), TRUE );
 
@@ -3916,7 +3916,7 @@ void wxWindowGTK::GtkSendPaintEvents()
 #ifndef __WXUNIVERSAL__
 #ifndef __WXGTK20__
     // The following code will result in all window-less widgets
-    // being redrawn because the wxWindows class is allowed to
+    // being redrawn because the wxWidgets class is allowed to
     // paint over the window-less widgets.
 
     GList *children = pizza->children;
@@ -4144,7 +4144,7 @@ void wxWindowGTK::SetWidgetStyle()
         static bool s_warningPrinted = FALSE;
         if (!s_warningPrinted)
         {
-            printf( "wxWindows warning: Widget styles disabled due to buggy GTK theme.\n" );
+            printf( "wxWidgets warning: Widget styles disabled due to buggy GTK theme.\n" );
             s_warningPrinted = TRUE;
         }
         m_widgetStyle = m_widget->style;
diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index c258135bab..31c0075cd6 100644
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
@@ -551,7 +551,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
         (gtk_minor_version == 2) &&
         (gtk_micro_version < 4))
     {
-        printf( "wxWindows warning: GUI threading disabled due to outdated GTK version\n" );
+        printf( "wxWidgets warning: GUI threading disabled due to outdated GTK version\n" );
     }
     else
     {
diff --git a/src/gtk1/bitmap.cpp b/src/gtk1/bitmap.cpp
index de3d7c1f67..bdc547ac08 100644
--- a/src/gtk1/bitmap.cpp
+++ b/src/gtk1/bitmap.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk1/bmpbuttn.cpp b/src/gtk1/bmpbuttn.cpp
index 17bc64454f..55c431e135 100644
--- a/src/gtk1/bmpbuttn.cpp
+++ b/src/gtk1/bmpbuttn.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk1/brush.cpp b/src/gtk1/brush.cpp
index 1c08f89f07..daa94416cb 100644
--- a/src/gtk1/brush.cpp
+++ b/src/gtk1/brush.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk1/button.cpp b/src/gtk1/button.cpp
index 4638f0a6b1..5f2aa87a80 100644
--- a/src/gtk1/button.cpp
+++ b/src/gtk1/button.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk1/checkbox.cpp b/src/gtk1/checkbox.cpp
index e7fe520d4d..5a2c901416 100644
--- a/src/gtk1/checkbox.cpp
+++ b/src/gtk1/checkbox.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/src/gtk1/checklst.cpp b/src/gtk1/checklst.cpp
index 45bc4adc20..703a365712 100644
--- a/src/gtk1/checklst.cpp
+++ b/src/gtk1/checklst.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk1/choice.cpp b/src/gtk1/choice.cpp
index 54f9b1de42..651bf9d161 100644
--- a/src/gtk1/choice.cpp
+++ b/src/gtk1/choice.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/src/gtk1/clipbrd.cpp b/src/gtk1/clipbrd.cpp
index 6faf83eaad..4a918060df 100644
--- a/src/gtk1/clipbrd.cpp
+++ b/src/gtk1/clipbrd.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk1/colour.cpp b/src/gtk1/colour.cpp
index 98946e1649..d8176b0b6c 100644
--- a/src/gtk1/colour.cpp
+++ b/src/gtk1/colour.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/src/gtk1/combobox.cpp b/src/gtk1/combobox.cpp
index f7950f67bf..5fa5b347cc 100644
--- a/src/gtk1/combobox.cpp
+++ b/src/gtk1/combobox.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk1/control.cpp b/src/gtk1/control.cpp
index dfbfe4b9c0..7f5b15bf08 100644
--- a/src/gtk1/control.cpp
+++ b/src/gtk1/control.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Vadim Zeitlin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk1/cursor.cpp b/src/gtk1/cursor.cpp
index 4360b9748d..e394b6f942 100644
--- a/src/gtk1/cursor.cpp
+++ b/src/gtk1/cursor.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk1/data.cpp b/src/gtk1/data.cpp
index f0626d1448..2303812ae4 100644
--- a/src/gtk1/data.cpp
+++ b/src/gtk1/data.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
diff --git a/src/gtk1/dataobj.cpp b/src/gtk1/dataobj.cpp
index aa7455040f..4ba016cbb3 100644
--- a/src/gtk1/dataobj.cpp
+++ b/src/gtk1/dataobj.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk1/dc.cpp b/src/gtk1/dc.cpp
index c74bbc81bb..c4ebcde39c 100644
--- a/src/gtk1/dc.cpp
+++ b/src/gtk1/dc.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/src/gtk1/dcclient.cpp b/src/gtk1/dcclient.cpp
index d67e3cc0c0..e590f029e0 100644
--- a/src/gtk1/dcclient.cpp
+++ b/src/gtk1/dcclient.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Robert Roebling, Chris Breeze
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk1/dcmemory.cpp b/src/gtk1/dcmemory.cpp
index 0ec10532b7..7a923753f7 100644
--- a/src/gtk1/dcmemory.cpp
+++ b/src/gtk1/dcmemory.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk1/dcscreen.cpp b/src/gtk1/dcscreen.cpp
index 1f46868b4e..d313929559 100644
--- a/src/gtk1/dcscreen.cpp
+++ b/src/gtk1/dcscreen.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk1/dialog.cpp b/src/gtk1/dialog.cpp
index 644f2a8994..8847044495 100644
--- a/src/gtk1/dialog.cpp
+++ b/src/gtk1/dialog.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk1/dnd.cpp b/src/gtk1/dnd.cpp
index 2181646be5..3eaf282f59 100644
--- a/src/gtk1/dnd.cpp
+++ b/src/gtk1/dnd.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
@@ -115,7 +115,7 @@ static const char * page_xpm[] = {
 // ============================================================================
 
 // ----------------------------------------------------------------------------
-// convert between GTK+ and wxWindows DND constants
+// convert between GTK+ and wxWidgets DND constants
 // ----------------------------------------------------------------------------
 
 static wxDragResult ConvertFromGTK(long action)
diff --git a/src/gtk1/evtloop.cpp b/src/gtk1/evtloop.cpp
index 9ff74e58c3..7891cbacd3 100644
--- a/src/gtk1/evtloop.cpp
+++ b/src/gtk1/evtloop.cpp
@@ -6,7 +6,7 @@
 // Created:     10.07.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// License:     wxWindows licence
+// License:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/gtk1/filedlg.cpp b/src/gtk1/filedlg.cpp
index 88b285e8ea..563be8c70b 100644
--- a/src/gtk1/filedlg.cpp
+++ b/src/gtk1/filedlg.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk1/font.cpp b/src/gtk1/font.cpp
index 3989eea3bf..84319a4f0a 100644
--- a/src/gtk1/font.cpp
+++ b/src/gtk1/font.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling and Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/gtk1/fontdlg.cpp b/src/gtk1/fontdlg.cpp
index df4b0eae8a..f456ee444c 100644
--- a/src/gtk1/fontdlg.cpp
+++ b/src/gtk1/fontdlg.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp
index 45d8071cdc..668e5f99f4 100644
--- a/src/gtk1/frame.cpp
+++ b/src/gtk1/frame.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -150,7 +150,7 @@ static void gtk_toolbar_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidge
 
 /* Callback for wxFrame. This very strange beast has to be used because
  * C++ has no virtual methods in a constructor. We have to emulate a
- * virtual function here as wxWindows requires different ways to insert
+ * virtual function here as wxWidgets requires different ways to insert
  * a child in container classes. */
 
 static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child )
diff --git a/src/gtk1/gauge.cpp b/src/gtk1/gauge.cpp
index 7fe754a52e..2d8ed0c4d3 100644
--- a/src/gtk1/gauge.cpp
+++ b/src/gtk1/gauge.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk1/gdiobj.cpp b/src/gtk1/gdiobj.cpp
index 63a3ca364c..a4327178f3 100644
--- a/src/gtk1/gdiobj.cpp
+++ b/src/gtk1/gdiobj.cpp
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk1/glcanvas.cpp b/src/gtk1/glcanvas.cpp
index 7cd95d0cab..6299e9453a 100644
--- a/src/gtk1/glcanvas.cpp
+++ b/src/gtk1/glcanvas.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        gtk/glcanvas.cpp
-// Purpose:     wxGLCanvas, for using OpenGL/Mesa with wxWindows and GTK
+// Purpose:     wxGLCanvas, for using OpenGL/Mesa with wxWidgets and GTK
 // Author:      Robert Roebling
 // Modified by:
 // Created:     17/08/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk1/gsockgtk.c b/src/gtk1/gsockgtk.c
index 0115e520db..d7f4657741 100644
--- a/src/gtk1/gsockgtk.c
+++ b/src/gtk1/gsockgtk.c
@@ -2,7 +2,7 @@
  * Project: GSocket (Generic Socket) for WX
  * Name:    gsockgtk.c
  * Purpose: GSocket: GTK part
- * Licence: The wxWindows licence
+ * Licence: The wxWidgets licence
  * CVSID:   $Id$
  * -------------------------------------------------------------------------
  */
diff --git a/src/gtk1/gsockgtk.cpp b/src/gtk1/gsockgtk.cpp
index 0115e520db..d7f4657741 100644
--- a/src/gtk1/gsockgtk.cpp
+++ b/src/gtk1/gsockgtk.cpp
@@ -2,7 +2,7 @@
  * Project: GSocket (Generic Socket) for WX
  * Name:    gsockgtk.c
  * Purpose: GSocket: GTK part
- * Licence: The wxWindows licence
+ * Licence: The wxWidgets licence
  * CVSID:   $Id$
  * -------------------------------------------------------------------------
  */
diff --git a/src/gtk1/icon.cpp b/src/gtk1/icon.cpp
index ef9780a56c..a022e70703 100644
--- a/src/gtk1/icon.cpp
+++ b/src/gtk1/icon.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp
index 9f06846793..6c6e9579bb 100644
--- a/src/gtk1/listbox.cpp
+++ b/src/gtk1/listbox.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/src/gtk1/main.cpp b/src/gtk1/main.cpp
index 96d7e9e4b6..dfae260042 100644
--- a/src/gtk1/main.cpp
+++ b/src/gtk1/main.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/src/gtk1/mdi.cpp b/src/gtk1/mdi.cpp
index d2de112f36..99586ff639 100644
--- a/src/gtk1/mdi.cpp
+++ b/src/gtk1/mdi.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp
index c8c37a1fcb..38f445633b 100644
--- a/src/gtk1/menu.cpp
+++ b/src/gtk1/menu.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk1/minifram.cpp b/src/gtk1/minifram.cpp
index 916328b6a5..5682f4d9f0 100644
--- a/src/gtk1/minifram.cpp
+++ b/src/gtk1/minifram.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk1/msgdlg.cpp b/src/gtk1/msgdlg.cpp
index 97ce07c616..26d9da5298 100644
--- a/src/gtk1/msgdlg.cpp
+++ b/src/gtk1/msgdlg.cpp
@@ -6,7 +6,7 @@
 // Created:     2003/02/28
 // RCS-ID:      $Id$
 // Copyright:   (c) Vaclav Slavik, 2003
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk1/notebook.cpp b/src/gtk1/notebook.cpp
index ded15fb845..eb9f4181b2 100644
--- a/src/gtk1/notebook.cpp
+++ b/src/gtk1/notebook.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling, Vadim Zeitlin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk1/pen.cpp b/src/gtk1/pen.cpp
index ee89ada46a..e21876dc56 100644
--- a/src/gtk1/pen.cpp
+++ b/src/gtk1/pen.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/src/gtk1/popupwin.cpp b/src/gtk1/popupwin.cpp
index 4c6a9f8cbc..c6a7a64721 100644
--- a/src/gtk1/popupwin.cpp
+++ b/src/gtk1/popupwin.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
@@ -118,7 +118,7 @@ gtk_dialog_realized_callback( GtkWidget * WXUNUSED(widget), wxPopupWindow *win )
 
 /* Callback for wxFrame. This very strange beast has to be used because
  * C++ has no virtual methods in a constructor. We have to emulate a
- * virtual function here as wxWindows requires different ways to insert
+ * virtual function here as wxWidgets requires different ways to insert
  * a child in container classes. */
 
 static void wxInsertChildInDialog( wxPopupWindow* parent, wxWindow* child )
diff --git a/src/gtk1/radiobox.cpp b/src/gtk1/radiobox.cpp
index 3538f3c037..4a482fbeea 100644
--- a/src/gtk1/radiobox.cpp
+++ b/src/gtk1/radiobox.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk1/radiobut.cpp b/src/gtk1/radiobut.cpp
index c03a82e438..04a6d4266f 100644
--- a/src/gtk1/radiobut.cpp
+++ b/src/gtk1/radiobut.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/src/gtk1/region.cpp b/src/gtk1/region.cpp
index 20746fb14b..d6ae8c12a1 100644
--- a/src/gtk1/region.cpp
+++ b/src/gtk1/region.cpp
@@ -5,7 +5,7 @@
 // Modified:    VZ at 05.10.00: use AllocExclusive(), comparison fixed
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/gtk1/renderer.cpp b/src/gtk1/renderer.cpp
index 7e8587f80d..ca775301d3 100644
--- a/src/gtk1/renderer.cpp
+++ b/src/gtk1/renderer.cpp
@@ -6,7 +6,7 @@
 // Created:     20.07.2003
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// License:     wxWindows license
+// License:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/gtk1/scrolbar.cpp b/src/gtk1/scrolbar.cpp
index 6dcd71ec52..46ebc7ca4d 100644
--- a/src/gtk1/scrolbar.cpp
+++ b/src/gtk1/scrolbar.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/src/gtk1/scrolwin.cpp b/src/gtk1/scrolwin.cpp
index de2b788576..12db2fc8a4 100644
--- a/src/gtk1/scrolwin.cpp
+++ b/src/gtk1/scrolwin.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -288,7 +288,7 @@ bool wxScrolledWindow::Create(wxWindow *parent,
     GtkHConnectEvent();
 
     // these handlers block mouse events to any window during scrolling such as
-    // motion events and prevent GTK and wxWindows from fighting over where the
+    // motion events and prevent GTK and wxWidgets from fighting over where the
     // slider should be
 
     gtk_signal_connect( GTK_OBJECT(scrolledWindow->vscrollbar), "button_press_event",
@@ -562,7 +562,7 @@ void wxScrolledWindow::Scroll( int x_pos, int y_pos )
 
         m_targetWindow->ScrollWindow( (old_x-m_xScrollPosition)*m_xScrollPixelsPerLine, 0 );
 
-        // Just update the scrollbar, don't send any wxWindows event
+        // Just update the scrollbar, don't send any wxWidgets event
         GtkHDisconnectEvent();
         gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "value_changed" );
         GtkHConnectEvent();
@@ -581,7 +581,7 @@ void wxScrolledWindow::Scroll( int x_pos, int y_pos )
 
         m_targetWindow->ScrollWindow( 0, (old_y-m_yScrollPosition)*m_yScrollPixelsPerLine );
 
-        // Just update the scrollbar, don't send any wxWindows event
+        // Just update the scrollbar, don't send any wxWidgets event
         GtkVDisconnectEvent();
         gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "value_changed" );
         GtkVConnectEvent();
@@ -783,14 +783,14 @@ void wxScrolledWindow::SetScrollPos( int orient, int pos, bool refresh )
     {
         if (orient == wxHORIZONTAL)
         {
-            // Just update the scrollbar, don't send any wxWindows event
+            // Just update the scrollbar, don't send any wxWidgets event
             GtkHDisconnectEvent();
             gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "value_changed" );
             GtkHConnectEvent();
         }
         else
         {
-            // Just update the scrollbar, don't send any wxWindows event
+            // Just update the scrollbar, don't send any wxWidgets event
             GtkVDisconnectEvent();
             gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "value_changed" );
             GtkVConnectEvent();
diff --git a/src/gtk1/settings.cpp b/src/gtk1/settings.cpp
index d838381c99..a525955a9a 100644
--- a/src/gtk1/settings.cpp
+++ b/src/gtk1/settings.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/src/gtk1/slider.cpp b/src/gtk1/slider.cpp
index e7079c5c10..582a6d53d7 100644
--- a/src/gtk1/slider.cpp
+++ b/src/gtk1/slider.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk1/spinbutt.cpp b/src/gtk1/spinbutt.cpp
index 423947a1d3..8f5b2263d3 100644
--- a/src/gtk1/spinbutt.cpp
+++ b/src/gtk1/spinbutt.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk1/spinctrl.cpp b/src/gtk1/spinctrl.cpp
index 45cc31f6b8..7ce9bb3807 100644
--- a/src/gtk1/spinctrl.cpp
+++ b/src/gtk1/spinctrl.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
@@ -216,7 +216,7 @@ void wxSpinCtrl::SetValue( int value )
 
 void wxSpinCtrl::SetSelection(long from, long to)
 {
-    // translate from wxWindows conventions to GTK+ ones: (-1, -1) means the
+    // translate from wxWidgets conventions to GTK+ ones: (-1, -1) means the
     // entire range
     if ( from == -1 && to == -1 )
     {
diff --git a/src/gtk1/statbmp.cpp b/src/gtk1/statbmp.cpp
index 48a8dafe73..6312440917 100644
--- a/src/gtk1/statbmp.cpp
+++ b/src/gtk1/statbmp.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:           wxWindows licence
+// Licence:           wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk1/statbox.cpp b/src/gtk1/statbox.cpp
index 879e2bc579..dc58e8de9e 100644
--- a/src/gtk1/statbox.cpp
+++ b/src/gtk1/statbox.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk1/statline.cpp b/src/gtk1/statline.cpp
index 3f95edd803..522d3bc8a3 100644
--- a/src/gtk1/statline.cpp
+++ b/src/gtk1/statline.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk1/stattext.cpp b/src/gtk1/stattext.cpp
index bfca9d9409..64c754c9bd 100644
--- a/src/gtk1/stattext.cpp
+++ b/src/gtk1/stattext.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk1/tbargtk.cpp b/src/gtk1/tbargtk.cpp
index 3360929f68..b3436728a0 100644
--- a/src/gtk1/tbargtk.cpp
+++ b/src/gtk1/tbargtk.cpp
@@ -5,7 +5,7 @@
 // Modified:    13.12.99 by VZ to derive from wxToolBarBase
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -50,7 +50,7 @@ extern wxCursor   g_globalCursor;
 // private functions
 // ----------------------------------------------------------------------------
 
-// translate wxWindows toolbar style flags to GTK orientation and style
+// translate wxWidgets toolbar style flags to GTK orientation and style
 static void GetGtkStyle(long style,
                         GtkOrientation *orient, GtkToolbarStyle *gtkStyle)
 {
diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp
index d36febec6b..590e88f272 100644
--- a/src/gtk1/textctrl.cpp
+++ b/src/gtk1/textctrl.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling, Vadim Zeitlin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
@@ -543,7 +543,7 @@ void wxTextCtrl::SetValue( const wxString &value )
     }
 
     // GRG, Jun/2000: Changed this after a lot of discussion in
-    //   the lists. wxWindows 2.2 will have a set of flags to
+    //   the lists. wxWidgets 2.2 will have a set of flags to
     //   customize this behaviour.
     SetInsertionPoint(0);
 
diff --git a/src/gtk1/threadno.cpp b/src/gtk1/threadno.cpp
index 8907b7d39d..54274d432d 100644
--- a/src/gtk1/threadno.cpp
+++ b/src/gtk1/threadno.cpp
@@ -6,7 +6,7 @@
 // Created:     04/22/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Wolfram Gloger (1996, 1997); Guilhem Lavaux (1998)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk1/threadsgi.cpp b/src/gtk1/threadsgi.cpp
index cc65251bb0..57596edb67 100644
--- a/src/gtk1/threadsgi.cpp
+++ b/src/gtk1/threadsgi.cpp
@@ -6,7 +6,7 @@
 // Created:     04/22/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Wolfram Gloger (1996, 1997); Guilhem Lavaux (1998)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "thread.h"
diff --git a/src/gtk1/timer.cpp b/src/gtk1/timer.cpp
index 3b28f1d1c2..d56255b481 100644
--- a/src/gtk1/timer.cpp
+++ b/src/gtk1/timer.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/src/gtk1/tooltip.cpp b/src/gtk1/tooltip.cpp
index 5dd9d17137..c1ad517ed9 100644
--- a/src/gtk1/tooltip.cpp
+++ b/src/gtk1/tooltip.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk1/toplevel.cpp b/src/gtk1/toplevel.cpp
index b4a0ed8489..9f93cc7772 100644
--- a/src/gtk1/toplevel.cpp
+++ b/src/gtk1/toplevel.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -265,7 +265,7 @@ static void gtk_window_draw_callback( GtkWidget *widget, GdkRectangle *rect, wxW
 
 /* Callback for wxTopLevelWindowGTK. This very strange beast has to be used because
  * C++ has no virtual methods in a constructor. We have to emulate a
- * virtual function here as wxWindows requires different ways to insert
+ * virtual function here as wxWidgets requires different ways to insert
  * a child in container classes. */
 
 static void wxInsertChildInTopLevelWindow( wxTopLevelWindowGTK* parent, wxWindow* child )
diff --git a/src/gtk1/treegtk.cpp b/src/gtk1/treegtk.cpp
index 8c2dd7b4a4..e00310eacf 100644
--- a/src/gtk1/treegtk.cpp
+++ b/src/gtk1/treegtk.cpp
@@ -6,7 +6,7 @@
 // Created:     07/05/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Denis Pershin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/gtk1/utilsgtk.cpp b/src/gtk1/utilsgtk.cpp
index cef8dbe54e..dc1d99dd9b 100644
--- a/src/gtk1/utilsgtk.cpp
+++ b/src/gtk1/utilsgtk.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
diff --git a/src/gtk1/utilsres.cpp b/src/gtk1/utilsres.cpp
index 69c6097176..65297fd402 100644
--- a/src/gtk1/utilsres.cpp
+++ b/src/gtk1/utilsres.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 //#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
@@ -28,7 +28,7 @@
 bool wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file )
 {
     wxString filename( file );
-    if (filename.IsEmpty()) filename = wxT(".wxWindows");
+    if (filename.IsEmpty()) filename = wxT(".wxWidgets");
     
     wxFileConfig conf( wxTheApp->GetAppName(), wxTheApp->GetVendorName(), filename );
     
@@ -64,7 +64,7 @@ bool wxWriteResource(const wxString& section, const wxString& entry, int value,
 bool wxGetResource(const wxString& section, const wxString& entry, wxChar **value, const wxString& file )
 {
     wxString filename( file );
-    if (filename.IsEmpty()) filename = wxT(".wxWindows");
+    if (filename.IsEmpty()) filename = wxT(".wxWidgets");
 
     wxFileConfig conf( wxTheApp->GetAppName(), wxTheApp->GetVendorName(), filename );
 
diff --git a/src/gtk1/win_gtk.c b/src/gtk1/win_gtk.c
index fecb23b7f5..5416e3f177 100644
--- a/src/gtk1/win_gtk.c
+++ b/src/gtk1/win_gtk.c
@@ -1,12 +1,12 @@
 /* ///////////////////////////////////////////////////////////////////////////
 // Name:        win_gtk.c
-// Purpose:     Native GTK+ widget for wxWindows, based on GtkLayout and
+// Purpose:     Native GTK+ widget for wxWidgets, based on GtkLayout and
 //              GtkFixed. It makes use of the gravity window property and
 //              therefore does not work with GTK 1.0.
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////// */
 
 #ifdef VMS
diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index 859efed9c5..8946429c73 100644
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -95,7 +95,7 @@ extern GtkContainerClass *pizza_parent_class;
 
 /*
    I have been asked several times about writing some documentation about
-   the GTK port of wxWindows, especially its internal structures. Obviously,
+   the GTK port of wxWidgets, especially its internal structures. Obviously,
    you cannot understand wxGTK without knowing a little about the GTK, but
    some more information about what the wxWindow, which is the base class
    for all other window classes, does seems required as well.
@@ -129,14 +129,14 @@ extern GtkContainerClass *pizza_parent_class;
 
    6) Display a border (sunken, raised, simple or none).
 
-   Normally one might expect, that one wxWindows window would always correspond
+   Normally one might expect, that one wxWidgets window would always correspond
    to one GTK widget. Under GTK, there is no such allround widget that has all
    the functionality. Moreover, the GTK defines a client area as a different
    widget from the actual widget you are handling. Last but not least some
    special classes (e.g. wxFrame) handle different categories of widgets and
    still have the possibility to draw something in the client area.
    It was therefore required to write a special purpose GTK widget, that would
-   represent a client area in the sense of wxWindows capable to do the jobs
+   represent a client area in the sense of wxWidgets capable to do the jobs
    2), 3) and 4). I have written this class and it resides in win_gtk.c of
    this directory.
 
@@ -165,18 +165,18 @@ extern GtkContainerClass *pizza_parent_class;
    one is (in the GTK sense) a child of the GtkScrolledWindow.
 
    If the m_wxwindow field is set, then all input to this widget is inter-
-   cepted and sent to the wxWindows class. If not, all input to the widget
+   cepted and sent to the wxWidgets class. If not, all input to the widget
    that gets pointed to by m_widget gets intercepted and sent to the class.
 
    II)
 
-   The design of scrolling in wxWindows is markedly different from that offered
+   The design of scrolling in wxWidgets is markedly different from that offered
    by the GTK itself and therefore we cannot simply take it as it is. In GTK,
    clicking on a scrollbar belonging to scrolled window will inevitably move
-   the window. In wxWindows, the scrollbar will only emit an event, send this
+   the window. In wxWidgets, the scrollbar will only emit an event, send this
    to (normally) a wxScrolledWindow and that class will call ScrollWindow()
    which actually moves the window and its subchildren. Note that GtkPizza
-   memorizes how much it has been scrolled but that wxWindows forgets this
+   memorizes how much it has been scrolled but that wxWidgets forgets this
    so that the two coordinates systems have to be kept in synch. This is done
    in various places using the pizza->xoffset and pizza->yoffset values.
 
@@ -1555,7 +1555,7 @@ static gint gtk_window_button_press_callback( GtkWidget *widget,
     if (gdk_event->button == 1)
     {
         // note that GDK generates triple click events which are not supported
-        // by wxWindows but still have to be passed to the app as otherwise
+        // by wxWidgets but still have to be passed to the app as otherwise
         // clicks would simply go missing
         switch (gdk_event->type)
         {
@@ -2688,7 +2688,7 @@ bool wxWindowGTK::Create( wxWindow *parent,
     gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "changed" );
 
     // these handlers block mouse events to any window during scrolling such as
-    // motion events and prevent GTK and wxWindows from fighting over where the
+    // motion events and prevent GTK and wxWidgets from fighting over where the
     // slider should be
 
     gtk_signal_connect( GTK_OBJECT(scrolledWindow->vscrollbar), "button_press_event",
@@ -2809,7 +2809,7 @@ void wxWindowGTK::PostCreation()
     {
         if (!m_noExpose)
         {
-            // these get reported to wxWindows -> wxPaintEvent
+            // these get reported to wxWidgets -> wxPaintEvent
 
             gtk_pizza_set_external( GTK_PIZZA(m_wxwindow), TRUE );
 
@@ -3916,7 +3916,7 @@ void wxWindowGTK::GtkSendPaintEvents()
 #ifndef __WXUNIVERSAL__
 #ifndef __WXGTK20__
     // The following code will result in all window-less widgets
-    // being redrawn because the wxWindows class is allowed to
+    // being redrawn because the wxWidgets class is allowed to
     // paint over the window-less widgets.
 
     GList *children = pizza->children;
@@ -4144,7 +4144,7 @@ void wxWindowGTK::SetWidgetStyle()
         static bool s_warningPrinted = FALSE;
         if (!s_warningPrinted)
         {
-            printf( "wxWindows warning: Widget styles disabled due to buggy GTK theme.\n" );
+            printf( "wxWidgets warning: Widget styles disabled due to buggy GTK theme.\n" );
             s_warningPrinted = TRUE;
         }
         m_widgetStyle = m_widget->style;
diff --git a/src/html/chm.cpp b/src/html/chm.cpp
index f65d43f97a..f42dd16085 100644
--- a/src/html/chm.cpp
+++ b/src/html/chm.cpp
@@ -4,7 +4,7 @@
 // Author:      Markus Sinner
 // Copyright:   (c) 2003 Herd Software Development
 // CVS-ID:      $Id$
-// Licence:     wxWindows Licence
+// Licence:     wxWidgets Licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
diff --git a/src/html/helpctrl.cpp b/src/html/helpctrl.cpp
index 5f0bc3fd68..7fd16b4706 100644
--- a/src/html/helpctrl.cpp
+++ b/src/html/helpctrl.cpp
@@ -6,7 +6,7 @@
 // Author:      Harm van der Heijden and Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) Harm van der Heijden and Vaclav Slavik
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
@@ -137,7 +137,7 @@ void wxHtmlHelpController::CreateHelpWindow()
     {
         m_Config = wxConfigBase::Get(FALSE);
         if (m_Config != NULL)
-            m_ConfigRoot = _T("wxWindows/wxHtmlHelpController");
+            m_ConfigRoot = _T("wxWidgets/wxHtmlHelpController");
     }
 
     m_helpFrame = CreateHelpFrame(&m_helpData);
diff --git a/src/html/helpdata.cpp b/src/html/helpdata.cpp
index c0418b8d39..f4866285a2 100644
--- a/src/html/helpdata.cpp
+++ b/src/html/helpdata.cpp
@@ -6,7 +6,7 @@
 // Author:      Harm van der Heijden and Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) Harm van der Heijden and Vaclav Slavik
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp
index 4acfbb9043..8a20387076 100644
--- a/src/html/helpfrm.cpp
+++ b/src/html/helpfrm.cpp
@@ -6,7 +6,7 @@
 // Author:      Harm van der Heijden and Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) Harm van der Heijden and Vaclav Slavik
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
@@ -1609,7 +1609,7 @@ void wxHtmlHelpFrame::OnClose(wxCommandEvent& event)
 
 void wxHtmlHelpFrame::OnAbout(wxCommandEvent& event)
 {
-    wxMessageBox(wxT("wxWindows HTML Help Viewer (c) 1998-2003, Vaclav Slavik et al"), wxT("HelpView"),
+    wxMessageBox(wxT("wxWidgets HTML Help Viewer (c) 1998-2003, Vaclav Slavik et al"), wxT("HelpView"),
         wxICON_INFORMATION|wxOK, this);
 }
 #endif
diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp
index 9e8f795042..986f6436f0 100644
--- a/src/html/htmlcell.cpp
+++ b/src/html/htmlcell.cpp
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
-// Licence:     wxWindows Licence
+// Licence:     wxWidgets Licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/html/htmlfilt.cpp b/src/html/htmlfilt.cpp
index 85cc8b74b2..02d03928be 100644
--- a/src/html/htmlfilt.cpp
+++ b/src/html/htmlfilt.cpp
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
-// Licence:     wxWindows Licence
+// Licence:     wxWidgets Licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/src/html/htmlpars.cpp b/src/html/htmlpars.cpp
index 2bfef86812..035cb90dbc 100644
--- a/src/html/htmlpars.cpp
+++ b/src/html/htmlpars.cpp
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
-// Licence:     wxWindows Licence
+// Licence:     wxWidgets Licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/src/html/htmltag.cpp b/src/html/htmltag.cpp
index c24739b189..9ff60909a4 100644
--- a/src/html/htmltag.cpp
+++ b/src/html/htmltag.cpp
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
-// Licence:     wxWindows Licence
+// Licence:     wxWidgets Licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index b7744b5cdc..e9eed8def7 100644
--- a/src/html/htmlwin.cpp
+++ b/src/html/htmlwin.cpp
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
-// Licence:     wxWindows Licence
+// Licence:     wxWidgets Licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp
index 720bde4849..ccf8ca40a9 100644
--- a/src/html/htmprint.cpp
+++ b/src/html/htmprint.cpp
@@ -5,7 +5,7 @@
 // Created:     25/09/99
 // RCS-ID:      $Id$
 // Copyright:   (c) Vaclav Slavik, 1999
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/src/html/m_dflist.cpp b/src/html/m_dflist.cpp
index e158936b78..d15b8903c9 100644
--- a/src/html/m_dflist.cpp
+++ b/src/html/m_dflist.cpp
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
-// Licence:     wxWindows Licence
+// Licence:     wxWidgets Licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/html/m_fonts.cpp b/src/html/m_fonts.cpp
index 7fd9c8c06b..a89a64a2c5 100644
--- a/src/html/m_fonts.cpp
+++ b/src/html/m_fonts.cpp
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
-// Licence:     wxWindows Licence
+// Licence:     wxWidgets Licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/html/m_hline.cpp b/src/html/m_hline.cpp
index 09e2bf50ac..99148cca12 100644
--- a/src/html/m_hline.cpp
+++ b/src/html/m_hline.cpp
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
-// Licence:     wxWindows Licence
+// Licence:     wxWidgets Licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/html/m_image.cpp b/src/html/m_image.cpp
index 58aaa45e23..d035c10377 100644
--- a/src/html/m_image.cpp
+++ b/src/html/m_image.cpp
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik, Joel Lucsy
-// Licence:     wxWindows Licence
+// Licence:     wxWidgets Licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/html/m_layout.cpp b/src/html/m_layout.cpp
index 42c72aded6..70302b7e91 100644
--- a/src/html/m_layout.cpp
+++ b/src/html/m_layout.cpp
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
-// Licence:     wxWindows Licence
+// Licence:     wxWidgets Licence
 /////////////////////////////////////////////////////////////////////////////
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation
diff --git a/src/html/m_links.cpp b/src/html/m_links.cpp
index 4abb172953..809eda76af 100644
--- a/src/html/m_links.cpp
+++ b/src/html/m_links.cpp
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
-// Licence:     wxWindows Licence
+// Licence:     wxWidgets Licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/html/m_list.cpp b/src/html/m_list.cpp
index 38a9826824..f1b90e4491 100644
--- a/src/html/m_list.cpp
+++ b/src/html/m_list.cpp
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
-// Licence:     wxWindows Licence
+// Licence:     wxWidgets Licence
 /////////////////////////////////////////////////////////////////////////////
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation
diff --git a/src/html/m_pre.cpp b/src/html/m_pre.cpp
index 2594df910c..f4727831b0 100644
--- a/src/html/m_pre.cpp
+++ b/src/html/m_pre.cpp
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
-// Licence:     wxWindows Licence
+// Licence:     wxWidgets Licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/html/m_style.cpp b/src/html/m_style.cpp
index 6f0eb8d766..3931dd45b3 100644
--- a/src/html/m_style.cpp
+++ b/src/html/m_style.cpp
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 2002 Vaclav Slavik
-// Licence:     wxWindows Licence
+// Licence:     wxWidgets Licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/html/m_tables.cpp b/src/html/m_tables.cpp
index 6c9d5062d5..ef6fad6759 100644
--- a/src/html/m_tables.cpp
+++ b/src/html/m_tables.cpp
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
-// Licence:     wxWindows Licence
+// Licence:     wxWidgets Licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/html/winpars.cpp b/src/html/winpars.cpp
index 0f7ee8027c..ef9edf9dab 100644
--- a/src/html/winpars.cpp
+++ b/src/html/winpars.cpp
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
-// Licence:     wxWindows Licence
+// Licence:     wxWidgets Licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/src/jpeg/jconfig.h b/src/jpeg/jconfig.h
index 3593170ff8..e76403adc2 100644
--- a/src/jpeg/jconfig.h
+++ b/src/jpeg/jconfig.h
@@ -10,7 +10,7 @@
 /* jconfig.cfg --- source file edited by configure script */
 /* see jconfig.doc for explanations */
 
-/* use wxWindows' configure */
+/* use wxWidgets' configure */
 #ifdef __MWERKS__
 #if (__MWERKS__ < 0x0900) || macintosh || defined ( __MACH__ )
     #define __WXMAC__
@@ -36,7 +36,7 @@
 #undef void
 #undef const
 
-/* use wxWindows' configure */
+/* use wxWidgets' configure */
 /* #undef CHAR_IS_UNSIGNED */
 #ifdef __CHAR_UNSIGNED__
   #ifndef CHAR_IS_UNSIGNED
@@ -59,7 +59,7 @@
 
 #undef RIGHT_SHIFT_IS_UNSIGNED
 
-/* use wxWindows' configure */
+/* use wxWidgets' configure */
 /* #define INLINE __inline__ */
 #if defined(__VISAGECPP__) && (__IBMCPP__ >= 400 || __IBMC__ >= 400)
 #define INLINE
diff --git a/src/mac/carbon/accel.cpp b/src/mac/carbon/accel.cpp
index 14aa88e53a..af6f7b2679 100644
--- a/src/mac/carbon/accel.cpp
+++ b/src/mac/carbon/accel.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index b4acbfac42..5cb78f44e7 100644
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -739,15 +739,15 @@ void wxStAppResource::OpenSharedLibraryResource(const void *initBlock)
         NSModule    theModule;
         const char *theLibPath;
 
-        gSharedLibraryBundle = CFBundleGetBundleWithIdentifier(CFSTR("com.wxwindows.wxWindows"));
+        gSharedLibraryBundle = CFBundleGetBundleWithIdentifier(CFSTR("com.wxwindows.wxWidgets"));
         if (gSharedLibraryBundle != NULL) {
-            // wxWindows has been bundled into a framework
+            // wxWidgets has been bundled into a framework
             //   load the framework resources
 
             gSharedLibraryResource = CFBundleOpenBundleResourceMap(gSharedLibraryBundle);
         }
         else {
-            // wxWindows is a simple dynamic shared library
+            // wxWidgets is a simple dynamic shared library
             //   load the resources from the data fork of a separate resource file
             wxString theResPath;
             wxString theName;
diff --git a/src/mac/carbon/bitmap.cpp b/src/mac/carbon/bitmap.cpp
index 6cbaa9d9b7..ae5a46bc3d 100644
--- a/src/mac/carbon/bitmap.cpp
+++ b/src/mac/carbon/bitmap.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/bmpbuttn.cpp b/src/mac/carbon/bmpbuttn.cpp
index 8fba4742c7..0465d5e90f 100644
--- a/src/mac/carbon/bmpbuttn.cpp
+++ b/src/mac/carbon/bmpbuttn.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/brush.cpp b/src/mac/carbon/brush.cpp
index f94401052f..78f89baa34 100644
--- a/src/mac/carbon/brush.cpp
+++ b/src/mac/carbon/brush.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/button.cpp b/src/mac/carbon/button.cpp
index 4bb38feb1e..20ed4e6073 100644
--- a/src/mac/carbon/button.cpp
+++ b/src/mac/carbon/button.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/cfsocket.cpp b/src/mac/carbon/cfsocket.cpp
index 480bedab9a..e0d481ad63 100644
--- a/src/mac/carbon/cfsocket.cpp
+++ b/src/mac/carbon/cfsocket.cpp
@@ -6,7 +6,7 @@
 // Copyright:  (C) 1999-1997, Guilhem Lavaux
 //             (C) 2000-1999, Guillermo Rodriguez Garcia
 // RCS_ID:     $Id$
-// License:    see wxWindows licence
+// License:    see wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ==========================================================================
@@ -66,7 +66,7 @@ WX_CHECK_BUILD_OPTIONS("wxNet")
 
 // what to do within waits: we have 2 cases: from the main thread itself we
 // have to call wxYield() to let the events (including the GUI events and the
-// low-level (not wxWindows) events from GSocket) be processed. From another
+// low-level (not wxWidgets) events from GSocket) be processed. From another
 // thread it is enough to just call wxThread::Yield() which will give away the
 // rest of our time slice: the explanation is that the events will be processed
 // by the main thread anyhow, without calling wxYield(), but we don't want to
diff --git a/src/mac/carbon/checkbox.cpp b/src/mac/carbon/checkbox.cpp
index 56284d3ce3..00f91c9189 100644
--- a/src/mac/carbon/checkbox.cpp
+++ b/src/mac/carbon/checkbox.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/checklst.cpp b/src/mac/carbon/checklst.cpp
index 69f9d75795..1e2fdf8469 100644
--- a/src/mac/carbon/checklst.cpp
+++ b/src/mac/carbon/checklst.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/mac/carbon/choice.cpp b/src/mac/carbon/choice.cpp
index 489243e04a..b451e7d351 100644
--- a/src/mac/carbon/choice.cpp
+++ b/src/mac/carbon/choice.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/clipbrd.cpp b/src/mac/carbon/clipbrd.cpp
index 7e48c9ec34..b97e0d2528 100644
--- a/src/mac/carbon/clipbrd.cpp
+++ b/src/mac/carbon/clipbrd.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/colordlg.cpp b/src/mac/carbon/colordlg.cpp
index 3c8411319b..7f1dcbfbef 100644
--- a/src/mac/carbon/colordlg.cpp
+++ b/src/mac/carbon/colordlg.cpp
@@ -7,7 +7,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/colour.cpp b/src/mac/carbon/colour.cpp
index 86487f7a35..1a065ff8b6 100644
--- a/src/mac/carbon/colour.cpp
+++ b/src/mac/carbon/colour.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/combobox.cpp b/src/mac/carbon/combobox.cpp
index f158ee702e..9fe390a888 100644
--- a/src/mac/carbon/combobox.cpp
+++ b/src/mac/carbon/combobox.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/combobxc.cpp b/src/mac/carbon/combobxc.cpp
index 8f1e122bd0..ce47b87064 100644
--- a/src/mac/carbon/combobxc.cpp
+++ b/src/mac/carbon/combobxc.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/control.cpp b/src/mac/carbon/control.cpp
index ba7d6a7a3c..297d1a73b5 100644
--- a/src/mac/carbon/control.cpp
+++ b/src/mac/carbon/control.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/cursor.cpp b/src/mac/carbon/cursor.cpp
index 741025af8b..7cf6cfe10c 100644
--- a/src/mac/carbon/cursor.cpp
+++ b/src/mac/carbon/cursor.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/data.cpp b/src/mac/carbon/data.cpp
index 1f0bea00d2..4b446ca163 100644
--- a/src/mac/carbon/data.cpp
+++ b/src/mac/carbon/data.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/event.h"
diff --git a/src/mac/carbon/dataobj.cpp b/src/mac/carbon/dataobj.cpp
index bec4f2bd60..9ad2e807ba 100644
--- a/src/mac/carbon/dataobj.cpp
+++ b/src/mac/carbon/dataobj.cpp
@@ -6,7 +6,7 @@
 // Created:     10/21/99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/mac/carbon/dc.cpp b/src/mac/carbon/dc.cpp
index 3084e7224c..ad4f677246 100644
--- a/src/mac/carbon/dc.cpp
+++ b/src/mac/carbon/dc.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/dcclient.cpp b/src/mac/carbon/dcclient.cpp
index f28c6dc576..a596683f13 100644
--- a/src/mac/carbon/dcclient.cpp
+++ b/src/mac/carbon/dcclient.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/dcmemory.cpp b/src/mac/carbon/dcmemory.cpp
index e850a59e4d..67cffc9046 100644
--- a/src/mac/carbon/dcmemory.cpp
+++ b/src/mac/carbon/dcmemory.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/dcprint.cpp b/src/mac/carbon/dcprint.cpp
index e875cb0387..caa8d1c3bf 100644
--- a/src/mac/carbon/dcprint.cpp
+++ b/src/mac/carbon/dcprint.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/dcscreen.cpp b/src/mac/carbon/dcscreen.cpp
index 03d769a05b..f700c64668 100644
--- a/src/mac/carbon/dcscreen.cpp
+++ b/src/mac/carbon/dcscreen.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/dialog.cpp b/src/mac/carbon/dialog.cpp
index 9ec4ef5220..c72889af05 100644
--- a/src/mac/carbon/dialog.cpp
+++ b/src/mac/carbon/dialog.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/dirdlg.cpp b/src/mac/carbon/dirdlg.cpp
index 0b4c7df195..17446c1aed 100644
--- a/src/mac/carbon/dirdlg.cpp
+++ b/src/mac/carbon/dirdlg.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/dirmac.cpp b/src/mac/carbon/dirmac.cpp
index ff168bafdc..9daaed30fd 100644
--- a/src/mac/carbon/dirmac.cpp
+++ b/src/mac/carbon/dirmac.cpp
@@ -6,7 +6,7 @@
 // Created:     08.12.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Stefan Csomor <csomor@advanced.ch>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/mac/carbon/display.cpp b/src/mac/carbon/display.cpp
index 8786306211..5196abdbdf 100644
--- a/src/mac/carbon/display.cpp
+++ b/src/mac/carbon/display.cpp
@@ -5,8 +5,8 @@
 // Modified by: Royce Mitchell III & Ryan Norton
 // Created:     06/21/02
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/dnd.cpp b/src/mac/carbon/dnd.cpp
index 53b046c2fb..0b3c2dcc97 100644
--- a/src/mac/carbon/dnd.cpp
+++ b/src/mac/carbon/dnd.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/filedlg.cpp b/src/mac/carbon/filedlg.cpp
index 2c2004b9c4..1b3ab421da 100644
--- a/src/mac/carbon/filedlg.cpp
+++ b/src/mac/carbon/filedlg.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/font.cpp b/src/mac/carbon/font.cpp
index 1b9416748d..48f38298c3 100644
--- a/src/mac/carbon/font.cpp
+++ b/src/mac/carbon/font.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/fontdlg.cpp b/src/mac/carbon/fontdlg.cpp
index 03c894c553..4e09af901c 100644
--- a/src/mac/carbon/fontdlg.cpp
+++ b/src/mac/carbon/fontdlg.cpp
@@ -7,7 +7,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/fontenum.cpp b/src/mac/carbon/fontenum.cpp
index 467bc95442..0cec036562 100644
--- a/src/mac/carbon/fontenum.cpp
+++ b/src/mac/carbon/fontenum.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/mac/carbon/fontutil.cpp b/src/mac/carbon/fontutil.cpp
index 1aa2298245..dbf7d0abe9 100644
--- a/src/mac/carbon/fontutil.cpp
+++ b/src/mac/carbon/fontutil.cpp
@@ -6,7 +6,7 @@
 // Created:     05.11.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/mac/carbon/frame.cpp b/src/mac/carbon/frame.cpp
index 9bb8cb9357..88b83c1540 100644
--- a/src/mac/carbon/frame.cpp
+++ b/src/mac/carbon/frame.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/gauge.cpp b/src/mac/carbon/gauge.cpp
index 36abf248dc..21f6a81fe5 100644
--- a/src/mac/carbon/gauge.cpp
+++ b/src/mac/carbon/gauge.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/gdiobj.cpp b/src/mac/carbon/gdiobj.cpp
index 528c5a7efe..5a1fff8a02 100644
--- a/src/mac/carbon/gdiobj.cpp
+++ b/src/mac/carbon/gdiobj.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/glcanvas.cpp b/src/mac/carbon/glcanvas.cpp
index e6a8b50a69..e240f00118 100644
--- a/src/mac/carbon/glcanvas.cpp
+++ b/src/mac/carbon/glcanvas.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        glcanvas.cpp
-// Purpose:     wxGLCanvas, for using OpenGL with wxWindows under Macintosh
+// Purpose:     wxGLCanvas, for using OpenGL with wxWidgets under Macintosh
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/helpxxxx.cpp b/src/mac/carbon/helpxxxx.cpp
index 7d0e4d1531..5b47fb5b9b 100644
--- a/src/mac/carbon/helpxxxx.cpp
+++ b/src/mac/carbon/helpxxxx.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/icon.cpp b/src/mac/carbon/icon.cpp
index bd1937bc2a..fc07dcc5d6 100644
--- a/src/mac/carbon/icon.cpp
+++ b/src/mac/carbon/icon.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/joystick.cpp b/src/mac/carbon/joystick.cpp
index 156b9b2657..7e38a7e75c 100644
--- a/src/mac/carbon/joystick.cpp
+++ b/src/mac/carbon/joystick.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp
index ae36062d4b..fa4e047e48 100644
--- a/src/mac/carbon/listbox.cpp
+++ b/src/mac/carbon/listbox.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/main.cpp b/src/mac/carbon/main.cpp
index ad5bd33263..9c09c1c6b3 100644
--- a/src/mac/carbon/main.cpp
+++ b/src/mac/carbon/main.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // We don't put main() in the library any more. GD.
diff --git a/src/mac/carbon/mdi.cpp b/src/mac/carbon/mdi.cpp
index 31d91ad9c8..f37a4ddab0 100644
--- a/src/mac/carbon/mdi.cpp
+++ b/src/mac/carbon/mdi.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/menu.cpp b/src/mac/carbon/menu.cpp
index cb3ae485a8..5113214648 100644
--- a/src/mac/carbon/menu.cpp
+++ b/src/mac/carbon/menu.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -18,7 +18,7 @@
 // headers & declarations
 // ============================================================================
 
-// wxWindows headers
+// wxWidgets headers
 // -----------------
 
 #include "wx/app.h"
diff --git a/src/mac/carbon/menuitem.cpp b/src/mac/carbon/menuitem.cpp
index 6cc3aa1a79..6bcc6e6587 100644
--- a/src/mac/carbon/menuitem.cpp
+++ b/src/mac/carbon/menuitem.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/mac/carbon/metafile.cpp b/src/mac/carbon/metafile.cpp
index 594fe43af5..d5cffd054e 100644
--- a/src/mac/carbon/metafile.cpp
+++ b/src/mac/carbon/metafile.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/mimetmac.cpp b/src/mac/carbon/mimetmac.cpp
index 1ea83612c2..ff6ef1d39f 100644
--- a/src/mac/carbon/mimetmac.cpp
+++ b/src/mac/carbon/mimetmac.cpp
@@ -6,7 +6,7 @@
 // Created:     23.09.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence (part of wxExtra library)
+// Licence:     wxWidgets licence (part of wxExtra library)
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef    __GNUG__
diff --git a/src/mac/carbon/minifram.cpp b/src/mac/carbon/minifram.cpp
index 6b49b9bdc7..7d5aeb6f1d 100644
--- a/src/mac/carbon/minifram.cpp
+++ b/src/mac/carbon/minifram.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/mpthread.cpp b/src/mac/carbon/mpthread.cpp
index 043fea5282..4319309bfe 100755
--- a/src/mac/carbon/mpthread.cpp
+++ b/src/mac/carbon/mpthread.cpp
@@ -7,7 +7,7 @@
 // RCS-ID:	$Id$
 // Copyright:	(c) Wolfram Gloger (1996, 1997); Guilhem Lavaux (1998),
 //		    Vadim Zeitlin (1999) , Stefan Csomor (2000)
-// Licence:	wxWindows licence
+// Licence:	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -796,7 +796,7 @@ private:
 	MPQueueID	    m_notifyQueueId;    // its notification queue
 
     wxThreadState m_state;              // see wxThreadState enum
-    int           m_prio;               // in wxWindows units: from 0 to 100
+    int           m_prio;               // in wxWidgets units: from 0 to 100
 
     // this flag is set when the thread should terminate
     bool m_cancelled;
@@ -927,8 +927,8 @@ void wxThreadInternal::SetPriority( int priority)
 	if ( m_tid)
     {
 		// Mac priorities range from 1 to 10,000, with a default of 100.
-		// wxWindows priorities range from 0 to 100 with a default of 50.
-		// We can map wxWindows to Mac priorities easily by assuming
+		// wxWidgets priorities range from 0 to 100 with a default of 50.
+		// We can map wxWidgets to Mac priorities easily by assuming
 		// the former uses a logarithmic scale.
 		const unsigned int macPriority = ( int)( exp( priority / 25.0 * log( 10.0)) + 0.5);
 		
diff --git a/src/mac/carbon/msgdlg.cpp b/src/mac/carbon/msgdlg.cpp
index 73548ad9f2..5250cb51cf 100644
--- a/src/mac/carbon/msgdlg.cpp
+++ b/src/mac/carbon/msgdlg.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/notebmac.cpp b/src/mac/carbon/notebmac.cpp
index cee99d8c80..6dfa28f1f1 100644
--- a/src/mac/carbon/notebmac.cpp
+++ b/src/mac/carbon/notebmac.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/palette.cpp b/src/mac/carbon/palette.cpp
index 60a0de6a8a..7812dbebc0 100644
--- a/src/mac/carbon/palette.cpp
+++ b/src/mac/carbon/palette.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/pen.cpp b/src/mac/carbon/pen.cpp
index fea55ab34e..55837becff 100644
--- a/src/mac/carbon/pen.cpp
+++ b/src/mac/carbon/pen.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/pnghand.cpp b/src/mac/carbon/pnghand.cpp
index f25141d7e9..b030b8d80b 100644
--- a/src/mac/carbon/pnghand.cpp
+++ b/src/mac/carbon/pnghand.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/printdlg.cpp b/src/mac/carbon/printdlg.cpp
index 89f2789250..8836ea007b 100644
--- a/src/mac/carbon/printdlg.cpp
+++ b/src/mac/carbon/printdlg.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/printmac.cpp b/src/mac/carbon/printmac.cpp
index a053eb7d80..3fbec1ed5d 100644
--- a/src/mac/carbon/printmac.cpp
+++ b/src/mac/carbon/printmac.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/radiobox.cpp b/src/mac/carbon/radiobox.cpp
index cf279d567b..daad360f1b 100644
--- a/src/mac/carbon/radiobox.cpp
+++ b/src/mac/carbon/radiobox.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/radiobut.cpp b/src/mac/carbon/radiobut.cpp
index 32ad08047e..4d9ba6887c 100644
--- a/src/mac/carbon/radiobut.cpp
+++ b/src/mac/carbon/radiobut.cpp
@@ -6,7 +6,7 @@
 // Created:     ??/??/98
 // RCS-ID:      $Id$
 // Copyright:   (c) AUTHOR
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/region.cpp b/src/mac/carbon/region.cpp
index a3cf8cef7b..fcf4055a2b 100644
--- a/src/mac/carbon/region.cpp
+++ b/src/mac/carbon/region.cpp
@@ -5,7 +5,7 @@
 // Created:   Fri Oct 24 10:46:34 MET 1997
 // RCS-ID:    $Id$
 // Copyright: (c) 1997 Stefan Csomor
-// Licence:   wxWindows licence
+// Licence:   wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/renderer.cpp b/src/mac/carbon/renderer.cpp
index 8555ef47e3..fd7d44cc30 100644
--- a/src/mac/carbon/renderer.cpp
+++ b/src/mac/carbon/renderer.cpp
@@ -6,7 +6,7 @@
 // Created:     20.07.2003
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// License:     wxWindows license
+// License:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/mac/carbon/scrolbar.cpp b/src/mac/carbon/scrolbar.cpp
index 08818c0470..56c09fad6a 100644
--- a/src/mac/carbon/scrolbar.cpp
+++ b/src/mac/carbon/scrolbar.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/settings.cpp b/src/mac/carbon/settings.cpp
index 4ddb2a4582..31e54059d8 100644
--- a/src/mac/carbon/settings.cpp
+++ b/src/mac/carbon/settings.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/slider.cpp b/src/mac/carbon/slider.cpp
index d1dd3ee950..214d46c808 100644
--- a/src/mac/carbon/slider.cpp
+++ b/src/mac/carbon/slider.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/sound.cpp b/src/mac/carbon/sound.cpp
index d6d13bb595..55ff79efd2 100644
--- a/src/mac/carbon/sound.cpp
+++ b/src/mac/carbon/sound.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/spinbutt.cpp b/src/mac/carbon/spinbutt.cpp
index 30d3076417..5ee91f60f3 100644
--- a/src/mac/carbon/spinbutt.cpp
+++ b/src/mac/carbon/spinbutt.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/spinctrl.cpp b/src/mac/carbon/spinctrl.cpp
index b0bb8c8441..2a57f1e0b9 100644
--- a/src/mac/carbon/spinctrl.cpp
+++ b/src/mac/carbon/spinctrl.cpp
@@ -5,7 +5,7 @@
 // Modified by: Mark Newsam (Based on GTK file)
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
@@ -322,7 +322,7 @@ void wxSpinCtrl::SetRange(int min, int max)
 
 void wxSpinCtrl::SetSelection(long from, long to)
 {
-    // if from and to are both -1, it means (in wxWindows) that all text should
+    // if from and to are both -1, it means (in wxWidgets) that all text should
     // be selected
     if ( (from == -1) && (to == -1) )
     {
diff --git a/src/mac/carbon/statbmp.cpp b/src/mac/carbon/statbmp.cpp
index f8fb079fd4..f55267cb87 100644
--- a/src/mac/carbon/statbmp.cpp
+++ b/src/mac/carbon/statbmp.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/statbox.cpp b/src/mac/carbon/statbox.cpp
index 870154ebba..c809df5da6 100644
--- a/src/mac/carbon/statbox.cpp
+++ b/src/mac/carbon/statbox.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/statbrma.cpp b/src/mac/carbon/statbrma.cpp
index 8220559531..f7b7ad477f 100644
--- a/src/mac/carbon/statbrma.cpp
+++ b/src/mac/carbon/statbrma.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/statline.cpp b/src/mac/carbon/statline.cpp
index 52f3d40733..dbc34aaa73 100644
--- a/src/mac/carbon/statline.cpp
+++ b/src/mac/carbon/statline.cpp
@@ -5,7 +5,7 @@
 // Created:     28.06.99
 // Version:     $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/mac/carbon/statlmac.cpp b/src/mac/carbon/statlmac.cpp
index d13f45e35e..98b737dc64 100644
--- a/src/mac/carbon/statlmac.cpp
+++ b/src/mac/carbon/statlmac.cpp
@@ -5,7 +5,7 @@
 // Created:     28.06.99
 // Version:     $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp
index e2bd22ed23..4e5ced0d6d 100644
--- a/src/mac/carbon/stattext.cpp
+++ b/src/mac/carbon/stattext.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/tabctrl.cpp b/src/mac/carbon/tabctrl.cpp
index e96fb25f80..00e1cbd4b1 100644
--- a/src/mac/carbon/tabctrl.cpp
+++ b/src/mac/carbon/tabctrl.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index 96c3cc2477..d19482e647 100644
--- a/src/mac/carbon/textctrl.cpp
+++ b/src/mac/carbon/textctrl.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -1912,7 +1912,7 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
                    }
                 }
 
-                // this will make wxWindows eat the ENTER key so that
+                // this will make wxWidgets eat the ENTER key so that
                 // we actually prevent line wrapping in a single line
                 // text control
                 eat_key = TRUE;
diff --git a/src/mac/carbon/thread.cpp b/src/mac/carbon/thread.cpp
index 8aebe3bde2..ad7f278ff9 100644
--- a/src/mac/carbon/thread.cpp
+++ b/src/mac/carbon/thread.cpp
@@ -7,7 +7,7 @@
 // RCS-ID:	$Id$
 // Copyright:	(c) Wolfram Gloger (1996, 1997); Guilhem Lavaux (1998),
 //		    Vadim Zeitlin (1999) , Stefan Csomor (2000)
-// Licence:	wxWindows licence
+// Licence:	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -962,7 +962,7 @@ private:
 	MPQueueID	    m_notifyQueueId;    // its notification queue
 
     wxThreadState m_state;              // see wxThreadState enum
-    int           m_prio;               // in wxWindows units: from 0 to 100
+    int           m_prio;               // in wxWidgets units: from 0 to 100
 
     // this flag is set when the thread should terminate
     bool m_cancelled;
@@ -1092,8 +1092,8 @@ void wxThreadInternal::SetPriority( int priority)
 	if ( m_tid)
     {
 		// Mac priorities range from 1 to 10,000, with a default of 100.
-		// wxWindows priorities range from 0 to 100 with a default of 50.
-		// We can map wxWindows to Mac priorities easily by assuming
+		// wxWidgets priorities range from 0 to 100 with a default of 50.
+		// We can map wxWidgets to Mac priorities easily by assuming
 		// the former uses a logarithmic scale.
 		const unsigned int macPriority = ( int)( exp( priority / 25.0 * log( 10.0)) + 0.5);
 		
diff --git a/src/mac/carbon/timer.cpp b/src/mac/carbon/timer.cpp
index 6830dd25cb..e585798d04 100644
--- a/src/mac/carbon/timer.cpp
+++ b/src/mac/carbon/timer.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/toolbar.cpp b/src/mac/carbon/toolbar.cpp
index 4869227f6c..33c9c9db57 100644
--- a/src/mac/carbon/toolbar.cpp
+++ b/src/mac/carbon/toolbar.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     The wxWindows licence
+// Licence:     The wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/tooltip.cpp b/src/mac/carbon/tooltip.cpp
index f2793110dd..acd76b39a0 100644
--- a/src/mac/carbon/tooltip.cpp
+++ b/src/mac/carbon/tooltip.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/toplevel.cpp b/src/mac/carbon/toplevel.cpp
index 2434341adf..b9d6baed24 100644
--- a/src/mac/carbon/toplevel.cpp
+++ b/src/mac/carbon/toplevel.cpp
@@ -6,7 +6,7 @@
 // Created:     24.09.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001-2004 Stefan Csomor
-// License:     wxWindows licence
+// License:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/mac/carbon/treectrl.cpp b/src/mac/carbon/treectrl.cpp
index 7a548a7436..55254dc973 100644
--- a/src/mac/carbon/treectrl.cpp
+++ b/src/mac/carbon/treectrl.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp
index 4dc05eedf3..26a50b4769 100644
--- a/src/mac/carbon/uma.cpp
+++ b/src/mac/carbon/uma.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     The wxWindows licence
+// Licence:     The wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/defs.h"
@@ -36,7 +36,7 @@
 
 // since we have decided that we only support 8.6 upwards we are
 // checking for these minimum requirements in the startup code of
-// the application so all wxWindows code can safely assume that appearance 1.1
+// the application so all wxWidgets code can safely assume that appearance 1.1
 // windows manager, control manager, navigation services etc. are
 // present
 
diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp
index ce536a4832..57630eaf02 100644
--- a/src/mac/carbon/utils.cpp
+++ b/src/mac/carbon/utils.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/utilsexc.cpp b/src/mac/carbon/utilsexc.cpp
index f270694d38..a32b21d74d 100644
--- a/src/mac/carbon/utilsexc.cpp
+++ b/src/mac/carbon/utilsexc.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index d135688cb8..40e6c7d937 100644
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/accel.cpp b/src/mac/classic/accel.cpp
index 14aa88e53a..af6f7b2679 100644
--- a/src/mac/classic/accel.cpp
+++ b/src/mac/classic/accel.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/app.cpp b/src/mac/classic/app.cpp
index 0c4f100d2c..c2db305bfa 100644
--- a/src/mac/classic/app.cpp
+++ b/src/mac/classic/app.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -387,7 +387,7 @@ MenuEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
     return eventNotHandledErr;
 }
 
-// due to the rather low-level event API of wxWindows, we cannot use RunApplicationEventLoop
+// due to the rather low-level event API of wxWidgets, we cannot use RunApplicationEventLoop
 // but have to use ReceiveNextEvent dealing with events manually, therefore we also have
 // deal with clicks in the menu bar explicitely
 
@@ -841,15 +841,15 @@ void wxStAppResource::OpenSharedLibraryResource(const void *initBlock)
         NSModule    theModule;
         const char *theLibPath;
 
-        gSharedLibraryBundle = CFBundleGetBundleWithIdentifier(CFSTR("com.wxwindows.wxWindows"));
+        gSharedLibraryBundle = CFBundleGetBundleWithIdentifier(CFSTR("com.wxwindows.wxWidgets"));
         if (gSharedLibraryBundle != NULL) {
-            // wxWindows has been bundled into a framework
+            // wxWidgets has been bundled into a framework
             //   load the framework resources
 
             gSharedLibraryResource = CFBundleOpenBundleResourceMap(gSharedLibraryBundle);
         }
         else {
-            // wxWindows is a simple dynamic shared library
+            // wxWidgets is a simple dynamic shared library
             //   load the resources from the data fork of a separate resource file
             wxString theResPath;
             wxString theName;
diff --git a/src/mac/classic/bitmap.cpp b/src/mac/classic/bitmap.cpp
index 6cbaa9d9b7..ae5a46bc3d 100644
--- a/src/mac/classic/bitmap.cpp
+++ b/src/mac/classic/bitmap.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/bmpbuttn.cpp b/src/mac/classic/bmpbuttn.cpp
index f6ce4dd00c..3d4f733fd3 100644
--- a/src/mac/classic/bmpbuttn.cpp
+++ b/src/mac/classic/bmpbuttn.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/brush.cpp b/src/mac/classic/brush.cpp
index d484314a2c..37ab00ed93 100644
--- a/src/mac/classic/brush.cpp
+++ b/src/mac/classic/brush.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/button.cpp b/src/mac/classic/button.cpp
index 82e4e34c5f..cbd8e743ed 100644
--- a/src/mac/classic/button.cpp
+++ b/src/mac/classic/button.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/checkbox.cpp b/src/mac/classic/checkbox.cpp
index 6e6aa299b2..de6bc64e22 100644
--- a/src/mac/classic/checkbox.cpp
+++ b/src/mac/classic/checkbox.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/checklst.cpp b/src/mac/classic/checklst.cpp
index c442bbdfcb..19f436bda1 100644
--- a/src/mac/classic/checklst.cpp
+++ b/src/mac/classic/checklst.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/mac/classic/choice.cpp b/src/mac/classic/choice.cpp
index 9f8494db9a..62b1685ca2 100644
--- a/src/mac/classic/choice.cpp
+++ b/src/mac/classic/choice.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/clipbrd.cpp b/src/mac/classic/clipbrd.cpp
index e331d80f8e..78bf50c31f 100644
--- a/src/mac/classic/clipbrd.cpp
+++ b/src/mac/classic/clipbrd.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/colordlg.cpp b/src/mac/classic/colordlg.cpp
index 3c8411319b..7f1dcbfbef 100644
--- a/src/mac/classic/colordlg.cpp
+++ b/src/mac/classic/colordlg.cpp
@@ -7,7 +7,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/colour.cpp b/src/mac/classic/colour.cpp
index 86487f7a35..1a065ff8b6 100644
--- a/src/mac/classic/colour.cpp
+++ b/src/mac/classic/colour.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/combobox.cpp b/src/mac/classic/combobox.cpp
index 27aa1a58de..fe3949ea80 100644
--- a/src/mac/classic/combobox.cpp
+++ b/src/mac/classic/combobox.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/control.cpp b/src/mac/classic/control.cpp
index 473bdec9fd..895237481f 100644
--- a/src/mac/classic/control.cpp
+++ b/src/mac/classic/control.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/cursor.cpp b/src/mac/classic/cursor.cpp
index b780a675c9..4616a36cb9 100644
--- a/src/mac/classic/cursor.cpp
+++ b/src/mac/classic/cursor.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/data.cpp b/src/mac/classic/data.cpp
index 1f0bea00d2..4b446ca163 100644
--- a/src/mac/classic/data.cpp
+++ b/src/mac/classic/data.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/event.h"
diff --git a/src/mac/classic/dataobj.cpp b/src/mac/classic/dataobj.cpp
index 64dc8053d0..d2f130a23e 100644
--- a/src/mac/classic/dataobj.cpp
+++ b/src/mac/classic/dataobj.cpp
@@ -6,7 +6,7 @@
 // Created:     10/21/99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/mac/classic/dc.cpp b/src/mac/classic/dc.cpp
index 8281192642..22a423c2a9 100644
--- a/src/mac/classic/dc.cpp
+++ b/src/mac/classic/dc.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/dcclient.cpp b/src/mac/classic/dcclient.cpp
index f28c6dc576..a596683f13 100644
--- a/src/mac/classic/dcclient.cpp
+++ b/src/mac/classic/dcclient.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/dcmemory.cpp b/src/mac/classic/dcmemory.cpp
index e850a59e4d..67cffc9046 100644
--- a/src/mac/classic/dcmemory.cpp
+++ b/src/mac/classic/dcmemory.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/dcprint.cpp b/src/mac/classic/dcprint.cpp
index e875cb0387..caa8d1c3bf 100644
--- a/src/mac/classic/dcprint.cpp
+++ b/src/mac/classic/dcprint.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/dcscreen.cpp b/src/mac/classic/dcscreen.cpp
index 03d769a05b..f700c64668 100644
--- a/src/mac/classic/dcscreen.cpp
+++ b/src/mac/classic/dcscreen.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/dialog.cpp b/src/mac/classic/dialog.cpp
index c5f6c57119..59c6101aae 100644
--- a/src/mac/classic/dialog.cpp
+++ b/src/mac/classic/dialog.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/dirdlg.cpp b/src/mac/classic/dirdlg.cpp
index 0b4c7df195..17446c1aed 100644
--- a/src/mac/classic/dirdlg.cpp
+++ b/src/mac/classic/dirdlg.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/dirmac.cpp b/src/mac/classic/dirmac.cpp
index 0afc3b5cb3..66a0fbf2f3 100644
--- a/src/mac/classic/dirmac.cpp
+++ b/src/mac/classic/dirmac.cpp
@@ -6,7 +6,7 @@
 // Created:     08.12.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Stefan Csomor <csomor@advanced.ch>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/mac/classic/display.cpp b/src/mac/classic/display.cpp
index 8786306211..5196abdbdf 100644
--- a/src/mac/classic/display.cpp
+++ b/src/mac/classic/display.cpp
@@ -5,8 +5,8 @@
 // Modified by: Royce Mitchell III & Ryan Norton
 // Created:     06/21/02
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/dnd.cpp b/src/mac/classic/dnd.cpp
index 22ced39ede..3628ec5088 100644
--- a/src/mac/classic/dnd.cpp
+++ b/src/mac/classic/dnd.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/filedlg.cpp b/src/mac/classic/filedlg.cpp
index 59807f398d..c23e088b66 100644
--- a/src/mac/classic/filedlg.cpp
+++ b/src/mac/classic/filedlg.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/font.cpp b/src/mac/classic/font.cpp
index ef0ecc73b6..3ea4bcb82e 100644
--- a/src/mac/classic/font.cpp
+++ b/src/mac/classic/font.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/fontdlg.cpp b/src/mac/classic/fontdlg.cpp
index 03c894c553..4e09af901c 100644
--- a/src/mac/classic/fontdlg.cpp
+++ b/src/mac/classic/fontdlg.cpp
@@ -7,7 +7,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/fontenum.cpp b/src/mac/classic/fontenum.cpp
index 467bc95442..0cec036562 100644
--- a/src/mac/classic/fontenum.cpp
+++ b/src/mac/classic/fontenum.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/mac/classic/fontutil.cpp b/src/mac/classic/fontutil.cpp
index 1aa2298245..dbf7d0abe9 100644
--- a/src/mac/classic/fontutil.cpp
+++ b/src/mac/classic/fontutil.cpp
@@ -6,7 +6,7 @@
 // Created:     05.11.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/mac/classic/frame.cpp b/src/mac/classic/frame.cpp
index b56f24712b..a5b3a616bd 100644
--- a/src/mac/classic/frame.cpp
+++ b/src/mac/classic/frame.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/gauge.cpp b/src/mac/classic/gauge.cpp
index 01a557e17c..a247de3dd4 100644
--- a/src/mac/classic/gauge.cpp
+++ b/src/mac/classic/gauge.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/gdiobj.cpp b/src/mac/classic/gdiobj.cpp
index 528c5a7efe..5a1fff8a02 100644
--- a/src/mac/classic/gdiobj.cpp
+++ b/src/mac/classic/gdiobj.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/glcanvas.cpp b/src/mac/classic/glcanvas.cpp
index e208531ff4..b431fd10a6 100644
--- a/src/mac/classic/glcanvas.cpp
+++ b/src/mac/classic/glcanvas.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        glcanvas.cpp
-// Purpose:     wxGLCanvas, for using OpenGL with wxWindows under Macintosh
+// Purpose:     wxGLCanvas, for using OpenGL with wxWidgets under Macintosh
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/helpxxxx.cpp b/src/mac/classic/helpxxxx.cpp
index 7d0e4d1531..5b47fb5b9b 100644
--- a/src/mac/classic/helpxxxx.cpp
+++ b/src/mac/classic/helpxxxx.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/icon.cpp b/src/mac/classic/icon.cpp
index bd1937bc2a..fc07dcc5d6 100644
--- a/src/mac/classic/icon.cpp
+++ b/src/mac/classic/icon.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/joystick.cpp b/src/mac/classic/joystick.cpp
index 156b9b2657..7e38a7e75c 100644
--- a/src/mac/classic/joystick.cpp
+++ b/src/mac/classic/joystick.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/listbox.cpp b/src/mac/classic/listbox.cpp
index 8322a7a2f2..b1d70172ae 100644
--- a/src/mac/classic/listbox.cpp
+++ b/src/mac/classic/listbox.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/main.cpp b/src/mac/classic/main.cpp
index ad5bd33263..9c09c1c6b3 100644
--- a/src/mac/classic/main.cpp
+++ b/src/mac/classic/main.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // We don't put main() in the library any more. GD.
diff --git a/src/mac/classic/mdi.cpp b/src/mac/classic/mdi.cpp
index add9482e11..aa29860098 100644
--- a/src/mac/classic/mdi.cpp
+++ b/src/mac/classic/mdi.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/menu.cpp b/src/mac/classic/menu.cpp
index c7a1407ab4..2c6cebe255 100644
--- a/src/mac/classic/menu.cpp
+++ b/src/mac/classic/menu.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -18,7 +18,7 @@
 // headers & declarations
 // ============================================================================
 
-// wxWindows headers
+// wxWidgets headers
 // -----------------
 
 #include "wx/app.h"
diff --git a/src/mac/classic/menuitem.cpp b/src/mac/classic/menuitem.cpp
index 6cc3aa1a79..6bcc6e6587 100644
--- a/src/mac/classic/menuitem.cpp
+++ b/src/mac/classic/menuitem.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/mac/classic/metafile.cpp b/src/mac/classic/metafile.cpp
index 594fe43af5..d5cffd054e 100644
--- a/src/mac/classic/metafile.cpp
+++ b/src/mac/classic/metafile.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/mimetmac.cpp b/src/mac/classic/mimetmac.cpp
index 1ea83612c2..ff6ef1d39f 100644
--- a/src/mac/classic/mimetmac.cpp
+++ b/src/mac/classic/mimetmac.cpp
@@ -6,7 +6,7 @@
 // Created:     23.09.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence (part of wxExtra library)
+// Licence:     wxWidgets licence (part of wxExtra library)
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef    __GNUG__
diff --git a/src/mac/classic/minifram.cpp b/src/mac/classic/minifram.cpp
index 6b49b9bdc7..7d5aeb6f1d 100644
--- a/src/mac/classic/minifram.cpp
+++ b/src/mac/classic/minifram.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/msgdlg.cpp b/src/mac/classic/msgdlg.cpp
index 73548ad9f2..5250cb51cf 100644
--- a/src/mac/classic/msgdlg.cpp
+++ b/src/mac/classic/msgdlg.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/notebmac.cpp b/src/mac/classic/notebmac.cpp
index 9aa4fdf5b9..dadb900f3c 100644
--- a/src/mac/classic/notebmac.cpp
+++ b/src/mac/classic/notebmac.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/palette.cpp b/src/mac/classic/palette.cpp
index 60a0de6a8a..7812dbebc0 100644
--- a/src/mac/classic/palette.cpp
+++ b/src/mac/classic/palette.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/pen.cpp b/src/mac/classic/pen.cpp
index fea55ab34e..55837becff 100644
--- a/src/mac/classic/pen.cpp
+++ b/src/mac/classic/pen.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/pnghand.cpp b/src/mac/classic/pnghand.cpp
index f25141d7e9..b030b8d80b 100644
--- a/src/mac/classic/pnghand.cpp
+++ b/src/mac/classic/pnghand.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/printdlg.cpp b/src/mac/classic/printdlg.cpp
index 89f2789250..8836ea007b 100644
--- a/src/mac/classic/printdlg.cpp
+++ b/src/mac/classic/printdlg.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/printmac.cpp b/src/mac/classic/printmac.cpp
index a053eb7d80..3fbec1ed5d 100644
--- a/src/mac/classic/printmac.cpp
+++ b/src/mac/classic/printmac.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/radiobox.cpp b/src/mac/classic/radiobox.cpp
index 103d68ca44..3443c68513 100644
--- a/src/mac/classic/radiobox.cpp
+++ b/src/mac/classic/radiobox.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/radiobut.cpp b/src/mac/classic/radiobut.cpp
index 991c8be68f..7ac6facefe 100644
--- a/src/mac/classic/radiobut.cpp
+++ b/src/mac/classic/radiobut.cpp
@@ -6,7 +6,7 @@
 // Created:     ??/??/98
 // RCS-ID:      $Id$
 // Copyright:   (c) AUTHOR
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/region.cpp b/src/mac/classic/region.cpp
index a3cf8cef7b..fcf4055a2b 100644
--- a/src/mac/classic/region.cpp
+++ b/src/mac/classic/region.cpp
@@ -5,7 +5,7 @@
 // Created:   Fri Oct 24 10:46:34 MET 1997
 // RCS-ID:    $Id$
 // Copyright: (c) 1997 Stefan Csomor
-// Licence:   wxWindows licence
+// Licence:   wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/renderer.cpp b/src/mac/classic/renderer.cpp
index 8555ef47e3..fd7d44cc30 100644
--- a/src/mac/classic/renderer.cpp
+++ b/src/mac/classic/renderer.cpp
@@ -6,7 +6,7 @@
 // Created:     20.07.2003
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// License:     wxWindows license
+// License:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/mac/classic/scrolbar.cpp b/src/mac/classic/scrolbar.cpp
index 3b08c25ecc..82d6b72415 100644
--- a/src/mac/classic/scrolbar.cpp
+++ b/src/mac/classic/scrolbar.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/settings.cpp b/src/mac/classic/settings.cpp
index 4ddb2a4582..31e54059d8 100644
--- a/src/mac/classic/settings.cpp
+++ b/src/mac/classic/settings.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/slider.cpp b/src/mac/classic/slider.cpp
index 4bd4bab532..d215892a09 100644
--- a/src/mac/classic/slider.cpp
+++ b/src/mac/classic/slider.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/sound.cpp b/src/mac/classic/sound.cpp
index d6d13bb595..55ff79efd2 100644
--- a/src/mac/classic/sound.cpp
+++ b/src/mac/classic/sound.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/spinbutt.cpp b/src/mac/classic/spinbutt.cpp
index f8dcca8bd9..571da8ef1d 100644
--- a/src/mac/classic/spinbutt.cpp
+++ b/src/mac/classic/spinbutt.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/spinctrl.cpp b/src/mac/classic/spinctrl.cpp
index 22553d47f1..b244573ab2 100644
--- a/src/mac/classic/spinctrl.cpp
+++ b/src/mac/classic/spinctrl.cpp
@@ -5,7 +5,7 @@
 // Modified by: Mark Newsam (Based on GTK file)
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -321,7 +321,7 @@ void wxSpinCtrl::SetRange(int min, int max)
 
 void wxSpinCtrl::SetSelection(long from, long to)
 {
-    // if from and to are both -1, it means (in wxWindows) that all text should
+    // if from and to are both -1, it means (in wxWidgets) that all text should
     // be selected
     if ( (from == -1) && (to == -1) )
     {
diff --git a/src/mac/classic/statbmp.cpp b/src/mac/classic/statbmp.cpp
index 68bc4efa6a..88c42425cf 100644
--- a/src/mac/classic/statbmp.cpp
+++ b/src/mac/classic/statbmp.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/statbox.cpp b/src/mac/classic/statbox.cpp
index 13c7daf669..c7de2a19ea 100644
--- a/src/mac/classic/statbox.cpp
+++ b/src/mac/classic/statbox.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/statbrma.cpp b/src/mac/classic/statbrma.cpp
index b2dba2135d..1f3d3113a0 100644
--- a/src/mac/classic/statbrma.cpp
+++ b/src/mac/classic/statbrma.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/statline.cpp b/src/mac/classic/statline.cpp
index 52f3d40733..dbc34aaa73 100644
--- a/src/mac/classic/statline.cpp
+++ b/src/mac/classic/statline.cpp
@@ -5,7 +5,7 @@
 // Created:     28.06.99
 // Version:     $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/mac/classic/statlmac.cpp b/src/mac/classic/statlmac.cpp
index a7a116ba57..126c6dac69 100644
--- a/src/mac/classic/statlmac.cpp
+++ b/src/mac/classic/statlmac.cpp
@@ -5,7 +5,7 @@
 // Created:     28.06.99
 // Version:     $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/mac/classic/stattext.cpp b/src/mac/classic/stattext.cpp
index 1c0facdbf7..c1ba821386 100644
--- a/src/mac/classic/stattext.cpp
+++ b/src/mac/classic/stattext.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/tabctrl.cpp b/src/mac/classic/tabctrl.cpp
index f879b78447..9bf8e212b1 100644
--- a/src/mac/classic/tabctrl.cpp
+++ b/src/mac/classic/tabctrl.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/textctrl.cpp b/src/mac/classic/textctrl.cpp
index 2b03417c0f..811e00268b 100644
--- a/src/mac/classic/textctrl.cpp
+++ b/src/mac/classic/textctrl.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -1640,7 +1640,7 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
                    }
                 }
 
-                // this will make wxWindows eat the ENTER key so that
+                // this will make wxWidgets eat the ENTER key so that
                 // we actually prevent line wrapping in a single line
                 // text control
                 eat_key = TRUE;
diff --git a/src/mac/classic/thread.cpp b/src/mac/classic/thread.cpp
index 5e322a719d..77d12e6e8d 100644
--- a/src/mac/classic/thread.cpp
+++ b/src/mac/classic/thread.cpp
@@ -7,7 +7,7 @@
 // RCS-ID:      $Id$
 // Copyright:   (c) Wolfram Gloger (1996, 1997); Guilhem Lavaux (1998),
 //                  Vadim Zeitlin (1999) , Stefan Csomor (2000)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/timer.cpp b/src/mac/classic/timer.cpp
index 26cf3cc150..84398ef98c 100644
--- a/src/mac/classic/timer.cpp
+++ b/src/mac/classic/timer.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/toolbar.cpp b/src/mac/classic/toolbar.cpp
index d8bdac1326..5472aecead 100644
--- a/src/mac/classic/toolbar.cpp
+++ b/src/mac/classic/toolbar.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     The wxWindows licence
+// Licence:     The wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/tooltip.cpp b/src/mac/classic/tooltip.cpp
index f269196711..924295c4f0 100644
--- a/src/mac/classic/tooltip.cpp
+++ b/src/mac/classic/tooltip.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/toplevel.cpp b/src/mac/classic/toplevel.cpp
index 878c27f2a9..0149fbc37d 100644
--- a/src/mac/classic/toplevel.cpp
+++ b/src/mac/classic/toplevel.cpp
@@ -6,7 +6,7 @@
 // Created:     24.09.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001-2004 Stefan Csomor
-// License:     wxWindows licence
+// License:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/mac/classic/treectrl.cpp b/src/mac/classic/treectrl.cpp
index 7a548a7436..55254dc973 100644
--- a/src/mac/classic/treectrl.cpp
+++ b/src/mac/classic/treectrl.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/uma.cpp b/src/mac/classic/uma.cpp
index 48a7599f04..bcab201b85 100644
--- a/src/mac/classic/uma.cpp
+++ b/src/mac/classic/uma.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     The wxWindows licence
+// Licence:     The wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/defs.h"
@@ -36,7 +36,7 @@
 
 // since we have decided that we only support 8.6 upwards we are
 // checking for these minimum requirements in the startup code of
-// the application so all wxWindows code can safely assume that appearance 1.1
+// the application so all wxWidgets code can safely assume that appearance 1.1
 // windows manager, control manager, navigation services etc. are
 // present
 
diff --git a/src/mac/classic/utils.cpp b/src/mac/classic/utils.cpp
index b64f77fae0..5e157ad143 100644
--- a/src/mac/classic/utils.cpp
+++ b/src/mac/classic/utils.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/utilsexc.cpp b/src/mac/classic/utilsexc.cpp
index f270694d38..a32b21d74d 100644
--- a/src/mac/classic/utilsexc.cpp
+++ b/src/mac/classic/utilsexc.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mac/classic/window.cpp b/src/mac/classic/window.cpp
index a5c56e4202..f5b98d14eb 100644
--- a/src/mac/classic/window.cpp
+++ b/src/mac/classic/window.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/mgl/app.cpp b/src/mgl/app.cpp
index d444527ccf..caa1806696 100644
--- a/src/mgl/app.cpp
+++ b/src/mgl/app.cpp
@@ -4,7 +4,7 @@
 //              based on GTK and MSW implementations
 // Id:          $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/mgl/bitmap.cpp b/src/mgl/bitmap.cpp
index bef5fc7e40..e763a2a712 100644
--- a/src/mgl/bitmap.cpp
+++ b/src/mgl/bitmap.cpp
@@ -3,7 +3,7 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/mgl/brush.cpp b/src/mgl/brush.cpp
index 8579529fc8..47e976691f 100644
--- a/src/mgl/brush.cpp
+++ b/src/mgl/brush.cpp
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/mgl/clipbrd.cpp b/src/mgl/clipbrd.cpp
index f7d2287510..b53151e853 100644
--- a/src/mgl/clipbrd.cpp
+++ b/src/mgl/clipbrd.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/mgl/colour.cpp b/src/mgl/colour.cpp
index da27128ada..13c7be1e44 100644
--- a/src/mgl/colour.cpp
+++ b/src/mgl/colour.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/mgl/cursor.cpp b/src/mgl/cursor.cpp
index 3ec1a27da2..0bf7b4ebe2 100644
--- a/src/mgl/cursor.cpp
+++ b/src/mgl/cursor.cpp
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/src/mgl/data.cpp b/src/mgl/data.cpp
index 7e15d92ce3..af3e072dde 100644
--- a/src/mgl/data.cpp
+++ b/src/mgl/data.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/defs.h"
diff --git a/src/mgl/dc.cpp b/src/mgl/dc.cpp
index 5b4101fd20..c756ff7c64 100644
--- a/src/mgl/dc.cpp
+++ b/src/mgl/dc.cpp
@@ -5,7 +5,7 @@
 // Created:     2001/03/09
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================
diff --git a/src/mgl/dcclient.cpp b/src/mgl/dcclient.cpp
index d238dbc95c..a7dc765c21 100644
--- a/src/mgl/dcclient.cpp
+++ b/src/mgl/dcclient.cpp
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/mgl/dcmemory.cpp b/src/mgl/dcmemory.cpp
index b782d5ed47..01123359ca 100644
--- a/src/mgl/dcmemory.cpp
+++ b/src/mgl/dcmemory.cpp
@@ -5,7 +5,7 @@
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Robert Roebling, 
 //                  2001 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/mgl/dcscreen.cpp b/src/mgl/dcscreen.cpp
index 148ca94a29..d308369d6f 100644
--- a/src/mgl/dcscreen.cpp
+++ b/src/mgl/dcscreen.cpp
@@ -3,7 +3,7 @@
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/mgl/dirmgl.cpp b/src/mgl/dirmgl.cpp
index e7c59d21b4..9f618b4283 100644
--- a/src/mgl/dirmgl.cpp
+++ b/src/mgl/dirmgl.cpp
@@ -7,7 +7,7 @@
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 //              (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/mgl/evtloop.cpp b/src/mgl/evtloop.cpp
index d9fd929566..6b57b9970d 100644
--- a/src/mgl/evtloop.cpp
+++ b/src/mgl/evtloop.cpp
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// License:     wxWindows licence
+// License:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ----------------------------------------------------------------------------
diff --git a/src/mgl/font.cpp b/src/mgl/font.cpp
index 06d972feee..a1e80d353f 100644
--- a/src/mgl/font.cpp
+++ b/src/mgl/font.cpp
@@ -3,7 +3,7 @@
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/mgl/fontenum.cpp b/src/mgl/fontenum.cpp
index ee847022d3..1af6e579c7 100644
--- a/src/mgl/fontenum.cpp
+++ b/src/mgl/fontenum.cpp
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/mgl/fontutil.cpp b/src/mgl/fontutil.cpp
index 7900bda0ec..6679ca9f24 100644
--- a/src/mgl/fontutil.cpp
+++ b/src/mgl/fontutil.cpp
@@ -5,7 +5,7 @@
 // Created:     2001/04/29
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/src/mgl/gdiobj.cpp b/src/mgl/gdiobj.cpp
index 62ec4bf06d..d5de7ffeb7 100644
--- a/src/mgl/gdiobj.cpp
+++ b/src/mgl/gdiobj.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/mgl/icon.cpp b/src/mgl/icon.cpp
index bedd19a32f..307407187c 100644
--- a/src/mgl/icon.cpp
+++ b/src/mgl/icon.cpp
@@ -3,7 +3,7 @@
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/mgl/palette.cpp b/src/mgl/palette.cpp
index efc4791921..71901fa002 100644
--- a/src/mgl/palette.cpp
+++ b/src/mgl/palette.cpp
@@ -4,7 +4,7 @@
 // Created:     2001/03/11
 // Id:          $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/src/mgl/pen.cpp b/src/mgl/pen.cpp
index 686e6d46db..0c43f74af2 100644
--- a/src/mgl/pen.cpp
+++ b/src/mgl/pen.cpp
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/src/mgl/region.cpp b/src/mgl/region.cpp
index b7ba0b5c09..2614636ce5 100644
--- a/src/mgl/region.cpp
+++ b/src/mgl/region.cpp
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:      region.cpp
-// Purpose:   Region handling for wxWindows/MGL
+// Purpose:   Region handling for wxWidgets/MGL
 // Author:    Vaclav Slavik
 // RCS-ID:    $Id$
 // Copyright: (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:   wxWindows licence
+// Licence:   wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/mgl/settings.cpp b/src/mgl/settings.cpp
index 76868a7369..3111c0089d 100644
--- a/src/mgl/settings.cpp
+++ b/src/mgl/settings.cpp
@@ -3,7 +3,7 @@
 // Author:      Vaclav Slavik, Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/src/mgl/toplevel.cpp b/src/mgl/toplevel.cpp
index e75baca885..8bb3d540b2 100644
--- a/src/mgl/toplevel.cpp
+++ b/src/mgl/toplevel.cpp
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/mgl/utils.cpp b/src/mgl/utils.cpp
index 21d02155ad..3f98e977ee 100644
--- a/src/mgl/utils.cpp
+++ b/src/mgl/utils.cpp
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
diff --git a/src/mgl/window.cpp b/src/mgl/window.cpp
index ae6e6e0177..d1d9c1bbed 100644
--- a/src/mgl/window.cpp
+++ b/src/mgl/window.cpp
@@ -5,7 +5,7 @@
 //              (based on GTK & MSW implementations)
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================
diff --git a/src/motif/accel.cpp b/src/motif/accel.cpp
index 230b9fb6c5..06d85c572a 100644
--- a/src/motif/accel.cpp
+++ b/src/motif/accel.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/motif/app.cpp b/src/motif/app.cpp
index 4ff6242196..38818167c3 100644
--- a/src/motif/app.cpp
+++ b/src/motif/app.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
@@ -207,7 +207,7 @@ bool wxApp::OnInitGui()
          // if you don't log to stderr, nothing will be shown...
         delete wxLog::SetActiveTarget(new wxLogStderr);
         wxString className(wxTheApp->GetClassName());
-        wxLogError(_("wxWindows could not open display for '%s': exiting."),
+        wxLogError(_("wxWidgets could not open display for '%s': exiting."),
                    className.c_str());
         exit(-1);
     }
diff --git a/src/motif/bmpbuttn.cpp b/src/motif/bmpbuttn.cpp
index d684d7b77b..41eb2bd1e3 100644
--- a/src/motif/bmpbuttn.cpp
+++ b/src/motif/bmpbuttn.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/motif/bmpmotif.cpp b/src/motif/bmpmotif.cpp
index e588d19a87..371097b2a2 100644
--- a/src/motif/bmpmotif.cpp
+++ b/src/motif/bmpmotif.cpp
@@ -6,7 +6,7 @@
 // Created:     25/03/2003
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/motif/button.cpp b/src/motif/button.cpp
index a1afbd74be..76e5ab9276 100644
--- a/src/motif/button.cpp
+++ b/src/motif/button.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/motif/checkbox.cpp b/src/motif/checkbox.cpp
index dea61e497e..e46ff8f6bd 100644
--- a/src/motif/checkbox.cpp
+++ b/src/motif/checkbox.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/motif/checklst.cpp b/src/motif/checklst.cpp
index 84a057a818..66b814e36f 100644
--- a/src/motif/checklst.cpp
+++ b/src/motif/checklst.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/motif/choice.cpp b/src/motif/choice.cpp
index 6a24190b8e..18c3ff84a6 100644
--- a/src/motif/choice.cpp
+++ b/src/motif/choice.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/motif/clipbrd.cpp b/src/motif/clipbrd.cpp
index 4af95a45ad..95c71a0fae 100644
--- a/src/motif/clipbrd.cpp
+++ b/src/motif/clipbrd.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/motif/colour.cpp b/src/motif/colour.cpp
index 17a8a4e72b..789851b7cb 100644
--- a/src/motif/colour.cpp
+++ b/src/motif/colour.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 //// TODO: make wxColour a ref-counted object,
diff --git a/src/motif/combobox.cpp b/src/motif/combobox.cpp
index 9e052ac94e..c8b8a92fdd 100644
--- a/src/motif/combobox.cpp
+++ b/src/motif/combobox.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/motif/combobox_native.cpp b/src/motif/combobox_native.cpp
index f610a3bfab..337c890d72 100644
--- a/src/motif/combobox_native.cpp
+++ b/src/motif/combobox_native.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/03
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
diff --git a/src/motif/control.cpp b/src/motif/control.cpp
index 2f503b86ae..818f8bc176 100644
--- a/src/motif/control.cpp
+++ b/src/motif/control.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/motif/cursor.cpp b/src/motif/cursor.cpp
index 76d242f82f..fdcd08b8a2 100644
--- a/src/motif/cursor.cpp
+++ b/src/motif/cursor.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
@@ -57,7 +57,7 @@ public:
     ~wxCursorRefData();
     
     wxXCursorList m_cursors;  // wxXCursor objects, one per display
-    wxStockCursor m_cursorId; // wxWindows standard cursor id
+    wxStockCursor m_cursorId; // wxWidgets standard cursor id
 };
 
 #define M_CURSORDATA ((wxCursorRefData *)m_refData)
diff --git a/src/motif/data.cpp b/src/motif/data.cpp
index 93fae931ee..f1d5f9f26a 100644
--- a/src/motif/data.cpp
+++ b/src/motif/data.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // this file is empty for now but a translation unit is not supposed to be
diff --git a/src/motif/dataobj.cpp b/src/motif/dataobj.cpp
index fc9896cda8..3aafc17dfb 100644
--- a/src/motif/dataobj.cpp
+++ b/src/motif/dataobj.cpp
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Id:          $Id$
 // Copyright:   (c) 1998 Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/motif/dc.cpp b/src/motif/dc.cpp
index 187bf9f018..1e89c4f5cc 100644
--- a/src/motif/dc.cpp
+++ b/src/motif/dc.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/motif/dcclient.cpp b/src/motif/dcclient.cpp
index 4bbab04cea..3a5619cd9a 100644
--- a/src/motif/dcclient.cpp
+++ b/src/motif/dcclient.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 /*
diff --git a/src/motif/dcmemory.cpp b/src/motif/dcmemory.cpp
index ce07b8fdd8..fbe064c561 100644
--- a/src/motif/dcmemory.cpp
+++ b/src/motif/dcmemory.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/motif/dcscreen.cpp b/src/motif/dcscreen.cpp
index 71f3c01e54..8c98e74cfc 100644
--- a/src/motif/dcscreen.cpp
+++ b/src/motif/dcscreen.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/motif/dialog.cpp b/src/motif/dialog.cpp
index 55d0b2fbef..0f182decf7 100644
--- a/src/motif/dialog.cpp
+++ b/src/motif/dialog.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/motif/dnd.cpp b/src/motif/dnd.cpp
index 8caa37f18b..40c0f938a5 100644
--- a/src/motif/dnd.cpp
+++ b/src/motif/dnd.cpp
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Id:          $Id$
 // Copyright:   (c) 1998 Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/motif/evtloop.cpp b/src/motif/evtloop.cpp
index 782ceeab07..56a87b4312 100644
--- a/src/motif/evtloop.cpp
+++ b/src/motif/evtloop.cpp
@@ -6,7 +6,7 @@
 // Created:     01.11.02
 // RCS-ID:      $Id$
 // Copyright:   (c) 2002 Mattia Barbon
-// License:     wxWindows licence
+// License:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/motif/filedlg.cpp b/src/motif/filedlg.cpp
index c244836db6..8195ac873c 100644
--- a/src/motif/filedlg.cpp
+++ b/src/motif/filedlg.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/motif/font.cpp b/src/motif/font.cpp
index 0c82eed410..7516f1cc09 100644
--- a/src/motif/font.cpp
+++ b/src/motif/font.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/motif/frame.cpp b/src/motif/frame.cpp
index ed2bc3ca87..6d68a702d2 100644
--- a/src/motif/frame.cpp
+++ b/src/motif/frame.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -364,7 +364,7 @@ void wxFrame::DoGetClientSize(int *x, int *y) const
 }
 
 // Set the client size (i.e. leave the calculation of borders etc.
-// to wxWindows)
+// to wxWidgets)
 void wxFrame::DoSetClientSize(int width, int height)
 {
     // Calculate how large the new main window should be
diff --git a/src/motif/gauge.cpp b/src/motif/gauge.cpp
index e1e3df3601..4718acae18 100644
--- a/src/motif/gauge.cpp
+++ b/src/motif/gauge.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
@@ -611,7 +611,7 @@ WidgetClass xmGaugeWidgetClass = (WidgetClass)&xmGaugeClassRec;
 void
 GaugePick(Widget WXUNUSED(w), XEvent *WXUNUSED(e), String *WXUNUSED(args), Cardinal  *WXUNUSED(num_args))
 {
-    /* Commented out for a read-only gauge in wxWindows */
+    /* Commented out for a read-only gauge in wxWidgets */
 #if 0
     XmGaugeWidget gw = (XmGaugeWidget)w;
 #define THIS gw->gauge
@@ -677,7 +677,7 @@ GaugePick(Widget WXUNUSED(w), XEvent *WXUNUSED(e), String *WXUNUSED(args), Cardi
 void
 GaugeDrag(Widget WXUNUSED(w), XEvent *WXUNUSED(e), String *WXUNUSED(args), Cardinal  *WXUNUSED(num_args))
 {
-    /* Commented out for a read-only gauge in wxWindows */
+    /* Commented out for a read-only gauge in wxWidgets */
 #if 0
     XmGaugeWidget gw = (XmGaugeWidget)w;
 #define THIS gw->gauge
@@ -746,7 +746,7 @@ GaugeDrag(Widget WXUNUSED(w), XEvent *WXUNUSED(e), String *WXUNUSED(args), Cardi
 void
 GaugeDrop(Widget WXUNUSED(w), XEvent *WXUNUSED(e), String *WXUNUSED(args), Cardinal  *WXUNUSED(num_args))
 {
-    /* Commented out for a read-only gauge in wxWindows */
+    /* Commented out for a read-only gauge in wxWidgets */
 #if 0
     XmGaugeWidget gw = (XmGaugeWidget)w;
 #define THIS gw->gauge
diff --git a/src/motif/gdiobj.cpp b/src/motif/gdiobj.cpp
index 89a00f8370..1229662f6c 100644
--- a/src/motif/gdiobj.cpp
+++ b/src/motif/gdiobj.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/motif/gsockmot.c b/src/motif/gsockmot.c
index e4904f6610..f4669c63d1 100644
--- a/src/motif/gsockmot.c
+++ b/src/motif/gsockmot.c
@@ -3,7 +3,7 @@
  * Name:    gsockmot.c
  * Purpose: GSocket: Motif part
  * CVSID:   $Id$
- * Licence: The wxWindows licence
+ * Licence: The wxWidgets licence
  * ------------------------------------------------------------------------- */
 
 #include "wx/setup.h"
diff --git a/src/motif/gsockmot.cpp b/src/motif/gsockmot.cpp
index e4904f6610..f4669c63d1 100644
--- a/src/motif/gsockmot.cpp
+++ b/src/motif/gsockmot.cpp
@@ -3,7 +3,7 @@
  * Name:    gsockmot.c
  * Purpose: GSocket: Motif part
  * CVSID:   $Id$
- * Licence: The wxWindows licence
+ * Licence: The wxWidgets licence
  * ------------------------------------------------------------------------- */
 
 #include "wx/setup.h"
diff --git a/src/motif/icon.cpp b/src/motif/icon.cpp
index 2006a62b4e..27df93ff29 100644
--- a/src/motif/icon.cpp
+++ b/src/motif/icon.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/motif/listbox.cpp b/src/motif/listbox.cpp
index 47016d85bc..71a7f7b3ab 100644
--- a/src/motif/listbox.cpp
+++ b/src/motif/listbox.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/motif/main.cpp b/src/motif/main.cpp
index f904fa1f1e..9285555401 100644
--- a/src/motif/main.cpp
+++ b/src/motif/main.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // We don't put main() in the library any more. GD.
diff --git a/src/motif/mdi.cpp b/src/motif/mdi.cpp
index 22a20fb5e8..28871a63e0 100644
--- a/src/motif/mdi.cpp
+++ b/src/motif/mdi.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
@@ -491,7 +491,7 @@ void wxMDIChildFrame::OnLower()
 #endif
 
 // Set the client size (i.e. leave the calculation of borders etc.
-// to wxWindows)
+// to wxWidgets)
 void wxMDIChildFrame::DoSetClientSize(int width, int height)
 {
     wxWindow::DoSetClientSize(width, height);
diff --git a/src/motif/menu.cpp b/src/motif/menu.cpp
index 1ec07c6b31..d08b9fe4d3 100644
--- a/src/motif/menu.cpp
+++ b/src/motif/menu.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -542,7 +542,7 @@ WXWidget wxMenu::CreateMenu (wxMenuBar * menuBar, WXWidget parent, wxMenu * topM
 }
 
 // Destroys the Motif implementation of the menu,
-// but maintains the wxWindows data structures so we can
+// but maintains the wxWidgets data structures so we can
 // do a CreateMenu again.
 void wxMenu::DestroyMenu (bool full)
 {
diff --git a/src/motif/menuitem.cpp b/src/motif/menuitem.cpp
index b77709f6d6..48755a9adb 100644
--- a/src/motif/menuitem.cpp
+++ b/src/motif/menuitem.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/motif/minifram.cpp b/src/motif/minifram.cpp
index 50524f2452..4cfebd2163 100644
--- a/src/motif/minifram.cpp
+++ b/src/motif/minifram.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/motif/msgdlg.cpp b/src/motif/msgdlg.cpp
index 0a03aabe8b..de6e1827f1 100644
--- a/src/motif/msgdlg.cpp
+++ b/src/motif/msgdlg.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/motif/palette.cpp b/src/motif/palette.cpp
index 7ede19b4c9..39990d9020 100644
--- a/src/motif/palette.cpp
+++ b/src/motif/palette.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 /*
@@ -20,7 +20,7 @@
 
 /* Wolfram Gloger <u7y22ab@sunmail.lrz-muenchen.de>
 I have implemented basic colormap support for the X11 versions of
-wxWindows, notably wxPalette::Create().  The way I did it is to
+wxWidgets, notably wxPalette::Create().  The way I did it is to
 allocate additional read-only color cells in the default colormap.  In
 general you will get arbitrary pixel values assigned to these new
 cells and therefore I added a method wxColourMap::TransferBitmap()
diff --git a/src/motif/popupwin.cpp b/src/motif/popupwin.cpp
index 8d4ce0915d..100927e453 100644
--- a/src/motif/popupwin.cpp
+++ b/src/motif/popupwin.cpp
@@ -6,7 +6,7 @@
 // Created:     28.08.03
 // RCS-ID:      $Id$
 // Copyright:   (c) Mattia barbon
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/motif/radiobox.cpp b/src/motif/radiobox.cpp
index c21d758ecd..210fdc5b60 100644
--- a/src/motif/radiobox.cpp
+++ b/src/motif/radiobox.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/motif/radiobut.cpp b/src/motif/radiobut.cpp
index 629a007915..2468f2cb37 100644
--- a/src/motif/radiobut.cpp
+++ b/src/motif/radiobut.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/motif/scrolbar.cpp b/src/motif/scrolbar.cpp
index 3d17e927af..a1e03f4b7d 100644
--- a/src/motif/scrolbar.cpp
+++ b/src/motif/scrolbar.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/motif/settings.cpp b/src/motif/settings.cpp
index 054bc38821..b7d25deadf 100644
--- a/src/motif/settings.cpp
+++ b/src/motif/settings.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // TODO: these settings should probably be configurable from some central or
diff --git a/src/motif/slider.cpp b/src/motif/slider.cpp
index e11f1bb9ce..2e5b374362 100644
--- a/src/motif/slider.cpp
+++ b/src/motif/slider.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/motif/spinbutt.cpp b/src/motif/spinbutt.cpp
index ca3a6e2af1..3d30a760ed 100644
--- a/src/motif/spinbutt.cpp
+++ b/src/motif/spinbutt.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/motif/statbmp.cpp b/src/motif/statbmp.cpp
index 215a77c3d3..b9259f8d3a 100644
--- a/src/motif/statbmp.cpp
+++ b/src/motif/statbmp.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/motif/statbox.cpp b/src/motif/statbox.cpp
index 5bdf05ea04..fa6b80056a 100644
--- a/src/motif/statbox.cpp
+++ b/src/motif/statbox.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/motif/stattext.cpp b/src/motif/stattext.cpp
index 2e0b136205..06012029a1 100644
--- a/src/motif/stattext.cpp
+++ b/src/motif/stattext.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/motif/textctrl.cpp b/src/motif/textctrl.cpp
index 090da09f5a..3277f3ab99 100644
--- a/src/motif/textctrl.cpp
+++ b/src/motif/textctrl.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/motif/timer.cpp b/src/motif/timer.cpp
index 8fab6d35c1..7fc728a089 100644
--- a/src/motif/timer.cpp
+++ b/src/motif/timer.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/motif/toolbar.cpp b/src/motif/toolbar.cpp
index 00da4412b6..4d29622f0a 100644
--- a/src/motif/toolbar.cpp
+++ b/src/motif/toolbar.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/motif/toplevel.cpp b/src/motif/toplevel.cpp
index 7555346227..3508e64b81 100644
--- a/src/motif/toplevel.cpp
+++ b/src/motif/toplevel.cpp
@@ -6,7 +6,7 @@
 // Created:     12/10/2002
 // RCS-ID:      $Id$
 // Copyright:   (c) Mattia Barbon
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/motif/utils.cpp b/src/motif/utils.cpp
index 6fd4988224..47007e6e83 100644
--- a/src/motif/utils.cpp
+++ b/src/motif/utils.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/motif/window.cpp b/src/motif/window.cpp
index fb6a636e1a..34b1e65c38 100644
--- a/src/motif/window.cpp
+++ b/src/motif/window.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -1596,7 +1596,7 @@ void wxWindow::DoPaint()
       // otherwise we don't know how many pixels have been scrolled. We might
       // solve this in the future by defining virtual wxWindow functions to get
       // the scroll position in pixels. Or, each kind of scrolled window has to
-      // implement backing stores itself, using generic wxWindows code.
+      // implement backing stores itself, using generic wxWidgets code.
       wxScrolledWindow* scrolledWindow = wxDynamicCast(this, wxScrolledWindow);
       if ( scrolledWindow )
       {
@@ -1764,7 +1764,7 @@ bool wxWindow::ProcessAccelerator(wxKeyEvent& event)
 // ============================================================================
 
 // ----------------------------------------------------------------------------
-// function which maintain the global hash table mapping Widgets to wxWindows
+// function which maintain the global hash table mapping Widgets to wxWidgets
 // ----------------------------------------------------------------------------
 
 bool wxAddWindowToTable(Widget w, wxWindow *win)
@@ -2333,7 +2333,7 @@ bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win,
             int x2, y2;
             win->GetPosition(&x2, &y2);
 
-            // The button x/y must be translated to wxWindows
+            // The button x/y must be translated to wxWidgets
             // window space - the widget might be a label or button,
             // within a form.
             int dx = 0;
diff --git a/src/msw/accel.cpp b/src/msw/accel.cpp
index 5f82d74601..a8f2b551cf 100644
--- a/src/msw/accel.cpp
+++ b/src/msw/accel.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 6c4e94bacd..f055309fe2 100644
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================
@@ -286,7 +286,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
         (
          NULL,
          _T("This program uses Unicode and requires Windows NT/2000/XP/CE.\nProgram aborted."),
-         _T("wxWindows Fatal Error"),
+         _T("wxWidgets Fatal Error"),
          MB_ICONERROR | MB_OK
         );
 
@@ -334,7 +334,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
         wxDisableButtonBrush = ::CreateBrushIndirect( & lb );
         ::DeleteObject( (HGDIOBJ)lb.lbHatch );
     }
-    //else: wxWindows resources are probably not linked in
+    //else: wxWidgets resources are probably not linked in
 #endif
 
 #if wxUSE_PENWINDOWS
@@ -770,7 +770,7 @@ bool wxApp::Yield(bool onlyIfNeeded)
 bool wxApp::OnExceptionInMainLoop()
 {
     // ask the user about what to do: use the Win32 API function here as it
-    // could be dangerous to use any wxWindows code in this state
+    // could be dangerous to use any wxWidgets code in this state
     switch (
             ::MessageBox
               (
diff --git a/src/msw/basemsw.cpp b/src/msw/basemsw.cpp
index 76cbb8ad4b..67449d094a 100644
--- a/src/msw/basemsw.cpp
+++ b/src/msw/basemsw.cpp
@@ -6,7 +6,7 @@
 // Created:     22.06.2003
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// License:     wxWindows license
+// License:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp
index f0c834bb24..6a3eb38191 100644
--- a/src/msw/bitmap.cpp
+++ b/src/msw/bitmap.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/msw/bmpbuttn.cpp b/src/msw/bmpbuttn.cpp
index bb2e787838..1465f35008 100644
--- a/src/msw/bmpbuttn.cpp
+++ b/src/msw/bmpbuttn.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/msw/brush.cpp b/src/msw/brush.cpp
index 29161607c3..5eae40c16a 100644
--- a/src/msw/brush.cpp
+++ b/src/msw/brush.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/msw/button.cpp b/src/msw/button.cpp
index 21fc5bab19..7ec5cbb742 100644
--- a/src/msw/button.cpp
+++ b/src/msw/button.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -285,7 +285,7 @@ wxSize wxButtonBase::GetDefaultSize()
    NB: all this is quite complicated by now and the worst is that normally
        it shouldn't be necessary at all as for the normal Windows programs
        DefWindowProc() and IsDialogMessage() take care of all this
-       automatically -- however in wxWindows programs this doesn't work for
+       automatically -- however in wxWidgets programs this doesn't work for
        nested hierarchies (i.e. a notebook inside a notebook) for unknown
        reason and so we have to reproduce all this code ourselves. It would be
        very nice if we could avoid doing it.
@@ -298,7 +298,7 @@ void wxButton::SetDefault()
 
     wxCHECK_RET( parent, _T("button without parent?") );
 
-    // set this one as the default button both for wxWindows ...
+    // set this one as the default button both for wxWidgets ...
     wxWindow *winOldDefault = parent->SetDefaultItem(this);
 
     // ... and Windows
diff --git a/src/msw/caret.cpp b/src/msw/caret.cpp
index a043aa174a..4c9d844c12 100644
--- a/src/msw/caret.cpp
+++ b/src/msw/caret.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     23.05.99
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================
diff --git a/src/msw/checkbox.cpp b/src/msw/checkbox.cpp
index f596c6a408..316735594c 100644
--- a/src/msw/checkbox.cpp
+++ b/src/msw/checkbox.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/msw/checklst.cpp b/src/msw/checklst.cpp
index bebe3235f3..5657d50088 100644
--- a/src/msw/checklst.cpp
+++ b/src/msw/checklst.cpp
@@ -6,7 +6,7 @@
 // Created:     16.11.97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/msw/choice.cpp b/src/msw/choice.cpp
index af029bf042..d1fa5f71f4 100644
--- a/src/msw/choice.cpp
+++ b/src/msw/choice.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/msw/clipbrd.cpp b/src/msw/clipbrd.cpp
index 49cc833ca9..5ad400b60a 100644
--- a/src/msw/clipbrd.cpp
+++ b/src/msw/clipbrd.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================
diff --git a/src/msw/colordlg.cpp b/src/msw/colordlg.cpp
index 53eed0cca9..2398e1bc76 100644
--- a/src/msw/colordlg.cpp
+++ b/src/msw/colordlg.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/msw/colour.cpp b/src/msw/colour.cpp
index 93f059049b..f59c3fd2b2 100644
--- a/src/msw/colour.cpp
+++ b/src/msw/colour.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp
index 6e07138a37..edbf672ccb 100644
--- a/src/msw/combobox.cpp
+++ b/src/msw/combobox.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -573,7 +573,7 @@ void wxComboBox::SetSelection(long from, long to)
     long fromChar = from;
     long toChar = to;
     // if from and to are both -1, it means
-    // (in wxWindows) that all text should be selected.
+    // (in wxWidgets) that all text should be selected.
     // This translates into Windows convention
     if ((from == -1) && (to == -1))
     {
diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index a4b4718831..b3b6a90039 100644
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -119,7 +119,7 @@ bool wxControl::MSWCreateControl(const wxChar *classname,
     // all controls should have this style
     style |= WS_CHILD;
 
-    // create the control visible if it's currently shown for wxWindows
+    // create the control visible if it's currently shown for wxWidgets
     if ( m_isShown )
     {
         style |= WS_VISIBLE;
@@ -163,7 +163,7 @@ bool wxControl::MSWCreateControl(const wxChar *classname,
     }
 #endif // wxUSE_CTL3D
 
-    // install wxWindows window proc for this window
+    // install wxWidgets window proc for this window
     SubclassWin(m_hWnd);
 
     // set up fonts and colours
diff --git a/src/msw/crashrpt.cpp b/src/msw/crashrpt.cpp
index 7762c9848a..1f20ef3391 100644
--- a/src/msw/crashrpt.cpp
+++ b/src/msw/crashrpt.cpp
@@ -6,7 +6,7 @@
 // Created:     13.07.03
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 /*
@@ -173,7 +173,7 @@ enum SymbolTag
 // ----------------------------------------------------------------------------
 
 // low level wxBusyCursor replacement: we use Win32 API directly here instead
-// of going through wxWindows calls as this could be dangerous
+// of going through wxWidgets calls as this could be dangerous
 class BusyCursor
 {
 public:
@@ -1220,7 +1220,7 @@ bool wxCrashReportImpl::Generate(
 
 #else // !wxUSE_DBGHELP
     Output(_T("Support for crash report generation was not included ")
-           _T("in this wxWindows version."));
+           _T("in this wxWidgets version."));
 #endif // wxUSE_DBGHELP/!wxUSE_DBGHELP
 
     return false;
diff --git a/src/msw/cursor.cpp b/src/msw/cursor.cpp
index bd27803b40..c18fe15a4e 100644
--- a/src/msw/cursor.cpp
+++ b/src/msw/cursor.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997-2003 Julian Smart and Vadim Zeitlin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -278,7 +278,7 @@ wxCursor::wxCursor(const wxString& filename,
 // Cursors by stock number
 wxCursor::wxCursor(int idCursor)
 {
-    // all wxWindows standard cursors
+    // all wxWidgets standard cursors
     static const struct StdCursor
     {
         // is this a standard Windows cursor?
diff --git a/src/msw/data.cpp b/src/msw/data.cpp
index 04abb7f531..4618007133 100644
--- a/src/msw/data.cpp
+++ b/src/msw/data.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
index 357f6b40f4..ee2cc1dc4a 100644
--- a/src/msw/dc.cpp
+++ b/src/msw/dc.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================
@@ -224,7 +224,7 @@ wxColourChanger::wxColourChanger(wxDC& dc) : m_dc(dc)
         m_colFgOld = ::GetTextColor(hdc);
         m_colBgOld = ::GetBkColor(hdc);
 
-        // note that Windows convention is opposite to wxWindows one, this is
+        // note that Windows convention is opposite to wxWidgets one, this is
         // why text colour becomes the background one and vice versa
         const wxColour& colFg = dc.GetTextForeground();
         if ( colFg.Ok() )
@@ -1082,7 +1082,7 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask
         // use MaskBlt() with ROP which doesn't do anything to dst in the mask
         // points
         // On some systems, MaskBlt succeeds yet is much much slower
-        // than the wxWindows fall-back implementation. So we need
+        // than the wxWidgets fall-back implementation. So we need
         // to be able to switch this on and off at runtime.
         bool ok = false;
 #if wxUSE_SYSTEM_OPTIONS
@@ -1973,7 +1973,7 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
         // of the mask which is also contrary to the Windows one)
 
         // On some systems, MaskBlt succeeds yet is much much slower
-        // than the wxWindows fall-back implementation. So we need
+        // than the wxWidgets fall-back implementation. So we need
         // to be able to switch this on and off at runtime.
 #if wxUSE_SYSTEM_OPTIONS
         if (wxSystemOptions::GetOptionInt(wxT("no-maskblt")) == 0)
@@ -2228,7 +2228,7 @@ wxSize wxDC::GetPPI() const
     return wxSize(x, y);
 }
 
-// For use by wxWindows only, unless custom units are required.
+// For use by wxWidgets only, unless custom units are required.
 void wxDC::SetLogicalScale(double x, double y)
 {
     WXMICROWIN_CHECK_HDC
diff --git a/src/msw/dcclient.cpp b/src/msw/dcclient.cpp
index 0093ebeaa5..99ec584b4a 100644
--- a/src/msw/dcclient.cpp
+++ b/src/msw/dcclient.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================
@@ -76,7 +76,7 @@ static PAINTSTRUCT g_paintStruct;
 #ifdef __WXDEBUG__
     // a global variable which we check to verify that wxPaintDC are only
     // created in resopnse to WM_PAINT message - doing this from elsewhere is a
-    // common programming error among wxWindows programmers and might lead to
+    // common programming error among wxWidgets programmers and might lead to
     // very subtle and difficult to debug refresh/repaint bugs.
     int g_isPainting = 0;
 #endif // __WXDEBUG__
diff --git a/src/msw/dcmemory.cpp b/src/msw/dcmemory.cpp
index 3427da41a1..4777e6986c 100644
--- a/src/msw/dcmemory.cpp
+++ b/src/msw/dcmemory.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/msw/dcprint.cpp b/src/msw/dcprint.cpp
index 819514bb60..c55eee4d39 100644
--- a/src/msw/dcprint.cpp
+++ b/src/msw/dcprint.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/msw/dcscreen.cpp b/src/msw/dcscreen.cpp
index a6f3948d1b..def411e0a6 100644
--- a/src/msw/dcscreen.cpp
+++ b/src/msw/dcscreen.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/msw/dde.cpp b/src/msw/dde.cpp
index 6554c530de..11641aeb8b 100644
--- a/src/msw/dde.cpp
+++ b/src/msw/dde.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp
index 67f6fec036..a0fecfed09 100644
--- a/src/msw/dialog.cpp
+++ b/src/msw/dialog.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/msw/dialup.cpp b/src/msw/dialup.cpp
index 3ef963a5f5..614556fb7f 100644
--- a/src/msw/dialup.cpp
+++ b/src/msw/dialup.cpp
@@ -6,7 +6,7 @@
 // Created:     07.07.99
 // RCS-ID:      $Id$
 // Copyright:   (c) Vadim Zeitlin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/msw/dib.cpp b/src/msw/dib.cpp
index 8da2f37757..21a5c2fc95 100644
--- a/src/msw/dib.cpp
+++ b/src/msw/dib.cpp
@@ -6,7 +6,7 @@
 // Created:     03.03.03 (replaces the old file with the same name)
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// License:     wxWindows licence
+// License:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 /*
diff --git a/src/msw/dir.cpp b/src/msw/dir.cpp
index fc9c933185..945b87e62d 100644
--- a/src/msw/dir.cpp
+++ b/src/msw/dir.cpp
@@ -6,7 +6,7 @@
 // Created:     08.12.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/msw/dirdlg.cpp b/src/msw/dirdlg.cpp
index bf9a67c590..fd07be3b91 100644
--- a/src/msw/dirdlg.cpp
+++ b/src/msw/dirdlg.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -70,7 +70,7 @@
 #endif
 
 // ----------------------------------------------------------------------------
-// wxWindows macros
+// wxWidgets macros
 // ----------------------------------------------------------------------------
 
 IMPLEMENT_CLASS(wxDirDialog, wxDialog)
diff --git a/src/msw/display.cpp b/src/msw/display.cpp
index 2758483bba..4ba49adf62 100644
--- a/src/msw/display.cpp
+++ b/src/msw/display.cpp
@@ -5,8 +5,8 @@
 // Modified by: VZ (resolutions enumeration/change support, DirectDraw, ...)
 // Created:     06/21/02
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================
diff --git a/src/msw/dragimag.cpp b/src/msw/dragimag.cpp
index 0789752ef0..c67eda693b 100644
--- a/src/msw/dragimag.cpp
+++ b/src/msw/dragimag.cpp
@@ -6,7 +6,7 @@
 // Created:     08/04/99
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/msw/dummy.cpp b/src/msw/dummy.cpp
index b4a58ed66a..7ca9d8a4d4 100644
--- a/src/msw/dummy.cpp
+++ b/src/msw/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/src/msw/enhmeta.cpp b/src/msw/enhmeta.cpp
index 73c04b84db..0c059a5c5d 100644
--- a/src/msw/enhmeta.cpp
+++ b/src/msw/enhmeta.cpp
@@ -6,7 +6,7 @@
 // Created:     13.01.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/msw/evtloop.cpp b/src/msw/evtloop.cpp
index 80be767371..3cf5712665 100644
--- a/src/msw/evtloop.cpp
+++ b/src/msw/evtloop.cpp
@@ -6,7 +6,7 @@
 // Created:     01.06.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// License:     wxWindows licence
+// License:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/msw/fdrepdlg.cpp b/src/msw/fdrepdlg.cpp
index b6acec5dab..964addb156 100644
--- a/src/msw/fdrepdlg.cpp
+++ b/src/msw/fdrepdlg.cpp
@@ -6,7 +6,7 @@
 // Created:     23/03/2001
 // RCS-ID:
 // Copyright:   (c) Markus Greither
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp
index 775affb082..7adedb7f72 100644
--- a/src/msw/filedlg.cpp
+++ b/src/msw/filedlg.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/msw/font.cpp b/src/msw/font.cpp
index 392b305357..0b97204493 100644
--- a/src/msw/font.cpp
+++ b/src/msw/font.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -457,7 +457,7 @@ wxFontEncoding wxNativeFontInfo::GetEncoding() const
 void wxNativeFontInfo::SetPointSize(int pointsize)
 {
 #if wxFONT_SIZE_COMPATIBILITY
-    // Incorrect, but compatible with old wxWindows behaviour
+    // Incorrect, but compatible with old wxWidgets behaviour
     lf.lfHeight = (pointSize*ppInch)/72;
 #else // wxFONT_SIZE_COMPATIBILITY
     // FIXME: using the screen here results in incorrect font size calculation
diff --git a/src/msw/fontdlg.cpp b/src/msw/fontdlg.cpp
index bffa169a38..2cca4b270e 100644
--- a/src/msw/fontdlg.cpp
+++ b/src/msw/fontdlg.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/msw/fontenum.cpp b/src/msw/fontenum.cpp
index 7ee7852e02..ed22b7406d 100644
--- a/src/msw/fontenum.cpp
+++ b/src/msw/fontenum.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/msw/fontutil.cpp b/src/msw/fontutil.cpp
index 6ab9f34d8f..1cc59c3cf7 100644
--- a/src/msw/fontutil.cpp
+++ b/src/msw/fontutil.cpp
@@ -6,7 +6,7 @@
 // Created:     05.11.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index 4b7181dd03..49b31709c3 100644
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/msw/gauge95.cpp b/src/msw/gauge95.cpp
index 6b176c92ec..cd06fdf42a 100644
--- a/src/msw/gauge95.cpp
+++ b/src/msw/gauge95.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/msw/gdiimage.cpp b/src/msw/gdiimage.cpp
index 26cabaa71c..49a70f8740 100644
--- a/src/msw/gdiimage.cpp
+++ b/src/msw/gdiimage.cpp
@@ -6,7 +6,7 @@
 // Created:     20.11.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/msw/gdiobj.cpp b/src/msw/gdiobj.cpp
index de94cd9d54..fb4550b49a 100644
--- a/src/msw/gdiobj.cpp
+++ b/src/msw/gdiobj.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/msw/glcanvas.cpp b/src/msw/glcanvas.cpp
index c5a0523d00..2ea0912880 100644
--- a/src/msw/glcanvas.cpp
+++ b/src/msw/glcanvas.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/msw/glcanvas.cpp
-// Purpose:     wxGLCanvas, for using OpenGL with wxWindows under MS Windows
+// Purpose:     wxGLCanvas, for using OpenGL with wxWidgets under MS Windows
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
@@ -46,7 +46,7 @@ WX_CHECK_BUILD_OPTIONS("wxGL")
   these two libraries to either the Makefile or project file.
 
   This is NOT a recommended technique, and certainly is unlikely to be used
-  anywhere else in wxWindows given it is so specific to not only wxMSW, but
+  anywhere else in wxWidgets given it is so specific to not only wxMSW, but
   also the VC compiler. However, in the case of opengl support, it's an
   applicable technique as opengl is optional in setup.h This code (wrapped by
   wxUSE_GLCANVAS), now allows opengl support to be added purely by modifying
diff --git a/src/msw/gsocket.c b/src/msw/gsocket.c
index 86cfc7b913..363eabc409 100644
--- a/src/msw/gsocket.c
+++ b/src/msw/gsocket.c
@@ -3,7 +3,7 @@
  * Name:    gsocket.c
  * Author:  Guillermo Rodriguez Garcia <guille@iies.es>
  * Purpose: GSocket main MSW file
- * Licence: The wxWindows licence
+ * Licence: The wxWidgets licence
  * CVSID:   $Id$
  * -------------------------------------------------------------------------
  */
diff --git a/src/msw/gsockmsw.c b/src/msw/gsockmsw.c
index 4ff547fe94..6a4ead800b 100644
--- a/src/msw/gsockmsw.c
+++ b/src/msw/gsockmsw.c
@@ -68,7 +68,7 @@ HINSTANCE wxGetInstance(void);
 #include "gsockmsw.h"
 #include "gsocket.h"
 
-/* If not using wxWindows, a global var called hInst must
+/* If not using wxWidgets, a global var called hInst must
  * be available and it must contain the app's instance
  * handle.
  */
diff --git a/src/msw/gsockmsw.cpp b/src/msw/gsockmsw.cpp
index a51169eaf0..adc76cb0fc 100644
--- a/src/msw/gsockmsw.cpp
+++ b/src/msw/gsockmsw.cpp
@@ -55,7 +55,7 @@ HINSTANCE wxGetInstance(void);
 #include "gsockmsw.h"
 #include "gsocket.h"
 
-/* If not using wxWindows, a global var called hInst must
+/* If not using wxWidgets, a global var called hInst must
  * be available and it must contain the app's instance
  * handle.
  */
diff --git a/src/msw/helpbest.cpp b/src/msw/helpbest.cpp
index bb1aad5059..a83f3702d7 100644
--- a/src/msw/helpbest.cpp
+++ b/src/msw/helpbest.cpp
@@ -6,7 +6,7 @@
 // Created:     02/04/2001
 // RCS-ID:      $Id$
 // Copyright:   (c) Mattia Barbon
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/msw/helpchm.cpp b/src/msw/helpchm.cpp
index 7ad6367747..1acd5bb4b5 100644
--- a/src/msw/helpchm.cpp
+++ b/src/msw/helpchm.cpp
@@ -6,7 +6,7 @@
 // Created:     16/04/2000
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/msw/helpwin.cpp b/src/msw/helpwin.cpp
index abaa425609..735109129d 100644
--- a/src/msw/helpwin.cpp
+++ b/src/msw/helpwin.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/msw/icon.cpp b/src/msw/icon.cpp
index 9064101a53..b38f7aacbf 100644
--- a/src/msw/icon.cpp
+++ b/src/msw/icon.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/msw/imaglist.cpp b/src/msw/imaglist.cpp
index e0a5d3a76e..42db9c1986 100644
--- a/src/msw/imaglist.cpp
+++ b/src/msw/imaglist.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -327,7 +327,7 @@ static HBITMAP GetMaskForImage(const wxBitmap& bitmap, const wxBitmap& mask)
         hbmpMask = (HBITMAP)pMask->GetMaskBitmap();
     }
 
-    // windows mask convention is opposite to the wxWindows one
+    // windows mask convention is opposite to the wxWidgets one
     HBITMAP hbmpMaskInv = wxInvertMask(hbmpMask);
 
     if ( deleteMask )
diff --git a/src/msw/iniconf.cpp b/src/msw/iniconf.cpp
index 0184d5ab1f..0c20850122 100644
--- a/src/msw/iniconf.cpp
+++ b/src/msw/iniconf.cpp
@@ -6,7 +6,7 @@
 // Created:     27.07.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/msw/joystick.cpp b/src/msw/joystick.cpp
index ac154cde1b..96c6d7d136 100644
--- a/src/msw/joystick.cpp
+++ b/src/msw/joystick.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/msw/listbox.cpp b/src/msw/listbox.cpp
index 61634811fa..e45103c7b1 100644
--- a/src/msw/listbox.cpp
+++ b/src/msw/listbox.cpp
@@ -6,7 +6,7 @@
 // Created:
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp
index 5fc412bb6b..e8d9f5b28f 100644
--- a/src/msw/listctrl.cpp
+++ b/src/msw/listctrl.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -1936,7 +1936,7 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 
             case LVN_ITEMCHANGED:
                 // we translate this catch all message into more interesting
-                // (and more easy to process) wxWindows events
+                // (and more easy to process) wxWidgets events
 
                 // first of all, we deal with the state change events only and
                 // only for valid items (item == -1 for the virtual list
diff --git a/src/msw/main.cpp b/src/msw/main.cpp
index 1a136df962..a9ba8c4081 100644
--- a/src/msw/main.cpp
+++ b/src/msw/main.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -34,7 +34,7 @@
 
 #include "wx/msw/private.h"
 
-// Don't implement WinMain if we're building an MFC/wxWindows hybrid app.
+// Don't implement WinMain if we're building an MFC/wxWidgets hybrid app.
 #if wxUSE_MFC && !defined(NOMAIN)
     #define NOMAIN 1
 #endif
@@ -107,7 +107,7 @@ extern "C"
 // ----------------------------------------------------------------------------
 
 // Note that WinMain is also defined in dummy.obj, which is linked to
-// an application that is using the DLL version of wxWindows.
+// an application that is using the DLL version of wxWidgets.
 
 #if defined(_WINDLL)
 
@@ -117,7 +117,7 @@ BOOL WINAPI
 DllMain(HANDLE hModule, DWORD fdwReason, LPVOID WXUNUSED(lpReserved))
 {
     // Only call wxEntry if the application itself is part of the DLL.
-    // If only the wxWindows library is in the DLL, then the
+    // If only the wxWidgets library is in the DLL, then the
     // initialisation will be called when the application implicitly
     // calls WinMain.
 #ifndef WXMAKINGDLL
diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp
index e8c4b63a79..210013f15f 100644
--- a/src/msw/mdi.cpp
+++ b/src/msw/mdi.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================
@@ -742,7 +742,7 @@ wxMDIChildFrame::~wxMDIChildFrame()
 }
 
 // Set the client size (i.e. leave the calculation of borders etc.
-// to wxWindows)
+// to wxWidgets)
 void wxMDIChildFrame::DoSetClientSize(int width, int height)
 {
   HWND hWnd = GetHwnd();
diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp
index 385c7fb320..1dcb9d6740 100644
--- a/src/msw/menu.cpp
+++ b/src/msw/menu.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================
diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp
index 2acfe24a1b..51d50bcb49 100644
--- a/src/msw/menuitem.cpp
+++ b/src/msw/menuitem.cpp
@@ -6,7 +6,7 @@
 // Created:     11.11.97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================
diff --git a/src/msw/metafile.cpp b/src/msw/metafile.cpp
index f39c90d320..3ea9711dc0 100644
--- a/src/msw/metafile.cpp
+++ b/src/msw/metafile.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/msw/microwin.c b/src/msw/microwin.c
index cdee637987..6a86cb796d 100644
--- a/src/msw/microwin.c
+++ b/src/msw/microwin.c
@@ -6,7 +6,7 @@
 // Created:     2001-05-31
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 */
diff --git a/src/msw/mimetype.cpp b/src/msw/mimetype.cpp
index 711023e813..7c9e20489f 100644
--- a/src/msw/mimetype.cpp
+++ b/src/msw/mimetype.cpp
@@ -6,7 +6,7 @@
 // Created:     23.09.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence (part of wxExtra library)
+// Licence:     wxWidgets licence (part of wxExtra library)
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef    __GNUG__
diff --git a/src/msw/minifram.cpp b/src/msw/minifram.cpp
index 5180dd713d..a2562e0607 100644
--- a/src/msw/minifram.cpp
+++ b/src/msw/minifram.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/msw/msgdlg.cpp b/src/msw/msgdlg.cpp
index 6ea59bcfdd..7819838078 100644
--- a/src/msw/msgdlg.cpp
+++ b/src/msw/msgdlg.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/msw/mslu.cpp b/src/msw/mslu.cpp
index eb7866d90c..6a733a4e6f 100644
--- a/src/msw/mslu.cpp
+++ b/src/msw/mslu.cpp
@@ -6,7 +6,7 @@
 // Created:     2002/02/17
 // RCS-ID:      $Id$
 // Copyright:   (c) 2002 Vaclav Slavik
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/msw/nativdlg.cpp b/src/msw/nativdlg.cpp
index 519176b336..903c4e9f19 100644
--- a/src/msw/nativdlg.cpp
+++ b/src/msw/nativdlg.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================
diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp
index e70911eeeb..89446d2d6d 100644
--- a/src/msw/notebook.cpp
+++ b/src/msw/notebook.cpp
@@ -6,7 +6,7 @@
 // Created:     11.06.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
@@ -22,7 +22,7 @@
 
 #if wxUSE_NOTEBOOK
 
-// wxWindows
+// wxWidgets
 #ifndef WX_PRECOMP
   #include  "wx/string.h"
 #endif  // WX_PRECOMP
@@ -438,7 +438,7 @@ wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage) const
 {
     wxSize sizeTotal = sizePage;
     
-    // We need to make getting tab size part of the wxWindows API.
+    // We need to make getting tab size part of the wxWidgets API.
     wxSize tabSize(0, 0);
     if (GetPageCount() > 0)
     {
diff --git a/src/msw/ole/access.cpp b/src/msw/ole/access.cpp
index 0dfdd300ac..54dd8da8ea 100644
--- a/src/msw/ole/access.cpp
+++ b/src/msw/ole/access.cpp
@@ -6,7 +6,7 @@
 // Created:     2003-02-12
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -772,7 +772,7 @@ STDMETHODIMP wxIAccessible::get_accParent ( IDispatch** ppDispParent)
         return E_FAIL;
 
     // It doesn't seem acceptable to return S_FALSE with a NULL
-    // ppDispParent, so if we have no wxWindows parent, we leave
+    // ppDispParent, so if we have no wxWidgets parent, we leave
     // it to the standard interface.
     if (status == wxACC_NOT_IMPLEMENTED || !parent)
     {
@@ -1041,7 +1041,7 @@ STDMETHODIMP wxIAccessible::get_accHelp ( VARIANT varID, BSTR* pszHelp)
 // Retrieves the full path of the WinHelp file associated with the specified
 // object and the identifier of the appropriate topic within that file.
 // Not all objects support this property.
-// NOTE: not supported by wxWindows at this time. Use
+// NOTE: not supported by wxWidgets at this time. Use
 // GetHelpText instead.
         
 STDMETHODIMP wxIAccessible::get_accHelpTopic ( BSTR* pszHelpFile, VARIANT varChild, long* pidTopic)
diff --git a/src/msw/ole/automtn.cpp b/src/msw/ole/automtn.cpp
index f80d6d8216..a78fe46537 100644
--- a/src/msw/ole/automtn.cpp
+++ b/src/msw/ole/automtn.cpp
@@ -6,7 +6,7 @@
 // Created:     11/6/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998, Julian Smart
-// Licence:     wxWindows Licence
+// Licence:     wxWidgets Licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp
index 14da1ff70c..3291e672b4 100644
--- a/src/msw/ole/dataobj.cpp
+++ b/src/msw/ole/dataobj.cpp
@@ -6,7 +6,7 @@
 // Created:     10.05.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/msw/ole/dropsrc.cpp b/src/msw/ole/dropsrc.cpp
index 7972450bd2..b9207c8341 100644
--- a/src/msw/ole/dropsrc.cpp
+++ b/src/msw/ole/dropsrc.cpp
@@ -6,7 +6,7 @@
 // Created:     10.05.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/msw/ole/droptgt.cpp b/src/msw/ole/droptgt.cpp
index 23ff76e111..b56b76c050 100644
--- a/src/msw/ole/droptgt.cpp
+++ b/src/msw/ole/droptgt.cpp
@@ -6,7 +6,7 @@
 // Created:
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/msw/ole/oleutils.cpp b/src/msw/ole/oleutils.cpp
index c8ce51a5b7..95139c2a44 100644
--- a/src/msw/ole/oleutils.cpp
+++ b/src/msw/ole/oleutils.cpp
@@ -6,7 +6,7 @@
 // Created:     19.02.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/msw/ole/uuid.cpp b/src/msw/ole/uuid.cpp
index 87bdd0cc08..d3f3356ec3 100644
--- a/src/msw/ole/uuid.cpp
+++ b/src/msw/ole/uuid.cpp
@@ -6,7 +6,7 @@
 // Created:     12.09.96
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/msw/ownerdrw.cpp b/src/msw/ownerdrw.cpp
index 6c3de9fd92..d6b8151490 100644
--- a/src/msw/ownerdrw.cpp
+++ b/src/msw/ownerdrw.cpp
@@ -6,7 +6,7 @@
 // Created:     13.11.97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/msw/palette.cpp b/src/msw/palette.cpp
index 40573ae148..50caee2057 100644
--- a/src/msw/palette.cpp
+++ b/src/msw/palette.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/msw/pen.cpp b/src/msw/pen.cpp
index dc52acc011..9cb3660340 100644
--- a/src/msw/pen.cpp
+++ b/src/msw/pen.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/msw/penwin.cpp b/src/msw/penwin.cpp
index afb20dc16f..3cc52941fd 100644
--- a/src/msw/penwin.cpp
+++ b/src/msw/penwin.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
@@ -42,7 +42,7 @@ typedef void (CALLBACK * PENREGPROC)(WORD,BOOL);
 // support Pen input when running under Microsoft Windows for
 // Pen Computing 1.0 without need of the PenPalete.
 //
-// Should masked edit functions be added to wxWindows we would
+// Should masked edit functions be added to wxWidgets we would
 // be a new class of functions to support BEDIT controls.
 //
 // (The function is a NOOP for native Windows-NT)
diff --git a/src/msw/popupwin.cpp b/src/msw/popupwin.cpp
index aa340cdc9f..2417fc0e89 100644
--- a/src/msw/popupwin.cpp
+++ b/src/msw/popupwin.cpp
@@ -6,7 +6,7 @@
 // Created:     08.05.02
 // RCS-ID:      $Id$
 // Copyright:   (c) 2002 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// License:     wxWindows licence
+// License:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/msw/printdlg.cpp b/src/msw/printdlg.cpp
index d3210c96b9..f2900df242 100644
--- a/src/msw/printdlg.cpp
+++ b/src/msw/printdlg.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================
diff --git a/src/msw/printwin.cpp b/src/msw/printwin.cpp
index bc72876edd..39149befce 100644
--- a/src/msw/printwin.cpp
+++ b/src/msw/printwin.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================
diff --git a/src/msw/radiobox.cpp b/src/msw/radiobox.cpp
index 97191a01fa..433c5dab7f 100644
--- a/src/msw/radiobox.cpp
+++ b/src/msw/radiobox.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================
diff --git a/src/msw/radiobut.cpp b/src/msw/radiobut.cpp
index 2d0a0e4f61..5a23b4c546 100644
--- a/src/msw/radiobut.cpp
+++ b/src/msw/radiobut.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/msw/regconf.cpp b/src/msw/regconf.cpp
index cb302531f9..398c0c7285 100644
--- a/src/msw/regconf.cpp
+++ b/src/msw/regconf.cpp
@@ -6,7 +6,7 @@
 // Created:     27.04.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/msw/region.cpp b/src/msw/region.cpp
index a5edd5cb49..424ed9fb89 100644
--- a/src/msw/region.cpp
+++ b/src/msw/region.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:   Fri Oct 24 10:46:34 MET 1997
 // RCS-ID:    $Id$
-// Copyright: (c) 1997-2002 wxWindows team
-// Licence:   wxWindows licence
+// Copyright: (c) 1997-2002 wxWidgets team
+// Licence:   wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/msw/registry.cpp b/src/msw/registry.cpp
index b2a25f4391..c386aa1668 100644
--- a/src/msw/registry.cpp
+++ b/src/msw/registry.cpp
@@ -6,7 +6,7 @@
 // Created:     03.04.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 // TODO:        - parsing of registry key names
 //              - support of other (than REG_SZ/REG_DWORD) registry types
 //              - add high level functions (RegisterOleServer, ...)
@@ -23,7 +23,7 @@
 #pragma hdrstop
 #endif
 
-// other wxWindows headers
+// other wxWidgets headers
 #include  "wx/string.h"
 #include  "wx/intl.h"
 #include  "wx/log.h"
diff --git a/src/msw/renderer.cpp b/src/msw/renderer.cpp
index d4c36549f8..011f0097bb 100644
--- a/src/msw/renderer.cpp
+++ b/src/msw/renderer.cpp
@@ -6,7 +6,7 @@
 // Created:     20.07.2003
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// License:     wxWindows license
+// License:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/msw/scrolbar.cpp b/src/msw/scrolbar.cpp
index 820c1fb0d5..3f89e9040d 100644
--- a/src/msw/scrolbar.cpp
+++ b/src/msw/scrolbar.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/msw/settings.cpp b/src/msw/settings.cpp
index bad418ac1e..3b72e22251 100644
--- a/src/msw/settings.cpp
+++ b/src/msw/settings.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/msw/slider95.cpp b/src/msw/slider95.cpp
index 36e29a5da7..bf3c4bf300 100644
--- a/src/msw/slider95.cpp
+++ b/src/msw/slider95.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/msw/slidrmsw.cpp b/src/msw/slidrmsw.cpp
index 48cfaf922a..dd1cc52995 100644
--- a/src/msw/slidrmsw.cpp
+++ b/src/msw/slidrmsw.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:       wxWindows licence
+// Licence:       wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/msw/snglinst.cpp b/src/msw/snglinst.cpp
index b3f621b44d..0e71909e16 100644
--- a/src/msw/snglinst.cpp
+++ b/src/msw/snglinst.cpp
@@ -7,7 +7,7 @@
 // Created:     08.06.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// License:     wxWindows licence
+// License:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/msw/sound.cpp b/src/msw/sound.cpp
index 795b1a9cbe..7c96fee643 100644
--- a/src/msw/sound.cpp
+++ b/src/msw/sound.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/msw/spinbutt.cpp b/src/msw/spinbutt.cpp
index d49253743b..c60d504468 100644
--- a/src/msw/spinbutt.cpp
+++ b/src/msw/spinbutt.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/msw/spinctrl.cpp b/src/msw/spinctrl.cpp
index c2df8b2451..9f0e30511f 100644
--- a/src/msw/spinctrl.cpp
+++ b/src/msw/spinctrl.cpp
@@ -6,7 +6,7 @@
 // Created:     22.07.99
 // RCS-ID:      $Id$
 // Copyright:   (c) Vadim Zeitlin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -441,7 +441,7 @@ int wxSpinCtrl::GetValue() const
 
 void wxSpinCtrl::SetSelection(long from, long to)
 {
-    // if from and to are both -1, it means (in wxWindows) that all text should
+    // if from and to are both -1, it means (in wxWidgets) that all text should
     // be selected - translate into Windows convention
     if ( (from == -1) && (to == -1) )
     {
diff --git a/src/msw/statbmp.cpp b/src/msw/statbmp.cpp
index b437dcf26a..fa7049f0b1 100644
--- a/src/msw/statbmp.cpp
+++ b/src/msw/statbmp.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================
diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp
index aa35e4e0a8..c4c0d0345e 100644
--- a/src/msw/statbox.cpp
+++ b/src/msw/statbox.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -121,7 +121,7 @@ bool wxStaticBox::Create(wxWindow *parent,
     // FIXME: I still think that it isn't the right solution because the static
     //        boxes shouldn't have to be transparent if the redrawing was done
     //        right elsewhere - who ever had to make them transparent in non
-    //        wxWindows programs, after all? But for now it does fix a serious
+    //        wxWidgets programs, after all? But for now it does fix a serious
     //        problem (try resizing the sizers test screen in the layout sample
     //        after removing WS_EX_TRANSPARENT bit) and so let's use it until
     //        we fix the real underlying problem
diff --git a/src/msw/statbr95.cpp b/src/msw/statbr95.cpp
index 3b203df0b0..19abffaaf6 100644
--- a/src/msw/statbr95.cpp
+++ b/src/msw/statbr95.cpp
@@ -6,7 +6,7 @@
 // Created:     04.04.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/msw/statline.cpp b/src/msw/statline.cpp
index 15971dc496..765612ed02 100644
--- a/src/msw/statline.cpp
+++ b/src/msw/statline.cpp
@@ -5,7 +5,7 @@
 // Created:     28.06.99
 // Version:     $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/msw/stattext.cpp b/src/msw/stattext.cpp
index 12b7403018..ab96144336 100644
--- a/src/msw/stattext.cpp
+++ b/src/msw/stattext.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/msw/tabctrl.cpp b/src/msw/tabctrl.cpp
index acbfd871c4..19c510339c 100644
--- a/src/msw/tabctrl.cpp
+++ b/src/msw/tabctrl.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp
index 57ce4633f8..d6ce0d0eb9 100644
--- a/src/msw/taskbar.cpp
+++ b/src/msw/taskbar.cpp
@@ -7,7 +7,7 @@
 // Created:     24/3/98
 // RCS-ID:      $Id$
 // Copyright:   (c)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index d439d680f4..a6b3113608 100644
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -55,7 +55,7 @@
 // conditional compilation
 // ----------------------------------------------------------------------------
 
-// wxWindows previously always considered that toolbar buttons have light grey
+// wxWidgets previously always considered that toolbar buttons have light grey
 // (0xc0c0c0) background and so ignored any bitmap masks - however, this
 // doesn't work with XPMs which then appear to have black background. To make
 // this work, we must respect the bitmap masks - which we do now. This should
diff --git a/src/msw/tbarmsw.cpp b/src/msw/tbarmsw.cpp
index ad62237f60..fb4f703cf5 100644
--- a/src/msw/tbarmsw.cpp
+++ b/src/msw/tbarmsw.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index e285303d8d..6ea4f14304 100644
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -1181,7 +1181,7 @@ bool wxTextCtrl::IsEditable() const
 
 void wxTextCtrl::SetSelection(long from, long to)
 {
-    // if from and to are both -1, it means (in wxWindows) that all text should
+    // if from and to are both -1, it means (in wxWidgets) that all text should
     // be selected - translate into Windows convention
     if ( (from == -1) && (to == -1) )
     {
@@ -2306,7 +2306,7 @@ bool wxTextCtrl::SetStyle(long start, long end, const wxTextAttr& style)
             cf.dwEffects |= CFE_UNDERLINE;
         }
 
-        // strikeout fonts are not supported by wxWindows
+        // strikeout fonts are not supported by wxWidgets
     }
 
     if ( style.HasTextColour() )
diff --git a/src/msw/thread.cpp b/src/msw/thread.cpp
index d50ea43a36..d68183e0fd 100644
--- a/src/msw/thread.cpp
+++ b/src/msw/thread.cpp
@@ -7,7 +7,7 @@
 // RCS-ID:      $Id$
 // Copyright:   (c) Wolfram Gloger (1996, 1997), Guilhem Lavaux (1998);
 //                  Vadim Zeitlin (1999-2002)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
@@ -526,7 +526,7 @@ void wxThreadInternal::SetPriority(unsigned int priority)
 {
     m_priority = priority;
 
-    // translate wxWindows priority to the Windows one
+    // translate wxWidgets priority to the Windows one
     int win_priority;
     if (m_priority <= 20)
         win_priority = THREAD_PRIORITY_LOWEST;
@@ -740,7 +740,7 @@ wxThreadInternal::WaitForTerminate(wxCriticalSection& cs,
                     //
                     // NB: we still must include QS_ALLINPUT even when waiting
                     //     in a secondary thread because if it had created some
-                    //     window somehow (possible not even using wxWindows)
+                    //     window somehow (possible not even using wxWidgets)
                     //     the system might dead lock then
                     if ( wxThread::IsMain() )
                     {
diff --git a/src/msw/timer.cpp b/src/msw/timer.cpp
index b1e23fca66..0cbfdef10d 100644
--- a/src/msw/timer.cpp
+++ b/src/msw/timer.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/msw/tooltip.cpp b/src/msw/tooltip.cpp
index 0ab90686a8..d64a5e2c12 100644
--- a/src/msw/tooltip.cpp
+++ b/src/msw/tooltip.cpp
@@ -6,7 +6,7 @@
 // Created:     31.01.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -147,7 +147,7 @@ LRESULT APIENTRY wxToolTipWndProc(HWND hwndTT,
         OutputDebugString("TTM_WINDOWFROMPOINT: ");
         OutputDebugString(wxString::Format("0x%08x => ", hwnd));
 
-        // return a HWND corresponding to a wxWindow because only wxWindows are
+        // return a HWND corresponding to a wxWindow because only wxWidgets are
         // associated with tooltips using TTM_ADDTOOL
         wxWindow *win = wxGetWindowFromHWND((WXHWND)hwnd);
 
@@ -360,7 +360,7 @@ void wxToolTip::SetWindow(wxWindow *win)
             {
                 // may be it's a child of parent of the control, in fact?
                 // (radiobuttons are subcontrols, i.e. children of the radiobox
-                // for wxWindows but are its siblings at Windows level)
+                // for wxWidgets but are its siblings at Windows level)
                 hwnd = GetDlgItem(GetHwndOf(m_window->GetParent()), id);
             }
 
diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index 6d87965ef7..513390591f 100644
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -6,7 +6,7 @@
 // Created:     24.09.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
-// License:     wxWindows licence
+// License:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -85,7 +85,7 @@ wxDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
 // globals
 // ----------------------------------------------------------------------------
 
-// the name of the default wxWindows class
+// the name of the default wxWidgets class
 #ifdef __WXWINCE__
 extern       wxChar *wxCanvasClassName;
 #else
@@ -932,7 +932,7 @@ void wxTopLevelWindowMSW::OnActivate(wxActivateEvent& event)
     }
 }
 
-// the DialogProc for all wxWindows dialogs
+// the DialogProc for all wxWidgets dialogs
 LONG APIENTRY _EXPORT
 wxDlgProc(HWND hDlg,
           UINT message,
diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp
index a488f9c547..01d5825352 100644
--- a/src/msw/treectrl.cpp
+++ b/src/msw/treectrl.cpp
@@ -6,7 +6,7 @@
 // Created:     1997
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -2797,7 +2797,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 
         case TVN_DELETEITEM:
             {
-                // NB: we might process this message using wxWindows event
+                // NB: we might process this message using wxWidgets event
                 //     tables, but due to overhead of wxWin event system we
                 //     prefer to do it here ourself (otherwise deleting a tree
                 //     with many items is just too slow)
diff --git a/src/msw/urlmsw.cpp b/src/msw/urlmsw.cpp
index 404da29892..9799473189 100644
--- a/src/msw/urlmsw.cpp
+++ b/src/msw/urlmsw.cpp
@@ -6,7 +6,7 @@
 // Created:     06/11/2003
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Hajo Kirchhoff
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp
index e56792a52d..7ae0144671 100644
--- a/src/msw/utils.cpp
+++ b/src/msw/utils.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -104,7 +104,7 @@
 // ----------------------------------------------------------------------------
 
 // In the WIN.INI file
-static const wxChar WX_SECTION[] = wxT("wxWindows");
+static const wxChar WX_SECTION[] = wxT("wxWidgets");
 static const wxChar eUSERNAME[]  = wxT("UserName");
 
 // ============================================================================
@@ -255,7 +255,7 @@ bool wxGetUserId(wxChar *buf, int maxSize)
     if (  (user = wxGetenv(wxT("USER"))) == NULL &&
             (user = wxGetenv(wxT("LOGNAME"))) == NULL )
     {
-        // Use wxWindows configuration data (comming soon)
+        // Use wxWidgets configuration data (comming soon)
         GetProfileString(WX_SECTION, eUSERID, default_id, buf, maxSize - 1);
     }
     else
@@ -340,7 +340,7 @@ error:
     return FALSE;
 #else  // !USE_NET_API
     // Could use NIS, MS-Mail or other site specific programs
-    // Use wxWindows configuration data
+    // Use wxWidgets configuration data
     bool ok = GetProfileString(WX_SECTION, eUSERNAME, wxEmptyString, buf, maxSize - 1) != 0;
     if ( !ok )
     {
@@ -1197,7 +1197,7 @@ extern long wxCharsetToCodepage(const wxChar *name)
   Creates a hidden window with supplied window proc registering the class for
   it if necesssary (i.e. the first time only). Caller is responsible for
   destroying the window and unregistering the class (note that this must be
-  done because wxWindows may be used as a DLL and so may be loaded/unloaded
+  done because wxWidgets may be used as a DLL and so may be loaded/unloaded
   multiple times into/from the same process so we cna't rely on automatic
   Windows class unregistration).
 
diff --git a/src/msw/utilsexc.cpp b/src/msw/utilsexc.cpp
index 671d9e9083..1042331c8a 100644
--- a/src/msw/utilsexc.cpp
+++ b/src/msw/utilsexc.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) 1998-2002 wxWindows dev team
-// Licence:     wxWindows licence
+// Copyright:   (c) 1998-2002 wxWidgets dev team
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/msw/utilsgui.cpp b/src/msw/utilsgui.cpp
index fc8b08f12d..fcd7ce463b 100644
--- a/src/msw/utilsgui.cpp
+++ b/src/msw/utilsgui.cpp
@@ -6,7 +6,7 @@
 // Created:     21.06.2003 (extracted from msw/utils.cpp)
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// License:     wxWindows license
+// License:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/msw/uxtheme.cpp b/src/msw/uxtheme.cpp
index 40a4195f6e..4c75f0989e 100644
--- a/src/msw/uxtheme.cpp
+++ b/src/msw/uxtheme.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     2003
 // RCS-ID:      $Id$
-// Copyright:   (c) 2003 wxWindows Dev-Team
-// License:     wxWindows license
+// Copyright:   (c) 2003 wxWidgets Dev-Team
+// License:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/msw/volume.cpp b/src/msw/volume.cpp
index f1750775a5..a508485ac2 100644
--- a/src/msw/volume.cpp
+++ b/src/msw/volume.cpp
@@ -6,7 +6,7 @@
 // Created:     28 Jan 02
 // RCS-ID:      $Id$
 // Copyright:   (c) 2002 George Policello
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/msw/wince/crt.cpp b/src/msw/wince/crt.cpp
index 0e9e70c85c..0c52cb2fb1 100644
--- a/src/msw/wince/crt.cpp
+++ b/src/msw/wince/crt.cpp
@@ -6,7 +6,7 @@
 // Created:     03.04.04
 // RCS-ID:
 // Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
@@ -53,7 +53,7 @@ void abort()
     if ( wxTheApp )
         name = wxTheApp->GetAppName();
     if ( name.empty() )
-        name = L"wxWindows Application";
+        name = L"wxWidgets Application";
 
     MessageBox(NULL, L"Abnormal program termination", name, MB_ICONHAND | MB_OK);
 
diff --git a/src/msw/wince/filedlgwce.cpp b/src/msw/wince/filedlgwce.cpp
index bb0a24773b..8422c3f016 100644
--- a/src/msw/wince/filedlgwce.cpp
+++ b/src/msw/wince/filedlgwce.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/msw/wince/helpwce.cpp b/src/msw/wince/helpwce.cpp
index 904d4dba72..32a0b7ef2e 100644
--- a/src/msw/wince/helpwce.cpp
+++ b/src/msw/wince/helpwce.cpp
@@ -6,7 +6,7 @@
 // Created:     2003-07-12
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/msw/wince/tbarwce.cpp b/src/msw/wince/tbarwce.cpp
index fe77c87875..4d8632ca94 100644
--- a/src/msw/wince/tbarwce.cpp
+++ b/src/msw/wince/tbarwce.cpp
@@ -6,7 +6,7 @@
 // Created:     2003-07-12
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -278,7 +278,7 @@ bool wxToolBar::MSWCreateToolbar(const wxPoint& pos, const wxSize& size, wxMenuB
     SetHWND((WXHWND) hWnd);
 #endif
 
-    // install wxWindows window proc for this window
+    // install wxWidgets window proc for this window
     SubclassWin(m_hWnd);
 
     if (menuBar)
diff --git a/src/msw/wince/time.cpp b/src/msw/wince/time.cpp
index b512e22ec7..5c7a2ca6f4 100644
--- a/src/msw/wince/time.cpp
+++ b/src/msw/wince/time.cpp
@@ -6,7 +6,7 @@
 // Created:     31-08-2003
 // RCS-ID:
 // Copyright:	(c) Marco Cavallini
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================
diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 77bce15ce7..b19c6320ec 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================
@@ -984,7 +984,7 @@ void wxWindowMSW::SubclassWin(WXHWND hWnd)
     {
         // don't bother restoring it neither: this also makes it easy to
         // implement IsOfStandardClass() method which returns true for the
-        // standard controls and false for the wxWindows own windows as it can
+        // standard controls and false for the wxWidgets own windows as it can
         // simply check m_oldWndProc
         m_oldWndProc = NULL;
     }
@@ -1116,7 +1116,7 @@ void wxWindowMSW::SetWindowStyleFlag(long flags)
 
 WXDWORD wxWindowMSW::MSWGetStyle(long flags, WXDWORD *exstyle) const
 {
-    // translate common wxWindows styles to Windows ones
+    // translate common wxWidgets styles to Windows ones
 
     // most of windows are child ones, those which are not (such as
     // wxTopLevelWindow) should remove WS_CHILD in their MSWGetStyle()
@@ -2142,7 +2142,7 @@ void wxWindowMSW::UnpackMenuSelect(WXWPARAM wParam, WXLPARAM lParam,
 }
 
 // ---------------------------------------------------------------------------
-// Main wxWindows window proc and the window proc for wxWindow
+// Main wxWidgets window proc and the window proc for wxWindow
 // ---------------------------------------------------------------------------
 
 // Hook for new window just as it's being created, when the window isn't yet
@@ -3026,7 +3026,7 @@ bool wxWindowMSW::MSWGetCreateWindowCoords(const wxPoint& pos,
     /*
       NB: there used to be some code here which set the initial size of the
           window to the client size of the parent if no explicit size was
-          specified. This was wrong because wxWindows programs often assume
+          specified. This was wrong because wxWidgets programs often assume
           that they get a WM_SIZE (EVT_SIZE) upon creation, however this broke
           it. To see why, you should understand that Windows sends WM_SIZE from
           inside ::CreateWindow() anyhow. However, ::CreateWindow() is called
@@ -3035,7 +3035,7 @@ bool wxWindowMSW::MSWGetCreateWindowCoords(const wxPoint& pos,
           event goes to some base class OnSize() instead). So the WM_SIZE we
           rely on is the one sent when the parent frame resizes its children
           but here is the problem: if the child already has just the right
-          size, nothing will happen as both wxWindows and Windows check for
+          size, nothing will happen as both wxWidgets and Windows check for
           this and ignore any attempts to change the window size to the size it
           already has - so no WM_SIZE would be sent.
      */
@@ -3045,7 +3045,7 @@ bool wxWindowMSW::MSWGetCreateWindowCoords(const wxPoint& pos,
     //
     //  1. it results in huge frames on modern screens (1000*800 is not
     //     uncommon on my 1280*1024 screen) which is way too big for a half
-    //     empty frame of most of wxWindows samples for example)
+    //     empty frame of most of wxWidgets samples for example)
     //
     //  2. it is buggy for frames with wxFRAME_TOOL_WINDOW style for which
     //     the default is for whatever reason 8*8 which breaks client <->
diff --git a/src/msw/winestub.c b/src/msw/winestub.c
index b2761ca1cc..9dc061a963 100644
--- a/src/msw/winestub.c
+++ b/src/msw/winestub.c
@@ -5,7 +5,7 @@
  * Created:     04/01/98
  * RCS-ID:      $Id$
  * Copyright:   (c) Robert Roebling
- * Licence:     wxWindows Licence
+ * Licence:     wxWidgets Licence
  *****************************************************************************/
 
 #include <string.h>
diff --git a/src/os2/accel.cpp b/src/os2/accel.cpp
index e21a611fe0..f87668f062 100644
--- a/src/os2/accel.cpp
+++ b/src/os2/accel.cpp
@@ -6,7 +6,7 @@
 // Created:     10/13/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
diff --git a/src/os2/app.cpp b/src/os2/app.cpp
index 3ea50a31ca..a189a1c8e6 100644
--- a/src/os2/app.cpp
+++ b/src/os2/app.cpp
@@ -6,7 +6,7 @@
 // Created:     10/13/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -408,7 +408,7 @@ bool wxApp::RegisterWindowClasses(
 } // end of wxApp::RegisterWindowClasses
 
 //
-// Cleans up any wxWindows internal structures left lying around
+// Cleans up any wxWidgets internal structures left lying around
 //
 void wxApp::CleanUp()
 {
diff --git a/src/os2/bitmap.cpp b/src/os2/bitmap.cpp
index 9d81414df6..86cc725f33 100644
--- a/src/os2/bitmap.cpp
+++ b/src/os2/bitmap.cpp
@@ -6,7 +6,7 @@
 // Created:     08/08/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/os2/bmpbuttn.cpp b/src/os2/bmpbuttn.cpp
index 6697e119b7..1a2a3c64c3 100644
--- a/src/os2/bmpbuttn.cpp
+++ b/src/os2/bmpbuttn.cpp
@@ -6,7 +6,7 @@
 // Created:     10/13/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
diff --git a/src/os2/brush.cpp b/src/os2/brush.cpp
index 8187fbf42c..6da22a5cbe 100644
--- a/src/os2/brush.cpp
+++ b/src/os2/brush.cpp
@@ -6,7 +6,7 @@
 // Created:     10/13/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
diff --git a/src/os2/button.cpp b/src/os2/button.cpp
index cb6894c3e6..150685d88e 100644
--- a/src/os2/button.cpp
+++ b/src/os2/button.cpp
@@ -6,7 +6,7 @@
 // Created:     10/13/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
@@ -233,7 +233,7 @@ void wxButton::SetDefault()
     wxCHECK_RET( pParent, _T("button without parent?") );
 
     //
-    // Set this one as the default button both for wxWindows and Windows
+    // Set this one as the default button both for wxWidgets and Windows
     //
     wxWindow*                       pWinOldDefault = pParent->SetDefaultItem(this);
 
diff --git a/src/os2/checkbox.cpp b/src/os2/checkbox.cpp
index 83480a8ef2..968269c38b 100644
--- a/src/os2/checkbox.cpp
+++ b/src/os2/checkbox.cpp
@@ -6,7 +6,7 @@
 // Created:     10/13/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
diff --git a/src/os2/checklst.cpp b/src/os2/checklst.cpp
index e1883b8545..ca3be19337 100644
--- a/src/os2/checklst.cpp
+++ b/src/os2/checklst.cpp
@@ -6,7 +6,7 @@
 // Created:     10/13/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -122,7 +122,7 @@ bool wxCheckListBoxItem::OnDrawItem (
     //
     // Unfortunately PM doesn't quite get the text position exact.  We need to alter
     // it down and to the right, just a little bit.  The coords in rRect are OS/2
-    // coords not wxWindows coords.
+    // coords not wxWidgets coords.
     //
     vRect.x += 5;
     vRect.y -= 3;
diff --git a/src/os2/choice.cpp b/src/os2/choice.cpp
index 793111d6b5..1320c33442 100644
--- a/src/os2/choice.cpp
+++ b/src/os2/choice.cpp
@@ -6,7 +6,7 @@
 // Created:     10/13/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
@@ -334,7 +334,7 @@ void wxChoice::DoSetSize(
     //
     // Ignore height parameter because height doesn't mean 'initially
     // displayed' height, it refers to the drop-down menu as well. The
-    // wxWindows interpretation is different; also, getting the size returns
+    // wxWidgets interpretation is different; also, getting the size returns
     // the _displayed_ size (NOT the drop down menu size) so
     // setting-getting-setting size would not work.
     //
diff --git a/src/os2/clipbrd.cpp b/src/os2/clipbrd.cpp
index e27f3bc58a..ed1f0d6717 100644
--- a/src/os2/clipbrd.cpp
+++ b/src/os2/clipbrd.cpp
@@ -6,7 +6,7 @@
 // Created:     10/13/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
diff --git a/src/os2/colour.cpp b/src/os2/colour.cpp
index 72fecad2e7..8d4d2191da 100644
--- a/src/os2/colour.cpp
+++ b/src/os2/colour.cpp
@@ -6,7 +6,7 @@
 // Created:     10/13/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
diff --git a/src/os2/combobox.cpp b/src/os2/combobox.cpp
index 5017194242..177b3af7a0 100644
--- a/src/os2/combobox.cpp
+++ b/src/os2/combobox.cpp
@@ -6,7 +6,7 @@
 // Created:     10/13/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/combobox.h"
@@ -334,7 +334,7 @@ void wxComboBox::SetSelection(
 
     //
     // If from and to are both -1, it means
-    // (in wxWindows) that all text should be selected.
+    // (in wxWidgets) that all text should be selected.
     // This translates into Windows convention
     //
     if ((lFrom == -1L) && (lTo == -1L))
diff --git a/src/os2/control.cpp b/src/os2/control.cpp
index c9354af222..6b858be71e 100644
--- a/src/os2/control.cpp
+++ b/src/os2/control.cpp
@@ -6,7 +6,7 @@
 // Created:     09/17/99
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -108,7 +108,7 @@ bool wxControl::OS2CreateControl(
 	(void) OS2GetStyle(GetWindowStyle(), &dwExstyle);
     }
     //
-    // All controls should have these styles (wxWindows creates all controls
+    // All controls should have these styles (wxWidgets creates all controls
     // visible by default)
     //
     if (m_isShown )
diff --git a/src/os2/cursor.cpp b/src/os2/cursor.cpp
index c1d68f0ffe..5a26455b25 100644
--- a/src/os2/cursor.cpp
+++ b/src/os2/cursor.cpp
@@ -6,7 +6,7 @@
 // Created:     10/13/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
diff --git a/src/os2/data.cpp b/src/os2/data.cpp
index 28ba3f0884..ac20a43736 100644
--- a/src/os2/data.cpp
+++ b/src/os2/data.cpp
@@ -6,7 +6,7 @@
 // Created:     09/20/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
diff --git a/src/os2/dataobj.cpp b/src/os2/dataobj.cpp
index 9c94fc10e4..e1ec79357b 100644
--- a/src/os2/dataobj.cpp
+++ b/src/os2/dataobj.cpp
@@ -6,7 +6,7 @@
 // Created:     10/21/99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/os2/dc.cpp b/src/os2/dc.cpp
index 0e8e6370be..e243e0b48a 100644
--- a/src/os2/dc.cpp
+++ b/src/os2/dc.cpp
@@ -6,7 +6,7 @@
 // Created:     10/14/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
@@ -39,22 +39,22 @@
     IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
 
 //
-// wxWindows uses the Microsoft convention that the origin is the UPPER left.
+// wxWidgets uses the Microsoft convention that the origin is the UPPER left.
 // Native OS/2 however in the GPI and PM define the origin as the LOWER left.
-// In order to map OS/2 GPI/PM y coordinates to wxWindows coordinates we must
+// In order to map OS/2 GPI/PM y coordinates to wxWidgets coordinates we must
 // perform the following transformation:
 //
 // Parent object height:     POBJHEIGHT
 // Desried origin:           WXORIGINY
 // Object to place's height: OBJHEIGHT
 //
-// To get the OS2 position from the wxWindows one:
+// To get the OS2 position from the wxWidgets one:
 //
 // OS2Y = POBJHEIGHT - (WXORIGINY + OBJHEIGHT)
 //
 // For OS/2 wxDC's we will always determine m_vRclPaint as the size of the
 // OS/2 Presentation Space associated with the device context.  y is the
-// desired application's y coordinate of the origin in wxWindows space.
+// desired application's y coordinate of the origin in wxWidgets space.
 // objy is the height of the object we are going to draw.
 //
 #define OS2Y(y, objy) ((m_vRclPaint.yTop - m_vRclPaint.yBottom) - (y + objy))
@@ -2271,7 +2271,7 @@ void wxDC::DoGetTextExtent(
        sError = wxPMErrorToStr(vErrorCode);
        // DEBUG
        sprintf(zMsg, "GpiQueryTextBox for %s: failed with Error: %lx - %s", pStr, vErrorCode, sError.c_str());
-       (void)wxMessageBox( "wxWindows Menu sample"
+       (void)wxMessageBox( "wxWidgets Menu sample"
                           ,zMsg
                           ,wxICON_INFORMATION
                          );
diff --git a/src/os2/dcclient.cpp b/src/os2/dcclient.cpp
index db4fb34562..e16f715a60 100644
--- a/src/os2/dcclient.cpp
+++ b/src/os2/dcclient.cpp
@@ -6,7 +6,7 @@
 // Created:     09/21/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================
@@ -70,7 +70,7 @@ static RECT        g_paintStruct;
 #ifdef __WXDEBUG__
     // a global variable which we check to verify that wxPaintDC are only
     // created in resopnse to WM_PAINT message - doing this from elsewhere is a
-    // common programming error among wxWindows programmers and might lead to
+    // common programming error among wxWidgets programmers and might lead to
     // very subtle and difficult to debug refresh/repaint bugs.
     int g_isPainting = 0;
 #endif // __WXDEBUG__
@@ -113,7 +113,7 @@ wxWindowDC::wxWindowDC(
     ::GpiAssociate(m_hPS, m_hDC);
 
     //
-    // Set the wxWindows color table
+    // Set the wxWidgets color table
     //
     if (!::GpiCreateLogColorTable( m_hPS
                                   ,0L
@@ -214,7 +214,7 @@ wxClientDC::wxClientDC(
                           ,PU_PELS | GPIF_LONG | GPIA_ASSOC
                          );
 
-    // Set the wxWindows color table
+    // Set the wxWidgets color table
     if (!::GpiCreateLogColorTable( m_hPS
                                   ,0L
                                   ,LCOLF_CONSECRGB
diff --git a/src/os2/dcmemory.cpp b/src/os2/dcmemory.cpp
index a86c96edf6..bfdb10ce83 100644
--- a/src/os2/dcmemory.cpp
+++ b/src/os2/dcmemory.cpp
@@ -6,7 +6,7 @@
 // Created:     10/14/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
@@ -81,7 +81,7 @@ bool wxMemoryDC::CreateCompatible(
             m_ok = TRUE;
             m_bOwnsDC = TRUE;
             //
-            // Set the wxWindows color table
+            // Set the wxWidgets color table
             //
             ::GpiCreateLogColorTable( m_hPS
                                      ,0L
diff --git a/src/os2/dcprint.cpp b/src/os2/dcprint.cpp
index 7497cdee96..0925866b15 100644
--- a/src/os2/dcprint.cpp
+++ b/src/os2/dcprint.cpp
@@ -6,7 +6,7 @@
 // Created:     10/14/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
diff --git a/src/os2/dcscreen.cpp b/src/os2/dcscreen.cpp
index 36f65d1de7..1b3517ee65 100644
--- a/src/os2/dcscreen.cpp
+++ b/src/os2/dcscreen.cpp
@@ -6,7 +6,7 @@
 // Created:     10/14/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/os2/dialog.cpp b/src/os2/dialog.cpp
index fb4e903b07..c7df8115c7 100644
--- a/src/os2/dialog.cpp
+++ b/src/os2/dialog.cpp
@@ -6,7 +6,7 @@
 // Created:     10/14/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
diff --git a/src/os2/dir.cpp b/src/os2/dir.cpp
index 9bb2087162..7cea36f132 100644
--- a/src/os2/dir.cpp
+++ b/src/os2/dir.cpp
@@ -6,7 +6,7 @@
 // Created:     08.12.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/os2/dirdlg.cpp b/src/os2/dirdlg.cpp
index c4a85eef97..2938939411 100644
--- a/src/os2/dirdlg.cpp
+++ b/src/os2/dirdlg.cpp
@@ -6,7 +6,7 @@
 // Created:     10/14/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/os2/dnd.cpp b/src/os2/dnd.cpp
index b12b6af4bb..a72f2fb07c 100644
--- a/src/os2/dnd.cpp
+++ b/src/os2/dnd.cpp
@@ -6,7 +6,7 @@
 // Created:     10/21/99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 AUTHOR
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/os2/dummy.cpp b/src/os2/dummy.cpp
index 73e42c3dec..ad42f8a26c 100644
--- a/src/os2/dummy.cpp
+++ b/src/os2/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.
  *
  * This will produce a big PCH file.
diff --git a/src/os2/evtloop.cpp b/src/os2/evtloop.cpp
index 4e3a117288..a9127402d5 100644
--- a/src/os2/evtloop.cpp
+++ b/src/os2/evtloop.cpp
@@ -6,7 +6,7 @@
 // Created:     01.06.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// License:     wxWindows licence
+// License:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/os2/filedlg.cpp b/src/os2/filedlg.cpp
index 0fa360c0d4..2c6d7bf1c0 100644
--- a/src/os2/filedlg.cpp
+++ b/src/os2/filedlg.cpp
@@ -6,7 +6,7 @@
 // Created:     10/05/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
diff --git a/src/os2/font.cpp b/src/os2/font.cpp
index 517053a915..158b31fb0f 100644
--- a/src/os2/font.cpp
+++ b/src/os2/font.cpp
@@ -6,7 +6,7 @@
 // Created:     10/06/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/os2/fontdlg.cpp b/src/os2/fontdlg.cpp
index c2b6091965..17e009349d 100644
--- a/src/os2/fontdlg.cpp
+++ b/src/os2/fontdlg.cpp
@@ -7,7 +7,7 @@
 // Created:     10/06/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
diff --git a/src/os2/fontenum.cpp b/src/os2/fontenum.cpp
index d85e98f18e..166657ceff 100644
--- a/src/os2/fontenum.cpp
+++ b/src/os2/fontenum.cpp
@@ -6,7 +6,7 @@
 // Created:     01/03/00
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/os2/fontutil.cpp b/src/os2/fontutil.cpp
index a1347e8a8e..ac4a5cd62e 100644
--- a/src/os2/fontutil.cpp
+++ b/src/os2/fontutil.cpp
@@ -6,7 +6,7 @@
 // Created:     01.03.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 #define DEBUG_PRINTF(NAME)   { static int raz=0; \
   printf( #NAME " %i\n",raz); fflush(stdout);       \
diff --git a/src/os2/frame.cpp b/src/os2/frame.cpp
index d455626ed8..c4294bca19 100644
--- a/src/os2/frame.cpp
+++ b/src/os2/frame.cpp
@@ -6,7 +6,7 @@
 // Created:     10/27/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
@@ -173,7 +173,7 @@ void wxFrame::DoGetClientSize(
 
 //
 // Set the client size (i.e. leave the calculation of borders etc.
-// to wxWindows)
+// to wxWidgets)
 //
 void wxFrame::DoSetClientSize(
   int                               nWidth
@@ -369,7 +369,7 @@ void wxFrame::SetMenuBar(
         //
         // Can set a menubar several times.
         // TODO: how to prevent a memory leak if you have a currently-unattached
-        // menubar? wxWindows assumes that the frame will delete the menu (otherwise
+        // menubar? wxWidgets assumes that the frame will delete the menu (otherwise
         // there are problems for MDI).
         //
         if (pMenuBar->GetHMenu())
diff --git a/src/os2/gauge.cpp b/src/os2/gauge.cpp
index 3ad621de73..ca7b75d058 100644
--- a/src/os2/gauge.cpp
+++ b/src/os2/gauge.cpp
@@ -6,7 +6,7 @@
 // Created:     10/06/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
diff --git a/src/os2/gdiimage.cpp b/src/os2/gdiimage.cpp
index 1c13465880..efdbe3cd52 100644
--- a/src/os2/gdiimage.cpp
+++ b/src/os2/gdiimage.cpp
@@ -6,7 +6,7 @@
 // Created:     20.11.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/os2/gdiobj.cpp b/src/os2/gdiobj.cpp
index af715606bc..54e65016e7 100644
--- a/src/os2/gdiobj.cpp
+++ b/src/os2/gdiobj.cpp
@@ -6,7 +6,7 @@
 // Created:     ??/??/98
 // RCS-ID:      $Id$
 // Copyright:   (c) AUTHOR
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
diff --git a/src/os2/gsocket.c b/src/os2/gsocket.c
index b57aa868d2..c230c3da4d 100644
--- a/src/os2/gsocket.c
+++ b/src/os2/gsocket.c
@@ -4,7 +4,7 @@
  * Authors: Guilhem Lavaux,
  *          Guillermo Rodriguez Garcia <guille@iies.es> (maintainer)
  * Purpose: GSocket main Unix and OS/2 file
- * Licence: The wxWindows licence
+ * Licence: The wxWidgets licence
  * CVSID:   $Id$
  * -------------------------------------------------------------------------
  */
diff --git a/src/os2/gsockpm.c b/src/os2/gsockpm.c
index c210cb0b28..89d841e6e7 100644
--- a/src/os2/gsockpm.c
+++ b/src/os2/gsockpm.c
@@ -2,7 +2,7 @@
  * Project: GSocket (Generic Socket) for WX
  * Name:    gsockpm.c
  * Purpose: GSocket: PM part
- * Licence: The wxWindows licence
+ * Licence: The wxWidgets licence
  * CVSID:   $Id$
  * ------------------------------------------------------------------------- */
 
diff --git a/src/os2/gsockpm.cpp b/src/os2/gsockpm.cpp
index c210cb0b28..89d841e6e7 100644
--- a/src/os2/gsockpm.cpp
+++ b/src/os2/gsockpm.cpp
@@ -2,7 +2,7 @@
  * Project: GSocket (Generic Socket) for WX
  * Name:    gsockpm.c
  * Purpose: GSocket: PM part
- * Licence: The wxWindows licence
+ * Licence: The wxWidgets licence
  * CVSID:   $Id$
  * ------------------------------------------------------------------------- */
 
diff --git a/src/os2/helpwin.cpp b/src/os2/helpwin.cpp
index 9c398cc185..1cff079772 100644
--- a/src/os2/helpwin.cpp
+++ b/src/os2/helpwin.cpp
@@ -6,7 +6,7 @@
 // Created:     10/09/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef WX_PRECOMP
diff --git a/src/os2/icon.cpp b/src/os2/icon.cpp
index afc541b13f..5252b5b471 100644
--- a/src/os2/icon.cpp
+++ b/src/os2/icon.cpp
@@ -6,7 +6,7 @@
 // Created:     10/09/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
diff --git a/src/os2/iniconf.cpp b/src/os2/iniconf.cpp
index 9ad3a3c367..e51f443eb2 100644
--- a/src/os2/iniconf.cpp
+++ b/src/os2/iniconf.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     10/09/99
 // Copyright:   David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
diff --git a/src/os2/joystick.cpp b/src/os2/joystick.cpp
index e40b19826e..51352cf319 100644
--- a/src/os2/joystick.cpp
+++ b/src/os2/joystick.cpp
@@ -6,7 +6,7 @@
 // Created:     10/09/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/defs.h"
diff --git a/src/os2/listbox.cpp b/src/os2/listbox.cpp
index ddb02f53b4..5b80d03fc2 100644
--- a/src/os2/listbox.cpp
+++ b/src/os2/listbox.cpp
@@ -6,7 +6,7 @@
 // Created:     10/09/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
@@ -194,7 +194,7 @@ bool wxListBox::Create(
     SetFont(*pTextFont);
 
     //
-    // Set standard wxWindows colors for Listbox items and highlighting
+    // Set standard wxWidgets colors for Listbox items and highlighting
     //
     wxColour                        vColour;
 
diff --git a/src/os2/listctrl.cpp b/src/os2/listctrl.cpp
index 1cf40a8c99..6afd2d2e95 100644
--- a/src/os2/listctrl.cpp
+++ b/src/os2/listctrl.cpp
@@ -6,7 +6,7 @@
 // Created:     01/21/03
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -69,11 +69,11 @@
 //   how many records the view will have, initially, and how many columns
 //   the detail view of the container will have, as the container represents
 //   a known data block.  Thus the OS/2 PM CV_DETAIL view, i.e.
-//   the wxWindows wxLC_REPORT view, relies on STATIC structure for its
+//   the wxWidgets wxLC_REPORT view, relies on STATIC structure for its
 //   columnar data.  It gets the data to display by telling it the specific
 //   offset of the field in the struct containing the displayable data.  That
 //   data has be of OS/2 Types, PSZ (char string), CDATE or CTIME format.
-//   wxWindows is dynamic in nature, however.  We insert columns, one at a
+//   wxWidgets is dynamic in nature, however.  We insert columns, one at a
 //   time and do not know how many until the app is done inserting them. So
 //   for OS/2 I have to set a max allowable since they are fixed.  We return
 //   an error to the app if they include more than we can handle.
diff --git a/src/os2/main.cpp b/src/os2/main.cpp
index 3a5802b172..99144685c3 100644
--- a/src/os2/main.cpp
+++ b/src/os2/main.cpp
@@ -6,7 +6,7 @@
 // Created:     10/10/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // We don't put main() in the library any more. SN.
diff --git a/src/os2/menu.cpp b/src/os2/menu.cpp
index a834dd5e85..5fa5301703 100644
--- a/src/os2/menu.cpp
+++ b/src/os2/menu.cpp
@@ -6,7 +6,7 @@
 // Created:     10/10/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/os2/menuitem.cpp b/src/os2/menuitem.cpp
index 87bac21267..66d1077dbc 100644
--- a/src/os2/menuitem.cpp
+++ b/src/os2/menuitem.cpp
@@ -6,7 +6,7 @@
 // Created:     10/10/98
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -196,7 +196,7 @@ wxString wxMenuItemBase::GetLabelFromText(
         {
             //
             // '~' is the escape character for OS/2PM and '&' is the one for
-            // wxWindows - skip both of them
+            // wxWidgets - skip both of them
             //
             continue;
         }
diff --git a/src/os2/metafile.cpp b/src/os2/metafile.cpp
index bb9fa9719d..b67f6f6aa5 100644
--- a/src/os2/metafile.cpp
+++ b/src/os2/metafile.cpp
@@ -6,7 +6,7 @@
 // Created:     10/10/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
diff --git a/src/os2/mimetype.cpp b/src/os2/mimetype.cpp
index eb5e585853..d27aa565e7 100644
--- a/src/os2/mimetype.cpp
+++ b/src/os2/mimetype.cpp
@@ -6,7 +6,7 @@
 // Created:     01.21.00
 // RCS-ID:      $Id$
 // Copyright:   Adopted from msw port --(c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence (part of wxExtra library)
+// Licence:     wxWidgets licence (part of wxExtra library)
 /////////////////////////////////////////////////////////////////////////////
 
 #define INCL_DOS
diff --git a/src/os2/msgdlg.cpp b/src/os2/msgdlg.cpp
index 8aaa2313cc..72cef2ae42 100644
--- a/src/os2/msgdlg.cpp
+++ b/src/os2/msgdlg.cpp
@@ -6,7 +6,7 @@
 // Created:     10/10/99
 // RCS-ID:      $$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/os2/nativdlg.cpp b/src/os2/nativdlg.cpp
index fa52806608..7a63958beb 100644
--- a/src/os2/nativdlg.cpp
+++ b/src/os2/nativdlg.cpp
@@ -6,7 +6,7 @@
 // Created:     10/12/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================
diff --git a/src/os2/notebook.cpp b/src/os2/notebook.cpp
index a8e9ea80b4..d3620ccc44 100644
--- a/src/os2/notebook.cpp
+++ b/src/os2/notebook.cpp
@@ -6,7 +6,7 @@
 // Created:     10/12/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
@@ -14,7 +14,7 @@
 
 #if wxUSE_NOTEBOOK
 
-// wxWindows
+// wxWidgets
 #ifndef WX_PRECOMP
   #include "wx/app.h"
   #include "wx/dcclient.h"
diff --git a/src/os2/ownerdrw.cpp b/src/os2/ownerdrw.cpp
index 12b76cc401..2abad3a92a 100644
--- a/src/os2/ownerdrw.cpp
+++ b/src/os2/ownerdrw.cpp
@@ -6,7 +6,7 @@
 // Created:     10/12/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -246,7 +246,7 @@ bool wxOwnerDrawn::OnDrawItem(
         // Fall back to default colors if none explicitly specified
         //
         vRef = ::WinQuerySysColor( HWND_DESKTOP
-                                  ,SYSCLR_MENU  // we are using gray for all our window backgrounds in wxWindows
+                                  ,SYSCLR_MENU  // we are using gray for all our window backgrounds in wxWidgets
                                   ,0L
                                  );
         vColBack.Set( GetRValue(vRef)
diff --git a/src/os2/palette.cpp b/src/os2/palette.cpp
index 43252c4070..fd58824a69 100644
--- a/src/os2/palette.cpp
+++ b/src/os2/palette.cpp
@@ -6,7 +6,7 @@
 // Created:     ??/??/98
 // RCS-ID:      $Id$
 // Copyright:   (c) AUTHOR
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
diff --git a/src/os2/pen.cpp b/src/os2/pen.cpp
index 77badbd512..4a1063dffd 100644
--- a/src/os2/pen.cpp
+++ b/src/os2/pen.cpp
@@ -6,7 +6,7 @@
 // Created:     10/10/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
diff --git a/src/os2/popupwin.cpp b/src/os2/popupwin.cpp
index b96c22d2a5..17056a22be 100644
--- a/src/os2/popupwin.cpp
+++ b/src/os2/popupwin.cpp
@@ -6,7 +6,7 @@
 // Created:     13.05.02
 // RCS-ID:      $Id$
 // Copyright:   (c) 2002 Dave Webster <dwebster@bhmi.com>
-// License:     wxWindows licence
+// License:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/os2/print.cpp b/src/os2/print.cpp
index 9073078b2b..3ff04265e2 100644
--- a/src/os2/print.cpp
+++ b/src/os2/print.cpp
@@ -6,7 +6,7 @@
 // Created:     10/14/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
diff --git a/src/os2/radiobox.cpp b/src/os2/radiobox.cpp
index 14ba806ec5..73a67c1d7a 100644
--- a/src/os2/radiobox.cpp
+++ b/src/os2/radiobox.cpp
@@ -6,7 +6,7 @@
 // Created:     10/12/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
diff --git a/src/os2/radiobut.cpp b/src/os2/radiobut.cpp
index 8d1b543ad8..287df6e52d 100644
--- a/src/os2/radiobut.cpp
+++ b/src/os2/radiobut.cpp
@@ -6,7 +6,7 @@
 // Created:     10/12/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
diff --git a/src/os2/region.cpp b/src/os2/region.cpp
index 039534285e..25b0acc8a8 100644
--- a/src/os2/region.cpp
+++ b/src/os2/region.cpp
@@ -6,7 +6,7 @@
 // Created:   10/15/99
 // RCS-ID:    $Id$
 // Copyright: (c) Davdi Webster
-// Licence:   wxWindows licence
+// Licence:   wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
diff --git a/src/os2/scrolbar.cpp b/src/os2/scrolbar.cpp
index 8b88e4078c..b351895371 100644
--- a/src/os2/scrolbar.cpp
+++ b/src/os2/scrolbar.cpp
@@ -6,7 +6,7 @@
 // Created:     10/15/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
diff --git a/src/os2/settings.cpp b/src/os2/settings.cpp
index b34ca6d079..f1f45e2128 100644
--- a/src/os2/settings.cpp
+++ b/src/os2/settings.cpp
@@ -6,7 +6,7 @@
 // Created:     10/15/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
diff --git a/src/os2/slider.cpp b/src/os2/slider.cpp
index db9beff768..718becc57a 100644
--- a/src/os2/slider.cpp
+++ b/src/os2/slider.cpp
@@ -6,7 +6,7 @@
 // Created:     10/15/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
diff --git a/src/os2/sound.cpp b/src/os2/sound.cpp
index e073d9f7f2..5bde6ee19f 100644
--- a/src/os2/sound.cpp
+++ b/src/os2/sound.cpp
@@ -6,7 +6,7 @@
 // Created:     10/17/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
diff --git a/src/os2/spinbutt.cpp b/src/os2/spinbutt.cpp
index 0bd30bf97c..3c6aee6eef 100644
--- a/src/os2/spinbutt.cpp
+++ b/src/os2/spinbutt.cpp
@@ -6,7 +6,7 @@
 // Created:     10/15/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/os2/spinctrl.cpp b/src/os2/spinctrl.cpp
index 5129a3bc85..8d3cdeebde 100644
--- a/src/os2/spinctrl.cpp
+++ b/src/os2/spinctrl.cpp
@@ -6,7 +6,7 @@
 // Created:     10/15/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -506,7 +506,7 @@ void wxSpinCtrl::SetSelection (
 )
 {
     //
-    // If from and to are both -1, it means (in wxWindows) that all text should
+    // If from and to are both -1, it means (in wxWidgets) that all text should
     // be selected - translate into Windows convention
     //
     if ((lFrom == -1) && (lTo == -1))
diff --git a/src/os2/statbmp.cpp b/src/os2/statbmp.cpp
index 09af143f46..8154913fd0 100644
--- a/src/os2/statbmp.cpp
+++ b/src/os2/statbmp.cpp
@@ -6,7 +6,7 @@
 // Created:     11/27/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/os2/statbox.cpp b/src/os2/statbox.cpp
index a30d967d59..1142b348f0 100644
--- a/src/os2/statbox.cpp
+++ b/src/os2/statbox.cpp
@@ -6,7 +6,7 @@
 // Created:     ??/??/98
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
diff --git a/src/os2/statline.cpp b/src/os2/statline.cpp
index cd3343c3be..854971b8ac 100644
--- a/src/os2/statline.cpp
+++ b/src/os2/statline.cpp
@@ -5,7 +5,7 @@
 // Created:     10/23/99
 // Version:     $Id$
 // Copyright:   (c) 1999 David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/os2/stattext.cpp b/src/os2/stattext.cpp
index d5cfd5c9e4..c987dafbc0 100644
--- a/src/os2/stattext.cpp
+++ b/src/os2/stattext.cpp
@@ -6,7 +6,7 @@
 // Created:     10/17/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/os2/tabctrl.cpp b/src/os2/tabctrl.cpp
index 1b664f8b16..39c54d8b49 100644
--- a/src/os2/tabctrl.cpp
+++ b/src/os2/tabctrl.cpp
@@ -6,7 +6,7 @@
 // Created:     10/17/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
diff --git a/src/os2/textctrl.cpp b/src/os2/textctrl.cpp
index c6bd6d1dd6..504758dee8 100644
--- a/src/os2/textctrl.cpp
+++ b/src/os2/textctrl.cpp
@@ -6,7 +6,7 @@
 // Created:     10/17/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ----------------------------------------------------------------------------
@@ -663,7 +663,7 @@ void wxTextCtrl::SetSelection(
     long                            lToChar = lTo;
 
     //
-    // If from and to are both -1, it means (in wxWindows) that all text should
+    // If from and to are both -1, it means (in wxWidgets) that all text should
     // be selected. Translate into Windows convention
     //
     if ((lFrom == -1L) && (lTo == -1L))
diff --git a/src/os2/thread.cpp b/src/os2/thread.cpp
index 738a99a758..4d9b41694b 100644
--- a/src/os2/thread.cpp
+++ b/src/os2/thread.cpp
@@ -7,7 +7,7 @@
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Neis (2003)
 //
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -62,7 +62,7 @@ static ULONG                        s_ulIdMainThread = 1;
 wxMutex*                            p_wxMainMutex;
 
 // OS2 substitute for Tls pointer the current parent thread object
-wxThread*                           m_pThread;    // pointer to the wxWindows thread object
+wxThread*                           m_pThread;    // pointer to the wxWidgets thread object
 
 // if it's FALSE, some secondary thread is holding the GUI lock
 static bool gs_bGuiOwnedByMainThread = TRUE;
@@ -383,7 +383,7 @@ public:
 private:
     // Threads in OS/2 have only an ID, so m_hThread is both it's handle and ID
     // PM also has no real Tls mechanism to index pointers by so we'll just
-    // keep track of the wxWindows parent object here.
+    // keep track of the wxWidgets parent object here.
     TID                             m_hThread;    // handle and ID of the thread
     wxThreadState                   m_eState;     // state, see wxThreadState enum
     unsigned int                    m_nPriority;  // thread priority in "wx" units
@@ -443,7 +443,7 @@ void wxThreadInternal::SetPriority(
   unsigned int                      nPriority
 )
 {
-    // translate wxWindows priority to the PM one
+    // translate wxWidgets priority to the PM one
     ULONG                           ulOS2_PriorityClass;
     ULONG                           ulOS2_SubPriority;
     ULONG                           ulrc;
diff --git a/src/os2/timer.cpp b/src/os2/timer.cpp
index 1aebce5ee1..4c0cea80a1 100644
--- a/src/os2/timer.cpp
+++ b/src/os2/timer.cpp
@@ -6,7 +6,7 @@
 // Created:     10/17/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
diff --git a/src/os2/toolbar.cpp b/src/os2/toolbar.cpp
index 82dd46c560..5e25c1dd51 100644
--- a/src/os2/toolbar.cpp
+++ b/src/os2/toolbar.cpp
@@ -6,7 +6,7 @@
 // Created:     06/30/02
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
diff --git a/src/os2/tooltip.cpp b/src/os2/tooltip.cpp
index 09b70270e2..990070139c 100644
--- a/src/os2/tooltip.cpp
+++ b/src/os2/tooltip.cpp
@@ -6,7 +6,7 @@
 // Created:     10/17/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/os2/toplevel.cpp b/src/os2/toplevel.cpp
index a038188dfb..1d52bad531 100644
--- a/src/os2/toplevel.cpp
+++ b/src/os2/toplevel.cpp
@@ -6,7 +6,7 @@
 // Created:     30.12.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
-// License:     wxWindows licence
+// License:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -55,7 +55,7 @@
 // list of all frames and modeless dialogs
 wxWindowList wxModelessWindows;
 
-// the name of the default wxWindows class
+// the name of the default wxWidgets class
 extern void          wxAssociateWinWithHandle( HWND         hWnd
                                               ,wxWindowOS2* pWin
                                              );
diff --git a/src/os2/treectrl.cpp b/src/os2/treectrl.cpp
index 8ea6c25d3d..ca250c5c16 100644
--- a/src/os2/treectrl.cpp
+++ b/src/os2/treectrl.cpp
@@ -6,7 +6,7 @@
 // Created:     1997
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/os2/utils.cpp b/src/os2/utils.cpp
index 22e8837796..e6dbfa8a91 100644
--- a/src/os2/utils.cpp
+++ b/src/os2/utils.cpp
@@ -6,7 +6,7 @@
 // Created:     09/17/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
@@ -45,7 +45,7 @@
 #include <netbios.h>
 #endif
 
-static const wxChar WX_SECTION[] = _T("wxWindows");
+static const wxChar WX_SECTION[] = _T("wxWidgets");
 static const wxChar eHOSTNAME[]  = _T("HostName");
 static const wxChar eUSERID[]    = _T("UserId");
 static const wxChar eUSERNAME[]  = _T("UserName");
diff --git a/src/os2/utilsexc.cpp b/src/os2/utilsexc.cpp
index f03454c49a..5df7c70697 100644
--- a/src/os2/utilsexc.cpp
+++ b/src/os2/utilsexc.cpp
@@ -6,7 +6,7 @@
 // Created:     10/17/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
diff --git a/src/os2/utilsgui.cpp b/src/os2/utilsgui.cpp
index fd710bbc20..74a925615d 100644
--- a/src/os2/utilsgui.cpp
+++ b/src/os2/utilsgui.cpp
@@ -6,7 +6,7 @@
 // Created:     20.08.2003 (extracted from os2/utils.cpp)
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// License:     wxWindows licence
+// License:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/os2/window.cpp b/src/os2/window.cpp
index ea20d2de24..46e620cf1d 100644
--- a/src/os2/window.cpp
+++ b/src/os2/window.cpp
@@ -5,7 +5,7 @@
 // Created:     10/12/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 //
@@ -1087,7 +1087,7 @@ WXDWORD wxWindowOS2::OS2GetStyle(
 } // end of wxWindowMSW::MSWGetStyle
 
 //
-// Make a Windows extended style from the given wxWindows window style
+// Make a Windows extended style from the given wxWidgets window style
 //
 WXDWORD wxWindowOS2::MakeExtendedStyle(
   long                              lStyle
@@ -2269,7 +2269,7 @@ void wxWindowOS2::UnpackMenuSelect(
 } // end of wxWindowOS2::UnpackMenuSelect
 
 // ---------------------------------------------------------------------------
-// Main wxWindows window proc and the window proc for wxWindow
+// Main wxWidgets window proc and the window proc for wxWindow
 // ---------------------------------------------------------------------------
 
 //
@@ -2754,7 +2754,7 @@ MRESULT wxWindowOS2::OS2WindowProc(
                             break;
                         }
                         //
-                        // Simulate a WM_COMMAND here, as wxWindows expects all control
+                        // Simulate a WM_COMMAND here, as wxWidgets expects all control
                         // button clicks to generate WM_COMMAND msgs, not WM_CONTROL
                         //
                         if (pWin->IsKindOf(CLASSINFO(wxRadioBox)))
@@ -2814,7 +2814,7 @@ MRESULT wxWindowOS2::OS2WindowProc(
                             break;
                         }
                         //
-                        // Simulate a WM_COMMAND here, as wxWindows expects all control
+                        // Simulate a WM_COMMAND here, as wxWidgets expects all control
                         // button clicks to generate WM_COMMAND msgs, not WM_CONTROL
                         //
                         if (pWin->IsKindOf(CLASSINFO(wxListBox)))
@@ -3386,7 +3386,7 @@ bool wxWindowOS2::OS2OnDrawItem(
                   );
         vDc.SetHPS(pMeasureStruct->hps);
         //
-        // Load the wxWindows Pallete and set to RGB mode
+        // Load the wxWidgets Pallete and set to RGB mode
         //
         if (!::GpiCreateLogColorTable( pMeasureStruct->hps
                                       ,0L
@@ -3962,7 +3962,7 @@ void wxWindowOS2::InitMouseEvent(
     int                                 nHeight;
     DoGetSize(0, &nHeight);
     rEvent.m_x           = nX;
-    // Convert to wxWindows standard coordinate system!
+    // Convert to wxWidgets standard coordinate system!
     rEvent.m_y           = nHeight - nY;
     rEvent.m_shiftDown   = ((uFlags & KC_SHIFT) != 0);
     rEvent.m_controlDown = ((uFlags & KC_CTRL) != 0);
@@ -4388,7 +4388,7 @@ void wxWindowOS2::MoveChildren(
 //
 //  Getting the Y position for a window, like a control, is a real
 //  pain.  There are three sitatuions we must deal with in determining
-//  the OS2 to wxWindows Y coordinate.
+//  the OS2 to wxWidgets Y coordinate.
 //
 //  1)  The controls are created in a dialog.
 //      This is the easiest since a dialog is created with its original
@@ -4900,7 +4900,7 @@ const char* wxGetMessageName(
         // Beginning of user defined messages
         case 0x1000: return "WM_USER";
 
-        // wxWindows user defined types
+        // wxWidgets user defined types
 
         // listview
         // case 0x1000 + 0: return "LVM_GETBKCOLOR";
diff --git a/src/png/pngconf.h b/src/png/pngconf.h
index 7b60f45b5b..723141ab2c 100644
--- a/src/png/pngconf.h
+++ b/src/png/pngconf.h
@@ -1246,7 +1246,7 @@ typedef z_stream FAR *  png_zstreamp;
 #endif
 
 #if defined(__VISAGECPP__)
-/* I don't compile with this _System linkage for wxWindows */
+/* I don't compile with this _System linkage for wxWidgets */
 #  ifdef PNGAPI
 #    undef PNGAPI
 #  endif
diff --git a/src/regex/regc_locale.c b/src/regex/regc_locale.c
index 331f6d1935..d68a88a5b1 100644
--- a/src/regex/regc_locale.c
+++ b/src/regex/regc_locale.c
@@ -11,9 +11,9 @@
  *
  * RCS: @(#) $Id$
  *
- * wxWindows:
+ * wxWidgets:
  *  The Scriptics license can be found in the file COPYRIGHT. Modifications
- *  for wxWindows are under the wxWindows licence, see README for details.
+ *  for wxWidgets are under the wxWidgets licence, see README for details.
  */
 
 #define CONST const
diff --git a/src/tiff/port.h b/src/tiff/port.h
index 3acbfb8ea5..773d63a8a3 100644
--- a/src/tiff/port.h
+++ b/src/tiff/port.h
@@ -1,6 +1,6 @@
 /*
  * Warning, this file was automatically created by the TIFF configure script
- *   Actually, it has been modified to use wxWindows' values.
+ *   Actually, it has been modified to use wxWidgets' values.
  * VERSION:	 v3.5.2
  * DATE:	 Son Nov 28 15:15:07 GMT 1999
  * TARGET:	 
@@ -18,14 +18,14 @@ extern "C" {
 #include <sys/types.h>
 #define HOST_FILLORDER FILLORDER_LSB2MSB
 
-/* wxWindows defines WORDS_BIGENDIAN */
+/* wxWidgets defines WORDS_BIGENDIAN */
 #ifdef WORDS_BIGENDIAN
 #define HOST_BIGENDIAN	1
 #else
 #define HOST_BIGENDIAN	0
 #endif
 
-/* wxWindows defines its own reading and writing routines */
+/* wxWidgets defines its own reading and writing routines */
 /* #define HAVE_MMAP 1 */
 
 #include <stdio.h>
@@ -44,12 +44,12 @@ typedef double dblparam_t;
 
 #define GLOBALDATA(TYPE,NAME)	extern TYPE NAME
 
-/* wxWindows defines wxUSE_LIBJPEG */
+/* wxWidgets defines wxUSE_LIBJPEG */
 #if wxUSE_LIBJPEG
 #define JPEG_SUPPORT
 #endif
 
-/* wxWindows defines wxUSE_ZLIB */
+/* wxWidgets defines wxUSE_ZLIB */
 #if wxUSE_ZLIB
 #define ZIP_SUPPORT
 #endif
diff --git a/src/univ/bmpbuttn.cpp b/src/univ/bmpbuttn.cpp
index 396dc3040a..8e04b369c0 100644
--- a/src/univ/bmpbuttn.cpp
+++ b/src/univ/bmpbuttn.cpp
@@ -6,7 +6,7 @@
 // Created:     25.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/univ/button.cpp b/src/univ/button.cpp
index fb7914d2a1..985dd62ae3 100644
--- a/src/univ/button.cpp
+++ b/src/univ/button.cpp
@@ -6,7 +6,7 @@
 // Created:     14.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/univ/checkbox.cpp b/src/univ/checkbox.cpp
index e80d036343..981fb551b6 100644
--- a/src/univ/checkbox.cpp
+++ b/src/univ/checkbox.cpp
@@ -6,7 +6,7 @@
 // Created:     25.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/univ/checklst.cpp b/src/univ/checklst.cpp
index f527683e61..8571abfd44 100644
--- a/src/univ/checklst.cpp
+++ b/src/univ/checklst.cpp
@@ -6,7 +6,7 @@
 // Created:     12.09.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/univ/choice.cpp b/src/univ/choice.cpp
index 426b2b4180..fdd855df67 100644
--- a/src/univ/choice.cpp
+++ b/src/univ/choice.cpp
@@ -6,7 +6,7 @@
 // Created:     15.12.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/univ/colschem.cpp b/src/univ/colschem.cpp
index 49975d709c..5d42746b14 100644
--- a/src/univ/colschem.cpp
+++ b/src/univ/colschem.cpp
@@ -6,7 +6,7 @@
 // Created:     20.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================
diff --git a/src/univ/combobox.cpp b/src/univ/combobox.cpp
index 83ecde8dc1..d50539d09f 100644
--- a/src/univ/combobox.cpp
+++ b/src/univ/combobox.cpp
@@ -6,7 +6,7 @@
 // Created:     15.12.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -280,7 +280,7 @@ wxComboControl::~wxComboControl()
 {
     // as the button and the text control are the parent's children and not
     // ours, we have to delete them manually - they are not deleted
-    // automatically by wxWindows when we're deleted
+    // automatically by wxWidgets when we're deleted
     delete m_btn;
     delete m_text;
 
diff --git a/src/univ/control.cpp b/src/univ/control.cpp
index a719d491fa..8f8db857db 100644
--- a/src/univ/control.cpp
+++ b/src/univ/control.cpp
@@ -6,7 +6,7 @@
 // Created:     14.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/univ/ctrlrend.cpp b/src/univ/ctrlrend.cpp
index 6a8be1ed6f..d9ca852dee 100644
--- a/src/univ/ctrlrend.cpp
+++ b/src/univ/ctrlrend.cpp
@@ -6,7 +6,7 @@
 // Created:     15.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================
diff --git a/src/univ/dialog.cpp b/src/univ/dialog.cpp
index 40b3f7efe8..edd348ad3c 100644
--- a/src/univ/dialog.cpp
+++ b/src/univ/dialog.cpp
@@ -3,7 +3,7 @@
 // Author:      Robert Roebling, Vaclav Slavik
 // Id:          $Id$
 // Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/univ/framuniv.cpp b/src/univ/framuniv.cpp
index 1fa17e7a06..4052121966 100644
--- a/src/univ/framuniv.cpp
+++ b/src/univ/framuniv.cpp
@@ -6,7 +6,7 @@
 // Created:     19.05.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================
diff --git a/src/univ/gauge.cpp b/src/univ/gauge.cpp
index c8ebbb2289..e0d1d557d0 100644
--- a/src/univ/gauge.cpp
+++ b/src/univ/gauge.cpp
@@ -6,7 +6,7 @@
 // Created:     20.02.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
-// License:     wxWindows licence
+// License:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/univ/inpcons.cpp b/src/univ/inpcons.cpp
index af38f0c8eb..f6e1d1be6a 100644
--- a/src/univ/inpcons.cpp
+++ b/src/univ/inpcons.cpp
@@ -6,7 +6,7 @@
 // Created:     14.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/univ/inphand.cpp b/src/univ/inphand.cpp
index 73357762fb..e9e7705ce8 100644
--- a/src/univ/inphand.cpp
+++ b/src/univ/inphand.cpp
@@ -6,7 +6,7 @@
 // Created:     18.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================
diff --git a/src/univ/listbox.cpp b/src/univ/listbox.cpp
index d05da69d53..95a00b01c6 100644
--- a/src/univ/listbox.cpp
+++ b/src/univ/listbox.cpp
@@ -6,7 +6,7 @@
 // Created:     30.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/univ/menu.cpp b/src/univ/menu.cpp
index a4cf5e1f75..e6ef491051 100644
--- a/src/univ/menu.cpp
+++ b/src/univ/menu.cpp
@@ -6,7 +6,7 @@
 // Created:     25.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/univ/notebook.cpp b/src/univ/notebook.cpp
index 68e2ec2e23..cd8777bf56 100644
--- a/src/univ/notebook.cpp
+++ b/src/univ/notebook.cpp
@@ -6,7 +6,7 @@
 // Created:     01.02.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/univ/radiobox.cpp b/src/univ/radiobox.cpp
index 621fde6d6f..ec34ceda00 100644
--- a/src/univ/radiobox.cpp
+++ b/src/univ/radiobox.cpp
@@ -6,7 +6,7 @@
 // Created:     11.09.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/univ/radiobut.cpp b/src/univ/radiobut.cpp
index 6ba669f940..5d3318b6b8 100644
--- a/src/univ/radiobut.cpp
+++ b/src/univ/radiobut.cpp
@@ -6,7 +6,7 @@
 // Created:     10.09.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/univ/scrarrow.cpp b/src/univ/scrarrow.cpp
index 9680ecc277..b35a45a2bc 100644
--- a/src/univ/scrarrow.cpp
+++ b/src/univ/scrarrow.cpp
@@ -6,7 +6,7 @@
 // Created:     22.01.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/univ/scrolbar.cpp b/src/univ/scrolbar.cpp
index 8626070f0d..1dd64695a0 100644
--- a/src/univ/scrolbar.cpp
+++ b/src/univ/scrolbar.cpp
@@ -6,7 +6,7 @@
 // Created:     20.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/univ/scrthumb.cpp b/src/univ/scrthumb.cpp
index 9e8b411062..77ef2b5444 100644
--- a/src/univ/scrthumb.cpp
+++ b/src/univ/scrthumb.cpp
@@ -6,7 +6,7 @@
 // Created:     13.02.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/univ/slider.cpp b/src/univ/slider.cpp
index e86aa02f8a..99aee782c7 100644
--- a/src/univ/slider.cpp
+++ b/src/univ/slider.cpp
@@ -6,7 +6,7 @@
 // Created:     09.02.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 /*
diff --git a/src/univ/spinbutt.cpp b/src/univ/spinbutt.cpp
index a9428daa30..f81494519d 100644
--- a/src/univ/spinbutt.cpp
+++ b/src/univ/spinbutt.cpp
@@ -6,7 +6,7 @@
 // Created:     21.01.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/univ/statbmp.cpp b/src/univ/statbmp.cpp
index 32bb836f7d..e7ee1a14d4 100644
--- a/src/univ/statbmp.cpp
+++ b/src/univ/statbmp.cpp
@@ -6,7 +6,7 @@
 // Created:     25.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/univ/statbox.cpp b/src/univ/statbox.cpp
index e1df45fb23..cae7591f1b 100644
--- a/src/univ/statbox.cpp
+++ b/src/univ/statbox.cpp
@@ -6,7 +6,7 @@
 // Created:     25.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/univ/statline.cpp b/src/univ/statline.cpp
index a4527c4017..519c3ec027 100644
--- a/src/univ/statline.cpp
+++ b/src/univ/statline.cpp
@@ -6,7 +6,7 @@
 // Created:     25.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/univ/stattext.cpp b/src/univ/stattext.cpp
index 2f2a955f83..51e32968ce 100644
--- a/src/univ/stattext.cpp
+++ b/src/univ/stattext.cpp
@@ -6,7 +6,7 @@
 // Created:     14.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/univ/statusbr.cpp b/src/univ/statusbr.cpp
index 71ffd980dd..0afebf1c93 100644
--- a/src/univ/statusbr.cpp
+++ b/src/univ/statusbr.cpp
@@ -6,7 +6,7 @@
 // Created:     14.10.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/univ/textctrl.cpp b/src/univ/textctrl.cpp
index 3111cdf4bd..b8e18fbd2b 100644
--- a/src/univ/textctrl.cpp
+++ b/src/univ/textctrl.cpp
@@ -6,7 +6,7 @@
 // Created:     15.09.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 /*
@@ -487,7 +487,7 @@ struct WXDLLEXPORT wxTextWrappedData : public wxTextMultiLineData
 // ----------------------------------------------------------------------------
 
 /*
-   We use custom versions of wxWindows command processor to implement undo/redo
+   We use custom versions of wxWidgets command processor to implement undo/redo
    as we want to avoid storing the backpointer to wxTextCtrl in wxCommand
    itself: this is a waste of memory as all commands in the given command
    processor always have the same associated wxTextCtrl and so it makes sense
diff --git a/src/univ/theme.cpp b/src/univ/theme.cpp
index 1ed1f57a20..143966ceef 100644
--- a/src/univ/theme.cpp
+++ b/src/univ/theme.cpp
@@ -6,7 +6,7 @@
 // Created:     06.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================
diff --git a/src/univ/themes/gtk.cpp b/src/univ/themes/gtk.cpp
index 2471eca2f9..74286b149a 100644
--- a/src/univ/themes/gtk.cpp
+++ b/src/univ/themes/gtk.cpp
@@ -6,7 +6,7 @@
 // Created:     06.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================
diff --git a/src/univ/themes/metal.cpp b/src/univ/themes/metal.cpp
index 31f9136b15..254ebed667 100644
--- a/src/univ/themes/metal.cpp
+++ b/src/univ/themes/metal.cpp
@@ -5,7 +5,7 @@
 // Created:     06.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================
diff --git a/src/univ/themes/win32.cpp b/src/univ/themes/win32.cpp
index 426420ec26..b875c5cb1b 100644
--- a/src/univ/themes/win32.cpp
+++ b/src/univ/themes/win32.cpp
@@ -5,7 +5,7 @@
 // Created:     06.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================
diff --git a/src/univ/toolbar.cpp b/src/univ/toolbar.cpp
index 74ff8b55e0..6ea811f965 100644
--- a/src/univ/toolbar.cpp
+++ b/src/univ/toolbar.cpp
@@ -7,7 +7,7 @@
 // Id:          $Id$
 // Copyright:   (c) 2001 Robert Roebling,
 //              (c) 2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/univ/topluniv.cpp b/src/univ/topluniv.cpp
index dea87cf2f5..a781437d5d 100644
--- a/src/univ/topluniv.cpp
+++ b/src/univ/topluniv.cpp
@@ -3,7 +3,7 @@
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/univ/winuniv.cpp b/src/univ/winuniv.cpp
index 7b6895d501..2311aa735d 100644
--- a/src/univ/winuniv.cpp
+++ b/src/univ/winuniv.cpp
@@ -6,7 +6,7 @@
 // Created:     06.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================
diff --git a/src/unix/baseunix.cpp b/src/unix/baseunix.cpp
index bd40653d6f..bc0b90d88c 100644
--- a/src/unix/baseunix.cpp
+++ b/src/unix/baseunix.cpp
@@ -6,7 +6,7 @@
 // Created:     23.06.2003
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// License:     wxWindows license
+// License:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/unix/dialup.cpp b/src/unix/dialup.cpp
index 65977f8e5e..34f62f0d1b 100644
--- a/src/unix/dialup.cpp
+++ b/src/unix/dialup.cpp
@@ -1,12 +1,12 @@
 // -*- c++ -*- ////////////////////////////////////////////////////////////////
 // Name:        unix/dialup.cpp
-// Purpose:     Network related wxWindows classes and functions
+// Purpose:     Network related wxWidgets classes and functions
 // Author:      Karsten Ballüder
 // Modified by:
 // Created:     03.10.99
 // RCS-ID:      $Id$
 // Copyright:   (c) Karsten Ballüder
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/unix/dir.cpp b/src/unix/dir.cpp
index c75d2712a4..1b9e6a1159 100644
--- a/src/unix/dir.cpp
+++ b/src/unix/dir.cpp
@@ -6,7 +6,7 @@
 // Created:     08.12.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/unix/displayx11.cpp b/src/unix/displayx11.cpp
index 08cf56f9f0..12c84cb796 100644
--- a/src/unix/displayx11.cpp
+++ b/src/unix/displayx11.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     12/05/02
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/unix/fontenum.cpp b/src/unix/fontenum.cpp
index 94520acb8d..9ef4f46f20 100644
--- a/src/unix/fontenum.cpp
+++ b/src/unix/fontenum.cpp
@@ -6,7 +6,7 @@
 // Created:     01.10.99
 // RCS-ID:      $Id$
 // Copyright:   (c) Vadim Zeitlin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/unix/fontutil.cpp b/src/unix/fontutil.cpp
index df38f593be..ffce45cd58 100644
--- a/src/unix/fontutil.cpp
+++ b/src/unix/fontutil.cpp
@@ -6,7 +6,7 @@
 // Created:     05.11.99
 // RCS-ID:      $Id$
 // Copyright:   (c) Vadim Zeitlin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -563,13 +563,13 @@ bool wxNativeFontInfo::GetUnderlined() const
 
 wxString wxNativeFontInfo::GetFaceName() const
 {
-    // wxWindows facename probably more accurately corresponds to X family
+    // wxWidgets facename probably more accurately corresponds to X family
     return GetXFontComponent(wxXLFD_FAMILY);
 }
 
 wxFontFamily wxNativeFontInfo::GetFamily() const
 {
-    // and wxWindows family -- to X foundry, but we have to translate it to
+    // and wxWidgets family -- to X foundry, but we have to translate it to
     // wxFontFamily somehow...
     wxFAIL_MSG(_T("not implemented")); // GetXFontComponent(wxXLFD_FOUNDRY);
 
diff --git a/src/unix/gsocket.c b/src/unix/gsocket.c
index dd8bfc5a92..3f1c19c862 100644
--- a/src/unix/gsocket.c
+++ b/src/unix/gsocket.c
@@ -4,7 +4,7 @@
  * Authors: Guilhem Lavaux,
  *          Guillermo Rodriguez Garcia <guille@iies.es> (maintainer)
  * Purpose: GSocket main Unix and OS/2 file
- * Licence: The wxWindows licence
+ * Licence: The wxWidgets licence
  * CVSID:   $Id$
  * -------------------------------------------------------------------------
  */
diff --git a/src/unix/gsocket.cpp b/src/unix/gsocket.cpp
index 28bbb98194..c580a78d33 100644
--- a/src/unix/gsocket.cpp
+++ b/src/unix/gsocket.cpp
@@ -5,7 +5,7 @@
  *          Guilhem Lavaux,
  *          Guillermo Rodriguez Garcia <guille@iies.es>
  * Purpose: GSocket main Unix and OS/2 file
- * Licence: The wxWindows licence
+ * Licence: The wxWidgets licence
  * CVSID:   $Id$
  * -------------------------------------------------------------------------
  */
diff --git a/src/unix/joystick.cpp b/src/unix/joystick.cpp
index cb88e0add9..2d99d7a2f7 100644
--- a/src/unix/joystick.cpp
+++ b/src/unix/joystick.cpp
@@ -6,7 +6,7 @@
 // Created:     05/23/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Guilhem Lavaux
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/unix/mimetype.cpp b/src/unix/mimetype.cpp
index e38775b671..28bcb2ffdb 100644
--- a/src/unix/mimetype.cpp
+++ b/src/unix/mimetype.cpp
@@ -6,7 +6,7 @@
 // Created:     23.09.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence (part of wxExtra library)
+// Licence:     wxWidgets licence (part of wxExtra library)
 /////////////////////////////////////////////////////////////////////////////
 
 // known bugs; there may be others!! chris elliott, biol75@york.ac.uk 27 Mar 01
diff --git a/src/unix/snglinst.cpp b/src/unix/snglinst.cpp
index df4971de41..d6733137da 100644
--- a/src/unix/snglinst.cpp
+++ b/src/unix/snglinst.cpp
@@ -7,7 +7,7 @@
 // Created:     09.06.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// License:     wxWindows licence
+// License:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/unix/sound.cpp b/src/unix/sound.cpp
index 1fb4999964..26d1068d85 100644
--- a/src/unix/sound.cpp
+++ b/src/unix/sound.cpp
@@ -6,7 +6,7 @@
 // Created:     25/10/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart, Open Source Applications Foundation
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/unix/sound_sdl.cpp b/src/unix/sound_sdl.cpp
index 16377aed4d..628175222e 100644
--- a/src/unix/sound_sdl.cpp
+++ b/src/unix/sound_sdl.cpp
@@ -6,7 +6,7 @@
 // Created:     2004/01/31
 // RCS-ID:      $Id$
 // Copyright:   (c) 2004, Open Source Applications Foundation
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // for compilers that support precompilation, includes "wx.h".
diff --git a/src/unix/taskbarx11.cpp b/src/unix/taskbarx11.cpp
index 52d44d68a2..b680769e4a 100644
--- a/src/unix/taskbarx11.cpp
+++ b/src/unix/taskbarx11.cpp
@@ -6,7 +6,7 @@
 // Created:     04/04/2003
 // RCS-ID:      $Id$
 // Copyright:   (c) Vaclav Slavik, 2003
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/unix/threadpsx.cpp b/src/unix/threadpsx.cpp
index 429b2a292c..3fdf392751 100644
--- a/src/unix/threadpsx.cpp
+++ b/src/unix/threadpsx.cpp
@@ -10,7 +10,7 @@
 //                  Vadim Zeitlin (1999-2002)
 //                  Robert Roebling (1999)
 //                  K. S. Sreeram (2002)
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -678,7 +678,7 @@ public:
 private:
     pthread_t     m_threadId;   // id of the thread
     wxThreadState m_state;      // see wxThreadState enum
-    int           m_prio;       // in wxWindows units: from 0 to 100
+    int           m_prio;       // in wxWidgets units: from 0 to 100
 
     // this flag is set when the thread should terminate
     bool m_cancelled;
diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp
index 5a3a772e1a..35d0fcbc10 100644
--- a/src/unix/utilsunx.cpp
+++ b/src/unix/utilsunx.cpp
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling, Vadim Zeitlin
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/unix/utilsx11.cpp b/src/unix/utilsx11.cpp
index 4f16da9388..fec01d6163 100644
--- a/src/unix/utilsx11.cpp
+++ b/src/unix/utilsx11.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     25.03.02
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__WXX11__) || defined(__WXGTK__) || defined(__WXMOTIF__)
@@ -199,7 +199,7 @@ void wxSetIconsX11( WXDisplay* display, WXWindow window,
 //     unless it has better compatiblity with older WMs).
 //
 //     
-//     This is what wxWindows does in wxSetFullScreenStateX11:
+//     This is what wxWidgets does in wxSetFullScreenStateX11:
 //       1) if _NET_WM_STATE_FULLSCREEN is supported, use it
 //       2) otherwise try WM-specific hacks (KDE, IceWM)
 //       3) use _WIN_LAYER and hope that the WM will recognize it
diff --git a/src/x11/app.cpp b/src/x11/app.cpp
index 461200728d..31772d616a 100644
--- a/src/x11/app.cpp
+++ b/src/x11/app.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
@@ -173,7 +173,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
         xdisplay = XOpenDisplay( displayName.ToAscii() );
     if (!xdisplay)
     {
-        wxLogError( _("wxWindows could not open display. Exiting.") );
+        wxLogError( _("wxWidgets could not open display. Exiting.") );
         return false;
     }
 
diff --git a/src/x11/bitmap.cpp b/src/x11/bitmap.cpp
index 10f3bc41e9..6ed4f11996 100644
--- a/src/x11/bitmap.cpp
+++ b/src/x11/bitmap.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart, Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/x11/brush.cpp b/src/x11/brush.cpp
index a3caec4115..d292fea085 100644
--- a/src/x11/brush.cpp
+++ b/src/x11/brush.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/x11/clipbrd.cpp b/src/x11/clipbrd.cpp
index e9ba9c5a04..a4851a06cd 100644
--- a/src/x11/clipbrd.cpp
+++ b/src/x11/clipbrd.cpp
@@ -5,7 +5,7 @@
 // Created:     
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/x11/colour.cpp b/src/x11/colour.cpp
index b334a9b931..f1dc41edf3 100644
--- a/src/x11/colour.cpp
+++ b/src/x11/colour.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart, Robert Roebling
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/src/x11/cursor.cpp b/src/x11/cursor.cpp
index fe53a0a5e9..6625bbdb4a 100644
--- a/src/x11/cursor.cpp
+++ b/src/x11/cursor.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/x11/data.cpp b/src/x11/data.cpp
index 9a16dd6c4a..730b22188a 100644
--- a/src/x11/data.cpp
+++ b/src/x11/data.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // this file is empty for now but a translation unit is not supposed to be
diff --git a/src/x11/dataobj.cpp b/src/x11/dataobj.cpp
index c095c13aa2..b721003407 100644
--- a/src/x11/dataobj.cpp
+++ b/src/x11/dataobj.cpp
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Id:          $Id$
 // Copyright:   (c) 1998 Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/x11/dc.cpp b/src/x11/dc.cpp
index 4b82e09a70..4e630c2b5c 100644
--- a/src/x11/dc.cpp
+++ b/src/x11/dc.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/x11/dcclient.cpp b/src/x11/dcclient.cpp
index d3601d5985..d047056099 100644
--- a/src/x11/dcclient.cpp
+++ b/src/x11/dcclient.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart, Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/x11/dcmemory.cpp b/src/x11/dcmemory.cpp
index 65affeed87..e437632478 100644
--- a/src/x11/dcmemory.cpp
+++ b/src/x11/dcmemory.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/x11/dcscreen.cpp b/src/x11/dcscreen.cpp
index a1999ffcec..f82868e312 100644
--- a/src/x11/dcscreen.cpp
+++ b/src/x11/dcscreen.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart, Robert Roebling
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/x11/dnd.cpp b/src/x11/dnd.cpp
index 9ed4df67e6..20328949c2 100644
--- a/src/x11/dnd.cpp
+++ b/src/x11/dnd.cpp
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Id:          $Id$
 // Copyright:   (c) 1998 Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/x11/evtloop.cpp b/src/x11/evtloop.cpp
index 0ac0eafb21..5e624178f8 100644
--- a/src/x11/evtloop.cpp
+++ b/src/x11/evtloop.cpp
@@ -6,7 +6,7 @@
 // Created:     01.06.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2002 Julian Smart
-// License:     wxWindows licence
+// License:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/x11/font.cpp b/src/x11/font.cpp
index 4eaee81f00..b6fa33d36a 100644
--- a/src/x11/font.cpp
+++ b/src/x11/font.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/x11/gdiobj.cpp b/src/x11/gdiobj.cpp
index 89a00f8370..1229662f6c 100644
--- a/src/x11/gdiobj.cpp
+++ b/src/x11/gdiobj.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/x11/glcanvas.cpp b/src/x11/glcanvas.cpp
index 0059ab89cf..4e9de4a8a3 100644
--- a/src/x11/glcanvas.cpp
+++ b/src/x11/glcanvas.cpp
@@ -1,13 +1,13 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        glcanvas.cpp
-// Purpose:     wxGLCanvas, for using OpenGL with wxWindows
+// Purpose:     wxGLCanvas, for using OpenGL with wxWidgets
 //              Uses the GLX extension.
 // Author:      Julian Smart and Wolfram Gloger
 // Modified by:
 // Created:     1995, 1999
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart, Wolfram Gloger
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/x11/gsockx11.c b/src/x11/gsockx11.c
index ae23842347..0cbe4f1763 100644
--- a/src/x11/gsockx11.c
+++ b/src/x11/gsockx11.c
@@ -2,7 +2,7 @@
  * Project: GSocket (Generic Socket) for WX
  * Name:    gsockmot.c
  * Purpose: GSocket: X11 part
- * Licence: The wxWindows licence
+ * Licence: The wxWidgets licence
  * CVSID:   $Id$
  * ------------------------------------------------------------------------- */
 
diff --git a/src/x11/gsockx11.cpp b/src/x11/gsockx11.cpp
index e42fd4942b..1feeb0c548 100644
--- a/src/x11/gsockx11.cpp
+++ b/src/x11/gsockx11.cpp
@@ -2,7 +2,7 @@
  * Project: GSocket (Generic Socket) for WX
  * Name:    gsockmot.c
  * Purpose: GSocket: X11 part
- * Licence: The wxWindows licence
+ * Licence: The wxWidgets licence
  * CVSID:   $Id$
  * ------------------------------------------------------------------------- */
 
diff --git a/src/x11/icon.cpp b/src/x11/icon.cpp
index 0086004ff4..18973b88f8 100644
--- a/src/x11/icon.cpp
+++ b/src/x11/icon.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/x11/joystick.cpp b/src/x11/joystick.cpp
index a21ce29b22..e3cce74ab0 100644
--- a/src/x11/joystick.cpp
+++ b/src/x11/joystick.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/x11/main.cpp b/src/x11/main.cpp
index e2eea40e29..6fb636643d 100644
--- a/src/x11/main.cpp
+++ b/src/x11/main.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/app.h"
diff --git a/src/x11/minifram.cpp b/src/x11/minifram.cpp
index 50524f2452..4cfebd2163 100644
--- a/src/x11/minifram.cpp
+++ b/src/x11/minifram.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/x11/nanox.c b/src/x11/nanox.c
index 5da90dd64d..9811d4d023 100644
--- a/src/x11/nanox.c
+++ b/src/x11/nanox.c
@@ -2,7 +2,7 @@
  * nanox.c
  *
  * Replacements for some comomon Xlib functions
- * Licence: The wxWindows licence
+ * Licence: The wxWidgets licence
  */
 
 #include "wx/setup.h"
diff --git a/src/x11/palette.cpp b/src/x11/palette.cpp
index c95becb4b9..071ca384cd 100644
--- a/src/x11/palette.cpp
+++ b/src/x11/palette.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 /*
@@ -20,7 +20,7 @@
 
 /* Wolfram Gloger <u7y22ab@sunmail.lrz-muenchen.de>
 I have implemented basic colormap support for the X11 versions of
-wxWindows, notably wxPalette::Create().  The way I did it is to
+wxWidgets, notably wxPalette::Create().  The way I did it is to
 allocate additional read-only color cells in the default colormap.  In
 general you will get arbitrary pixel values assigned to these new
 cells and therefore I added a method wxColourMap::TransferBitmap()
diff --git a/src/x11/pango_x.cpp b/src/x11/pango_x.cpp
index 49393ad53e..50370c89d3 100644
--- a/src/x11/pango_x.cpp
+++ b/src/x11/pango_x.cpp
@@ -2,7 +2,7 @@
  * This file gets included from dcclient.cpp and implements 
  * the X11 interface to Pango. 
  * Copyright (C) Owen Taylor and Robert Roebling.
- * Licence: The wxWindows licence
+ * Licence: The wxWidgets licence
  */
 
 /* Declaration */
diff --git a/src/x11/pangox11.cpp b/src/x11/pangox11.cpp
index 3f4f0cc0c0..a033284d1d 100644
--- a/src/x11/pangox11.cpp
+++ b/src/x11/pangox11.cpp
@@ -2,7 +2,7 @@
  * This file gets included from dcclient.cpp and implements 
  * the X11 interface to Pango. 
  * Copyright (C) Owen Taylor and Robert Roebling.
- * Licence: The wxWindows licence
+ * Licence: The wxWidgets licence
  */
 
 /* Declaration */
diff --git a/src/x11/pen.cpp b/src/x11/pen.cpp
index ecff52dd02..a308e433ec 100644
--- a/src/x11/pen.cpp
+++ b/src/x11/pen.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/x11/popupwin.cpp b/src/x11/popupwin.cpp
index 35bbf8c99f..a9b07ccaab 100644
--- a/src/x11/popupwin.cpp
+++ b/src/x11/popupwin.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/x11/region.cpp b/src/x11/region.cpp
index 78be859708..ff48e00ac8 100644
--- a/src/x11/region.cpp
+++ b/src/x11/region.cpp
@@ -5,7 +5,7 @@
 // Created:   Fri Oct 24 10:46:34 MET 1997
 // RCS-ID:    $Id$
 // Copyright: (c) 1997 Julian Smart, Robert Roebling
-// Licence:   wxWindows licence
+// Licence:   wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/x11/reparent.cpp b/src/x11/reparent.cpp
index 7e76d2334d..214d08924f 100644
--- a/src/x11/reparent.cpp
+++ b/src/x11/reparent.cpp
@@ -6,7 +6,7 @@
 // Created:     2002-03-09
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/x11/settings.cpp b/src/x11/settings.cpp
index 188217ba89..59c535b028 100644
--- a/src/x11/settings.cpp
+++ b/src/x11/settings.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // TODO: these settings should probably be configurable from some central or
diff --git a/src/x11/textctrl.cpp b/src/x11/textctrl.cpp
index 3b778c72a9..22e0550a3a 100644
--- a/src/x11/textctrl.cpp
+++ b/src/x11/textctrl.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/src/x11/toplevel.cpp b/src/x11/toplevel.cpp
index 7fcd2b9894..213c2d056d 100644
--- a/src/x11/toplevel.cpp
+++ b/src/x11/toplevel.cpp
@@ -6,7 +6,7 @@
 // Created:     24.09.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2002 Julian Smart
-// License:     wxWindows licence
+// License:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -669,7 +669,7 @@ struct MwmHints {
 #define PROP_MOTIF_WM_HINTS_ELEMENTS 5
 
 // Set the window manager decorations according to the
-// given wxWindows style
+// given wxWidgets style
 bool wxSetWMDecorations(Window w, long style)
 {
 #if wxUSE_NANOX
diff --git a/src/x11/utils.cpp b/src/x11/utils.cpp
index 071f4f6b98..1fc85e2df8 100644
--- a/src/x11/utils.cpp
+++ b/src/x11/utils.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
diff --git a/src/x11/utilsx.cpp b/src/x11/utilsx.cpp
index 7a25ddbcc5..2339461346 100644
--- a/src/x11/utilsx.cpp
+++ b/src/x11/utilsx.cpp
@@ -6,7 +6,7 @@
 // Created:     05/04/03
 // RCS-ID:      $Id$
 // Copyright:   (c) Mattia Barbon
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __VMS
diff --git a/src/x11/window.cpp b/src/x11/window.cpp
index f84025ee9b..03177cefa4 100644
--- a/src/x11/window.cpp
+++ b/src/x11/window.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -1293,7 +1293,7 @@ void wxWindowX11::OnInternalIdle()
 }
 
 // ----------------------------------------------------------------------------
-// function which maintain the global hash table mapping Widgets to wxWindows
+// function which maintain the global hash table mapping Widgets to wxWidgets
 // ----------------------------------------------------------------------------
 
 bool wxAddWindowToTable(Window w, wxWindow *win)
diff --git a/src/xml/xml.cpp b/src/xml/xml.cpp
index 80c76829fc..c8c41cda0e 100644
--- a/src/xml/xml.cpp
+++ b/src/xml/xml.cpp
@@ -5,7 +5,7 @@
 // Created:     2000/03/05
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
diff --git a/utils/tex2rtf/docs/tex2rtf.tex b/utils/tex2rtf/docs/tex2rtf.tex
index f01f682d51..f62b6c3bb5 100644
--- a/utils/tex2rtf/docs/tex2rtf.tex
+++ b/utils/tex2rtf/docs/tex2rtf.tex
@@ -80,11 +80,11 @@ It is available in Sun Open Look, Motif, Windows 3.1, Windows 95/NT, and
 non-GUI UNIX versions.
 
 Tex2RTF was developed using the free Open Look, Motif and Windows 3.1
-C++ class library \popref{wxWindows}{wxwindows}.
+C++ class library \popref{wxWidgets}{wxwidgets}.
 
 \section{Status of Tex2RTF}\index{status of Tex2RTF}%
 
-Windows HTML help, and wxWindows 2 wxHTML help, are now catered for using
+Windows HTML help, and wxWidgets 2 wxHTML help, are now catered for using
 the htmlWorkshopFiles setting.
 
 Tex2RTF is very rarely updated these days: it would be nice to
@@ -671,8 +671,8 @@ each line with three fields separated by bar characters: the indexed phrase, the
 
 \twocolitem{\inioption{htmlWorkshopFiles}}{If true, specifies generation of {\tt .hpp, .hhc} and {\tt .hhk} files
 which can be used to create both MS HTML Help and wxHTML Help files. wxHTML Help
-is the HTML help facility that can be used by wxWindows 2 applications (see the wxWindows manual
-and the wxWindows HTML sample).}
+is the HTML help facility that can be used by wxWidgets 2 applications (see the wxWidgets manual
+and the wxWidgets HTML sample).}
 \twocolitem{\inioption{upperCaseNames}}{If true, filenames in links are in upper case. By default
 filenames are in lower case.}
 \twocolitem{\inioption{backgroundColour}}{Specifies the RGB background colour for the document, e.g. {\tt 255;255;255} for white.
@@ -725,7 +725,7 @@ The following DDE commands may be used:
 Since Tex2RTF reads the whole file into memory, a lot of memory is needed.
 For very large documents, 16MB of RAM is adviseable.
 
-I tested conversion of the wxWindows 1.63 manual on both VC++ 1.5 and
+I tested conversion of the wxWidgets 1.63 manual on both VC++ 1.5 and
 Watcom WIN32s versions of Tex2RTF, both running under Windows 3.11 on a
 Gateway P60 with 16MB of RAM and a 2MB disk cache. Two passes were
 made, with 1.5MB of WinHelp RTF being generated. The unoptimized 16-bit
@@ -795,7 +795,7 @@ hypertext format.
 commonly used by documents in the World Wide Web distributed hypertext
 system, and formats text dynamically rather like Windows Help.
 \item wxHelp\index{wxHelp}. This is the platform-independent help system for
-the class library wxWindows (see the wxWindows User Manual \cite{smart93a}).
+the class library wxWidgets (see the wxWidgets User Manual \cite{smart93a}).
 It can display ASCII files with embedded codes
 for changing font styles, but no formatting is done by wxHelp.
 \end{itemize}
@@ -1301,7 +1301,7 @@ can handle. Since spacing is passed through to the output, you need to
 format your input document appropriately, with lines of reasonable length.
 
 The generated xlp file is an ASCII file that can be read directly by
-wxHelp, the generic wxWindows help viewer.
+wxHelp, the generic wxWidgets help viewer.
 
 \chapter{Command reference}\index{command reference}%
 \setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
@@ -2294,17 +2294,17 @@ This is an example of making a glossary in a report:
     \gloss{API}\label{api}
 
     Application Programmer's Interface - a set of calls and
-    classes defining how a library (in this case, wxWindows)
+    classes defining how a library (in this case, wxWidgets)
     can be used.
 
     \gloss{Canvas}\label{canvas}
 
-    A canvas in XView and wxWindows is a subwindow...
+    A canvas in XView and wxWidgets is a subwindow...
 
     \gloss{DDE}\label{dde}
 
     Dynamic Data Exchange - Microsoft's interprocess
-    communication protocol. wxWindows provides an abstraction
+    communication protocol. wxWidgets provides an abstraction
     of DDE under both Windows and UNIX.
 
     \end{helpglossary}
@@ -2387,7 +2387,7 @@ Note that only RGB-encoded Windows bitmaps, or placeable metafiles, are
 valid for input to Tex2RTF. You can convert a RLE (run length encoded)
 bitmap file into a (bigger) RGB file using a program such as Paintshop
 Pro. A placeable metafile has a special header with dimension
-information. One may be constructed by a wxWindows program by calling
+information. One may be constructed by a wxWidgets program by calling
 the function wxMakeMetafilePlaceable. The Microsoft Windows SDK has a
 sample program that loads and steps through placeable and ordinary
 metafiles.
@@ -2807,7 +2807,7 @@ is given following the text.
 Example:
 
 \begin{verbatim}
-    See also the \urlref{wxWindows manual}
+    See also the \urlref{wxWidgets manual}
       {http://www.aiai.ed.ac.uk/~jacs.html}.
 \end{verbatim}
 
@@ -3285,14 +3285,14 @@ input to the Windows Help compiler.
 \gloss{wxHelp}\label{wxhelp}
 
 wxHelp is the hypertext help facility used to provide on-line
-documentation for UNIX-based wxWindows applications. Under Windows 3.1,
+documentation for UNIX-based wxWidgets applications. Under Windows 3.1,
 Windows Help is used instead.
 
-\gloss{wxWindows}\label{wxwindows}
+\gloss{wxWidgets}\label{wxwidgets}
 
-wxWindows is a free C++ toolkit for writing applications that are
+wxWidgets is a free C++ toolkit for writing applications that are
 portable across several platforms. Currently these are Motif, Open Look,
-Windows 3.1 and Windows NT. Tex2RTF is written using wxWindows.
+Windows 3.1 and Windows NT. Tex2RTF is written using wxWidgets.
 
 \end{helpglossary}