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, 13 insertions, 13 deletions

diff --git a/examples/OpenGL3-glut-test.cxx b/examples/OpenGL3-glut-test.cxx
index 77d738311..9ec8c4989 100644
--- a/examples/OpenGL3-glut-test.cxx
+++ b/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>
diff --git a/examples/OpenGL3test.cxx b/examples/OpenGL3test.cxx
index 1f8c2b8d9..ca880d22f 100644
--- a/examples/OpenGL3test.cxx
+++ b/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>
diff --git a/examples/clipboard.cxx b/examples/clipboard.cxx
index 156c520d2..d95f883bd 100644
--- a/examples/clipboard.cxx
+++ b/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");
diff --git a/examples/howto-add_fd-and-popen.cxx b/examples/howto-add_fd-and-popen.cxx
index 0131f4018..285a377f3 100644
--- a/examples/howto-add_fd-and-popen.cxx
+++ b/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
diff --git a/examples/progress-simple.cxx b/examples/progress-simple.cxx
index 9f72c4ca6..5221ddcb8 100644
--- a/examples/progress-simple.cxx
+++ b/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) {
diff --git a/examples/table-sort.cxx b/examples/table-sort.cxx
index 2cbee1f51..dba178e8f 100644
--- a/examples/table-sort.cxx
+++ b/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