Changed __GTK__, __WINDOWS__ and __MOTIF__ to __WXGTK__, __WXMSW__ and __WXMOTIF__

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@224 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-07-10 14:15:17 +00:00
parent 7007fcfced
commit 2049ba38ad
154 changed files with 481 additions and 463 deletions
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -29,7 +29,7 @@
 #include "wx/gdicmn.h"
 #include "wx/cmndata.h"

-#ifdef __WINDOWS__
+#ifdef __WXMSW__
 #include <windows.h>

 #ifndef __WIN32__
@@ -127,7 +127,7 @@ void wxFontData::operator=(const wxFontData& data)

 wxPrintData::wxPrintData(void)
 {
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
    printData = NULL;
 #endif
    printOrientation = wxPORTRAIT;
@@ -148,7 +148,7 @@ wxPrintData::wxPrintData(void)

 wxPrintData::~wxPrintData(void)
 {
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
    PRINTDLG *pd = (PRINTDLG *)printData;
    if ( pd && pd->hDevMode )
        GlobalFree(pd->hDevMode);
@@ -157,7 +157,7 @@ wxPrintData::~wxPrintData(void)
 #endif
 }

-#ifdef __WINDOWS__
+#ifdef __WXMSW__
 void wxPrintData::ConvertToNative(void)
 {
    PRINTDLG *pd = (PRINTDLG*) printData;
--- a/src/common/config.cpp
+++ b/src/common/config.cpp
@@ -136,7 +136,7 @@ wxString ExpandEnvVars(const wxString& str)
    Bracket_None, 
    Bracket_Normal  = ')', 
    Bracket_Curly   = '}',
-#ifdef  __WINDOWS__
+#ifdef  __WXMSW__
    Bracket_Windows = '%'     // yeah, Windows people are a bit strange ;-)
 #endif
  };
@@ -144,13 +144,13 @@ wxString ExpandEnvVars(const wxString& str)
  uint m;
  for ( uint n = 0; n < str.Len(); n++ ) {
    switch ( str[n] ) {
-#ifdef  __WINDOWS__
+#ifdef  __WXMSW__
      case '%':
 #endif  //WINDOWS
      case '$':
        {
          Bracket bracket;
-          #ifdef  __WINDOWS__
+          #ifdef  __WXMSW__
            if ( str[n] == '%' )
              bracket = Bracket_Windows;
            else
@@ -188,7 +188,7 @@ wxString ExpandEnvVars(const wxString& str)
          }
          else {
            // variable doesn't exist => don't change anything
-            #ifdef  __WINDOWS__
+            #ifdef  __WXMSW__
              if ( bracket != Bracket_Windows )
            #endif
                if ( bracket != Bracket_None )
--- a/src/common/date.cpp
+++ b/src/common/date.cpp
@@ -466,7 +466,7 @@ bool wxDate::IsLeapYear( void ) const

 wxDate& wxDate::Set()
 {
-//#ifdef __WINDOWS__
+//#ifdef __WXMSW__
 #if 0
    struct _dosdate_t sDate;
    _dos_getdate(&sDate);
--- a/src/common/datstrm.cpp
+++ b/src/common/datstrm.cpp
@@ -173,7 +173,7 @@ void wxDataStream::Write8(unsigned char i)

 void wxDataStream::WriteLine(const wxString& line)
 {
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
  wxString tmp_string = line + "\r\n";
 #else
  wxString tmp_string = line + '\n';
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -44,7 +44,7 @@
 #include "wx/generic/printps.h"

 /*
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
 #include "wx/mdi.h"
 #endif
 */
@@ -491,7 +491,7 @@ void wxView::OnChangeFilename(void)
    // If the frame is an MDI child, just set the title
    // to the name.
    // Otherwise, append the document name to the name of the application
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
    if (GetFrame()->IsKindOf(CLASSINFO(wxMDIChildFrame)))
 #else
    if (FALSE)
@@ -753,7 +753,7 @@ void wxDocManager::OnPrint(wxCommandEvent& WXUNUSED(event))
  {
    // TODO: trouble about this is that it pulls in the postscript
    // code unecessarily
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
    if ( wxTheApp->GetPrintMode() == wxPRINT_WINDOWS )
    {
      wxWindowsPrinter printer;
@@ -779,7 +779,7 @@ void wxDocManager::OnPrintSetup(wxCommandEvent& WXUNUSED(event))

  wxPrintData data;

-#ifdef __WINDOWS__
+#ifdef __WXMSW__
  if ( wxTheApp->GetPrintMode() == wxPRINT_WINDOWS )
  {
    wxPrintDialog printerDialog(parentWin, & data);
@@ -806,7 +806,7 @@ void wxDocManager::OnPreview(wxCommandEvent& WXUNUSED(event))
  {
    // Pass two printout objects: for preview, and possible printing.
    wxPrintPreviewBase *preview = NULL;
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
    if ( wxTheApp->GetPrintMode() == wxPRINT_WINDOWS )
        preview = new wxWindowsPrintPreview(printout, view->OnCreatePrintout());
    else
@@ -1126,7 +1126,7 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
    int noTemplates, wxString& path, long WXUNUSED(flags), bool WXUNUSED(save))
 {
  // We can only have multiple filters in Windows
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
  char *descrBuf = new char[1000];
  descrBuf[0] = 0;
  int i;
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -27,7 +27,7 @@
 #endif

 // standard
-#if 	defined(__WINDOWS__) && !defined(__GNUWIN32__)
+#if 	defined(__WXMSW__) && !defined(__GNUWIN32__)
  #include  <io.h>
 #elif (defined(__UNIX__) || defined(__GNUWIN32__))
  #include  <unistd.h>
--- a/src/common/fileconf.cpp
+++ b/src/common/fileconf.cpp
@@ -40,8 +40,8 @@
 #include  <wx/fileconf.h>

 // _WINDOWS_ is defined when windows.h is included,
-// __WINDOWS__ is defined for MS Windows compilation
-#if       defined(__WINDOWS__) && !defined(_WINDOWS_)
+// __WXMSW__ is defined for MS Windows compilation
+#if       defined(__WXMSW__) && !defined(_WINDOWS_)
  #include  <windows.h>
 #endif  //windows.h

--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -45,7 +45,7 @@
 #include <dirent.h>
 #endif

-#ifdef __WINDOWS__
+#ifdef __WXMSW__
 #ifndef __GNUWIN32__
 #include <direct.h>
 #include <dos.h>
@@ -69,7 +69,7 @@
 #include <dir.h>
 #endif

-#ifdef __WINDOWS__
+#ifdef __WXMSW__
 #include "windows.h"
 #endif

@@ -90,7 +90,7 @@ void wxPathList::Add (const wxString& path)
 void wxPathList::AddEnvList (const wxString& envVariable)
 {
  static const char PATH_TOKS[] =
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
 	" ;"; // Don't seperate with colon in DOS (used for drive)
 #else
 	" :;";
@@ -135,7 +135,7 @@ bool wxPathList::Member (const wxString& path)
  {
      wxString path2((char *) node->Data ());
      if (
-#if defined(__WINDOWS__) || defined(__VMS__)
+#if defined(__WXMSW__) || defined(__VMS__)
      // Case INDEPENDENT
 	  path.CompareTo (path2, wxString::ignoreCase) == 0
 #else
@@ -166,7 +166,7 @@ wxString wxPathList::FindValidPath (const wxString& file)
      if (ch != '\\' && ch != '/')
        strcat (wxBuffer, "/");
      strcat (wxBuffer, filename);
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
      Unix2DosFilename (wxBuffer);
 #endif
      if (wxFileExists (wxBuffer))
@@ -193,7 +193,7 @@ wxString wxPathList::FindAbsoluteValidPath (const wxString& file)
      lastCh = buf[len-1];
    if (lastCh != '/' && lastCh != '\\')
    {
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
      strcat(buf, "\\");
 #else
      strcat(buf, "/");
@@ -236,7 +236,7 @@ wxIsAbsolutePath (const wxString& filename)
 #ifdef __VMS__
      || (filename[0] == '[' && filename[1] != '.')
 #endif
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
      /* MSDOS */
      || filename[0] == '\\' || (isalpha (filename[0]) && filename[1] == ':')
 #endif
@@ -270,7 +270,7 @@ void wxStripExtension(char *buffer)
 // Destructive removal of /./ and /../ stuff
 char *wxRealPath (char *path)
 {
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
  static const char SEP = '\\';
  Unix2DosFilename(path);
 #else
@@ -300,7 +300,7 @@ char *wxRealPath (char *path)
 			path[0] = SEP;
 			path[1] = '\0';
 		      }
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
 		    /* Check that path[2] is NULL! */
 		    else if (path[1] == ':' && !path[2])
 		      {
@@ -330,7 +330,7 @@ char *wxCopyAbsolutePath(const wxString& filename)
    buf[0] = '\0';
    wxGetWorkingDirectory(buf, sizeof(buf)/sizeof(char));
    char ch = buf[strlen(buf) - 1];
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
    if (ch != '\\' && ch != '/')
 	strcat(buf, "\\");
 #else
@@ -381,7 +381,7 @@ char *wxExpandPath(char *buf, const char *name)
    trimchars[2] = '\t';
    trimchars[3] = 0;

-#ifdef __WINDOWS__
+#ifdef __WXMSW__
     const char     SEP = '\\';
 #else
     const char     SEP = '/';
@@ -402,7 +402,7 @@ char *wxExpandPath(char *buf, const char *name)

    s = nm;
    d = lnm;
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
    q = FALSE;
 #else
    q = nm[0] == '\\' && nm[1] == '~';
@@ -410,7 +410,7 @@ char *wxExpandPath(char *buf, const char *name)

    /* Expand inline environment variables */
    while ((*d++ = *s)) {
-#ifndef __WINDOWS__
+#ifndef __WXMSW__
 	if (*s == '\\') {
 	    if ((*(d - 1) = *++s)) {
 		s++;
@@ -419,7 +419,7 @@ char *wxExpandPath(char *buf, const char *name)
 		break;
 	} else
 #endif
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
 	if (*s++ == '$' && (*s == '{' || *s == ')'))
 #else
 	if (*s++ == '$')
@@ -510,7 +510,7 @@ wxContractPath (const wxString& filename, const wxString& envname, const wxStrin
    return NULL;

  strcpy (dest, WXSTRINGCAST filename);
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
  Unix2DosFilename(dest);
 #endif

@@ -537,7 +537,7 @@ wxContractPath (const wxString& filename, const wxString& envname, const wxStrin
      strcpy(wxBuffer, "~");
      if (user && *user)
 	strcat(wxBuffer, user);
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
 //      strcat(wxBuffer, "\\");
 #else
 //      strcat(wxBuffer, "/");
@@ -568,7 +568,7 @@ char *wxFileNameFromPath (char *path)
 #endif
 	    return tcp + 1;
 	}			/* while */
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
      if (isalpha (*path) && *(path + 1) == ':')
 	return path + 2;
 #endif
@@ -595,7 +595,7 @@ wxString wxFileNameFromPath (const wxString& path1)
 #endif
 	        return wxString(tcp + 1);
 	    }			/* while */
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
      if (isalpha (*path) && *(path + 1) == ':')
 	    return wxString(path + 2);
 #endif
@@ -637,7 +637,7 @@ wxPathOnly (char *path)
        else i --;
      }

-#ifdef __WINDOWS__
+#ifdef __WXMSW__
      // Try Drive specifier
      if (isalpha (buf[0]) && buf[1] == ':')
 	{
@@ -685,7 +685,7 @@ wxString wxPathOnly (const wxString& path)
        else i --;
      }

-#ifdef __WINDOWS__
+#ifdef __WXMSW__
      // Try Drive specifier
      if (isalpha (buf[0]) && buf[1] == ':')
 	{
@@ -712,7 +712,7 @@ wxDos2UnixFilename (char *s)
      {
 	if (*s == '\\')
 	  *s = '/';
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
 	else
 	  *s = wxToLower (*s);	// Case INDEPENDENT
 #endif
@@ -724,7 +724,7 @@ void
 wxUnix2DosFilename (char *s)
 {
 // Yes, I really mean this to happen under DOS only! JACS
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
  if (s)
    while (*s)
      {
@@ -826,7 +826,7 @@ bool wxMkdir(const wxString& dir)
 {
 #ifdef __VMS__
 	return FALSE;
-#elif (defined(__GNUWIN32__) && !defined(__MINGW32__)) || !defined(__WINDOWS__)
+#elif (defined(__GNUWIN32__) && !defined(__MINGW32__)) || !defined(__WXMSW__)
  return (mkdir (WXSTRINGCAST dir, S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) == 0);
 #else
  return (mkdir(WXSTRINGCAST dir) == 0);
@@ -847,7 +847,7 @@ bool wxDirExists(const wxString& dir)
 {
 #ifdef __VMS__
  return FALSE;
-#elif !defined(__WINDOWS__)
+#elif !defined(__WXMSW__)
  struct stat sbuf;
  return (stat(dir, &sbuf) != -1) && S_ISDIR(sbuf.st_mode) ? TRUE : FALSE;
 #else
@@ -904,7 +904,7 @@ bool wxPathExists(const char *pszPathName)
 // Get a temporary filename, opening and closing the file.
 char *wxGetTempFileName(const wxString& prefix, char *buf)
 {
-#ifdef __WINDOWS__
+#ifdef __WXMSW__

 #ifndef	__WIN32__
  char tmp[144];
@@ -1051,7 +1051,7 @@ char *wxFindNextFile(void)
  return NULL;
 }

-#elif defined(__WINDOWS__)
+#elif defined(__WXMSW__)

 #ifdef __WIN32__
 HANDLE wxFileStrucHandle = INVALID_HANDLE_VALUE;
@@ -1216,7 +1216,7 @@ char *wxFindNextFile(void)
 }

 #endif
- // __WINDOWS__
+ // __WXMSW__

 // Get current working directory.
 // If buf is NULL, allocates space using new, else
@@ -1240,7 +1240,7 @@ bool wxSetWorkingDirectory(const wxString& d)
 {
 #ifdef __UNIX__
  return (chdir(d) == 0);
-#elif defined(__WINDOWS__)
+#elif defined(__WXMSW__)

 #ifdef __WIN32__
  return (bool)(SetCurrentDirectory(d) != 0);
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -31,7 +31,7 @@

 #include <string.h>

-#ifdef __WINDOWS__
+#ifdef __WXMSW__
 #include <windows.h>
 #endif

@@ -146,7 +146,7 @@ void wxColourDatabase::Initialize ()
  cdef cc;
  static cdef table[]={
  
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
   {"AQUAMARINE",112, 219, 147},
   {"BLACK",0, 0, 0},
   {"BLUE", 0, 0, 255},
@@ -220,7 +220,7 @@ void wxColourDatabase::Initialize ()
   {"YELLOW GREEN", 153, 204, 50},
 #endif

-#if defined(__GTK__) || defined(__X__)
+#if defined(__WXGTK__) || defined(__X__)
   {"MEDIUM GOLDENROD", 234, 234, 173},
   {"MEDIUM FOREST GREEN", 107, 142, 35},
   {"LIGHT MAGENTA", 255, 0, 255},
@@ -252,11 +252,11 @@ wxColour *wxColourDatabase::FindColour(const wxString& colour)
  if (node)
    return (wxColour *)node->Data();
    
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
  else return NULL;
 #endif

-#ifdef __GTK__
+#ifdef __WXGTK__
  else {
    wxColour *col = new wxColour( colour );
    
@@ -273,7 +273,7 @@ wxColour *wxColourDatabase::FindColour(const wxString& colour)
  else {
    XColor xcolour;

-#ifdef __MOTIF__
+#ifdef __WXMOTIF__
    Display *display = XtDisplay(wxTheApp->topLevel) ;
 #endif
 #ifdef __XVIEW__
@@ -326,7 +326,7 @@ wxInitializeStockObjects ()
  wxTheFontList = new wxFontList;
  wxTheBitmapList = new wxBitmapList;

-#ifdef __MOTIF__
+#ifdef __WXMOTIF__
 #endif
 #ifdef __X__
  wxFontPool = new XFontPool;
@@ -542,7 +542,7 @@ void wxBrushList::RemoveBrush (wxBrush * brush)

 wxFontList::~wxFontList ()
 {
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
  wxNode *node = First ();
  while (node)
    {
@@ -585,7 +585,7 @@ wxFont *wxFontList::
 	  each_font->GetStyle () == Style &&
 	  each_font->GetWeight () == Weight &&
 	  each_font->GetUnderlined () == underline &&
-#if defined(__X__) || (defined(__WINDOWS__) && USE_PORTABLE_FONTS_IN_MSW)
+#if defined(__X__) || (defined(__WXMSW__) && USE_PORTABLE_FONTS_IN_MSW)
 	  each_font->GetFontId () == FamilyOrFontId) /* New font system */
 #else
 	  each_font->GetFamily () == FamilyOrFontId &&
--- a/src/common/list.cpp
+++ b/src/common/list.cpp
@@ -174,7 +174,7 @@ wxList::wxList (wxObject * first_one...)
    {
      wxObject *object = va_arg (ap, wxObject *);
 //    if (object == NULL) // Doesn't work in Windows -- segment is non-zero for NULL!
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
      if ((int) object == 0)
 #else
      if ((long) object == 0)
@@ -525,7 +525,7 @@ wxStringList::wxStringList (const char *first...)
    {
      char *s = va_arg (ap, char *);
 //    if (s == NULL)
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
      if ((int) s == 0)
 #else
      if ((long) s == 0)
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -47,7 +47,7 @@
 #include  <stdlib.h>
 #include  <time.h>

-#ifdef  __WINDOWS__
+#ifdef  __WXMSW__
  #include  <windows.h>
 #else   //Unix
  #include  <signal.h>
@@ -359,7 +359,7 @@ void wxLogStream::DoLogString(const char *szString)
 // ----------------------------------------------------------------------------
 wxLogTextCtrl::wxLogTextCtrl(wxTextCtrl *pTextCtrl)
 // @@@ TODO: in wxGTK wxTextCtrl doesn't derive from streambuf
-#ifndef __GTK__
+#ifndef __WXGTK__
             : wxLogStream(new ostream(pTextCtrl))
 #endif //GTK
 {
@@ -367,7 +367,7 @@ wxLogTextCtrl::wxLogTextCtrl(wxTextCtrl *pTextCtrl)

 wxLogTextCtrl::~wxLogTextCtrl()
 {
-  #ifndef __GTK__
+  #ifndef __WXGTK__
    delete m_ostr;
  #endif //GTK
 }
@@ -619,7 +619,7 @@ void wxLogFrame::OnSave(wxCommandEvent& event)
  // retrieve text and save it
  // -------------------------
  
-#ifdef __GTK__
+#ifdef __WXGTK__
  // @@@@ TODO: no GetNumberOfLines and GetLineText in wxGTK yet
  wxLogError("Sorry, this function is not implemented under GTK");
 #else
@@ -678,7 +678,7 @@ void wxLogWindow::DoLogString(const char *szString)
  wxTextCtrl *pText = m_pLogFrame->TextCtrl();

  // remove selection (WriteText is in fact ReplaceSelection)
-  #ifdef __WINDOWS__
+  #ifdef __WXMSW__
    long nLen = pText->GetLastPosition();
    pText->SetSelection(nLen, nLen);
  #endif // Windows
@@ -751,7 +751,7 @@ static void wxLogWrap(FILE *f, const char *pszPrefix, const char *psz)
 // get error code from syste
 unsigned long wxSysErrorCode()
 {
-  #ifdef  __WINDOWS__
+  #ifdef  __WXMSW__
    #ifdef  __WIN32__
      return ::GetLastError();
    #else   //WIN16
@@ -769,7 +769,7 @@ const char *wxSysErrorMsg(unsigned long nErrCode)
  if ( nErrCode == 0 )
    nErrCode = wxSysErrorCode();

-  #ifdef  __WINDOWS__
+  #ifdef  __WXMSW__
    #ifdef  __WIN32__
      static char s_szBuf[LOG_BUFFER_SIZE / 2];

@@ -838,7 +838,7 @@ void wxOnAssert(const char *szFile, int nLine, const char *szMsg)
    switch ( wxMessageBox(szBuf, _("Debug"),
                          wxYES_NO | wxCANCEL | wxICON_STOP ) ) {
      case wxYES:
-        #ifdef __WINDOWS__
+        #ifdef __WXMSW__
          DebugBreak();
        #else // Unix
          raise(SIGTRAP);
--- a/src/common/memory.cpp
+++ b/src/common/memory.cpp
@@ -51,7 +51,7 @@
 #include <stdarg.h>
 #include <string.h>

-#ifdef __WINDOWS__
+#ifdef __WXMSW__
 #include <windows.h>

 #ifdef GetClassInfo
@@ -1021,7 +1021,7 @@ void wxTrace(const char *fmt ...)

  va_start(ap, fmt);

-#ifdef __WINDOWS__
+#ifdef __WXMSW__
  wvsprintf(buffer,fmt,ap) ;
 #else
  vsprintf(buffer,fmt,ap) ;
@@ -1035,7 +1035,7 @@ void wxTrace(const char *fmt ...)
    wxDebugContext::GetStream().flush();
  }
  else
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
    OutputDebugString((LPCSTR)buffer) ;
 #else
    fprintf(stderr, buffer);
@@ -1053,7 +1053,7 @@ void wxTraceLevel(int level, const char *fmt ...)

  va_start(ap, fmt);

-#ifdef __WINDOWS__
+#ifdef __WXMSW__
  wvsprintf(buffer,fmt,ap) ;
 #else
  vsprintf(buffer,fmt,ap) ;
@@ -1067,7 +1067,7 @@ void wxTraceLevel(int level, const char *fmt ...)
    wxDebugContext::GetStream().flush();
  }
  else
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
    OutputDebugString((LPCSTR)buffer) ;
 #else
    fprintf(stderr, buffer);
--- a/src/common/odbc.cpp
+++ b/src/common/odbc.cpp
@@ -36,7 +36,7 @@
 #include <math.h>
 #include <stdlib.h>

-#if defined(__WINDOWS__) && !defined(__WIN32__)
+#if defined(__WXMSW__) && !defined(__WIN32__)
 #include <print.h>
 #endif

--- a/src/common/postscrp.cpp
+++ b/src/common/postscrp.cpp
@@ -44,7 +44,7 @@

 #include "wx/dcmemory.h"

-#ifdef __WINDOWS__
+#ifdef __WXMSW__
 #include "wx/msw/private.h"
 #endif

@@ -62,7 +62,7 @@
 #include <limits.h>
 #include <assert.h>

-#ifdef __GTK__
+#ifdef __WXGTK__

 #include "gdk/gdkx.h"        // GDK_DISPLAY
 #include "gdk/gdkprivate.h"  // XImage
@@ -71,7 +71,7 @@

 #endif

-#ifdef __WINDOWS__
+#ifdef __WXMSW__

 #ifdef DrawText
 #undef DrawText
@@ -105,7 +105,7 @@
 // SGI's Display Postscript Previewer
 //# define PS_VIEWER_PROG "dps"
 # define PS_VIEWER_PROG "xpsview"
-#elif defined(__X__) || defined(__GTK__)
+#elif defined(__X__) || defined(__WXGTK__)
 // Front-end to ghostscript
 # define PS_VIEWER_PROG "ghostview"
 #else
@@ -175,7 +175,7 @@ wxPostScriptDC::wxPostScriptDC (void)

  m_pstream = NULL;

-#ifdef __WINDOWS__
+#ifdef __WXMSW__
  // Can only send to file in Windows
  wxThePrintSetupData->SetPrinterMode(PS_FILE);
 #endif
@@ -205,7 +205,7 @@ bool wxPostScriptDC::Create(const wxString& file, bool interactive, wxWindow *pa
  m_filename = file;
  m_pstream = NULL;

-#ifdef __WINDOWS__
+#ifdef __WXMSW__
  // Can only send to file in Windows
  wxThePrintSetupData->SetPrinterMode(PS_FILE);
 #endif
@@ -669,7 +669,7 @@ void wxPostScriptDC::DrawEllipse (long x, long y, long width, long height)

 void wxPostScriptDC::DrawIcon (const wxIcon& icon, long x, long y)
 {
-#if defined(__X__) || defined(__GTK__)
+#if defined(__X__) || defined(__WXGTK__)
  wxMemoryDC memDC;
  memDC.SelectObject(icon);
  Blit(x, y, icon.GetWidth(), icon.GetHeight(), &memDC, 0, 0);
@@ -1272,7 +1272,7 @@ void wxPostScriptDC::EndDoc (void)
  wxRemoveFile (wxThePrintSetupData->GetPrinterFile());
  wxRenameFile(tmp_file, wxThePrintSetupData->GetPrinterFile());

-#if defined(__X__) || defined(__GTK__)
+#if defined(__X__) || defined(__WXGTK__)
  if (m_ok)
    {
      switch (wxThePrintSetupData->GetPrinterMode()) {
@@ -1406,7 +1406,7 @@ Blit (long xdest, long ydest, long fwidth, long fheight,
 {
  long width, height, x, y;

-#if !defined(__X__) && !defined(__GTK__)
+#if !defined(__X__) && !defined(__WXGTK__)
  return FALSE;
 #endif

@@ -1428,7 +1428,7 @@ Blit (long xdest, long ydest, long fwidth, long fheight,
  *m_pstream << "  currentfile DataString readhexstring pop\n";
  *m_pstream << "} bind image\n";

-#if defined(__X__) || defined(__GTK__)
+#if defined(__X__) || defined(__WXGTK__)

  /* Output data as hex digits: */
  Display *d;
@@ -1437,7 +1437,7 @@ Blit (long xdest, long ydest, long fwidth, long fheight,
  long j, i;
  char s[3];
  
-#ifdef __GTK__
+#ifdef __WXGTK__

  d = gdk_display;
  cm = ((GdkColormapPrivate*)gdk_colormap_get_system())->xcolormap;
@@ -1446,7 +1446,7 @@ Blit (long xdest, long ydest, long fwidth, long fheight,

 #else  

-#ifdef __MOTIF__
+#ifdef __WXMOTIF__
  d = source->display;
 #else
  d = wxGetDisplay();
@@ -2082,7 +2082,7 @@ wxDialog(parent, -1, title, pos, size, style)
  wxRadioBox *radio1 = new wxRadioBox(this, wxID_PRINTER_MODES, "PostScript:",
    wxPoint(150, yPos), wxSize(-1,-1), features, print_modes, features, 0);

-#ifdef __WINDOWS__
+#ifdef __WXMSW__
  radio1->Enable(0, FALSE);
  if (wxThePrintSetupData->GetPrintPreviewCommand() && *wxThePrintSetupData->GetPrintPreviewCommand())
    radio1->Enable(2, FALSE);
@@ -2491,12 +2491,12 @@ void wxInitializePrintSetupData(bool init)
    wxThePrintSetupData->SetPrinterOptions("/nonotify/queue=psqueue");
    wxThePrintSetupData->SetAFMPath("sys$ps_font_metrics:");
 #endif
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
    wxThePrintSetupData->SetPrinterCommand("print");
    wxThePrintSetupData->SetAFMPath("c:\\windows\\system\\");
    wxThePrintSetupData->SetPrinterOptions(NULL);
 #endif
-#if !defined(__VMS__) && !defined(__WINDOWS__)
+#if !defined(__VMS__) && !defined(__WXMSW__)
    wxThePrintSetupData->SetPrinterCommand("lpr");
    wxThePrintSetupData->SetPrinterOptions(NULL);
    wxThePrintSetupData->SetAFMPath(NULL);
--- a/src/common/prntbase.cpp
+++ b/src/common/prntbase.cpp
@@ -22,7 +22,7 @@

 #include "wx/defs.h"

-#ifdef __WINDOWS__
+#ifdef __WXMSW__
 #define __GOOD_COMPILER__
 #endif

@@ -47,7 +47,7 @@
 #include <stdlib.h>
 #include <string.h>

-#ifdef __WINDOWS__
+#ifdef __WXMSW__
 #include <windows.h>
 #include <commdlg.h>

@@ -77,7 +77,7 @@ typedef signed short int SHORT ;

 LONG APIENTRY _EXPORT wxAbortProc(HDC hPr, int Code);
 #endif
- // End __WINDOWS__
+ // End __WXMSW__

 #if !USE_SHARED_LIBRARY
 IMPLEMENT_CLASS(wxPrinterBase, wxObject)
@@ -337,7 +337,7 @@ void wxPreviewControlBar::CreateButtons(void)

  SetSize(0, 0, 400, 40);

-#ifdef __WINDOWS__
+#ifdef __WXMSW__
  int fontSize = 9;
 #else
  int fontSize = 10;
@@ -484,7 +484,7 @@ void wxPreviewFrame::Initialize(void)
 //  int w, h;
 //  controlBar->GetSize(&w, &h);
  int h;
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
  h = 40;
 #else
  h = 60;
--- a/src/common/resource.cpp
+++ b/src/common/resource.cpp
@@ -2090,7 +2090,7 @@ wxBitmap *wxResourceCreateBitmap(char *resource, wxResourceTable *table)
          }
          break;
        }
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
        case RESOURCE_PLATFORM_WINDOWS:
        {
          if (!optResource && ((noColours == 0) || (noColours <= thisNoColours)))
@@ -2165,7 +2165,7 @@ wxBitmap *wxResourceCreateBitmap(char *resource, wxResourceTable *table)
      }
      case wxBITMAP_TYPE_XPM_DATA:
      {
-#if (defined(__X__) && USE_XPM_IN_X) || (defined(__WINDOWS__) && USE_XPM_IN_MSW)
+#if (defined(__X__) && USE_XPM_IN_X) || (defined(__WXMSW__) && USE_XPM_IN_MSW)
        wxItemResource *item = table->FindResource(name);
        if (!item)
        {
@@ -2263,7 +2263,7 @@ wxIcon *wxResourceCreateIcon(char *resource, wxResourceTable *table)
          }
          break;
        }
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
        case RESOURCE_PLATFORM_WINDOWS:
        {
          if (!optResource && ((noColours == 0) || (noColours <= thisNoColours)))
@@ -2340,7 +2340,7 @@ wxIcon *wxResourceCreateIcon(char *resource, wxResourceTable *table)
      {
      // *** XPM ICON NOT YET IMPLEMENTED IN WXWINDOWS ***
 /*
-#if (defined(__X__) && USE_XPM_IN_X) || (defined(__WINDOWS__) && USE_XPM_IN_MSW)
+#if (defined(__X__) && USE_XPM_IN_X) || (defined(__WXMSW__) && USE_XPM_IN_MSW)
        wxItemResource *item = table->FindResource(name);
        if (!item)
        {
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -907,7 +907,7 @@ int wxString::Scanf(const char *pszFormat, ...) const

 int wxString::ScanfV(const char *pszFormat, va_list argptr) const
 {
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
  wxMessageBox("ScanfV not implemented");
  return 0;
 #else
--- a/src/common/tbarbase.cpp
+++ b/src/common/tbarbase.cpp
@@ -25,7 +25,7 @@
 #endif

 // For ::UpdateWindow
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
 #include <windows.h>
 #endif

@@ -500,7 +500,7 @@ void wxToolBarBase::SetScrollbars (int pixelsPerUnitX, int pixelsPerUnitY,
    }
 	AdjustScrollbars();
    Refresh();
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
    ::UpdateWindow ((HWND) GetHWND());
 #endif
 }
@@ -755,7 +755,7 @@ void wxToolBarBase::Scroll (int x_pos, int y_pos)
      SetScrollPos (wxVERTICAL, y_pos, TRUE);
    }
  Refresh();
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
  UpdateWindow ((HWND) GetHWND());
 #endif
 }
@@ -827,7 +827,7 @@ void wxToolBarBase::DoToolbarUpdates(void)
 	}
 }

-#ifdef __WINDOWS__
+#ifdef __WXMSW__
 // Circumvent wxControl::MSWOnMouseMove which doesn't set the cursor.
 void wxToolBarBase::MSWOnMouseMove(int x, int y, const WXUINT flags)
 {
--- a/src/common/textfile.cpp
+++ b/src/common/textfile.cpp
@@ -39,7 +39,7 @@
  
 // default type is the native one
 const wxTextFile::Type wxTextFile::typeDefault = wxTextFile::
-#if   defined(__WINDOWS__)
+#if   defined(__WXMSW__)
  Type_Dos;
 #elif defined(__UNIX__)
  Type_Unix;
--- a/src/common/timercmn.cpp
+++ b/src/common/timercmn.cpp
@@ -144,7 +144,7 @@ bool wxGetLocalTime(long *timeZone, int *dstObserved)
  *dstObserved = tp->tm_isdst;
 #else

-#if (((defined(__SYSV__) && !defined(__HPUX__)) || defined(__MSDOS__) || defined(__WINDOWS__)) && !defined(__GNUWIN32__))
+#if (((defined(__SYSV__) && !defined(__HPUX__)) || defined(__MSDOS__) || defined(__WXMSW__)) && !defined(__GNUWIN32__))
 #ifdef __BORLANDC__
  /* Borland uses underscores */
  *timeZone = _timezone;
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -56,7 +56,7 @@
 #include "../common/glob.inc"
 #endif

-#ifdef __WINDOWS__
+#ifdef __WXMSW__
 #include "windows.h"
 #endif

@@ -109,7 +109,7 @@ int strncasecmp(const char *str_1, const char *str_2, size_t maxchar)
 }
 #endif

-#ifdef __WINDOWS__
+#ifdef __WXMSW__

 #ifndef __GNUWIN32__
 #define strcasecmp stricmp
@@ -134,7 +134,7 @@ extern "C"
  int strncasecmp (const char *, const char *, size_t);
 }
 #endif
-#endif				/* __WINDOWS__ */
+#endif				/* __WXMSW__ */


 char *
@@ -519,7 +519,7 @@ int wxDebugStreamBuf::overflow(int WXUNUSED(i))
  char *txt = new char[len+1];
  strncpy(txt, pbase(), len);
  txt[len] = '\0';
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
  OutputDebugString((LPCSTR)txt);
 #else
  fprintf(stderr, txt);
@@ -535,7 +535,7 @@ int wxDebugStreamBuf::sync(void)
  char *txt = new char[len+1];
  strncpy(txt, pbase(), len);
  txt[len] = '\0';
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
  OutputDebugString((LPCSTR)txt);
 #else
  fprintf(stderr, txt);
--- a/src/generic/gridg.cpp
+++ b/src/generic/gridg.cpp
@@ -32,7 +32,7 @@
 #include "wx/settings.h"

 // Set to zero to use no double-buffering
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
 #define USE_DOUBLE_BUFFERING 1
 #else
 #define USE_DOUBLE_BUFFERING 0
@@ -840,7 +840,7 @@ void wxGenericGrid::DrawCellBackground(wxDC *dc, wxRectangle *rect, int row, int
  {
    dc->SetBrush(*cell->GetBackgroundBrush());
    dc->SetPen(*wxTRANSPARENT_PEN);
-#ifdef __MOTIF__
+#ifdef __WXMOTIF__
    dc->DrawRectangle(rect->x+1, rect->y+1, rect->width-1, rect->height-1);
 #else
    dc->DrawRectangle(rect->x+1, rect->y+1, rect->width, rect->height);
@@ -1371,7 +1371,7 @@ void wxGenericGrid::OnSelectCellImplementation(wxDC *dc, int row, int col)

  // Why isn't this needed for Windows??
  // Probably because of the SetValue??
-#ifndef __WINDOWS__
+#ifndef __WXMSW__
  HighlightCell(dc);
 #endif
  dc->DestroyClippingRegion();
@@ -1751,7 +1751,7 @@ void wxGenericGrid::RefreshCell(int row, int col, bool setText)
        currentPos = TRUE;
      }
      // Gets refreshed anyway in MSW
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
      if (!currentPos)
 #endif
      {
--- a/src/generic/helpxlp.cpp
+++ b/src/generic/helpxlp.cpp
@@ -55,7 +55,7 @@

 #if !USE_SHARED_LIBRARY

-#ifdef __WINDOWS__
+#ifdef __WXMSW__
 IMPLEMENT_CLASS(wxXLPHelpClient, wxDDEClient)
 IMPLEMENT_CLASS(wxXLPHelpConnection, wxDDEConnection)
 #else
@@ -189,7 +189,7 @@ bool wxXLPHelpController::Run(void)
  if (!helpFile || !helpHost || helpRunning)
    return FALSE;
 #endif
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
  if (!helpFile || helpRunning)
    return FALSE;
 #endif
@@ -208,7 +208,7 @@ bool wxXLPHelpController::Run(void)

  char server[32];
  sprintf(server, "%d", helpServer);
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
  // Only one instance of wxHelp under Windows.
  // See if there's already an instance of wxHelp
  if ((helpConnection = (wxXLPHelpConnection *)helpClient.MakeConnection(helpHost, server, "WXHELP")))
--- a/src/generic/panelg.cpp
+++ b/src/generic/panelg.cpp
@@ -93,7 +93,7 @@ void wxPanel::OnNavigationKey(wxNavigationKeyEvent& event)
  wxWindow *winFocus = event.GetCurrentFocus();
  
  // @@@ no FindFocus() in wxGTK
-  #ifndef __GTK__
+  #ifndef __WXGTK__
    if ( winFocus == NULL )
      winFocus = wxWindow::FindFocus();
  #endif
--- a/src/generic/prntdlgg.cpp
+++ b/src/generic/prntdlgg.cpp
@@ -425,7 +425,7 @@ void wxGenericPageSetupDialog::OnPrinter(wxCommandEvent& WXUNUSED(event))

    genericPrintSetupDialog->Close(TRUE);
  }
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
  else
  {
    wxPrintData data;
--- a/src/generic/scrolwin.cpp
+++ b/src/generic/scrolwin.cpp
@@ -20,7 +20,7 @@
 #include "wx/utils.h"
 #include "wx/dcclient.h"

-#ifdef __WINDOWS__
+#ifdef __WXMSW__
 #include "windows.h"
 #endif

@@ -103,7 +103,7 @@ void wxScrolledWindow::SetScrollbars (int pixelsPerUnitX, int pixelsPerUnitY,
   
   if (do_refresh && !noRefresh) Refresh();
   
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
    UpdateWindow ((HWND) GetHWND());
 #endif
 }
@@ -403,7 +403,7 @@ void wxScrolledWindow::Scroll (int x_pos, int y_pos)
      SetScrollPos (wxVERTICAL, y_pos, TRUE);
    }
  Refresh();
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
  ::UpdateWindow ((HWND) GetHWND());
 #endif
 }
--- a/src/generic/statusbr.cpp
+++ b/src/generic/statusbr.cpp
@@ -29,7 +29,7 @@

 #include "wx/generic/statusbr.h"

-#ifdef __WINDOWS__
+#ifdef __WXMSW__
 #include <windows.h>

 #ifdef DrawText
@@ -123,7 +123,7 @@ void wxStatusBar::SetStatusText(const wxString& text, int number)

  Refresh();

-#ifdef __WINDOWS__
+#ifdef __WXMSW__
  // For some reason, this can cause major GDI problems - graphics
  // all over the place. E.g. in print previewing.
 //  ::UpdateWindow((HWND) GetHWND());
--- a/src/gtk/setup/setup.hin
+++ b/src/gtk/setup/setup.hin
@@ -21,7 +21,7 @@
 #endif

 /* define the system to compile */
-#undef __GTK__
+#undef __WXGTK__
 #undef __UNIX__
 #undef __LINUX__
 #undef __SGI__
--- a/src/gtk1/setup/setup.hin
+++ b/src/gtk1/setup/setup.hin
@@ -21,7 +21,7 @@
 #endif

 /* define the system to compile */
-#undef __GTK__
+#undef __WXGTK__
 #undef __UNIX__
 #undef __LINUX__
 #undef __SGI__
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -113,7 +113,7 @@ WARN = -Wall
 # -Wredudant-decs

 # Which GUI, -Dwx_xview or -Dwx_motif (don't change this)
-GUI = -D__WINDOWS__
+GUI = -D__WXMSW__

 # Optimization
 # OPT = -O
--- a/src/makemsc.env
+++ b/src/makemsc.env
@@ -56,15 +56,15 @@ LIBS=$(WXLIB) $(EXTRALIBS) oldnames libw llibcew commdlg ddeml shell mmsystem $(
 !if "$(DLL)" == "0"
 PCH=WX.PCH
 PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\src\msw\$(PCH)
-CPPFLAGS= $(DEBUG_FLAGS) $(OPTIONS) $(INC) $(EXTRAFLAGS) /DWXDEBUG=1 /D__WXDEBUG__ /AL /Gt4 /Gx- /W4 /G2sw $(OPT) /D__WINDOWS__ $(PRECOMP)
-CPPFLAGS2= $(DEBUG_FLAGS) $(OPTIONS) $(INC) $(EXTRAFLAGS) /DWXDEBUG=1 /D__WXDEBUG__ /AL /Gt4 /Gx- /W4 /G2sw $(OPT) /D__WINDOWS__
+CPPFLAGS= $(DEBUG_FLAGS) $(OPTIONS) $(INC) $(EXTRAFLAGS) /DWXDEBUG=1 /D__WXDEBUG__ /AL /Gt4 /Gx- /W4 /G2sw $(OPT) /D__WXMSW__ $(PRECOMP)
+CPPFLAGS2= $(DEBUG_FLAGS) $(OPTIONS) $(INC) $(EXTRAFLAGS) /DWXDEBUG=1 /D__WXDEBUG__ /AL /Gt4 /Gx- /W4 /G2sw $(OPT) /D__WXMSW__
 LINKFLAGS=$(LINK_DEBUG_FLAGS) /NOD /SEG:512 /ONERROR:NOEXE
 DUMMY=dummy
 !else
 PCH=WX.PCH
 PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\src\msw\$(PCH)
-CPPFLAGS= $(DEBUG_FLAGS) $(OPTIONS) $(INC) $(EXTRAFLAGS) /AL /Gt4 /Gx- /W4 /G2s /GD $(OPT) /D__WINDOWS__ $(PRECOMP)
-CPPFLAGS2= $(DEBUG_FLAGS) $(OPTIONS) $(INC) $(EXTRAFLAGS) /AL /Gt4 /Gx- /W4 /G2s /GD $(OPT) /D__WINDOWS__
+CPPFLAGS= $(DEBUG_FLAGS) $(OPTIONS) $(INC) $(EXTRAFLAGS) /AL /Gt4 /Gx- /W4 /G2s /GD $(OPT) /D__WXMSW__ $(PRECOMP)
+CPPFLAGS2= $(DEBUG_FLAGS) $(OPTIONS) $(INC) $(EXTRAFLAGS) /AL /Gt4 /Gx- /W4 /G2s /GD $(OPT) /D__WXMSW__
 LINKFLAGS=$(LINK_DEBUG_FLAGS) /NOD /SEG:512 /ONERROR:NOEXE
 DUMMY=dummydll
 !endif
--- a/src/makesc.env
+++ b/src/makesc.env
@@ -12,7 +12,7 @@ OBJSUFF = obj

 CC=sc
 RC=rc
-CFLAGS = -o -ml -W -D__WINDOWS__
+CFLAGS = -o -ml -W -D__WXMSW__
 LDFLAGS = -ml -W

 .$(SRCSUFF).obj:
--- a/src/makewat.env
+++ b/src/makewat.env
@@ -54,8 +54,8 @@ RESFLAGS1   = -r -bt=windows /i$(WXDIR)\include\msw /i$(WXDIR)\contrib\fafa
 RESFLAGS2   = -R $(name) /i$(WXDIR)\include\msw /i$(WXDIR)\contrib\fafa
 DEBUGINFO   = debug all

-#CPPFLAGS    = /zw /w1 /zq /d2 /d__WIN386__ /zt4 $(MODEL) /d__WINDOWS__
-CPPFLAGS    = /zw /w1 /zq /d1 /d__WIN386__ $(MODEL) $(PRECOMP) /d__WINDOWS__ $(EXTRACPPFLAGS)
+#CPPFLAGS    = /zw /w1 /zq /d2 /d__WIN386__ /zt4 $(MODEL) /d__WXMSW__
+CPPFLAGS    = /zw /w1 /zq /d1 /d__WIN386__ $(MODEL) $(PRECOMP) /d__WXMSW__ $(EXTRACPPFLAGS)

 !endif
 #### END WIN386 MODE
@@ -88,8 +88,8 @@ DEBUGINFO   = debug all
 # or we get link failure (TEXT segment overflow). Is this OK for
 # 32-bit mode also? -- JACS
 # An alternative might be /zc (put string literals in code segment).
-#CPPFLAGS    = /zw /w1 /zq /d1 /zt4 $(MODEL) /d__WINDOWS__
-CPPFLAGS    = /zw /w2 /zq /d1 $(MODEL) $(PRECOMP) /d__WINDOWS__ $(EXTRACPPFLAGS)
+#CPPFLAGS    = /zw /w1 /zq /d1 /zt4 $(MODEL) /d__WXMSW__
+CPPFLAGS    = /zw /w2 /zq /d1 $(MODEL) $(PRECOMP) /d__WXMSW__ $(EXTRACPPFLAGS)

 !endif
 #### END WINDOWS MODE
@@ -130,7 +130,7 @@ DEBUGINFO   = debug all # Linking: comment out if operating in a non-debuggable
 OPTFLAGS=/ox /5r # /DWXDEBUG=1

 # /d1 for line numbers only: anything else produces an enormous wx32.lib
-CPPFLAGS    = /bt=nt /w1 /D__WIN32__ /zq $(OPTFLAGS) $(MODEL) $(PRECOMP) /d1 /d__WINDOWS__ $(EXTRACPPFLAGS)
+CPPFLAGS    = /bt=nt /w1 /D__WIN32__ /zq $(OPTFLAGS) $(MODEL) $(PRECOMP) /d1 /d__WXMSW__ $(EXTRACPPFLAGS)

 !endif
 #### END NT MODE
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -337,7 +337,7 @@ void wxApp::CleanUp()

 void wxApp::CommonInit()
 {
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
  wxBuffer = new char[1500];
 #else
  wxBuffer = new char[BUFSIZ + 512];
@@ -648,7 +648,7 @@ wxApp::wxApp()
  m_appName = "";
  argc = 0;
  argv = NULL;
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
  m_printMode = wxPRINT_WINDOWS;
 #else
  m_printMode = wxPRINT_POSTSCRIPT;
--- a/src/msw/data.cpp
+++ b/src/msw/data.cpp
@@ -148,7 +148,7 @@ const char *wxFatalErrorStr = "wxWindows Fatal Error";
 const char *wxFloatToStringStr = "%.2f";
 const char *wxDoubleToStringStr = "%.2f";

-#ifdef __WINDOWS__
+#ifdef __WXMSW__
 const char *wxUserResourceStr = "TEXT";
 #endif

@@ -201,7 +201,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxDC)
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxDC)
 IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC)

-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
 #include "wx/dcprint.h"
 IMPLEMENT_CLASS(wxPrinterDC, wxDC)
 #endif
@@ -225,7 +225,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxPrintData, wxObject)
 #include "wx/colordlg.h"
 #include "wx/fontdlg.h"

-#if !defined(__WINDOWS__) || USE_GENERIC_DIALOGS_IN_MSW
+#if !defined(__WXMSW__) || USE_GENERIC_DIALOGS_IN_MSW
 #include "wx/generic/colordlg.h"
 #include "wx/generic/fontdlg.h"
 IMPLEMENT_DYNAMIC_CLASS(wxGenericColourDialog, wxDialog)
@@ -268,7 +268,7 @@ IMPLEMENT_CLASS(wxHelpControllerBase, wxObject)

 #if USE_HELP

-#ifdef __WINDOWS__
+#ifdef __WXMSW__
 #include "wx/msw/helpwin.h"
 IMPLEMENT_DYNAMIC_CLASS(wxWinHelpController, wxHelpControllerBase)
 #endif
@@ -276,7 +276,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxWinHelpController, wxHelpControllerBase)
 // Generic wxHelp controller
 IMPLEMENT_CLASS(wxXLPHelpController, wxHelpControllerBase)

-#ifdef __WINDOWS__
+#ifdef __WXMSW__
 IMPLEMENT_CLASS(wxXLPHelpClient, wxDDEClient)
 IMPLEMENT_CLASS(wxXLPHelpConnection, wxDDEConnection)
 #else
@@ -397,7 +397,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxToolBarBase, wxControl)
 #include "wx/tbarsmpl.h"
 IMPLEMENT_DYNAMIC_CLASS(wxToolBarSimple, wxToolBarBase)

-#ifdef __WINDOWS__
+#ifdef __WXMSW__
 #include "wx/tbarmsw.h"
 IMPLEMENT_DYNAMIC_CLASS(wxToolBarMSW, wxToolBarBase)

@@ -426,7 +426,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxTime, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxString, wxObject)
 #endif

-#ifdef __MOTIF__
+#ifdef __WXMOTIF__
 IMPLEMENT_DYNAMIC_CLASS(wxXColormap, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxXFont, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxXCursor, wxObject)
@@ -441,7 +441,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject)
 IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject)

 // This will presumably be implemented on other platforms too
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxBMPResourceHandler, wxBitmapHandler)
 IMPLEMENT_DYNAMIC_CLASS(wxBMPFileHandler, wxBitmapHandler)
@@ -537,7 +537,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxPanel, wxWindow)
 #include "wx/dirdlg.h"
 #include "wx/choicdlg.h"

-#if !defined(__WINDOWS__) || USE_GENERIC_DIALOGS_IN_MSW
+#if !defined(__WXMSW__) || USE_GENERIC_DIALOGS_IN_MSW
 #include "wx/generic/msgdlgg.h"
 IMPLEMENT_CLASS(wxGenericMessageDialog, wxDialog)
 #endif
@@ -547,12 +547,12 @@ IMPLEMENT_CLASS(wxSingleChoiceDialog, wxDialog)
 IMPLEMENT_CLASS(wxFileDialog, wxDialog)
 IMPLEMENT_CLASS(wxDirDialog, wxDialog)

-#ifdef __WINDOWS__
+#ifdef __WXMSW__
 IMPLEMENT_CLASS(wxMessageDialog)
 #endif

 #if USE_GAUGE
-#ifdef __MOTIF__
+#ifdef __WXMOTIF__
 #include "../../contrib/xmgauge/gauge.h"
 #endif
 #include "wx_gauge.h"
@@ -615,7 +615,7 @@ BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
 	EVT_ERASE_BACKGROUND(wxTextCtrl::OnEraseBackground)
 END_EVENT_TABLE()

-#ifdef __WINDOWS__
+#ifdef __WXMSW__
 BEGIN_EVENT_TABLE(wxMDIParentWindow, wxFrame)
  EVT_SIZE(wxMDIParentWindow::OnSize)
  EVT_ACTIVATE(wxMDIParentWindow::OnActivate)
@@ -640,7 +640,7 @@ BEGIN_EVENT_TABLE(wxToolBarSimple, wxToolBarBase)
 	EVT_MOUSE_EVENTS(wxToolBarSimple::OnMouseEvent)
 END_EVENT_TABLE()

-#ifdef __WINDOWS__
+#ifdef __WXMSW__
 BEGIN_EVENT_TABLE(wxToolBarMSW, wxToolBarBase)
 	EVT_SIZE(wxToolBarMSW::OnSize)
 	EVT_PAINT(wxToolBarMSW::OnPaint)
@@ -669,7 +669,7 @@ BEGIN_EVENT_TABLE(wxControl, wxWindow)
  EVT_ERASE_BACKGROUND(wxControl::OnEraseBackground)
 END_EVENT_TABLE()

-#if !defined(__WINDOWS__) || USE_GENERIC_DIALOGS_IN_MSW
+#if !defined(__WXMSW__) || USE_GENERIC_DIALOGS_IN_MSW
 BEGIN_EVENT_TABLE(wxGenericMessageDialog, wxDialog)
 	EVT_BUTTON(wxID_YES, wxGenericMessageDialog::OnYes)
 	EVT_BUTTON(wxID_NO, wxGenericMessageDialog::OnNo)
--- a/src/msw/font.cpp
+++ b/src/msw/font.cpp
@@ -146,7 +146,7 @@ bool wxFont::RealizeResource(void)
    else if (M_FONTDATA->m_weight == wxBOLD)
      ff_weight = FW_BOLD;

-#if defined(__X__) || (defined(__WINDOWS__) && USE_PORTABLE_FONTS_IN_MSW)
+#if defined(__X__) || (defined(__WXMSW__) && USE_PORTABLE_FONTS_IN_MSW)
    ff_face = wxTheFontNameDirectory.GetScreenName(M_FONTDATA->m_family, M_FONTDATA->m_weight, M_FONTDATA->m_style);
 #else
    ff_face = M_FONTDATA->m_faceName;
--- a/src/msw/helpwin.cpp
+++ b/src/msw/helpwin.cpp
@@ -29,7 +29,7 @@
 #if USE_HELP
 #include <time.h>

-#ifdef __WINDOWS__
+#ifdef __WXMSW__
 #include <wx/msw/private.h>
 #endif

--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -553,7 +553,7 @@ $(CFG): makefile.b32

 -L$(BCCDIR)\lib
 -D__WXWIN__
-D__WINDOWS__
+-D__WXMSW__
 -DWIN32
 $(OPT)
 $(DEBUG_FLAGS)
--- a/src/msw/ownerdrw.cpp
+++ b/src/msw/ownerdrw.cpp
@@ -45,7 +45,7 @@ wxOwnerDrawn::wxOwnerDrawn(const wxTString& str,
  m_nMarginWidth = ms_nLastMarginWidth;
 }

-#if defined(__WINDOWS__) && defined(__WIN32__)
+#if defined(__WXMSW__) && defined(__WIN32__)
  uint wxOwnerDrawn::ms_nDefaultMarginWidth = GetSystemMetrics(SM_CXMENUCHECK);
 #else   // # what is the reasonable default?
  uint wxOwnerDrawn::ms_nDefaultMarginWidth = 15;
--- a/src/msw/printdlg.cpp
+++ b/src/msw/printdlg.cpp
@@ -79,7 +79,7 @@ bool wxPrintDialog::Create(wxWindow *p, wxPrintData* data)
  if ( data )
    printData = *data;

-#ifdef __WINDOWS__
+#ifdef __WXMSW__
  printData.SetOwnerWindow(p);
 #endif

--- a/src/msw/utils.cpp
+++ b/src/msw/utils.cpp
@@ -559,7 +559,7 @@ bool wxCheckForInterrupt(wxWindow *wnd)
 // MSW only: get user-defined resource from the .res file.
 // Returns NULL or newly-allocated memory, so use delete[] to clean up.

-#ifdef __WINDOWS__
+#ifdef __WXMSW__
 char *wxLoadUserResource(const wxString& resourceName, const wxString& resourceType)
 {
  char *s = NULL;
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -4355,7 +4355,7 @@ void wxWindow::OnChar(wxKeyEvent& event)
  if (vert_units)
 	 y_pages = (int)(v_height/vert_units) - y_page;

-#ifdef __WINDOWS__
+#ifdef __WXMSW__
  int y = 0;
 #else
  int y = y_page-1;
--- a/src/ntwxwin.mak
+++ b/src/ntwxwin.mak
@@ -141,9 +141,9 @@ PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\src\msw\$(PCH) /Fd$(WXDIR)\lib\wx.pdb
 MAKEPRECOMP=/YcWX/WXPREC.H
 !endif

-CPPFLAGS=$(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WINDOWS__ /DDEBUG=1 $(INC) $(OPT) $(EXTRADLLFLAGS) /MD /GX /D__DEBUG__
+CPPFLAGS=$(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXMSW__ /DDEBUG=1 $(INC) $(OPT) $(EXTRADLLFLAGS) /MD /GX /D__DEBUG__
 # If you don't include wxprec.h, use CPPFLAGS2
-CPPFLAGS2=$(WINFLAGS) $(DEBUG_FLAGS) /D__WINDOWS__ /DDEBUG=1 $(INC) $(EXTRAFLAGS) $(OPT) $(EXTRADLLFLAGS) /MD /GX /D__DEBUG__
+CPPFLAGS2=$(WINFLAGS) $(DEBUG_FLAGS) /D__WXMSW__ /DDEBUG=1 $(INC) $(EXTRAFLAGS) $(OPT) $(EXTRADLLFLAGS) /MD /GX /D__DEBUG__
 LINKFLAGS=$(LINK_DEBUG_FLAGS) $(WINLINKFLAGS) -entry:WinMainCRTStartup
 DUMMY=dummy

@@ -158,8 +158,8 @@ DUMMY=dummy
 !endif

 PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\src\msw\$(PCH) /Fd$(WXDIR)\lib\wx.pdb
-CPPFLAGS=$(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WINDOWS__ $(INC) $(OPT) /D_DLL /MT $(EXTRADLLFLAGS) /D_WINDOWS /D_WINDLL
-CPPFLAGS2=$(WINFLAGS) $(DEBUG_FLAGS) /D__WINDOWS__ $(INC) $(EXTRAFLAGS) $(OPT) /D_DLL /MT $(EXTRADLLFLAGS) /D_WINDOWS /D_WINDLL
+CPPFLAGS=$(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXMSW__ $(INC) $(OPT) /D_DLL /MT $(EXTRADLLFLAGS) /D_WINDOWS /D_WINDLL
+CPPFLAGS2=$(WINFLAGS) $(DEBUG_FLAGS) /D__WXMSW__ $(INC) $(EXTRAFLAGS) $(OPT) /D_DLL /MT $(EXTRADLLFLAGS) /D_WINDOWS /D_WINDLL
 LINKFLAGS=$(LINK_DEBUG_FLAGS) -machine:i386 -subsystem:windows,$(APPVER) -dll # -entry:_DllMainCRTStartup$(DLLENTRY)
 !endif