Support for Cygwin 1.0 (thought it worked before, but...)

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

diff --git a/include/wx/msw/gccpriv.h b/include/wx/msw/gccpriv.h
index 5b130f01a01dd046e3099185dda92b051bdabe7d..5fff4db8262c6f7f183f8370767e29d8aaa29a96 100644 (file)
--- a/include/wx/msw/gccpriv.h
+++ b/include/wx/msw/gccpriv.h
@@ -15,7 +15,7 @@
 
 // Cygwin / Mingw32 with gcc >= 2.95 use new windows headers which
 // are more ms-like (header author is Anders Norlander, hence the name)
-#if (defined(__MINGW32__) || defined(__CYGWIN__)) && ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95)))
+#if (defined(__MINGW32__) || defined(__CYGWIN__)) && ((__GNUC__>2) || ((__GNUC__==2) && (__GNUC_MINOR__>=95)))
     #ifndef wxUSE_NORLANDER_HEADERS
         #define wxUSE_NORLANDER_HEADERS 1
     #endif
@@ -32,5 +32,10 @@
     #define __GNUWIN32_OLD__
 #endif
 
+// Cygwin 1.0
+#if defined(__CYGWIN__) && ((__GNUC__==2) && (__GNUC_MINOR__==9))
+    #define __CYGWIN10__
+#endif
+
 #endif
   // _WX_MSW_GCCPRIV_H_

diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index 0f012b199428945710f7824675b4120856d082a2..1c4136e33a0b69c38ebdfe2ab7a53cb09e909f66 100644 (file)
--- a/include/wx/msw/private.h
+++ b/include/wx/msw/private.h
@@ -68,7 +68,7 @@ WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT;
 // this defines a CASTWNDPROC macro which casts a pointer to the type of a
 // window proc
 
-#ifdef __GNUWIN32_OLD__
+#if defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__)
     #define CASTWNDPROC (long unsigned)
 #else
     #if defined(STRICT) || defined(__GNUC__)

diff --git a/src/makeg95.env b/src/makeg95.env
index 1485e1d8b8bb3e27f419d71c5d6a0908303c2cbd..888bfee2edfa313c6aa71976e5af1825b63e8595 100644 (file)
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -151,11 +151,11 @@ COMPPATHS=
 
 ########################## Directories ###############################
 
+OLELIBS=-lole32 -loleaut32 -luuid
 WINLIBS=-lstdc++ -lgcc \
        -lwinspool -lwinmm -lshell32 \
        -lcomctl32 -lctl3d32 -lodbc32 -ladvapi32 \
-       -lole32 -loleaut32 -luuid \
-       -lodbc32 -lwsock32 -lopengl32 -lglu32 #  -loldnames
+       -lodbc32 -lwsock32 -lopengl32 -lglu32 $(OLELIBS) #  -loldnames
 
 #WINLIBS=-lstdc++ -lgcc \
 #      -lwinspool -lwinmm -lshell32 \

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 64b718e4e05224a0ad7dd8939c71e2408d01afef..6277236d8e2e7fb87aee80d569c44acc24794286 100644 (file)
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -86,7 +86,7 @@
 #include <string.h>
 #include <ctype.h>
 
-#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) || defined(__TWIN32__))
+#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__))
     #include <commctrl.h>
 #endif
 

diff --git a/src/msw/checklst.cpp b/src/msw/checklst.cpp
index 808a4b4f7fbe45b1b260740867aa7c45112b1335..ae3ced7b55097d1d621bc0a20a9df681828cbad2 100644 (file)
--- a/src/msw/checklst.cpp
+++ b/src/msw/checklst.cpp
@@ -45,7 +45,7 @@
 #include <windows.h>
 #include <windowsx.h>
 
-#ifdef __GNUWIN32_OLD__
+#if defined(__GNUWIN32_OLD__)
     #include "wx/msw/gnuwin32/extra.h"
 #endif
 

diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp
index fafda5dd76996655adddea010c129dfdabb31d64..a7062aaff402a4fc7ea5fe9801d12aefb01014bb 100644 (file)
--- a/src/msw/combobox.cpp
+++ b/src/msw/combobox.cpp
@@ -41,7 +41,7 @@
 #include "wx/msw/private.h"
 
 #if wxUSE_TOOLTIPS
-    #ifndef __GNUWIN32_OLD__
+    #if !defined(__GNUWIN32_OLD__) || defined(__CYGWIN10__)
         #include <commctrl.h>
     #endif
     #include "wx/tooltip.h"
