6 files changed, 29 insertions, 30 deletions
diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver.H b/src/drivers/GDI/Fl_GDI_Graphics_Driver.H
index 8de2a9a1d..1ab61722b 100644
--- a/src/drivers/GDI/Fl_GDI_Graphics_Driver.H
+++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver.H
@@ -19,7 +19,7 @@
 
 /**
  \file Fl_GDI_Graphics_Driver.H
- \brief Definition of MSWindows GDI graphics driver.
+ \brief Definition of Windows GDI graphics driver.
  */
 
 #ifndef FL_GDI_GRAPHICS_DRIVER_H
@@ -30,10 +30,10 @@
 
 
 /**
- \brief The MSWindows-specific graphics class.
- *
- This class is implemented only on the MSWindows platform.
- */
+  \brief The Windows-specific graphics driver class.
+
+  This class is implemented only on the Windows platform.
+*/
 class FL_EXPORT Fl_GDI_Graphics_Driver : public Fl_Scalable_Graphics_Driver {
 private:
   BOOL alpha_blend_(int x, int y, int w, int h, HDC src_gc, int srcx, int srcy, int srcw, int srch);
@@ -151,10 +151,11 @@ protected:
 
 
 /**
- The graphics driver used when printing on MSWindows.
- *
- This class is implemented only on the MSWindows platform. It 's extremely similar to Fl_GDI_Graphics_Driver.
- */
+  The graphics driver used when printing on Windows.
+
+  This class is implemented only on the Windows platform.
+  It is extremely similar to Fl_GDI_Graphics_Driver.
+*/
 class FL_EXPORT Fl_GDI_Printer_Graphics_Driver : public Fl_GDI_Graphics_Driver {
 private:
   typedef BOOL (WINAPI* transparent_f_type) (HDC,int,int,int,int,HDC,int,int,int,int,UINT);
diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx b/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx
index 4a49db6d5..e4088b0c0 100644
--- a/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx
+++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx
@@ -25,7 +25,7 @@
 
 /*
  * By linking this module, the following static method will instantiate the
- * MSWindows GDI Graphics driver as the main display driver.
+ * Windows GDI Graphics driver as the main display driver.
  */
 Fl_Graphics_Driver *Fl_Graphics_Driver::newMainGraphicsDriver()
 {
@@ -53,7 +53,7 @@ void Fl_GDI_Graphics_Driver::global_gc()
 }
 
 /*
- * This function checks if the version of MSWindows that we
+ * This function checks if the version of Windows that we
  * curently run on supports alpha blending for bitmap transfers
  * and finds the required function if so.
  */
diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver_font.cxx b/src/drivers/GDI/Fl_GDI_Graphics_Driver_font.cxx
index c9d74e59e..7127682cc 100644
--- a/src/drivers/GDI/Fl_GDI_Graphics_Driver_font.cxx
+++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver_font.cxx
@@ -1,7 +1,7 @@
 //
 // "$Id$"
 //
-// WIN32 font utilities for the Fast Light Tool Kit (FLTK).
+// Windows font utilities for the Fast Light Tool Kit (FLTK).
 //
 // Copyright 1998-2018 by Bill Spitzak and others.
 //
@@ -16,23 +16,21 @@
 //     http://www.fltk.org/str.php
 //
 
-#ifdef WIN32
-# ifndef WIN32_LEAN_AND_MEAN
-#  define WIN32_LEAN_AND_MEAN
-# endif
+#ifndef WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
 /* We require Windows 2000 features such as GetGlyphIndices */
-# if !defined(WINVER) || (WINVER < 0x0500)
-#  ifdef WINVER
-#   undef WINVER
-#  endif
-#  define WINVER 0x0500
+#if !defined(WINVER) || (WINVER < 0x0500)
+# ifdef WINVER
+#  undef WINVER
 # endif
-# if !defined(_WIN32_WINNT) || (_WIN32_WINNT < 0x0500)
-#  ifdef _WIN32_WINNT
-#   undef _WIN32_WINNT
-#  endif
-#  define _WIN32_WINNT 0x0500
+# define WINVER 0x0500
+#endif
+#if !defined(_WIN32_WINNT) || (_WIN32_WINNT < 0x0500)
+# ifdef _WIN32_WINNT
+#  undef _WIN32_WINNT
 # endif
+# define _WIN32_WINNT 0x0500
 #endif
 
 // Select fonts from the FLTK font table.
diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver_image.cxx b/src/drivers/GDI/Fl_GDI_Graphics_Driver_image.cxx
index 63dded34d..31d308464 100644
--- a/src/drivers/GDI/Fl_GDI_Graphics_Driver_image.cxx
+++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver_image.cxx
@@ -1,7 +1,7 @@
 //
 // "$Id$"
 //
-// WIN32 image drawing code for the Fast Light Tool Kit (FLTK).
+// Windows image drawing code for the Fast Light Tool Kit (FLTK).
 //
 // Copyright 1998-2018 by Bill Spitzak and others.
 //
@@ -414,7 +414,7 @@ void Fl_GDI_Graphics_Driver::draw_unscaled(Fl_Bitmap *bm, float s, int XP, int Y
   int save = SaveDC(tempdc);
   SelectObject(tempdc, (HGDIOBJ)*Fl_Graphics_Driver::id(bm));
   SelectObject(gc_, fl_brush());
-  // secret bitblt code found in old MSWindows reference manual:
+  // secret bitblt code found in old Windows reference manual:
   BitBlt(gc_, X, Y, W, H, tempdc, cx, cy, 0xE20746L);
   RestoreDC(tempdc, save);
   DeleteDC(tempdc);
diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver_rect.cxx b/src/drivers/GDI/Fl_GDI_Graphics_Driver_rect.cxx
index d347cc6a8..0dbb674f0 100644
--- a/src/drivers/GDI/Fl_GDI_Graphics_Driver_rect.cxx
+++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver_rect.cxx
@@ -19,7 +19,7 @@
 
 /**
  \file Fl_GDI_Graphics_Driver_rect.cxx
- \brief MSWindows GDI specific line and polygon drawing with integer coordinates.
+ \brief Windows GDI specific line and polygon drawing with integer coordinates.
  */
 
 #include <config.h>
diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver_vertex.cxx b/src/drivers/GDI/Fl_GDI_Graphics_Driver_vertex.cxx
index b8ee81d65..caace8b39 100644
--- a/src/drivers/GDI/Fl_GDI_Graphics_Driver_vertex.cxx
+++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver_vertex.cxx
@@ -20,7 +20,7 @@
   \file Fl_GDI_Graphics_Driver_vertex.cxx
 
   \brief  Portable drawing code for drawing arbitrary shapes with
-	  simple 2D transformations, implemented for MSWindows GDI.
+	  simple 2D transformations, implemented for Windows GDI.
 */
 
 #include "Fl_GDI_Graphics_Driver.H"