Use "MSW" and "Windows" more accurately to avoid confusion.

"MSW" is used as the name of toolkit using the standard Windows UI while
"Windows" is the name of the OS under which wxGTK can be now used too (in
addition to wxMSW).

This terminology is not perfect but at least let's keep it unambiguous.

Closes #15328.

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

diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl
index 5e430df793b438e9b8e2fff74783c8ce18908d5e..f4fed35f76148525fcb04d7855c9e5cc981de1b9 100644 (file)
--- a/build/bakefiles/config.bkl
+++ b/build/bakefiles/config.bkl
@@ -66,7 +66,7 @@
             </option>
         </if>
 
-        <!-- We must make TOOLKIT a constant under MSW -->
+        <!-- We must make TOOLKIT a constant under Windows -->
         <if cond="FORMAT in ['borland','mingw','msvc','watcom', 'msvc6prj', 'msvs2003prj', 'msvs2005prj', 'msvs2008prj']">
             <set var="TOOLKIT">MSW</set>
         </if>

diff --git a/docs/changes.txt b/docs/changes.txt
index 621e4aae7b57c34704003e8e6056fd4becb9ca52..0e824dccee666c6a775c92d44d08ffb742c3e3fd 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -689,7 +689,7 @@ All (GUI):
 wxGTK:
 
 - Allow building wxGTK3 with Broadway and Wayland backends (Kolya Kosenko).
-- Further improvements to wxGTK/MSW port (Kolya Kosenko).
+- Further improvements to wxGTK/Win32 port (Kolya Kosenko).
 - Provide native implementation of wxNotificationMessage using libnotify.
 - Generate clipboard events for wxComboBox and not only wxTextCtrl.
 - Improve drag-and-drop of URLs.

diff --git a/docs/msw/gtk.txt b/docs/msw/gtk.txt
index 8dfac942ffd6ec6fc51e9ca0936f1f20b7b47f23..7e7640c845cb0b1c3bdf2e1112243856210d4fda 100644 (file)
--- a/docs/msw/gtk.txt
+++ b/docs/msw/gtk.txt
@@ -24,7 +24,7 @@ diff build/bakefiles/config.bkl build/bakefiles/config.bkl
 @@ -67,9 +67,9 @@
          </if>
  
-         <!-- We must make TOOLKIT a constant under MSW -->
+         <!-- We must make TOOLKIT a constant under Windows -->
 -        <if cond="FORMAT in ['borland','mingw','msvc','watcom', 'msvc6prj', 'msvs2003prj', 'msvs2005prj', 'msvs2008prj']">
 +        <!--if cond="FORMAT in ['borland','mingw','msvc','watcom', 'msvc6prj', 'msvs2003prj', 'msvs2005prj', 'msvs2008prj']">
              <set var="TOOLKIT">MSW</set>