From d6fdbbd6b3759fd33969ebfd41f6e53870a78ae6 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 6 May 2009 11:42:16 +0000 Subject: [PATCH] enable wxHAS_RAW_BITMAP for OpenWatcom 1.8 and later git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_9_0_BRANCH@60526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/features.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/include/wx/features.h b/include/wx/features.h index 22276fae0e..a3a521f26f 100644 --- a/include/wx/features.h +++ b/include/wx/features.h @@ -86,10 +86,15 @@ /* Direct access to bitmap data is not implemented in all ports yet */ #if defined(__WXGTK20__) || defined(__WXMAC__) || defined(__WXDFB__) || \ - (defined(__WXMSW__) && !defined(__WATCOMC__)) + defined(__WXMSW__) - // HP aCC for PA-RISC can't compile rawbmp.h - #if !defined(__HP_aCC) || !defined(__hppa) + /* + These compilers can't deal with templates in wx/rawbmp.h: + - HP aCC for PA-RISC + - Watcom < 1.8 + */ + #if !wxONLY_WATCOM_EARLIER_THAN(1, 8) && \ + !(defined(__HP_aCC) && defined(__hppa)) #define wxHAS_RAW_BITMAP #endif #endif