AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

OpenWatcom compilation fixes (patch 665959)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18700 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2003-01-12 22:40:48 +00:00
parent c5c843e007
commit 4c87eb44c2
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@ -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
===========

2
include/wx/msw/missing.h
View File

@ -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;

4
include/wx/msw/setup0.h
View File

@ -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

5
src/common/imagjpeg.cpp
View File

@ -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