From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 6 May 2009 11:42:16 +0000 (+0000)
Subject: enable wxHAS_RAW_BITMAP for OpenWatcom 1.8 and later
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/5cbe87b2fa246a6a35bb2107d97b83ce0dd826c6

enable wxHAS_RAW_BITMAP for OpenWatcom 1.8 and later

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

diff --git a/include/wx/features.h b/include/wx/features.h
index 62df285ff9..27e19d7969 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__))
-
-    // HP aCC for PA-RISC can't compile rawbmp.h
-    #if !defined(__HP_aCC) || !defined(__hppa)
+        defined(__WXMSW__)
+
+    /*
+       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