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

diff --git a/distrib/msw/zipdist.bat b/distrib/msw/zipdist.bat
index f6d91e089b32c8ed5de28c3ea955838e37e43974..0e1dde4dab55348e32dd56477c90ef669f7ea442 100755 (executable)
--- a/distrib/msw/zipdist.bat
+++ b/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.

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 170cc0e38f6ac5b7533e6ef305ec1dbc580d41ab..a9ae62cf41ec81180e06c9908227781d11dd3b01 100644 (file)
--- a/include/wx/defs.h
+++ b/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_

diff --git a/include/wx/msw/treectrl.h b/include/wx/msw/treectrl.h
index 9fda6b0f87da2dec17a7db9c3cb60c9cfbaa1cd1..48c0d60504e0f340485ceb9ec354ccf38150e2df 100644 (file)
--- a/include/wx/msw/treectrl.h
+++ b/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

diff --git a/include/wx/wxprec.h b/include/wx/wxprec.h
index a5e0b4bce88707c3d44680a987866c20730cec7b..b7c00c4f704549b8fbd3aec4164352e3ff1c509b 100644 (file)
--- a/include/wx/wxprec.h
+++ b/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

diff --git a/src/common/file.cpp b/src/common/file.cpp
index 30bc2d13d7e1e96dfc6ab2617ae8479b48f8b8d7..9a8684002bf177287cd0b9c5da1fd133af6c3a7b 100644 (file)
--- a/src/common/file.cpp
+++ b/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>

diff --git a/src/msw/joystick.cpp b/src/msw/joystick.cpp
index de7d50f4b1144b571f99d92374614ce781e8f341..6f5dfcd0b556540c4c32908b6817928e8bfef95f 100644 (file)
--- a/src/msw/joystick.cpp
+++ b/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)

diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp
index ef8ee7abc9c3f647f04158de9a5b34362d2f4017..0ba3d68da5a3c74e942939ab0a736341bdb0dae2 100644 (file)
--- a/src/msw/listctrl.cpp
+++ b/src/msw/listctrl.cpp
@@ -21,7 +21,7 @@
 #endif
 
 #ifndef WX_PRECOMP
-#include "wx.h"
+#include "wx/wx.h"
 #endif
 
 #if defined(__WIN95__)

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index 202b58d8a141cc784c482fe0ca7970484087f011..21199e7ca659a944aa42927358928f1cf8adaf03 100644 (file)
--- a/src/msw/makefile.g95
+++ b/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) \

diff --git a/src/msw/slider95.cpp b/src/msw/slider95.cpp
index 6e5f9c4ba33ede6aebd2653b7266b18e7ec729d9..9047d9bd7cd68b2ffe878153aa57c69e6a8ad160 100644 (file)
--- a/src/msw/slider95.cpp
+++ b/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__

diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp
index 749fabf602a42795db8c795e72a77061e66c0bfc..334be2636e70bb66e9743a45f970542eeb26533e 100644 (file)
--- a/src/msw/taskbar.cpp
+++ b/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__

diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp
index 929193aa7d7fe6a135aaece75da38e7a37738dc7..07b86000b98f931efb22862e57083c3673950e25 100644 (file)
--- a/src/msw/treectrl.cpp
+++ b/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