AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use wxHAS_RAW_BITMAP instead of wxHAVE_RAW_BITMAP

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53916 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2008-06-01 20:19:43 +00:00
parent 23f3f8c2ac
commit 3fb1e0594a
5 changed files with 14 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/msw/bitmap.cpp
View File

@ -46,7 +46,7 @@
#include "wx/msw/dib.h"
#endif
#ifdef wxHAVE_RAW_BITMAP
#ifdef wxHAS_RAW_BITMAP
#include "wx/rawbmp.h"
#endif
@ -1247,7 +1247,8 @@ void wxBitmap::SetMask(wxMask *mask)
// raw bitmap access support
// ----------------------------------------------------------------------------
#ifdef wxHAVE_RAW_BITMAP
#ifdef wxHAS_RAW_BITMAP
void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
{
#if wxUSE_WXDIB
@ -1353,7 +1354,7 @@ void wxBitmap::UngetRawData(wxPixelDataBase& dataBase)
}
#endif // wxUSE_WXDIB
}
#endif // #ifdef wxHAVE_RAW_BITMAP
#endif // wxHAS_RAW_BITMAP
// ----------------------------------------------------------------------------
// wxMask

16
src/msw/dc.cpp
View File

@ -43,7 +43,7 @@
#include "wx/sysopt.h"
#include "wx/dynlib.h"
#ifdef wxHAVE_RAW_BITMAP
#ifdef wxHAS_RAW_BITMAP
#include "wx/rawbmp.h"
#endif
@ -133,7 +133,7 @@ static bool AlphaBlt(HDC hdcDst,
HDC hdcSrc,
const wxBitmap& bmp);
#ifdef wxHAVE_RAW_BITMAP
#ifdef wxHAS_RAW_BITMAP
// our (limited) AlphaBlend() replacement for Windows versions not providing it
static void
@ -143,7 +143,7 @@ wxAlphaBlend(HDC hdcDst, int xDst, int yDst,
int srcWidth, int srcHeight,
const wxBitmap& bmpSrc);
#endif // wxHAVE_RAW_BITMAP
#endif // wxHAS_RAW_BITMAP
// ----------------------------------------------------------------------------
// private classes
@ -2579,21 +2579,21 @@ static bool AlphaBlt(HDC hdcDst,
// AlphaBlend() unavailable of failed: use our own (probably much slower)
// implementation
#ifdef wxHAVE_RAW_BITMAP
#ifdef wxHAS_RAW_BITMAP
wxAlphaBlend(hdcDst, x, y, dstWidth, dstHeight, srcX, srcY, srcWidth, srcHeight, bmp);
return true;
#else // !wxHAVE_RAW_BITMAP
#else // !wxHAS_RAW_BITMAP
// no wxAlphaBlend() neither, fall back to using simple BitBlt() (we lose
// alpha but at least something will be shown like this)
wxUnusedVar(bmp);
return false;
#endif // wxHAVE_RAW_BITMAP
#endif // wxHAS_RAW_BITMAP/!wxHAS_RAW_BITMAP
}
// wxAlphaBlend: our fallback if ::AlphaBlend() is unavailable
#ifdef wxHAVE_RAW_BITMAP
#ifdef wxHAS_RAW_BITMAP
static void
wxAlphaBlend(HDC hdcDst, int xDst, int yDst,
@ -2655,7 +2655,7 @@ wxAlphaBlend(HDC hdcDst, int xDst, int yDst,
}
}
#endif // #ifdef wxHAVE_RAW_BITMAP
#endif // wxHAS_RAW_BITMAP
void wxMSWDCImpl::DoGradientFillLinear (const wxRect& rect,
const wxColour& initialColour,

16
src/palmos/bitmap.cpp
View File

@ -45,10 +45,6 @@
#include "wx/xpmdecod.h"
#ifdef wxHAVE_RAW_BITMAP
#include "wx/rawbmp.h"
#endif
// missing from mingw32 header
#ifndef CLR_INVALID
#define CLR_INVALID ((COLORREF)-1)
@ -364,18 +360,6 @@ void wxBitmap::SetMask(wxMask *mask)
// raw bitmap access support
// ----------------------------------------------------------------------------
#ifdef wxHAVE_RAW_BITMAP
void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
{
return NULL;
}
void wxBitmap::UngetRawData(wxPixelDataBase& dataBase)
{
return;
}
#endif // #ifdef wxHAVE_RAW_BITMAP
// ----------------------------------------------------------------------------
// wxMask
// ----------------------------------------------------------------------------

4
src/palmos/dc.cpp
View File

@ -44,10 +44,6 @@
#include "wx/sysopt.h"
#include "wx/dynlib.h"
#ifdef wxHAVE_RAW_BITMAP
#include "wx/rawbmp.h"
#endif
#include "wx/palmos/dc.h"
#ifndef AC_SRC_ALPHA

4
src/stc/PlatWX.cpp
View File

@ -32,7 +32,7 @@
#include "wx/imaglist.h"
#include "wx/tokenzr.h"
#ifdef wxHAVE_RAW_BITMAP
#ifdef wxHAS_RAW_BITMAP
#include "wx/rawbmp.h"
#endif
@ -368,7 +368,7 @@ void SurfaceImpl::AlphaRectangle(PRectangle rc, int cornerSize,
ColourAllocated fill, int alphaFill,
ColourAllocated outline, int alphaOutline,
int /*flags*/) {
#ifdef wxHAVE_RAW_BITMAP
#ifdef wxHAS_RAW_BITMAP
// TODO: do something with cornerSize
wxUnusedVar(cornerSize);