Only use raw bitmap if it is available

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

diff --git a/contrib/src/stc/PlatWX.cpp b/contrib/src/stc/PlatWX.cpp
index e0445dd848a9bd445c06bee208f47c38bd31bca3..e19b281f8c690b4a7527d643d00f156b7e4fc685 100644 (file)
--- a/contrib/src/stc/PlatWX.cpp
+++ b/contrib/src/stc/PlatWX.cpp
@@ -13,7 +13,10 @@
 #include "wx/image.h"
 #include "wx/imaglist.h"
 #include "wx/tokenzr.h"
 #include "wx/image.h"
 #include "wx/imaglist.h"
 #include "wx/tokenzr.h"

+
+#ifdef wxHAVE_RAW_BITMAP

 #include "wx/rawbmp.h"
 #include "wx/rawbmp.h"

+#endif

 
 #include "Platform.h"
 #include "PlatWX.h"
 
 #include "Platform.h"
 #include "PlatWX.h"


@@ -345,6 +348,7 @@ void SurfaceImpl::AlphaRectangle(PRectangle rc, int cornerSize,
                                  ColourAllocated fill, int alphaFill,
                                  ColourAllocated outline, int alphaOutline,
                                  int /*flags*/) {
                                  ColourAllocated fill, int alphaFill,
                                  ColourAllocated outline, int alphaOutline,
                                  int /*flags*/) {

+#ifdef wxHAVE_RAW_BITMAP

     int x, y;
     wxRect r = wxRectFromPRectangle(rc);
     wxBitmap bmp(r.width, r.height, 32);
     int x, y;
     wxRect r = wxRectFromPRectangle(rc);
     wxBitmap bmp(r.width, r.height, 32);


@@ -402,6 +406,10 @@ void SurfaceImpl::AlphaRectangle(PRectangle rc, int cornerSize,
     
     // Draw the bitmap
     hdc->DrawBitmap(bmp, r.x, r.y, true);
     
     // Draw the bitmap
     hdc->DrawBitmap(bmp, r.x, r.y, true);

+
+#else
+        RectangleDraw(rc, outline, fill);
+#endif

 }
 
 void SurfaceImpl::Ellipse(PRectangle rc, ColourAllocated fore, ColourAllocated back) {
 }
 
 void SurfaceImpl::Ellipse(PRectangle rc, ColourAllocated fore, ColourAllocated back) {

diff --git a/src/stc/PlatWX.cpp b/src/stc/PlatWX.cpp
index e0445dd848a9bd445c06bee208f47c38bd31bca3..e19b281f8c690b4a7527d643d00f156b7e4fc685 100644 (file)
--- a/src/stc/PlatWX.cpp
+++ b/src/stc/PlatWX.cpp
@@ -13,7 +13,10 @@
 #include "wx/image.h"
 #include "wx/imaglist.h"
 #include "wx/tokenzr.h"
 #include "wx/image.h"
 #include "wx/imaglist.h"
 #include "wx/tokenzr.h"

+
+#ifdef wxHAVE_RAW_BITMAP

 #include "wx/rawbmp.h"
 #include "wx/rawbmp.h"

+#endif

 
 #include "Platform.h"
 #include "PlatWX.h"
 
 #include "Platform.h"
 #include "PlatWX.h"


@@ -345,6 +348,7 @@ void SurfaceImpl::AlphaRectangle(PRectangle rc, int cornerSize,
                                  ColourAllocated fill, int alphaFill,
                                  ColourAllocated outline, int alphaOutline,
                                  int /*flags*/) {
                                  ColourAllocated fill, int alphaFill,
                                  ColourAllocated outline, int alphaOutline,
                                  int /*flags*/) {

+#ifdef wxHAVE_RAW_BITMAP

     int x, y;
     wxRect r = wxRectFromPRectangle(rc);
     wxBitmap bmp(r.width, r.height, 32);
     int x, y;
     wxRect r = wxRectFromPRectangle(rc);
     wxBitmap bmp(r.width, r.height, 32);


@@ -402,6 +406,10 @@ void SurfaceImpl::AlphaRectangle(PRectangle rc, int cornerSize,
     
     // Draw the bitmap
     hdc->DrawBitmap(bmp, r.x, r.y, true);
     
     // Draw the bitmap
     hdc->DrawBitmap(bmp, r.x, r.y, true);

+
+#else
+        RectangleDraw(rc, outline, fill);
+#endif

 }
 
 void SurfaceImpl::Ellipse(PRectangle rc, ColourAllocated fore, ColourAllocated back) {
 }
 
 void SurfaceImpl::Ellipse(PRectangle rc, ColourAllocated fore, ColourAllocated back) {