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

CMake/setup.cmake

@@ -73,20 +73,6 @@ set(FLTK_DOCDIR ${CMAKE_INSTALL_DATADIR}/doc CACHE PATH
 # platform dependent information
 #######################################################################
 
-# I think this code is useless, so I disabled it by commenting it out.
-# Let's wait and see if it does any harm (user complaints).
-# The real fix is below: add_definitions(-DWIN32).
-# AlbrechtS, Dec 28, 2017.
-# fix no WIN32 defined issue
-# if(NOT WIN32)
-#     if(_WIN32)
-#         set(WIN32 _WIN32)
-#     elseif(__WIN32__)
-#         set(WIN32 __WIN32__)
-#     endif(_WIN32)
-# endif(NOT WIN32)
-# End of code commented out on Dec 28, 2017
-
 # set where config files go
 if(WIN32 AND NOT CYGWIN)
    set(FLTK_CONFIG_PATH CMake)
@@ -124,13 +110,13 @@ if(APPLE)
 endif(APPLE)
 
 if(WIN32)
-    add_definitions(-DWIN32)
+    # we do no longer define WIN32 or _WIN32 (since FLTK 1.4.0)
+    # ... but if we did, we'd define _WIN32 (since FLTK 1.4.0)
+    # add_definitions(-D_WIN32)
     if(MSVC)
         add_definitions(-DWIN32_LEAN_AND_MEAN)
         add_definitions(-D_CRT_SECURE_NO_WARNINGS)
-######## from ide/VisualC2010/config.h
         set(BORDER_WIDTH 2)
-########
     endif(MSVC)
     if(CMAKE_C_COMPILER_ID STREQUAL GNU)
         set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-subsystem,windows")

FL/Fl.H

@@ -146,27 +146,27 @@ public: // run time information about compile time configuration
   /** @{ */
   static bool cfg_gfx_xlib;   ///< X11 Xlib rendering available, usually on Linux systems
   static bool cfg_gfx_quartz; ///< Quartz rendering available, usually on OS X systems
-  static bool cfg_gfx_gdi;    ///< GDI rendering available, usually on MSWindows systems
+  static bool cfg_gfx_gdi;    ///< GDI rendering available, usually on Windows systems
   static bool cfg_gfx_opengl; ///< OpenGL rendering available, available on many platforms
   static bool cfg_gfx_cairo;  ///< Cairo rendering available, available on many platforms
-  static bool cfg_gfx_directx;///< DirectX rendering available, usually on MSWindows systems
+  static bool cfg_gfx_directx;///< DirectX rendering available, usually on Windows systems
   /** @} */
   /** \defgroup cfg_prn runtime printer driver configuration */
   /** @{ */
   static bool cfg_prn_ps;     ///< PostScript rendering available, usually on Linux systems
   static bool cfg_prn_quartz; ///< Quartz rendering available, usually on OS X systems
-  static bool cfg_prn_gdi;    ///< GDI rendering available, usually on MSWindows systems
+  static bool cfg_prn_gdi;    ///< GDI rendering available, usually on Windows systems
   /** @} */
   /** \defgroup cfg_win runtime window and event manager configuration */
   /** @{ */
   static bool cfg_win_x11;    ///< X11 window management available, usually on Linux systems
   static bool cfg_win_cocoa;  ///< Cocoa window management available, usually on OS X systems
-  static bool cfg_win_win32;  ///< WIN32 window management available, on low level MSWindows
+  static bool cfg_win_win32;  ///< Windows window management available, on low level Windows
   /** @} */
   /** \defgroup cfg_sys runtime system configuration */
   /** @{ */
   static bool cfg_sys_posix;  ///< Posix system available, usually on Linux and OS X systems, but also Cygwin
-  static bool cfg_sys_win32;  ///< WIN32 system available, on MSWindows
+  static bool cfg_sys_win32;  ///< Windows system available, on Windows
   /** @} */
 
 public: // should be private!
@@ -195,7 +195,7 @@ public: // should be private!
   static Fl_Widget* selection_owner_;
   static Fl_Window* modal_;
   static Fl_Window* grab_;
-  static int compose_state; // used for dead keys (WIN32) or marked text (MacOS)
+  static int compose_state; // used for dead keys (Windows) or marked text (MacOS)
   static void call_screen_init(); // recompute screen number and dimensions
   static void reset_marked_text(); // resets marked text
   static void insertion_point_location(int x, int y, int height); // sets window coordinates & height of insertion point
@@ -507,7 +507,7 @@ int main() {
     
     Under UNIX <I>any</I> file descriptor can be monitored (files,
     devices, pipes, sockets, etc.). Due to limitations in Microsoft Windows,
-    WIN32 applications can only monitor sockets.
+    Windows applications can only monitor sockets.
   */
   static void add_fd(int fd, int when, Fl_FD_Handler cb, void* = 0); // platform dependent
   /** See void add_fd(int fd, int when, Fl_FD_Handler cb, void* = 0) */
@@ -609,7 +609,7 @@ int main() {
    focus is (including in other programs). The window <I>does not have
    to be shown()</I> , this lets the handle() method of a
    "dummy" window override all event handling and allows you to
-   map and unmap a complex set of windows (under both X and WIN32
+   map and unmap a complex set of windows (under both X and Windows
    <I>some</I> window must be mapped because the system interface needs a
    window id).
    
@@ -813,7 +813,7 @@ int main() {
 
     On X Fl::get_key(FL_Button+n) does not work.
     
-    On WIN32 Fl::get_key(FL_KP_Enter) and Fl::event_key(FL_KP_Enter) do not work.
+    On Windows Fl::get_key(FL_KP_Enter) and Fl::event_key(FL_KP_Enter) do not work.
   */
   static int event_key(int key);
   /** 
@@ -939,7 +939,7 @@ int main() {
    
    \par Platform details for image data:
    \li Unix/Linux platform: Clipboard images in PNG or BMP formats are recognized. Requires linking with the fltk_images library.
-   \li MSWindows platform: Both bitmap and vectorial (Enhanced metafile) data from clipboard
+   \li Windows platform: Both bitmap and vectorial (Enhanced metafile) data from clipboard
    can be pasted as image data.
    \li Mac OS X platform: Both bitmap (TIFF) and vectorial (PDF) data from clipboard
    can be pasted as image data.
@@ -1090,7 +1090,7 @@ int main() {
     "-*" will select all fonts with any encoding as long as they have
     normal X font names with dashes in them.  Passing "*" will list every
     font that exists (on X this may produce some strange output).  Other
-    values may be useful but are system dependent.  With WIN32 NULL
+    values may be useful but are system dependent.  With Windows NULL
     selects fonts with ISO8859-1 encoding and non-NULL selects
     all fonts.
     

FL/Fl_Copy_Surface.H

@@ -39,7 +39,7 @@
  Fl_Display_Device::display_device()->set_current();  // direct graphics requests back to the display
  \endcode
  Platform details:
- \li MSWindows: Transparent RGB images copy without transparency.
+ \li Windows: Transparent RGB images copy without transparency.
  The graphical data are copied to the clipboard as an 'enhanced metafile'.
  \li Mac OS: The graphical data are copied to the clipboard (a.k.a. pasteboard) in two 'flavors':
  1) in vectorial form as PDF data; 2) in bitmap form as a TIFF image. 

FL/Fl_Export.H

@@ -1,9 +1,9 @@
 /*
  * "$Id$"
  *
- * WIN32 DLL export .
+ * Windows DLL export .
  *
- * Copyright 1998-2010 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
@@ -20,7 +20,7 @@
 #  define Fl_Export_H
 
 /*
- * The following is only used when building DLLs under WIN32...
+ * The following is only used when building DLLs under Windows...
  */
 
 #  if defined(FL_DLL)

FL/Fl_Gl_Window.H

@@ -166,7 +166,7 @@ public:
    mode() must not be called within draw() since it
    changes the current context.
    
-   \note On the <b>MSWindows and Unix/Linux platforms</b>, FLTK produces
+   \note On the <b>Windows and Unix/Linux platforms</b>, FLTK produces
    contexts for the highest OpenGL version supported by the hardware. Such contexts
    are also compatible with lower OpenGL versions. On the <b>Apple OS X
    platform</b>, it is necessary to decide whether the source code targets
@@ -186,7 +186,7 @@ public:
    the <tt>glXChooseVisual()</tt> function (e.g., <tt>GLX_DOUBLEBUFFER</tt>, defined by including <GL/glx.h>).
    \note What attributes are adequate here is subject to change.
    The preferred, stable public API is Fl_Gl_Window::mode(int a).
-   <p><b>MSWindows platform</b>: this member function is of no use.
+   <p><b>Windows platform</b>: this member function is of no use.
    <p><b>Mac OS X platform</b>: attributes belong to the <tt>CGLPixelFormatAttribute</tt> enumeration
    (defined by including <tt><OpenGL/OpenGL.h></tt>, e.g., <tt>kCGLPFADoubleBuffer</tt>)
    and may be followed by adequate attribute values.

FL/Fl_Graphics_Driver.H

@@ -1,7 +1,7 @@
 //
 // "$Id$"
 //
-// Definition of classes  Fl_Graphics_Driver, Fl_Surface_Device, Fl_Display_Device
+// Definition of classes Fl_Graphics_Driver, Fl_Surface_Device, Fl_Display_Device
 // for the Fast Light Tool Kit (FLTK).
 //
 // Copyright 2010-2018 by Bill Spitzak and others.
@@ -444,7 +444,7 @@ struct Fl_Fontdesc {
  - scale and unscale the clipping region.
  
  This class is presently used on the X11 platform to support HiDPI displays.
- In the future, it may also be used on the WIN32 platform.
+ In the future, it may also be used on the Windows platform.
  */
 class FL_EXPORT Fl_Scalable_Graphics_Driver : public Fl_Graphics_Driver {
 public:

FL/Fl_Input.H

@@ -31,7 +31,7 @@
   characters, and will correctly display any UTF text, using
   ^X notation for unprintable control characters. It assumes the
   font can draw any characters of the used scripts, which is true
-  for standard fonts under MSWindows and Mac OS X.
+  for standard fonts under Windows and Mac OS X.
   Characters can be input using the keyboard or the character palette/map.
   Character composition is done using dead keys and/or a compose
   key as defined by the operating system.

FL/Fl_Native_File_Chooser.H

@@ -21,21 +21,21 @@
    Fl_Native_File_Chooser widget. */
 
 /* Implementation note:
- 
+
  class Fl_Native_File_Chooser  <== public API used by applications
- 
+
  class Fl_Native_File_Chooser_Driver   <== virtual API that a platform may implement
                                            this API has a do-nothing default implementation
- 
+
         class Fl_Native_File_Chooser_FLTK_Driver   <== this API implementation is the default FLTK file chooser
                 class Fl_GTK_Native_File_Chooser_Driver  <== this API implementation runs a GTK file chooser
                                         it is determined at run-time if the GTK dynamic libraries are available
- 
+
         class Fl_Quartz_Native_File_Chooser_Driver  <== this API implementation runs a Mac OS X file chooser
 
-        class Fl_WinAPI_Native_File_Chooser_Driver  <== this API implementation runs a MSWindows file chooser
+        class Fl_WinAPI_Native_File_Chooser_Driver  <== this API implementation runs a Windows file chooser
- 
+
- 
+
  Each platform must implement the constructor of the Fl_Native_File_Chooser class.
  This particular implementation:
  
@@ -97,8 +97,8 @@ class Fl_Native_File_Chooser_Driver;
  
  The Fl_Native_File_Chooser widget transmits UTF-8 encoded filenames to its user. It is
  recommended to open files that may have non-ASCII names with the fl_fopen() or
- fl_open() utility functions that handle these names in a cross-platform way 
+ fl_open() utility functions that handle these names in a cross-platform way
- (whereas the standard fopen()/open() functions fail on the MSWindows platform 
+ (whereas the standard fopen()/open() functions fail on the Windows platform
  to open files with a non-ASCII name).
  
  <B>Platform Specific Caveats</B>

FL/Fl_Preferences.H

@@ -1,7 +1,7 @@
 //
 // "$Id$"
 //
-// Preferences .
+// Preferences implementation for the Fast Light Tool Kit (FLTK).
 //
 // Copyright 2002-2010 by Matthias Melcher.
 //
@@ -30,7 +30,7 @@
    settings between application starts.
 
    It is similar to the
-   Registry on WIN32 and Preferences on MacOS, and provides a
+   Registry on Windows and Preferences on MacOS, and provides a
    simple configuration mechanism for UNIX.
 
    Fl_Preferences uses a hierarchy to store data. It

FL/Fl_Printer.H

@@ -78,7 +78,7 @@
  before creation of the Fl_Printer object.
  Use Fl_PostScript_File_Device::file_chooser_title to customize the title of the file chooser dialog that opens
  when using the "Print To File" option of the print dialog. 
- <li>MSWindows platform: Transparent Fl_RGB_Image 's don't print with exact transparency on most printers
+ <li>Windows platform: Transparent Fl_RGB_Image 's don't print with exact transparency on most printers
  (a workaround is to use print_window_part() ).
  Fl_RGB_Image 's don't rotate() well.
  <li>Mac OS X platform: all graphics requests print as on display and accept rotation and scaling.

FL/Fl_Window.H

@@ -348,7 +348,7 @@ public:
   void icon(const Fl_RGB_Image*);
   void icons(const Fl_RGB_Image*[], int);
 
-#if defined(WIN32) && !defined(FL_DOXYGEN)
+#if defined(_WIN32) && !defined(FL_DOXYGEN)
   typedef struct HICON__* HICON;
   // These 2 member functions break the driver model but are kept for back compatibility.
   // They are implemented in Fl_win32.cxx

FL/filename.H

@@ -3,7 +3,7 @@
  *
  * Filename header file for the Fast Light Tool Kit (FLTK).
  *
- * Copyright 1998-2010 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
@@ -56,7 +56,7 @@ FL_EXPORT int fl_filename_isdir(const char *name);
 
 #  if defined(__cplusplus) && !defined(FL_DOXYGEN)
 /*
- * Under WIN32, we include filename.H from numericsort.c; this should probably change...
+ * Under Windows, we include filename.H from numericsort.c; this should probably change...
  */
 
 inline char *fl_filename_setext(char *to, const char *ext) { return fl_filename_setext(to, FL_PATH_MAX, ext); }

FL/fl_draw.H

@@ -3,7 +3,7 @@
 //
 // Portable drawing function header file for the Fast Light Tool Kit (FLTK).
 //
-// 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
@@ -286,7 +286,7 @@ inline void fl_yxline(int x, int y, int y1, int x2, int y3) {fl_graphics_driver-
  Draw ellipse sections using integer coordinates.
  
  These functions match the rather limited circle drawing code provided by X
- and WIN32. The advantage over using fl_arc with floating point coordinates
+ and Windows. The advantage over using fl_arc with floating point coordinates
  is that they are faster because they often use the hardware, and they draw
  much nicer small circles, since the small sizes are often hard-coded bitmaps.
  

FL/fl_utf8.h

@@ -3,7 +3,7 @@
  *
  * Author: Jean-Marc Lienher ( http://oksid.ch )
  * Copyright 2000-2010 by O'ksi'D.
- * Copyright 2016-2017 by Bill Spitzak and others.
+ * Copyright 2016-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
@@ -121,14 +121,14 @@ FL_EXPORT char* fl_utf2mbcs(const char *src);
 FL_EXPORT unsigned fl_utf8from_mb(char *dst, unsigned dstlen, const char *src, unsigned srclen);
 
 /*****************************************************************************/
-#ifdef WIN32
+#ifdef _WIN32
-/* these two WIN32-only functions are kept for API compatibility */
+/* these two Windows-only functions are kept for API compatibility */
 /* OD: Attempt to convert the UTF-8 string to the current locale */
 FL_EXPORT char *fl_utf8_to_locale(const char *s, int len, unsigned int codepage);
 
 /* OD: Attempt to convert a string in the current locale to UTF-8 */
 FL_EXPORT char *fl_locale_to_utf8(const char *s, int len, unsigned int codepage);
-#endif /* WIN32 */
+#endif /* _WIN32 */
 
 /*****************************************************************************
  * The following functions are intended to provide portable, UTF-8 aware

FL/gl.h

@@ -44,7 +44,7 @@
 #  define FL_gl_H
 
 #  include "Enumerations.H" // for color names
-#  ifdef WIN32
+#  ifdef _WIN32
 #    include <windows.h>
 #  endif
 #  ifndef APIENTRY

FL/glu.h

@@ -27,7 +27,7 @@
 #  define FL_glu_H
 
 #  include "Enumerations.H" // for color names
-#  ifdef WIN32
+#  ifdef _WIN32
 #    include <windows.h>
 #  endif
 #  ifndef APIENTRY

FL/math.h

@@ -42,12 +42,12 @@
 #    define M_SQRT1_2       0.70710678118654752440
 #  endif // !M_SQRT2
 
-#  if (defined(WIN32) || defined(CRAY)) && !defined(__MINGW32__) && !defined(__MWERKS__)
+#  if (defined(_WIN32) || defined(CRAY)) && !defined(__MINGW32__) && !defined(__MWERKS__)
 
 inline double rint(double v) {return floor(v+.5);}
 inline double copysign(double a, double b) {return b<0 ? -a : a;}
 
-#  endif // (WIN32 || CRAY) && !__MINGW32__ && !__MWERKS__
+#  endif // (_WIN32 || CRAY) && !__MINGW32__ && !__MWERKS__
 
 #endif // !fl_math_h
 

FL/platform.H

@@ -35,7 +35,7 @@
 #   include <FL/fl_types.h> // for uchar
 class Fl_Window;
 
-#  ifdef WIN32
+#  ifdef _WIN32
 #    include "win32.H"
 #  elif defined(__APPLE__)
 #    include "mac.H"

FL/platform_types.h

@@ -70,7 +70,7 @@ typedef int FL_SOCKET;
 #  define FL_COMMAND	FL_META
 #  define FL_CONTROL 	FL_CTRL
 
-#elif defined(WIN32)
+#elif defined(_WIN32)
 typedef struct HBITMAP__ *HBITMAP;
 typedef HBITMAP Fl_Offscreen;
 typedef HBITMAP Fl_Bitmask;
@@ -116,8 +116,8 @@ typedef struct __GLXcontextRec *GLContext;
 
 
 #ifndef __APPLE__
-#  define FL_COMMAND	FL_CTRL   /**< An alias for FL_CTRL on WIN32 and X11, or FL_META on MacOS X */
+#  define FL_COMMAND	FL_CTRL   /**< An alias for FL_CTRL on Windows and X11, or FL_META on MacOS X */
-#  define FL_CONTROL	FL_META   /**< An alias for FL_META on WIN32 and X11, or FL_CTRL on MacOS X */
+#  define FL_CONTROL	FL_META   /**< An alias for FL_META on Windows and X11, or FL_CTRL on MacOS X */
 #endif
 
 #endif /* FL_PLATFORM_TYPES_H */

FL/win32.H

@@ -1,7 +1,7 @@
 //
 // "$Id$"
 //
-// WIN32 header file for the Fast Light Tool Kit (FLTK).
+// Windows system header file for the Fast Light Tool Kit (FLTK).
 //
 // Copyright 1998-2018 by Bill Spitzak and others.
 //
@@ -17,7 +17,7 @@
 //
 
 // Do not directly include this file, instead use <FL/platform.H>.  It will
-// include this file if WIN32 is defined.  This is to encourage
+// include this file if _WIN32 is defined.  This is to encourage
 // portability of even the system-specific code...
 
 #ifndef FL_DOXYGEN

README

@@ -54,7 +54,7 @@ BUILDING AND INSTALLING FLTK UNDER UNIX AND Mac OS X
     You can run configure yourself to get the exact setup you
     need. Type "./configure <options>".  Options include:
 
-	--enable-cygwin         - Enable the Cygwin libraries (WIN32)
+	--enable-cygwin         - Enable the Cygwin libraries (Windows)
 	--enable-debug          - Enable debugging code & symbols
 	--disable-gl            - Disable OpenGL support
 	--enable-shared         - Enable generation of shared libraries

README.Unix.txt

@@ -376,7 +376,7 @@ recommend that you add it to the command search path.
 ===========================================
 
 Code::Blocks is a free and popular C++ IDE in the Linux world. It also runs on
-OS X and MSWindows. Configured correctly, it can also cross-compile between
+OS X and Windows. Configured correctly, it can also cross-compile between
 these platforms. This chapter focuses on creating a new FLTK project for Linux, 
 assuming that FLTK 1.3 was previously built and installed in its default 
 location from the command line.

README.Windows.txt

@@ -429,9 +429,7 @@ file to it. The FLTK "hello" source code is a good base.
 
 Now open the Project Properties dialog and add "Comctl32.lib" and all the FLTK
 libraries that you want to use (at least "fltk.lib") to Additional Dependencies
-(Configuration Properties > Linker > Additional Dependencies). In the same
+(Configuration Properties > Linker > Additional Dependencies).
-dialog, add "WIN32" to the C++ Preprocessor Definitions (Configuration
-Properties > C/C++ > Preprocessor > Preprocessor Definitions).
 
 Compile and run your test program with F5.
 
@@ -529,9 +527,7 @@ file to it. The FLTK "hello" source code is a good base.
 
 Now open the Project Properties dialog and add "Comctl32.lib" and all the FLTK
 libraries that you want to use (at least "fltk.lib") to Additional Dependencies
-(Configuration Properties > Linker > Additional Dependencies). In the same
+(Configuration Properties > Linker > Additional Dependencies).
-dialog, add "WIN32" to the C++ Preprocessor Definitions (Configuration
-Properties > C/C++ > Preprocessor > Preprocessor Definitions).
 
 Compile and run your test program with F5.
 

cairo/Fl_Cairo.cxx

@@ -28,7 +28,7 @@
 
 #if defined(USE_X11) // X11
 #  include <cairo-xlib.h>
-#elif defined(WIN32)
+#elif defined(_WIN32)
 #  include <cairo-win32.h>
 #elif defined(__APPLE_QUARTZ__) // PORTME: Cairo Support
 #  include <cairo-quartz.h>
@@ -95,14 +95,14 @@ cairo_t * Fl::cairo_make_current(Fl_Window* wi) {
 
 /* 
     Creates transparently a cairo_surface_t object.
-    gc is an HDC context in  WIN32, a CGContext* in Quartz, and
+    gc is an HDC context in Windows, a CGContext* in Quartz, and
     a display on X11 (not used on this platform)
  */
 
 static cairo_surface_t * cairo_create_surface(void * gc, int W, int H) {
 # if defined(USE_X11)
     return cairo_xlib_surface_create(fl_display, fl_window, fl_visual->visual, W, H);
-# elif   defined(WIN32)
+# elif   defined(_WIN32)
     return cairo_win32_surface_create((HDC) gc);
 # elif defined(__APPLE_QUARTZ__)
     return cairo_quartz_surface_create_for_cg_context((CGContext*) gc, W, H);
@@ -131,8 +131,8 @@ cairo_t * Fl::cairo_make_current(void *gc) {
       W = CGBitmapContextGetWidth(fl_gc);
       H = CGBitmapContextGetHeight(fl_gc);
     }
-#elif defined(WIN32)
+#elif defined(_WIN32)
-    // we don't need any W,H for WIN32
+    // we don't need any W,H for Windows
 #else
 # error Cairo is not supported on this platform.
 #endif

configure.ac

@@ -5,7 +5,7 @@ dnl "$Id$"
 dnl
 dnl Configuration script for the Fast Light Tool Kit (FLTK).
 dnl
-dnl Copyright 1998-2016 by Bill Spitzak and others.
+dnl Copyright 1998-2018 by Bill Spitzak and others.
 dnl
 dnl This library is free software. Distribution and use rights are outlined in
 dnl the file "COPYING" which should have been included with this file.  If this
@@ -860,8 +860,11 @@ case $host_os_gui in
 	# checks don't work because the shell puts out \r\n instead of
 	# \n.  Here we just force U32 to be defined to "unsigned"...
 	AC_DEFINE(U32,unsigned)
-	CFLAGS="-mwindows -DWIN32 -DUSE_OPENGL32 $CFLAGS"
+	# We do no longer define WIN32 or _WIN32 (since FLTK 1.4.0)
-	CXXFLAGS="-mwindows -DWIN32 -DUSE_OPENGL32 $CXXFLAGS"
+	# CFLAGS="-mwindows -D_WIN32 -DUSE_OPENGL32 $CFLAGS"
+	# CXXFLAGS="-mwindows -D_WIN32 -DUSE_OPENGL32 $CXXFLAGS"
+	CFLAGS="-mwindows -DUSE_OPENGL32 $CFLAGS"
+	CXXFLAGS="-mwindows -DUSE_OPENGL32 $CXXFLAGS"
 	LDFLAGS="-mwindows $LDFLAGS"
 	DSOFLAGS="-mwindows $DSOFLAGS"
 	LIBS="$LIBS -lole32 -luuid -lcomctl32"
@@ -1511,7 +1514,7 @@ case $host_os in
   mingw*)
      # Determine the path where MSys has /usr installed
 	msyspath=`mount | grep '\/usr ' | cut -d ' ' -f -1 | sed -e 's/\\\/\// g'`
-     # Then substitute that in the WIN32 path instead of /usr
+     # Then substitute that in the Windows path instead of /usr
 	AC_DEFINE_UNQUOTED(FLTK_DOCDIR, "$msyspath/local/share/doc/fltk")
     ;;
   *)

documentation/src/basics.dox

@@ -333,9 +333,12 @@ find the FLTK header files. This can be done by selecting
 "Preprocessor" settings under the "C/C++" tab. You will also 
 need to add the FLTK (<tt>FLTK.LIB</tt> or <tt>FLTKD.LIB</tt>) and the Windows
 Common Controls (<tt>COMCTL32.LIB</tt>) libraries to the "Link" settings.
-You must also define <tt>WIN32</tt>.
 
-More information can be found in <tt>README.MSWindows.txt</tt>.
+You must also define <tt>_WIN32</tt> if the compiler doesn't do this.
+Currently all known Windows compilers define _WIN32 - unless you use Cygwin.
+You must not define _WIN32 if you use Cygwin.
+
+More information can be found in <tt>README.Windows.txt</tt>.
 
 You can build your Microsoft Windows applications as Console or
 Desktop applications.  If you want to use the standard C \p main()

documentation/src/editor.dox

@@ -543,7 +543,7 @@ void set_title(Fl_Window* w) {
   else {
     char *slash;
     slash = strrchr(filename, '/');
-#ifdef WIN32
+#ifdef _WIN32
     if (slash == NULL) slash = strrchr(filename, '\\');
 #endif
     if (slash != NULL) strcpy(title, slash + 1);

documentation/src/enumerations.dox

@@ -154,7 +154,7 @@ value:
   - FL_ALT - One of the alt keys is down.
   - FL_NUM_LOCK - The num lock is on.
   - FL_META - One of the meta/Windows keys is down.
-  - FL_COMMAND - An alias for FL_CTRL on WIN32 and X11,
+  - FL_COMMAND - An alias for FL_CTRL on Windows and X11,
     or FL_META on MacOS X.
   - FL_SCROLL_LOCK - The scroll lock is on.
   - FL_BUTTON1 - Mouse button 1 is pushed.
@@ -289,7 +289,7 @@ cursors.
   - FL_CURSOR_CROSS - crosshair
   - FL_CURSOR_WAIT - watch or hourglass
   - FL_CURSOR_INSERT - I-beam
-  - FL_CURSOR_HAND - hand (uparrow on MSWindows)
+  - FL_CURSOR_HAND - hand (uparrow on Windows)
   - FL_CURSOR_HELP - question mark
   - FL_CURSOR_MOVE - 4-pointed arrow
   - FL_CURSOR_NS - up/down arrow

documentation/src/fluid.dox

@@ -109,9 +109,9 @@ immediately, losing any changes.
 
 \section fluid_fluid_under_windows Running FLUID Under Microsoft Windows
 
-To run FLUID under WIN32, double-click on the \e FLUID.exe
+To run FLUID under Windows, double-click on the \e FLUID.exe
 file. You can also run FLUID from the Command Prompt window.
-FLUID always runs in the background under WIN32.
+FLUID always runs in the background under Windows.
 
 \section fluid_compiling_fl_files Compiling .fl files
 
@@ -1407,7 +1407,7 @@ and the KDE icon editor.
 
 \par
 FLUID reads Windows BMP image files which are often used in
-WIN32 applications for icons. FLUID converts BMP files into
+Windows applications for icons. FLUID converts BMP files into
 (modified) XPM format and uses a Fl_BMP_Image image to label the
 widget. Transparency is handled the same as for XPM files. All
 image data is uncompressed when written to the source file, so

documentation/src/intro.dox

@@ -94,10 +94,10 @@ Here are some of the core features unique to FLTK:
 
 \li The FLUID program (which includes every widget) is 538k.
 
-\li Written directly atop core libraries (Xlib, WIN32 or Cocoa) for
+\li Written directly atop core libraries (Xlib, Windows or Cocoa) for
     maximum speed, and carefully optimized for code size and performance.
 
-\li Precise low-level compatibility between the X11, WIN32 and MacOS
+\li Precise low-level compatibility between the X11, Windows and MacOS
     versions - only about 10% of the code is different.
 
 \li Interactive user interface builder program. Output is human-readable
@@ -105,12 +105,12 @@ Here are some of the core features unique to FLTK:
 
 \li Support for overlay hardware, with emulation if none is available.
 
-\li Very small & fast portable 2-D drawing library to hide Xlib, WIN32,
+\li Very small & fast portable 2-D drawing library to hide Xlib, Windows,
     or QuickDraw.
 
 \li OpenGL/Mesa drawing area widget.
 
-\li Support for OpenGL overlay hardware on both X11 and WIN32, with
+\li Support for OpenGL overlay hardware on both X11 and Windows, with
     emulation if none is available.
 
 \li Text widgets with cut & paste, undo, and support
@@ -191,7 +191,7 @@ You can run configure yourself to get the exact setup you need.
 Type  "./configure <options>", where options are:
 
 \par --enable-cygwin
-Enable the Cygwin libraries under WIN32
+Enable the Cygwin libraries under Windows
 
 \par --enable-debug
 Enable debugging code & symbols
@@ -247,7 +247,7 @@ files to "includedir", and the library files to "libdir".
 
 NOTE: This documentation section is currently under review.
 More up-to-date information for this release may be available
-in the file "README.MSWindows.txt" and you should read
+in the file "README.Windows.txt" and you should read
 that file to determine if there are changes that may be
 applicable to your build environment.
 

documentation/src/opengl.dox

@@ -23,7 +23,7 @@ functions around your OpenGL code.
 You must include FLTK's \p <FL/gl.h> header file. It will include
 the file \p <GL/gl.h> (on macOS: \p <OpenGL/gl.h>), define
 some extra drawing functions provided by FLTK, and include the
-\p <windows.h> header file needed by WIN32 applications.
+\p <windows.h> header file needed by Windows applications.
 
 Some simple coding rules (see \ref osissues_retina) allow to write
 cross-platform code that will draw high resolution
@@ -206,7 +206,7 @@ context with an orthographic projection so that 0,0 is the
 lower-left corner of the window and each pixel is one unit. The
 current clipping is reproduced with OpenGL \p glScissor()
 commands. These functions also synchronize the OpenGL graphics stream
-with the drawing done by other X, WIN32, or FLTK functions.
+with the drawing done by other X, Windows, or FLTK functions.
 
 \code
 gl_start();
@@ -397,7 +397,7 @@ void OptimizerWindow::draw() {
     // This is the first time we've been asked to draw; create the
     // Optimizer context for the scene...
 
-#ifdef WIN32
+#ifdef _WIN32
     context_ = new csContext((HDC)fl_getHDC());
     context_->ref();
     context_->makeCurrent((HDC)fl_getHDC());
@@ -405,7 +405,7 @@ void OptimizerWindow::draw() {
     context_ = new csContext(fl_display, fl_visual);
     context_->ref();
     context_->makeCurrent(fl_display, fl_window);
-#endif // WIN32
+#endif // _WIN32
 
     ... perform other context setup as desired ...
 
@@ -417,11 +417,11 @@ void OptimizerWindow::draw() {
       camera_->draw(draw_action_);
     }
   } else {
-#ifdef WIN32
+#ifdef _WIN32
     context_->makeCurrent((HDC)fl_getHDC());
 #else
     context_->makeCurrent(fl_display, fl_window);
-#endif // WIN32
+#endif // _WIN32
   }
 
   if (!valid()) {
@@ -456,7 +456,7 @@ showing how to use OpenGL 3.0 (or higher versions) with FLTK in a cross-platform
 It contains also OpenGL3-glut-test.cxx which shows how to use FLTK's GLUT compatibility
 and OpenGL 3.
 
-<b>On the MSWindows and Unix/Linux platforms</b>, FLTK creates contexts
+<b>On the Windows and Unix/Linux platforms</b>, FLTK creates contexts
 implementing the highest OpenGL version supported by the hardware,
 which are also compatible with lower OpenGL versions. Thus, FLTK allows
 source code targeting any version of OpenGL. Access to functions from OpenGL
@@ -467,10 +467,10 @@ FLTK creates by default contexts implementing OpenGL versions 1 or 2.
 To access OpenGL 3.0 (or higher versions), use the <tt>FL_OPENGL3</tt> flag (see below).
 Mac OS 10.7 or above is required; GLEW is possible but not necessary.
 
-\par GLEW installation (Unix/Linux and MSWindows platforms)
+\par GLEW installation (Unix/Linux and Windows platforms)
 GLEW is available as a package for most Linux distributions and in source
 form at http://glew.sourceforge.net/.
-For the MSWindows platform, a Visual Studio static library (glew32.lib) can
+For the Windows platform, a Visual Studio static library (glew32.lib) can
 be downloaded from the same web site; a MinGW-style static library (libglew32.a)
 can be built from source with the make command.
 
@@ -481,7 +481,7 @@ and before \#include <FL/glut.h> if you use GLUT):
 #if defined(__APPLE__)
 #  include <OpenGL/gl3.h> // defines OpenGL 3.0+ functions
 #else
-#  if defined(WIN32)
+#  if defined(_WIN32)
 #    define GLEW_STATIC 1
 #  endif
 #  include <GL/glew.h>

documentation/src/osissues.dox

@@ -198,7 +198,7 @@ Set which X display to use.  This actually does
 <tt>putenv("DISPLAY=...")</tt> so that child programs
 will display on the same screen if called with \c exec().
 This must be done before the display is opened. This call is
-provided under MacOS and WIN32 but it has no effect.
+provided under MacOS and Windows but it has no effect.
 
 extern Display *fl_display
 
@@ -474,9 +474,9 @@ the class "fltk" is used (e.g. <tt>fltk.background</tt>). If no
 match is found, a global search is done (e.g.
 <tt>*background</tt>).
 
-\section osissues_win32 The Windows (WIN32) Interface
+\section osissues_win32 The Windows Interface
 
-The Windows interface provides access to the WIN32 GDI
+The Windows interface provides access to the Windows GDI
 state information and data structures.
 
 \subsection non_ascii_filenames Using filenames with non-ASCII characters
@@ -494,15 +494,15 @@ requests with the same code on both Windows and UNIX systems.
 Other processes can send this message via \c PostThreadMessage() in
 order to request, rather than force your application to terminate.
 
-\subsection osissues_win32_messages Handling Other WIN32 Messages
+\subsection osissues_win32_messages Handling Other Windows API Messages
 
 By default a single WNDCLASSEX called "FLTK" is
-created. All Fl_Window 's are of this class unless you
+created. All Fl_Window's are of this class unless you
 use Fl_Window::xclass(). The window class is created
 the first time Fl_Window::show() is called.
 
 You can probably combine FLTK with other libraries that make
-their own WIN32 window classes. The easiest way is to call
+their own window classes. The easiest way is to call
 Fl::wait(), as it will call \c DispatchMessage()
 for all messages to the other windows. If necessary you can let
 the other library take over as long as it calls
@@ -517,7 +517,7 @@ extern MSG fl_msg
 This variable contains the most recent message read by
 \c GetMessage(), which is called by Fl::wait().
 This may not be the
-most recent message sent to an FLTK window, because silly WIN32
+most recent message sent to an FLTK window, because silly Windows
 calls the handle procedures directly for some events (sigh).
 
 void Fl::add_handler(int (*f)(int))
@@ -545,7 +545,7 @@ window handle, or \c NULL if not found. This function uses
 a cache so it is slightly faster than iterating through the
 windows yourself.
 
-\subsection osissues_win32_gdi Drawing Things Using the WIN32 GDI
+\subsection osissues_win32_gdi Drawing Things Using the Windows GDI
 
 When the virtual function Fl_Widget::draw() is
 called, FLTK stores all the extra arguments you need to
@@ -614,13 +614,13 @@ bitmap data.
 
 \subsection osissues_msdos_console How to Not Get a MSDOS Console Window
 
-WIN32 has a really stupid mode switch stored in the
+Windows has a really stupid mode switch stored in the
 executables that controls whether or not to make a console
 window.
 
 To always get a console window you simply create a console
 application (the "/SUBSYSTEM:CONSOLE" option for the
-linker). For a GUI-only application create a WIN32 application
+linker). For a GUI-only application create a Windows application
 (the "/SUBSYSTEM:WINDOWS" option for the linker).
 
 FLTK includes a \c WinMain() function that calls the
@@ -630,16 +630,16 @@ This function creates a console window when you use the debug
 version of the library.
 </I>
 
-WIN32 applications without a console cannot write to
+Windows applications without a console cannot write to
 \c stdout or \c stderr, even if they are run from a
 console window. Any output is silently thrown away.
-Additionally, WIN32 applications are run in the background by
+Additionally, Windows applications are run in the background by
 the console, although you can use "start /wait program" to run
 them in the foreground.
 
-\subsection osissues_win32_problems Known WIN32 Bugs and Problems
+\subsection osissues_win32_problems Known Windows Bugs and Problems
 
-The following is a list of known bugs and problems in the WIN32
+The following is a list of known bugs and problems in the Windows
 version of FLTK:
 
 \li	If a program is deactivated, <tt>Fl::wait()</tt>
@@ -650,7 +650,7 @@ version of FLTK:
 	windows or otherwise holding the mouse down. We were
 	forced to remove most of the efficiency FLTK uses for
 	redrawing in order to get windows to update while being
-	moved. This is a design error in WIN32 and probably
+	moved. This is a design error in Windows and probably
 	impossible to get around.
 
 \li	<tt>Fl_Gl_Window::can_do_overlay()</tt> returns true

documentation/src/preface.dox

@@ -65,8 +65,9 @@ The X Window System interface library.
 
 \par MS Windows, <tt>WIN32</tt>
 The Microsoft Windows Application Programmer's Interface for Windows 2000, 
-Windows XP, Windows Vista, and Windows 7. FLTK uses the preprocessor definition
+Windows XP, Windows Vista, Windows 7 and later Windows versions.
-<tt>WIN32</tt> for the 32 bit and 64 bit MS Windows API.
+FLTK uses the preprocessor definition <tt>_WIN32</tt> for the 32 bit
+and 64 bit MS Windows API.
 
 \par OS X, <tt>__APPLE__</tt>
 The Apple desktop operating sytem OS X 10.0 and later. MacOS 8 and 9 support

examples/OpenGL3-glut-test.cxx

@@ -21,7 +21,7 @@
 #  define GL_DO_NOT_WARN_IF_MULTI_GL_VERSION_HEADERS_INCLUDED 1
 #  include <OpenGL/gl3.h> // defines OpenGL 3.0+ functions
 #else
-#  if defined(WIN32)
+#  if defined(_WIN32)
 #    define GLEW_STATIC 1
 #  endif
 #  include <GL/glew.h>

examples/OpenGL3test.cxx

@@ -27,7 +27,7 @@
 #if defined(__APPLE__)
 #  include <OpenGL/gl3.h> // defines OpenGL 3.0+ functions
 #else
-#  if defined(WIN32)
+#  if defined(_WIN32)
 #    define GLEW_STATIC 1
 #  endif
 #  include <GL/glew.h>

examples/clipboard.cxx

@@ -26,9 +26,9 @@
 #include <FL/Fl_Button.H>
 #include <FL/Fl.H>
 #include <FL/fl_draw.H>
-#ifdef WIN32
+#ifdef _WIN32
 #include <windows.h>
-#endif // WIN32
+#endif // _WIN32
 
 /* Displays and follows the content of the clipboard with either image or text data
  */
@@ -79,7 +79,7 @@ public:
       if (!im) return 1;
       char title[300];
       sprintf(title, "%dx%d",im->w(), im->h()); // display the image original size
-#ifdef WIN32
+#ifdef _WIN32
       OpenClipboard(NULL); // display extra technical info about clipboard content
       char *p=title + strlen(title);
       int format = EnumClipboardFormats(0);
@@ -133,7 +133,7 @@ void clip_callback(int source, void *data) { // called after clipboard was chang
 
 int main(int argc, char **argv)
 {
-#if !(defined(__APPLE__) || defined(WIN32))
+#if !(defined(__APPLE__) || defined(_WIN32))
   fl_register_images(); // required to allow pasting of images
 #endif
   Fl_Window* win = new Fl_Window(500, 550, "clipboard viewer");

examples/howto-add_fd-and-popen.cxx

@@ -27,7 +27,7 @@
 #include <FL/Fl_Window.H>
 #include <FL/Fl_Multi_Browser.H>
 
-#ifdef WIN32
+#ifdef _WIN32
 #  define PING_CMD "ping -n 10 localhost"	// 'slow command' under windows
 #  ifdef _MSC_VER
 #    define popen _popen

examples/progress-simple.cxx

@@ -23,14 +23,14 @@
 #include <FL/Fl_Button.H>
 #include <FL/Fl_Progress.H>
 
-#ifdef WIN32
+#ifdef _WIN32
 // WINDOWS
 #include <windows.h>
 #define usleep(v) Sleep(v/1000)
-#else /*WIN32*/
+#else /* _WIN32 */
 // UNIX
 #include <unistd.h>                            // usleep
-#endif /*WIN32*/
+#endif /* _WIN32 */
 
 // Button callback
 void butt_cb(Fl_Widget *butt, void *data) {

examples/table-sort.cxx

@@ -37,18 +37,18 @@
 
 #define MARGIN 20
 
-#ifdef WIN32
+#ifdef _WIN32
 // WINDOWS
 #  define DIRCMD          "dir"
 static const char *G_header[] = { "Date", "Time", "Size", "Filename", "", "", "", "", "", 0 };
 #  ifdef _MSC_VER
 #    define popen           _popen
 #  endif
-#else /*WIN32*/
+#else /* _WIN32 */
 // UNIX
 #  define DIRCMD          "ls -l"
 static const char *G_header[] = { "Perms", "#L", "Own", "Group", "Size", "Date", "", "", "Filename", 0 };
-#endif /*WIN32*/
+#endif /* _WIN32 */
 
 // Font face/sizes for header and rows
 #define HEADER_FONTFACE FL_HELVETICA_BOLD

fluid/Fl_Function_Type.cxx

@@ -28,7 +28,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef WIN32
+#ifdef _WIN32
   #include "ExternalCodeEditor_WIN32.h"
 #else
   #include "ExternalCodeEditor_UNIX.h"

fluid/Fl_Type.h

@@ -32,7 +32,7 @@
 #include <FL/fl_draw.H>
 #include <stdarg.h>
 
-#ifdef WIN32
+#ifdef _WIN32
   #include "ExternalCodeEditor_WIN32.h"
 #else
   #include "ExternalCodeEditor_UNIX.h"

fluid/fluid.cxx

@@ -48,7 +48,7 @@
 #include "function_panel.h"
 #include "template_panel.h"
 
-#if defined(WIN32) && !defined(__CYGWIN__)
+#if defined(_WIN32) && !defined(__CYGWIN__)
 #  include <direct.h>
 #  include <windows.h>
 #  include <io.h>
@@ -235,10 +235,10 @@ void save_cb(Fl_Widget *, void *v) {
       const char *basename;
       if ((basename = strrchr(c, '/')) != NULL)
         basename ++;
-#if defined(WIN32)
+#if defined(_WIN32)
       if ((basename = strrchr(c, '\\')) != NULL)
         basename ++;
-#endif // WIN32
+#endif // _WIN32
       else
         basename = c;
 
@@ -1000,7 +1000,7 @@ void print_menu_cb(Fl_Widget *, void *) {
     fl_draw(date, w - (int)fl_width(date), fl_height());
     // Get the base filename...
     const char *basename = strrchr(filename, 
-#ifdef WIN32
+#ifdef _WIN32
 				   '\\'
 #else
 				   '/'
@@ -1287,11 +1287,11 @@ void update_history(const char *flname) {
   fl_filename_absolute(absolute, sizeof(absolute), flname);
 
   for (i = 0; i < max_files; i ++)
-#if defined(WIN32) || defined(__APPLE__)
+#if defined(_WIN32) || defined(__APPLE__)
     if (!strcasecmp(absolute, absolute_history[i])) break;
 #else
     if (!strcmp(absolute, absolute_history[i])) break;
-#endif // WIN32 || __APPLE__
+#endif // _WIN32 || __APPLE__
 
   if (i == 0) return;
 
@@ -1342,7 +1342,7 @@ public:
   FILE * desc() const { return _fpt;} // non null if file is open
   char * get_line(char * line, size_t s) const {return _fpt ? fgets(line, s, _fpt) : NULL;}
 
-#if defined(WIN32)  && !defined(__CYGWIN__)
+#if defined(_WIN32)  && !defined(__CYGWIN__)
 protected:
   HANDLE pin[2], pout[2], perr[2];
   char ptmode;
@@ -1365,7 +1365,7 @@ protected:
   FILE * _fpt;
 };
 
-#if defined(WIN32)  && !defined(__CYGWIN__)
+#if defined(_WIN32)  && !defined(__CYGWIN__)
 bool Fl_Process::createPipe(HANDLE * h, BOOL bInheritHnd) {
   SECURITY_ATTRIBUTES sa;
   sa.nLength = sizeof(sa);
@@ -1376,7 +1376,7 @@ bool Fl_Process::createPipe(HANDLE * h, BOOL bInheritHnd) {
 #endif
 // portable open process:
 FILE * Fl_Process::popen(const char *cmd, const char *mode) {
-#if defined(WIN32)  && !defined(__CYGWIN__)
+#if defined(_WIN32)  && !defined(__CYGWIN__)
   // PRECONDITIONS
   if (!mode || !*mode || (*mode!='r' && *mode!='w') ) return NULL;
   if (_fpt) close(); // close first before reuse
@@ -1417,7 +1417,7 @@ FILE * Fl_Process::popen(const char *cmd, const char *mode) {
 }
 
 int Fl_Process::close() {
-#if defined(WIN32)  && !defined(__CYGWIN__)
+#if defined(_WIN32)  && !defined(__CYGWIN__)
   if (_fpt) {
     fclose(_fpt);
     clean_close(perr[0]);
@@ -1434,7 +1434,7 @@ int Fl_Process::close() {
 #endif
 }
 
-#if defined(WIN32)  && !defined(__CYGWIN__)
+#if defined(_WIN32)  && !defined(__CYGWIN__)
 void Fl_Process::clean_close(HANDLE& h) {
   if (h!= INVALID_HANDLE_VALUE) CloseHandle(h);
   h = INVALID_HANDLE_VALUE;
@@ -1674,9 +1674,9 @@ void set_modflag(int mf) {
   if (main_window) {
     if (!filename) basename = "Untitled.fl";
     else if ((basename = strrchr(filename, '/')) != NULL) basename ++;
-#if defined(WIN32)
+#if defined(_WIN32)
     else if ((basename = strrchr(filename, '\\')) != NULL) basename ++;
-#endif // WIN32
+#endif // _WIN32
     else basename = filename;
 
     if (modflag) {
@@ -1727,7 +1727,7 @@ static int arg(int argc, char** argv, int& i) {
   return 0;
 }
 
-#if ! (defined(WIN32) && !defined (__CYGWIN__))
+#if ! (defined(_WIN32) && !defined (__CYGWIN__))
 
 int quit_flag = 0;
 #include <signal.h>
@@ -1833,7 +1833,7 @@ int main(int argc,char **argv) {
   }
   set_modflag(0);
   undo_clear();
-#ifndef WIN32
+#ifndef _WIN32
   signal(SIGINT,sigint);
 #endif
 
@@ -1842,13 +1842,13 @@ int main(int argc,char **argv) {
 
   grid_cb(horizontal_input, 0); // Makes sure that windows get snap params...
 
-#ifdef WIN32
+#ifdef _WIN32
   Fl::run();
 #else
   while (!quit_flag) Fl::wait();
 
   if (quit_flag) exit_cb(0,0);
-#endif // WIN32
+#endif // _WIN32
 
   undo_clear();
 

fluid/template_panel.cxx

@@ -27,11 +27,11 @@
 #include <FL/fl_ask.H>
 #include <FL/Fl_Shared_Image.H>
 #include <FL/Fl_Preferences.H>
-#if defined(WIN32) && !defined(__CYGWIN__)
+#if defined(_WIN32) && !defined(__CYGWIN__)
 #include <io.h>
 #else
 #include <unistd.h>
-#endif // WIN32 && !__CYGWIN__
+#endif // _WIN32 && !__CYGWIN__
 extern Fl_Preferences fluid_prefs;
 
 Fl_Double_Window *template_panel=(Fl_Double_Window *)0;

fluid/template_panel.fl

@@ -46,7 +46,7 @@ decl {\#include <FL/Fl_Shared_Image.H>} {private local
 decl {\#include <FL/Fl_Preferences.H>} {private local
 }
 
-declblock {\#if defined(WIN32) && !defined(__CYGWIN__)} {after {\#endif // WIN32 && !__CYGWIN__}
+declblock {\#if defined(_WIN32) && !defined(__CYGWIN__)} {after {\#endif // _WIN32 && !__CYGWIN__}
 } {
   decl {\#include <io.h>} {private local
   }

fluid/undo.cxx

@@ -23,13 +23,13 @@
 #include <FL/filename.H>
 #include "../src/flstring.h"
 
-#if defined(WIN32) && !defined(__CYGWIN__)
+#if defined(_WIN32) && !defined(__CYGWIN__)
 #  include <io.h>
 #  include <windows.h>
 #  define getpid (int)GetCurrentProcessId
 #else
 #  include <unistd.h>
-#endif // WIN32 && !__CYGWIN__
+#endif // _WIN32 && !__CYGWIN__
 
 
 extern Fl_Preferences	fluid_prefs;	// FLUID preferences

jpeg/jconfig.h

@@ -59,14 +59,6 @@ typedef unsigned char boolean;
 /* #undef NEED_SIGNAL_CATCHER */
 /* #undef DONT_USE_B_MODE */
 
-#if 0					/* FLTK 1.3.3 (disabled in FLTK 1.3.4) */
-
-#if defined(WIN32) || defined(__EMX__)
-#  define USE_SETMODE
-#endif /* WIN32 || __EMX__ */
-
-#endif					/* FLTK 1.3.3 (disabled in FLTK 1.3.4) */
-
 /* Define this if you want percent-done progress reports from cjpeg/djpeg. */
 /* #undef PROGRESS_REPORT */
 

src/Fl.cxx

@@ -101,12 +101,12 @@ bool Fl::cfg_win_win32 = 1;
 bool Fl::cfg_win_win32 = 0;
 #endif
 
-#ifdef FL_SYS_POSIX
+#ifdef FL_CFG_SYS_POSIX
 bool Fl::cfg_sys_posix = 1;
 #else
 bool Fl::cfg_sys_posix = 0;
 #endif
-#ifdef FL_SYS_WIN32
+#ifdef FL_CFG_SYS_WIN32
 bool Fl::cfg_sys_win32 = 1;
 #else
 bool Fl::cfg_sys_win32 = 0;

src/Fl_File_Chooser2.cxx

@@ -23,85 +23,85 @@
 /** \class Fl_File_Chooser
   The Fl_File_Chooser widget displays a standard file selection
   dialog that supports various selection modes.
-  
+
   \image html Fl_File_Chooser.jpg 
   \image latex  Fl_File_Chooser.jpg "Fl_File_Chooser" width=12cm
- 
+
- The Fl_File_Chooser widget transmits UTF-8 encoded filenames to its user. It is
+  The Fl_File_Chooser widget transmits UTF-8 encoded filenames to its user. It is
- recommended to open files that may have non-ASCII names with the fl_fopen() or
+  recommended to open files that may have non-ASCII names with the fl_fopen() or
- fl_open() utility functions that handle these names in a cross-platform way 
+  fl_open() utility functions that handle these names in a cross-platform way
- (whereas the standard fopen()/open() functions fail on the MSWindows platform 
+  (whereas the standard fopen()/open() functions fail on the Windows platform
- to open files with a non-ASCII name).
+  to open files with a non-ASCII name).
- 
+
   The Fl_File_Chooser class also exports several static values
   that may be used to localize or customize the appearance of all file chooser
   dialogs:
   
   <CENTER><TABLE BORDER="1">
   <TR>
-  	<TH>Member</TH>
+	<TH>Member</TH>
-  	<TH>Default value</TH>
+	<TH>Default value</TH>
   </TR>
   <TR>
-  	<TD>add_favorites_label</TD>
+	<TD>add_favorites_label</TD>
-  	<TD>"Add to Favorites"</TD>
+	<TD>"Add to Favorites"</TD>
   </TR>
   <TR>
-  	<TD>all_files_label</TD>
+	<TD>all_files_label</TD>
-  	<TD>"All Files (*)"</TD>
+	<TD>"All Files (*)"</TD>
   </TR>
   <TR>
-  	<TD>custom_filter_label</TD>
+	<TD>custom_filter_label</TD>
-  	<TD>"Custom Filter"</TD>
+	<TD>"Custom Filter"</TD>
   </TR>
   <TR>
-  	<TD>existing_file_label</TD>
+	<TD>existing_file_label</TD>
-  	<TD>"Please choose an existing file!"</TD>
+	<TD>"Please choose an existing file!"</TD>
   </TR>
   <TR>
-  	<TD>favorites_label</TD>
+	<TD>favorites_label</TD>
-  	<TD>"Favorites"</TD>
+	<TD>"Favorites"</TD>
   </TR>
   <TR>
-  	<TD>filename_label</TD>
+	<TD>filename_label</TD>
-  	<TD>"Filename:"</TD>
+	<TD>"Filename:"</TD>
   </TR>
   <TR>
-  	<TD>filesystems_label</TD>
+	<TD>filesystems_label</TD>
-  	<TD>"My Computer" (WIN32)<BR>
+	<TD>"My Computer" (Windows)<BR>
-  	"File Systems" (all others)</TD>
+	"File Systems" (all others)</TD>
   </TR>
- <TR>
+  <TR>
 	<TD>hidden_label</TD>
 	<TD>"Show hidden files:"</TD>
- </TR>
- <TR>
-  	<TD>manage_favorites_label</TD>
-  	<TD>"Manage Favorites"</TD>
   </TR>
   <TR>
-  	<TD>new_directory_label</TD>
+	<TD>manage_favorites_label</TD>
-  	<TD>"New Directory?"</TD>
+	<TD>"Manage Favorites"</TD>
   </TR>
   <TR>
-  	<TD>new_directory_tooltip</TD>
+	<TD>new_directory_label</TD>
-  	<TD>"Create a new directory."</TD>
+	<TD>"New Directory?"</TD>
   </TR>
   <TR>
-  	<TD>preview_label</TD>
+	<TD>new_directory_tooltip</TD>
-  	<TD>"Preview"</TD>
+	<TD>"Create a new directory."</TD>
   </TR>
   <TR>
-  	<TD>save_label</TD>
+	<TD>preview_label</TD>
-  	<TD>"Save"</TD>
+	<TD>"Preview"</TD>
   </TR>
   <TR>
-  	<TD>show_label</TD>
+	<TD>save_label</TD>
-  	<TD>"Show:"</TD>
+	<TD>"Save"</TD>
   </TR>
- <TR>
+  <TR>
-  	<TD>sort</TD>
+	<TD>show_label</TD>
-  	<TD>fl_numericsort</TD>
+	<TD>"Show:"</TD>
+  </TR>
+  <TR>
+	<TD>sort</TD>
+	<TD>fl_numericsort</TD>
   </TR>
   </TABLE></CENTER>
 

src/Fl_Gl_Overlay.cxx

@@ -62,7 +62,7 @@ void Fl_Gl_Window::make_overlay_current() {
   pGlWindowDriver->make_overlay_current();
 }
 
-/** Hides the window if it is not this window, does nothing in WIN32. */
+/** Hides the window if it is not this window, does nothing in Windows. */
 void Fl_Gl_Window::hide_overlay() {
   pGlWindowDriver->hide_overlay();
 }
@@ -211,7 +211,7 @@ void Fl_X11_Gl_Window_Driver::make_overlay(void *&current) {
 #include "drivers/WinAPI/Fl_WinAPI_Window_Driver.H"
 
 ////////////////////////////////////////////////////////////////
-// WIN32 version:
+// Windows version:
 
 void Fl_WinAPI_Gl_Window_Driver::hide_overlay(void *& overlay) {
 #if HAVE_GL_OVERLAY

src/Fl_Graphics_Driver.cxx

@@ -1,7 +1,7 @@
 //
 // "$Id$"
 //
-// implementation of Fl_Graphics_Driver class for the Fast Light Tool Kit (FLTK).
+// Fl_Graphics_Driver class for the Fast Light Tool Kit (FLTK).
 //
 // Copyright 2010-2018 by Bill Spitzak and others.
 //
@@ -89,7 +89,7 @@ void Fl_Graphics_Driver::copy_offscreen(int x, int y, int w, int h, Fl_Offscreen
   fl_begin_offscreen(pixmap); // does nothing if pixmap was not created by fl_create_offscreen()
   float s = 1;
   if (current == Fl_Surface_Device::surface()) {// pixmap was not created by fl_create_offscreen()
-    // happens, e.g., when drawing images under WIN32
+    // happens, e.g., when drawing images under Windows
     surface = new Fl_Image_Surface(px_width, px_height, 0, pixmap);
     Fl_Surface_Device::push_current(surface);
   }