Replace "WIN32" with "_WIN32" or "Windows".

Replace compiler/preprocessor/platform macro "WIN32" with "_WIN32".
Replace "WIN32" in text and documentation with "Windows".
Replace "MSWindows" with "Windows".

To do: README.Windows.txt (and maybe other documentation as well)
needs updates.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12655 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

6 files changed, 20 insertions, 21 deletions

diff --git a/src/drivers/WinAPI/Fl_WinAPI_Printer_Driver.cxx b/src/drivers/WinAPI/Fl_WinAPI_Printer_Driver.cxx
index 2c318d0b4..7492074a7 100644
--- a/src/drivers/WinAPI/Fl_WinAPI_Printer_Driver.cxx
+++ b/src/drivers/WinAPI/Fl_WinAPI_Printer_Driver.cxx
@@ -1,9 +1,9 @@
 //
 // "$Id$"
 //
-// Support for WIN32 printing for the Fast Light Tool Kit (FLTK).
+// Printing support for Windows for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 2010-2016 by Bill Spitzak and others.
+// Copyright 2010-2018 by Bill Spitzak and others.
 //
 // This library is free software. Distribution and use rights are outlined in
 // the file "COPYING" which should have been included with this file.  If this
@@ -16,7 +16,7 @@
 //     http://www.fltk.org/str.php
 //
 
-#ifdef WIN32
+#ifdef _WIN32
 
 #include "../GDI/Fl_GDI_Graphics_Driver.H"
 #include <FL/Fl_Printer.H>
@@ -27,7 +27,7 @@
 
 extern HWND fl_window;
 
-/** Support for printing on the MSWindows platform */
+/** Support for printing on the Windows platform */
 class Fl_WinAPI_Printer_Driver : public Fl_Paged_Device {
   friend class Fl_Paged_Device;
 private:
@@ -318,7 +318,7 @@ void Fl_WinAPI_Printer_Driver::origin(int *x, int *y)
   Fl_Paged_Device::origin(x, y);
 }
 
-#endif // WIN32
+#endif // _WIN32
 
 //
 // End of "$Id$".
diff --git a/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.H b/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.H
index b5d238ba9..d6dfaf889 100644
--- a/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.H
+++ b/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.H
@@ -1,7 +1,7 @@
 //
 // "$Id$"
 //
-// Definition of MSWindows Win32/64 Screen interface
+// Definition of Windows screen interface
 // for the Fast Light Tool Kit (FLTK).
 //
 // Copyright 2010-2018 by Bill Spitzak and others.
@@ -19,7 +19,7 @@
 
 /**
  \file Fl_WinAPI_Screen_Driver.H
- \brief Definition of MSWindows Win32/64 Screen interface.
+ \brief Definition of Windows screen interface.
  */
 
 #ifndef FL_WINAPI_SCREEN_DRIVER_H
diff --git a/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.cxx b/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.cxx
index f44fa7a3c..4521038f0 100644
--- a/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.cxx
+++ b/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.cxx
@@ -1,7 +1,7 @@
 //
 // "$Id$"
 //
-// Definition of MSWindows Win32/64 Screen interface
+// Windows screen interface for the Fast Light Tool Kit (FLTK).
 //
 // Copyright 1998-2018 by Bill Spitzak and others.
 //
@@ -275,7 +275,7 @@ void Fl_WinAPI_Screen_Driver::flush()
 extern void fl_fix_focus(); // in Fl.cxx
 
 // We have to keep track of whether we have captured the mouse, since
-// MSWindows shows little respect for this... Grep for fl_capture to
+// Windows shows little respect for this... Grep for fl_capture to
 // see where and how this is used.
 extern HWND fl_capture;
 
diff --git a/src/drivers/WinAPI/Fl_WinAPI_System_Driver.H b/src/drivers/WinAPI/Fl_WinAPI_System_Driver.H
index 0f376a00a..0fe23cfda 100644
--- a/src/drivers/WinAPI/Fl_WinAPI_System_Driver.H
+++ b/src/drivers/WinAPI/Fl_WinAPI_System_Driver.H
@@ -1,10 +1,9 @@
 //
 // "$Id$"
 //
