better fix for aCC and rawbmp.h

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

diff --git a/include/wx/features.h b/include/wx/features.h
index 1b9847304f2bf94576b3922e491afef75922235c..22276fae0e2a0d4c1dce75b4b332872f0845b05b 100644 (file)
--- a/include/wx/features.h
+++ b/include/wx/features.h
@@ -87,7 +87,11 @@
 /* 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
+
+    // HP aCC for PA-RISC can't compile rawbmp.h
+    #if !defined(__HP_aCC) || !defined(__hppa)
+        #define wxHAS_RAW_BITMAP
+    #endif
 #endif
 
 /* also define deprecated synonym which exists for compatibility only */

diff --git a/include/wx/rawbmp.h b/include/wx/rawbmp.h
index d636d586e5b86750605f05f58ba9b6d6e7a82dfd..0f25a78252918fd134ac7479d98b60de2b1f5443 100644 (file)
--- a/include/wx/rawbmp.h
+++ b/include/wx/rawbmp.h
@@ -12,6 +12,10 @@
 #ifndef _WX_RAWBMP_H_
 #define _WX_RAWBMP_H_
 
+#include "wx/defs.h"
+
+#ifdef wxHAS_RAW_BITMAP
+
 #include "wx/image.h"
 #include "wx/bitmap.h"
 
@@ -749,4 +753,5 @@ struct wxPixelIterator : public wxPixelData<Image, PixelFormat>::Iterator
 {
 };
 
+#endif // wxHAS_RAW_BITMAP
 #endif // _WX_RAWBMP_H_

diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp
index 7811f87e542b432641c79d9287d74445d96257bf..8a2785bbd82abe6b8b014477347e22df3473774a 100644 (file)
--- a/src/gtk/bitmap.cpp
+++ b/src/gtk/bitmap.cpp
@@ -21,10 +21,7 @@
     #include "wx/colour.h"
 #endif
 
-// HP aCC for PA-RISC can't compile rawbmp.h
-#if !defined(__HP_aCC) || !defined(__hppa)
-    #include "wx/rawbmp.h"
-#endif
+#include "wx/rawbmp.h"
 
 #include "wx/gtk/private/object.h"
 
@@ -859,7 +856,7 @@ void wxBitmap::PurgeOtherRepresentations(wxBitmap::Representation keep)
     }
 }
 
-#if !defined(__HP_aCC) || !defined(__hppa)
+#ifdef wxHAS_RAW_BITMAP
 void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
 {
     void* bits = NULL;
@@ -880,7 +877,7 @@ void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
 void wxBitmap::UngetRawData(wxPixelDataBase& WXUNUSED(data))
 {
 }
-#endif
+#endif // wxHAS_RAW_BITMAP
 
 bool wxBitmap::HasAlpha() const
 {