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

diff --git a/fluid/Fl_Function_Type.cxx b/fluid/Fl_Function_Type.cxx
index dadd44f6c..97d6485d2 100644
--- a/fluid/Fl_Function_Type.cxx
+++ b/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"
diff --git a/fluid/Fl_Type.h b/fluid/Fl_Type.h
index 859f98bd1..6d7bd5eac 100644
--- a/fluid/Fl_Type.h
+++ b/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"
diff --git a/fluid/fluid.cxx b/fluid/fluid.cxx
index 8bc13ac92..e13a171b3 100644
--- a/fluid/fluid.cxx
+++ b/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();
 
diff --git a/fluid/template_panel.cxx b/fluid/template_panel.cxx
index 5762980ac..9975b16b6 100644
--- a/fluid/template_panel.cxx
+++ b/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;
diff --git a/fluid/template_panel.fl b/fluid/template_panel.fl
index fd6a1d5e1..7c9239dc6 100644
--- a/fluid/template_panel.fl
+++ b/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
   }
diff --git a/fluid/undo.cxx b/fluid/undo.cxx
index 62770fec4..fc23e60a1 100644
--- a/fluid/undo.cxx
+++ b/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