-// Definition of MSWindows system driver
-// for the Fast Light Tool Kit (FLTK).
+// Definition of Windows system driver for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 2010-2017 by Bill Spitzak and others.
+// Copyright 2010-2018 by Bill Spitzak and others.
 //
 // This library is free software. Distribution and use rights are outlined in
 // the file "COPYING" which should have been included with this file.  If this
@@ -19,7 +18,7 @@
 
 /**
  \file Fl_WinAPI_System_Driver.H
- \brief Definition of MSWindows system driver.
+ \brief Definition of Windows system driver.
  */
 
 #ifndef FL_WINAPI_SYSTEM_DRIVER_H
diff --git a/src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx b/src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx
index 26a41bd61..f2b56e0e0 100644
--- a/src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx
+++ b/src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx
@@ -3,7 +3,7 @@
 //
 // Definition of Apple Darwin system driver.
 //
-// Copyright 1998-2017 by Bill Spitzak and others.
+// Copyright 1998-2018 by Bill Spitzak and others.
 //
 // This library is free software. Distribution and use rights are outlined in
 // the file "COPYING" which should have been included with this file.  If this
@@ -155,7 +155,7 @@ Fl_System_Driver *Fl_System_Driver::newSystemDriver()
 }
 
 void Fl_WinAPI_System_Driver::warning(const char *format, va_list args) {
-  // Show nothing for warnings under WIN32...
+  // Show nothing for warnings under Windows...
 }
 
 void Fl_WinAPI_System_Driver::error(const char *format, va_list args) {
@@ -308,7 +308,7 @@ int Fl_WinAPI_System_Driver::rename(const char *fnam, const char *newnam) {
   return _wrename(wbuf, wbuf1);
 }
 
-// Two WIN32-specific functions fl_utf8_to_locale() and fl_locale_to_utf8()
+// Two Windows-specific functions fl_utf8_to_locale() and fl_locale_to_utf8()
 // from file fl_utf8.cxx are put here for API compatibility
 
 static char *buf = NULL;
@@ -721,7 +721,7 @@ int Fl_WinAPI_System_Driver::file_browser_load_filesystem(Fl_File_Browser *brows
   endmntent(m);
 #  else
   //
-  // Normal WIN32 code uses drive bits...
+  // Normal Windows code uses drive bits...
   //
   DWORD	drives;		// Drive available bits
   drives = GetLogicalDrives();
@@ -729,7 +729,7 @@ int Fl_WinAPI_System_Driver::file_browser_load_filesystem(Fl_File_Browser *brows
     if (drives & 1)
     {
       sprintf(filename, "%c:/", i);
-      if (i < 'C') // see also: GetDriveType and GetVolumeInformation in WIN32
+      if (i < 'C') // see also: GetDriveType and GetVolumeInformation in Windows
         browser->add(filename, icon);
       else
         browser->add(filename, icon);
diff --git a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H
index 576d42736..7e67f2355 100644
--- a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H
+++ b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H
@@ -4,7 +4,7 @@
 // Definition of Apple Cocoa window driver
 // for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 2010-2016 by Bill Spitzak and others.
+// Copyright 2010-2018 by Bill Spitzak and others.
 //
 // This library is free software. Distribution and use rights are outlined in
 // the file "COPYING" which should have been included with this file.  If this
@@ -19,7 +19,7 @@
 
 /**
  \file Fl_WinAPI_Window_Driver.H
- \brief Definition of MSWindows window driver.
+ \brief Definition of Windows window driver.
  */
 
 #ifndef FL_WINAPI_WINDOW_DRIVER_H
@@ -40,7 +40,7 @@
  - window types and styles, depth, etc.
  - decorations
  
- ? where do we handle the interface between OpenGL/DirectX and Cocoa/WIN32/Glx?
+ ? where do we handle the interface between OpenGL/DirectX and Cocoa/Windows/Glx?
  */