Changes to allow Cygwin to compile in non-PCH mode

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1350 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

distrib/msw/zipdist.bat

@@ -38,6 +38,12 @@ zip32 -@ %dest\ogl3.zip < %src\utils\ogl\distrib\ogl.rsp
 rem Tex2RTF
 zip32 -@ %dest\tex2rtf.zip < %src\distrib\msw\tex2rtf.rsp
 
+copy %src\docs\changes.txt %dest
+copy %src\docs\msw\install.txt %dest\install_msw.txt
+copy %src\docs\motif\install.txt %dest\install_motif.txt
+copy %src\docs\gtk\install.txt %dest\install_gtk.txt
+copy %src\docs\readme.txt %dest
+
 cd %dest
 
 echo wxWindows archived.

include/wx/defs.h

@@ -976,7 +976,6 @@ typedef void*          gpointer;
 
 /* Stand-ins for GDK types */
 typedef gulong                  GdkAtom;
-typedef struct _GdkVisual       GdkVisual;
 typedef struct _GdkColor        GdkColor;
 typedef struct _GdkColormap     GdkColormap;
 typedef struct _GdkFont         GdkFont;
@@ -995,7 +994,42 @@ typedef struct _GtkList         GtkList;
 typedef struct _GtkToolbar      GtkToolbar;
 typedef struct _GtkNotebook     GtkNotebook;
 typedef struct _GtkNotebookPage GtkNotebookPage;
+
 #endif
 
+// This is required because of clashing macros in windows.h, which may be
+// included before or after wxWindows classes, and therefore must be
+// disabled here before any significant wxWindows headers are included.
+#ifdef __WXMSW__
+#ifdef GetClassInfo
+#undef GetClassInfo
+#endif
+
+#ifdef GetClassName
+#undef GetClassName
+#endif
+
+#ifdef DrawText
+#undef DrawText
+#endif
+
+#ifdef GetCharWidth
+#undef GetCharWidth
+#endif
+
+#ifdef StartDoc
+#undef StartDoc
+#endif
+
+#ifdef FindWindow
+#undef FindWindow
+#endif
+
+#ifdef FindResource
+#undef FindResource
+#endif
+#endif
+  // __WXMSW__
+
 #endif
     // _WX_DEFS_H_

include/wx/msw/treectrl.h

@@ -21,6 +21,7 @@
 
 #include "wx/control.h"
 #include "wx/event.h"
+#include "wx/textctrl.h"
 
 #ifdef __GNUWIN32__
 #  ifdef GetFirstChild

include/wx/wxprec.h

@@ -10,7 +10,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 // check if to use precompiled headers
-#if (defined(__BORLANDC__) || defined(_MSC_VER) || defined(__WATCOMC__) || defined(__GNUWIN32__)) && defined(__WXMSW__)
+#if (defined(__BORLANDC__) || defined(_MSC_VER) || defined(__WATCOMC__)) && defined(__WXMSW__)
 #if !NOPCH
 #define WX_PRECOMP
 #endif

src/common/file.cpp

@@ -53,6 +53,9 @@
   #include  <windows.h>     // for GetTempFileName
 #elif (defined(__UNIX__) || defined(__GNUWIN32__))
   #include  <unistd.h>
+#ifdef __GNUWIN32__
+  #include <windows.h>
+#endif
 #elif (defined(__WXSTUBS__))
   // Have to ifdef this for different environments
   #include <io.h>

src/msw/joystick.cpp

@@ -39,6 +39,7 @@ typedef UINT MMRESULT;
 #define NO_JOYGETPOSEX
 #endif
 
+#include <wx/window.h>
 #include <wx/msw/joystick.h>
 
 IMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject)

src/msw/listctrl.cpp

@@ -21,7 +21,7 @@
 #endif
 
 #ifndef WX_PRECOMP
-#include "wx.h"
+#include "wx/wx.h"
 #endif
 
 #if defined(__WIN95__)

src/msw/makefile.g95

@@ -60,12 +60,9 @@ DOCDIR = $(WXDIR)\docs
 
 GENERICOBJS= \
   $(GENDIR)/choicdgg.$(OBJSUFF) \
-  $(GENDIR)/colrdlgg.$(OBJSUFF) \
   $(GENDIR)/dirdlgg.$(OBJSUFF) \
-  $(GENDIR)/fontdlgg.$(OBJSUFF) \
   $(GENDIR)/gridg.$(OBJSUFF) \
   $(GENDIR)/laywin.$(OBJSUFF) \
-  $(GENDIR)/msgdlgg.$(OBJSUFF) \
   $(GENDIR)/panelg.$(OBJSUFF) \
   $(GENDIR)/prop.$(OBJSUFF) \
   $(GENDIR)/propform.$(OBJSUFF) \
@@ -77,8 +74,11 @@ GENERICOBJS= \
   $(GENDIR)/tabg.$(OBJSUFF) \
   $(GENDIR)/textdlgg.$(OBJSUFF)
 
+#  $(GENDIR)/colrdlgg.$(OBJSUFF) \
+#  $(GENDIR)/fontdlgg.$(OBJSUFF) \
 #  $(GENDIR)/prntdlgg.$(OBJSUFF) \
 #  $(GENDIR)/printps.$(OBJSUFF) \
+#  $(GENDIR)/msgdlgg.$(OBJSUFF) \
 
 COMMONOBJS = \
   $(COMMDIR)/config.$(OBJSUFF) \

src/msw/slider95.cpp

@@ -22,6 +22,8 @@
 
 #ifndef WX_PRECOMP
 #include <stdio.h>
+#include <wx/utils.h>
+#include <wx/brush.h>
 #endif
 
 #ifdef __WIN95__

src/msw/taskbar.cpp

@@ -21,15 +21,19 @@
 #pragma hdrstop
 #endif
 
+#include <windows.h>
+
 #ifndef WX_PRECOMP
 #include "wx/defs.h"
+#include "wx/window.h"
+#include "wx/frame.h"
+#include "wx/utils.h"
 #endif
 
 #ifdef __WIN95__
 
-#include <wx/msw/taskbar.h>
 #include <string.h>
-#include <windows.h>
+#include <wx/msw/taskbar.h>
 #include <wx/msw/private.h>
 
 #ifdef __GNUWIN32__

src/msw/treectrl.cpp

@@ -28,7 +28,7 @@
 #endif
 
 #ifndef WX_PRECOMP
-    #include "wx.h"
+    #include "wx/wx.h"
 #endif
 
 #if defined(__WIN95__)
@@ -54,6 +54,10 @@
 #undef GetNextSibling
 #endif
 
+#ifdef GetClassInfo
+#undef GetClassInfo
+#endif
+
 #include "wx/msw/treectrl.h"
 
 // Bug in headers, sometimes