From 4c87eb44c25c2c4d466e129dbd5ed435d583b1bc Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 12 Jan 2003 22:40:48 +0000
Subject: [PATCH] OpenWatcom compilation fixes (patch 665959)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18700 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 docs/changes.txt         | 1 +
 include/wx/msw/missing.h | 2 +-
 include/wx/msw/setup0.h  | 4 ++--
 src/common/imagjpeg.cpp  | 5 +++--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index f010b4412c..cb70a47470 100644
--- 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 eaff031b73..4a094e59de 100644
--- 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 907b31e53c..6b8d5974f1 100644
--- 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 c2525bae43..d1588229f9 100644
--- 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
-- 
2.45.2