diff --git a/contrib/src/stc/PlatWX.cpp b/contrib/src/stc/PlatWX.cpp
index c587f89dde..68e32fc29f 100644
--- a/contrib/src/stc/PlatWX.cpp
+++ b/contrib/src/stc/PlatWX.cpp
@@ -14,7 +14,9 @@
 #include "wx/imaglist.h"
 #include "wx/tokenzr.h"
 
+#ifdef wxHAVE_RAW_BITMAP
 #include "wx/rawbmp.h"
+#endif
 
 #include "Platform.h"
 #include "PlatWX.h"
@@ -346,6 +348,7 @@ void SurfaceImpl::AlphaRectangle(PRectangle rc, int cornerSize,
                                  ColourAllocated fill, int alphaFill,
                                  ColourAllocated outline, int alphaOutline,
                                  int /*flags*/) {
+#ifdef wxHAVE_RAW_BITMAP
 
     // TODO:  do something with cornerSize
     wxUnusedVar(cornerSize);
@@ -407,6 +410,13 @@ void SurfaceImpl::AlphaRectangle(PRectangle rc, int cornerSize,
     
     // Draw the bitmap
     hdc->DrawBitmap(bmp, r.x, r.y, true);
+
+#else
+    wxUnusedVar(cornerSize);
+    wxUnusedVar(alphaFill);
+    wxUnusedVar(alphaOutline);
+    RectangleDraw(rc, outline, fill);
+#endif
 }
 
 void SurfaceImpl::Ellipse(PRectangle rc, ColourAllocated fore, ColourAllocated back) {
diff --git a/include/wx/platform.h b/include/wx/platform.h
index 6c45b0aa0d..4dbeb8b5cd 100644
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -585,6 +585,9 @@
 #        define wxHAVE_RAW_BITMAP
 #    endif
 #endif
+#if defined(__WXGTK20__) || defined(__WXMAC__)
+#    define wxHAVE_RAW_BITMAP
+#endif
 
 /*
     Handle Darwin gcc universal compilation.  Don't do this in an Apple-