@@ -115,7 +115,7 @@ LRESULT APIENTRY _EXPORT wxComboEditWndProc(HWND hWnd,
 #endif // 0
 
         // deal with tooltips here
-#if wxUSE_TOOLTIPS
+#if wxUSE_TOOLTIPS && defined(TTN_NEEDTEXT)
         case WM_NOTIFY:
             {
                 wxCHECK_MSG( win, 0, _T("should have a parent") );

diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index 689ed8f972b167afd21ecf735550a9a61b9650a7..7a3c2e5828d4dd2977638c611b6d545dcc48e199 100644 (file)
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -31,7 +31,7 @@
 
 #include "wx/msw/private.h"
 
-#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) || defined(__TWIN32__))
+#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__))
     #include <commctrl.h>
 #endif
 

diff --git a/src/msw/dragimag.cpp b/src/msw/dragimag.cpp
index f8c1580476d0dfbfdfd33cc388db44f953480e89..6898665ca214ea0228c003c5d0b38de8600fe7f1 100644 (file)
--- a/src/msw/dragimag.cpp
+++ b/src/msw/dragimag.cpp
@@ -49,7 +49,7 @@
 #include "wx/msw/dragimag.h"
 #include "wx/msw/private.h"
 
-#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) || defined(__TWIN32__))
+#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__))
 #include <commctrl.h>
 #endif
 

diff --git a/src/msw/fontenum.cpp b/src/msw/fontenum.cpp
index 431c2eae92bfeeb683b033e0083904ed8088a2d9..7bf7c8df2b3afb28f7cfb48b071ad5bef3ae45d5 100644 (file)
--- a/src/msw/fontenum.cpp
+++ b/src/msw/fontenum.cpp
@@ -133,7 +133,7 @@ bool wxFontEnumeratorHelper::SetEncoding(wxFontEncoding encoding)
     return TRUE;
 }
 
-#if defined(__GNUWIN32__)
+#if defined(__GNUWIN32__) && !defined(__CYGWIN10__)
     #if wxUSE_NORLANDER_HEADERS
         #define wxFONTENUMPROC int(*)(const LOGFONT *, const TEXTMETRIC *, long unsigned int, LPARAM)
     #else

diff --git a/src/msw/gauge95.cpp b/src/msw/gauge95.cpp
index e171056ef1cc5a63b7d72c756552271f5fd922d1..efcb6da2979c6d0a0a3370531bc80735a19a1337 100644 (file)
--- a/src/msw/gauge95.cpp
+++ b/src/msw/gauge95.cpp
@@ -37,7 +37,7 @@
 #include "wx/msw/gauge95.h"
 #include "wx/msw/private.h"
 
-#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) || defined(__TWIN32__))
+#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__))
     #include <commctrl.h>
 #endif
 

diff --git a/src/msw/imaglist.cpp b/src/msw/imaglist.cpp
index f8a26cd0363aa3971ab7bc17f9feeb0b8ed40305..5140135aebb0edbfa60d7c9eb6b72d905a83e9e1 100644 (file)
--- a/src/msw/imaglist.cpp
+++ b/src/msw/imaglist.cpp
@@ -46,7 +46,7 @@
 #include "wx/msw/imaglist.h"
 #include "wx/msw/private.h"
 
-#if !defined(__GNUWIN32_OLD__) && !defined(__TWIN32__)
+#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__))
     #include <commctrl.h>
 #endif
 

diff --git a/src/msw/joystick.cpp b/src/msw/joystick.cpp
index 28c0752f0595ba5cb3f2ee757bb3dbdcfc20190f..b8920854e6e1625284869f0c723279914196094c 100644 (file)
--- a/src/msw/joystick.cpp
+++ b/src/msw/joystick.cpp
@@ -24,7 +24,7 @@
 #include "wx/window.h"
 #include "wx/msw/private.h"
 
-#ifndef __GNUWIN32_OLD__
+#if !defined(__GNUWIN32_OLD__) || defined(__CYGWIN10__)
     #include <mmsystem.h>
 #endif
 

diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp
index 9aab81658ded1163bb1f3e5c7f01a58b9219943f..10826ae39f05bb90ed5a459f7f416b007511b79d 100644 (file)
--- a/src/msw/listctrl.cpp
+++ b/src/msw/listctrl.cpp
@@ -45,7 +45,7 @@
 
 #include "wx/msw/private.h"
 
-#ifdef __GNUWIN32_OLD__
+#if ((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__))
     #include "wx/msw/gnuwin32/extra.h"
 #else
     #include <commctrl.h>

diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp
index 952ad27333a0bd584ebffe6dd45141774aad5e0b..ff201a3ec900125ddcd888cd6acc48d77ac39f81 100644 (file)
--- a/src/msw/notebook.cpp
+++ b/src/msw/notebook.cpp
@@ -46,7 +46,7 @@
     #endif
 #endif
 
-#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) || defined(__TWIN32__))
+#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__))
     #include <commctrl.h>
 #endif
 

diff --git a/src/msw/ole/automtn.cpp b/src/msw/ole/automtn.cpp
index a5c49e721bb4d6668f22b3ecede9d5f19cdd62bd..e08b49196d2c3e0a2120bdee0aa203c72c820236 100644 (file)
--- a/src/msw/ole/automtn.cpp
+++ b/src/msw/ole/automtn.cpp
@@ -24,7 +24,7 @@
 
 // Watcom C++ gives a linker error if this is compiled in.
 // With Borland C++, all samples crash if this is compiled in.
-#if !defined(__WATCOMC__) && !(defined(__BORLANDC__) && (__BORLANDC__ < 0x520))
+#if !defined(__WATCOMC__) && !(defined(__BORLANDC__) && (__BORLANDC__ < 0x520)) && !defined(__CYGWIN10__)
 
 #include "wx/log.h"
 #include "wx/msw/ole/automtn.h"

diff --git a/src/msw/ole/oleutils.cpp b/src/msw/ole/oleutils.cpp
index 55e74c6c45f6ec60b4f3525c39ccba09d3a82697..7649d712e20c5cf379609ee8948ccec584afa33c 100644 (file)
--- a/src/msw/ole/oleutils.cpp
+++ b/src/msw/ole/oleutils.cpp
@@ -31,6 +31,8 @@
 #include  "wx/setup.h"
 #include  "wx/log.h"
 
+#ifndef __CYGWIN10__
+
 #include <windows.h>
 
 // OLE
@@ -208,3 +210,7 @@ void wxLogRelease(const char *szInterface, ULONG cRef)
 
 #endif
   // wxUSE_DRAG_AND_DROP
+
+#endif
+  // __CYGWIN10__
+

diff --git a/src/msw/radiobox.cpp b/src/msw/radiobox.cpp
index a89956a5ca832a95f2f85f32063d708596fbc78c..0310b8c887cc1f85627fe41844f5fa87a33b4f37 100644 (file)
--- a/src/msw/radiobox.cpp
+++ b/src/msw/radiobox.cpp
@@ -39,7 +39,7 @@
 #include "wx/msw/private.h"
 
 #if wxUSE_TOOLTIPS
-    #ifndef __GNUWIN32_OLD__
+    #if !defined(__GNUWIN32_OLD__) || defined(__CYGWIN10__)
         #include <commctrl.h>
     #endif
     #include "wx/tooltip.h"

diff --git a/src/msw/registry.cpp b/src/msw/registry.cpp
index b0c061c1d0f5c53fbbe1940c8af69a6a6a43b775..34e7c891a51efc34d8acec68f80f7ce97b581c76 100644 (file)
--- a/src/msw/registry.cpp
+++ b/src/msw/registry.cpp
@@ -316,7 +316,7 @@ bool wxRegKey::GetKeyInfo(size_t *pnSubKeys,
 #if defined(__WIN32__) && !defined(__TWIN32__)
 
     // old gcc headers incorrectly prototype RegQueryInfoKey()
-#ifdef __GNUWIN32_OLD__
+#if defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__)
     #define REG_PARAM   (size_t *)
 #else
     #define REG_PARAM   (LPDWORD)

diff --git a/src/msw/slider95.cpp b/src/msw/slider95.cpp
index 67d7bc1a5722478571108fb2173145bfec99ca1c..443bfec956ff2913b31397d338617e751fe248fe 100644 (file)
--- a/src/msw/slider95.cpp
+++ b/src/msw/slider95.cpp
@@ -31,7 +31,7 @@
 #include "wx/msw/slider95.h"
 #include "wx/msw/private.h"
 
-#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) || defined(__TWIN32__))
+#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__))
     #include <commctrl.h>
 #endif
 

diff --git a/src/msw/spinbutt.cpp b/src/msw/spinbutt.cpp
index 81734c8ee739bf4efbbfae269f9234cc80c56c9b..215abe2427ff117efdb10928f07f54a729de9713 100644 (file)
--- a/src/msw/spinbutt.cpp
+++ b/src/msw/spinbutt.cpp
@@ -46,7 +46,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent)
 
 #include "wx/msw/private.h"
 
-#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) || defined(__TWIN32__))
+#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__))
     #include <commctrl.h>
 #endif
 

diff --git a/src/msw/spinctrl.cpp b/src/msw/spinctrl.cpp
index e4cef9f9ac4ed6ec6661fce486bcd1142686808a..b06ff27e385b5be01003d16f5d76df2f4fca6a68 100644 (file)
--- a/src/msw/spinctrl.cpp
+++ b/src/msw/spinctrl.cpp
@@ -40,7 +40,7 @@
 #include "wx/spinctrl.h"
 #include "wx/msw/private.h"
 
-#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) || defined(__TWIN32__))
+#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__))
     #include <commctrl.h>
 #endif
 

diff --git a/src/msw/statbr95.cpp b/src/msw/statbr95.cpp
index c1c3c4706f17eefe3f909e22e66a94cc7933cc16..a9576f40b55f14f4b63bdc8eb4436fccbbb8e50c 100644 (file)
--- a/src/msw/statbr95.cpp
+++ b/src/msw/statbr95.cpp
@@ -36,7 +36,7 @@
 #include "wx/msw/private.h"
 #include <windowsx.h>
 
-#if !(defined(__GNUWIN32_OLD__) || defined(__TWIN32__))
+#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__))
     #include <commctrl.h>
 #endif
 

diff --git a/src/msw/tabctrl.cpp b/src/msw/tabctrl.cpp
index 5b970afa464e7c5fdf740826ac7f689d508f3414..1e4e378ac02a8eee68232e16f3c111a30965ffae 100644 (file)
--- a/src/msw/tabctrl.cpp
+++ b/src/msw/tabctrl.cpp
@@ -32,7 +32,7 @@
 
 #include <windows.h>
 
-#if !(defined(__GNUWIN32_OLD__) || defined(__TWIN32__))
+#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__))
     #include <commctrl.h>
 #else
     #include "wx/msw/gnuwin32/extra.h"

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index 2f534d533d0afb6dd50bf66de8e582a38088f0d8..4ffad796938921f6ad15beca87d55c3419c65538 100644 (file)
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -50,10 +50,10 @@
 
 #ifndef __TWIN32__
 
-#ifdef __GNUWIN32_OLD__
-    #include "wx/msw/gnuwin32/extra.h"
-#else
+#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__))
     #include <commctrl.h>
+#else
+    #include "wx/msw/gnuwin32/extra.h"
 #endif
 
 #endif // __TWIN32__

diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index 62850ac1d1eb9a31ad487dd546d33374744cbef0..9d68d44fc6d5bbb305f8d3d962d264b0445a1d1b 100644 (file)
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -60,7 +60,7 @@
 #   include <fstream>
 #endif
 
-#if wxUSE_RICHEDIT && !defined(__GNUWIN32_OLD__)
+#if wxUSE_RICHEDIT && (!defined(__GNUWIN32_OLD__) || defined(__CYGWIN10__))
     #include <richedit.h>
 #endif
 

diff --git a/src/msw/tooltip.cpp b/src/msw/tooltip.cpp
index 0dcc94f036857190f63644d007098592e20cb4ae..e8b34e7da0410736529b542dad0b65bd1c8f0c14 100644 (file)
--- a/src/msw/tooltip.cpp
+++ b/src/msw/tooltip.cpp
@@ -32,7 +32,7 @@
 #include "wx/tooltip.h"
 #include "wx/msw/private.h"
 
-#if defined(__WIN95__) && (!defined(__GNUWIN32_OLD__) || defined(__MINGW32__))
+#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__))
     #include <commctrl.h>
 #endif
 

diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp
index f42d35f685a90edf358013f27d68d51d7ec06269..ddae7272b4e61137d4861ea76ea87af130fb1417 100644 (file)
--- a/src/msw/treectrl.cpp
+++ b/src/msw/treectrl.cpp
@@ -54,7 +54,7 @@
     #include "wx/msw/gnuwin32/extra.h"
 #endif
 
-#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) || defined(__TWIN32__))
+#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__))
     #include <commctrl.h>
 #endif
 

diff --git a/src/msw/wave.cpp b/src/msw/wave.cpp
index 675d15c9aeb6b96afbd757dd69de5e433dcc4084..4016b5dce912657a606b2f8c338d8afab7edca1c 100644 (file)
--- a/src/msw/wave.cpp
+++ b/src/msw/wave.cpp
@@ -31,7 +31,7 @@
 #include <windows.h>
 #include <windowsx.h>
 
-#ifdef __GNUWIN32_OLD__
+#if defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__)
     #include "wx/msw/gnuwin32/extra.h"
 #else
     #include <mmsystem.h>

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index faf7da613622f04c03e2c26453530bbee27c28d0..4986e29e79131602aedc3948e59a23f995eb0ff7 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -84,7 +84,7 @@
 
 #include <string.h>
 
-#ifndef __GNUWIN32_OLD__
+#if !defined(__GNUWIN32_OLD__) || defined(__CYGWIN10__)
     #include <shellapi.h>
     #include <mmsystem.h>
 #endif
@@ -93,7 +93,7 @@
     #include <windowsx.h>
 #endif
 
-#if !defined(__GNUWIN32_OLD__) && !defined(__TWIN32__)
+#if (!defined(__GNUWIN32_OLD__) && !defined(__TWIN32__)) || defined(__CYGWIN10__)
     #ifdef __WIN95__
         #include <commctrl.h>
     #endif