Also set wxHAVE_RAW_BITMAP for Mac and GTK2, use it in wxSTC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@53169 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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) {
|
||||
|
@@ -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-
|
||||
|
Reference in New Issue
Block a user