Replace wxTINY_CAPTION_{HORIZ,VERT} with a single wxTINY_CAPTION.

[wxWidgets.git] / include / wx / features.h

diff --git a/include/wx/features.h b/include/wx/features.h
index 1b9847304f2bf94576b3922e491afef75922235c..27e19d79694b034339bf54ff261dabec8633b5f8 100644 (file)
--- a/include/wx/features.h
+++ b/include/wx/features.h
@@ -86,8 +86,17 @@
 
 /* Direct access to bitmap data is not implemented in all ports yet */
 #if defined(__WXGTK20__) || defined(__WXMAC__) || defined(__WXDFB__) || \
-        (defined(__WXMSW__) && !defined(__WATCOMC__))
-    #define wxHAS_RAW_BITMAP
+        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
 
 /* also define deprecated synonym which exists for compatibility only */
@@ -95,5 +104,15 @@
     #define wxHAVE_RAW_BITMAP
 #endif
 
+/*
+   If this is defined, wxEvtHandler::Bind<>() is available (not all compilers
+   have the required template support for this and in particular under Windows
+   where only g++ and MSVC >= 7 currently support it.
+ */
+#if wxCHECK_GCC_VERSION(3, 2) || wxCHECK_VISUALC_VERSION(7)
+    #define wxHAS_EVENT_BIND
+#endif
+
+
 #endif /*  _WX_FEATURES_H_ */