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

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
-<tt>WIN32</tt> for the 32 bit and 64 bit MS Windows API.
+Windows XP, Windows Vista, Windows 7 and later Windows versions.
+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