OpenWatcom compilation fixes (patch 665959)

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

diff --git a/docs/changes.txt b/docs/changes.txt
index f010b4412cc43faccd5bde80c64d4e67f8c760b2..cb70a474706cc3cc561211610c0016514db69dcf 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -38,6 +38,7 @@ wxMSW:
 - wxCaret::SetSize() doesn't hide the caret any longer as it used to
 - wxCheckListBox::Check() doesn't send CHECKLISTBOX_TOGGLE event any more
 - fixed bug with wxTR_EDIT_LABELS not workign with wxTR_MULTIPLE
+- fixes for compilation with OpenWatcom compiler
 
 OLD CHANGES
 ===========

diff --git a/include/wx/msw/missing.h b/include/wx/msw/missing.h
index eaff031b73dab77db9337bc8a5c2ecc751b05d59..4a094e59de4c7c2f0fe0228b5b3cddd047beb6c0 100644 (file)
--- a/include/wx/msw/missing.h
+++ b/include/wx/msw/missing.h
@@ -159,7 +159,7 @@ typedef struct tagNMLVDISPINFOW {
 #endif
 #endif
 
-#if defined(__GNUWIN32__) && !defined(HDN_GETDISPINFOW)
+#if ((defined(__WATCOMC__) && __WATCOMC__ >= 1200) || defined(__GNUWIN32__)) && !defined(HDN_GETDISPINFOW)
 #define HDN_GETDISPINFOW (HDN_FIRST-29)
 typedef struct {
         NMHDR hdr;

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index 907b31e53c25204466c813cb53869f5e72d57425..6b8d5974f152d28643c8c6c311e75cc25bdcd5f5 100644 (file)
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -1068,7 +1068,7 @@
 // ----------------------------------------------------------------------------
 
 #ifndef wxUSE_NORLANDER_HEADERS
-#if ((defined(__MINGW32__) && defined(__CYGWIN__)) ||defined(__WINE__)) && ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95)))
+#if (defined(__WATCOMC__) && (__WATCOMC__ >= 1200)) || ((defined(__MINGW32__) || defined(__CYGWIN__)) && ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95))))
 #   define wxUSE_NORLANDER_HEADERS 1
 #else
 #   define wxUSE_NORLANDER_HEADERS 0
@@ -1182,7 +1182,7 @@
 #define wxUSE_DEBUG_NEW_ALWAYS 0
 #endif
 
-#if defined(__WXMSW__) && defined(__WATCOMC__)
+#if defined(__WXMSW__) && (defined(__WATCOMC__) && __WATCOMC__ < 1200)
 /*
 #undef  wxUSE_GLCANVAS
 #define wxUSE_GLCANVAS 0

diff --git a/src/common/imagjpeg.cpp b/src/common/imagjpeg.cpp
index c2525bae43fcf288e561e5f091b17f3e87aea94c..d1588229f99d48703fb982ad7b2161322b21972e 100644 (file)
--- a/src/common/imagjpeg.cpp
+++ b/src/common/imagjpeg.cpp
@@ -28,11 +28,12 @@
 #include "wx/log.h"
 #include "wx/app.h"
 
-// NB: Some compilers define boolean type in Windows headers (e.g. Watcom C++).
+// NB: Some compilers define boolean type in Windows headers 
+//     (e.g. Watcom C++, but not Open Watcom).
 //     This causes a conflict with jmorecfg.h header from libjpeg, so we have
 //     to make sure libjpeg won't try to define boolean itself. This is done by
 //     defining HAVE_BOOLEAN.
-#if defined(__WXMSW__) && (defined(__MWERKS__) || defined(__WATCOMC__))
+#if defined(__WXMSW__) && (defined(__MWERKS__) || (defined(__WATCOMC__) && __WATCOMC__ < 1200))
     #define HAVE_BOOLEAN
     #include <windows.h>
 #endif