#include "wx/sysopt.h"
#include "wx/dynlib.h"
-#ifdef wxHAVE_RAW_BITMAP
+#ifdef wxHAS_RAW_BITMAP
#include "wx/rawbmp.h"
#endif
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
int srcWidth, int srcHeight,
const wxBitmap& bmpSrc);
-#endif // wxHAVE_RAW_BITMAP
+#endif // wxHAS_RAW_BITMAP
// ----------------------------------------------------------------------------
// private classes
// ----------------------------------------------------------------------------
+// various classes to change some DC property temporarily
+
+// text background and foreground colours
+class wxTextColoursChanger
+{
+public:
+ wxTextColoursChanger(HDC hdc, const wxMSWDCImpl& dc)
+ : m_hdc(hdc)
+ {
+ Change(dc.GetTextForeground(), dc.GetTextBackground());
+ }
+
+ wxTextColoursChanger(HDC hdc, const wxColour& colFg, const wxColour& colBg)
+ : m_hdc(hdc)
+ {
+ Change(colFg, colBg);
+ }
+
+ ~wxTextColoursChanger()
+ {
+ if ( m_oldColFg != CLR_INVALID )
+ ::SetTextColor(m_hdc, m_oldColFg);
+ if ( m_oldColBg != CLR_INVALID )
+ ::SetBkColor(m_hdc, m_oldColBg);
+ }
+
+protected:
+ // this ctor doesn't change mode immediately, call Change() later to do it
+ // only if needed
+ wxTextColoursChanger(HDC hdc)
+ : m_hdc(hdc)
+ {
+ m_oldColFg =
+ m_oldColBg = CLR_INVALID;
+ }
+
+ void Change(const wxColour& colFg, const wxColour& colBg)
+ {
+ if ( colFg.IsOk() )
+ {
+ m_oldColFg = ::SetTextColor(m_hdc, colFg.GetPixel());
+ if ( m_oldColFg == CLR_INVALID )
+ {
+ wxLogLastError(_T("SetTextColor"));
+ }
+ }
+ else
+ {
+ m_oldColFg = CLR_INVALID;
+ }
+
+ if ( colBg.IsOk() )
+ {
+ m_oldColBg = ::SetBkColor(m_hdc, colBg.GetPixel());
+ if ( m_oldColBg == CLR_INVALID )
+ {
+ wxLogLastError(_T("SetBkColor"));
+ }
+ }
+ else
+ {
+ m_oldColBg = CLR_INVALID;
+ }
+ }
+
+private:
+ const HDC m_hdc;
+ COLORREF m_oldColFg,
+ m_oldColBg;
+
+ DECLARE_NO_COPY_CLASS(wxTextColoursChanger)
+};
+
+// background mode
+class wxBkModeChanger
+{
+public:
+ // set background mode to opaque if mode != wxBRUSHSTYLE_TRANSPARENT
+ wxBkModeChanger(HDC hdc, int mode)
+ : m_hdc(hdc)
+ {
+ Change(mode);
+ }
+
+ ~wxBkModeChanger()
+ {
+ if ( m_oldMode )
+ ::SetBkMode(m_hdc, m_oldMode);
+ }
+
+protected:
+ // this ctor doesn't change mode immediately, call Change() later to do it
+ // only if needed
+ wxBkModeChanger(HDC hdc) : m_hdc(hdc) { m_oldMode = 0; }
+
+ void Change(int mode)
+ {
+ m_oldMode = ::SetBkMode(m_hdc, mode == wxBRUSHSTYLE_TRANSPARENT
+ ? TRANSPARENT
+ : OPAQUE);
+ if ( !m_oldMode )
+ {
+ wxLogLastError(_T("SetBkMode"));
+ }
+ }
+
+private:
+ const HDC m_hdc;
+ int m_oldMode;
+
+ DECLARE_NO_COPY_CLASS(wxBkModeChanger)
+};
+
// instead of duplicating the same code which sets and then restores text
// colours in each wxDC method working with wxSTIPPLE_MASK_OPAQUE brushes,
// encapsulate this in a small helper class
-// wxColourChanger: changes the text colours in the ctor if required and
+// wxBrushAttrsSetter: changes the text colours in the ctor if required and
// restores them in the dtor
-class wxColourChanger
+class wxBrushAttrsSetter : private wxBkModeChanger,
+ private wxTextColoursChanger
{
public:
- wxColourChanger(wxMSWDCImpl& dc);
- ~wxColourChanger();
+ wxBrushAttrsSetter(wxMSWDCImpl& dc);
private:
- wxMSWDCImpl& m_dc;
-
- COLORREF m_colFgOld, m_colBgOld;
-
- bool m_changed;
-
- DECLARE_NO_COPY_CLASS(wxColourChanger)
+ DECLARE_NO_COPY_CLASS(wxBrushAttrsSetter)
};
// this class saves the old stretch blit mode during its life time
// ===========================================================================
// ----------------------------------------------------------------------------
-// wxColourChanger
+// wxBrushAttrsSetter
// ----------------------------------------------------------------------------
-wxColourChanger::wxColourChanger(wxMSWDCImpl& dc) : m_dc(dc)
+wxBrushAttrsSetter::wxBrushAttrsSetter(wxMSWDCImpl& dc)
+ : wxBkModeChanger(GetHdcOf(dc)),
+ wxTextColoursChanger(GetHdcOf(dc))
{
const wxBrush& brush = dc.GetBrush();
- if ( brush.IsOk() && brush.GetStyle() == wxSTIPPLE_MASK_OPAQUE )
+ if ( brush.IsOk() && brush.GetStyle() == wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE )
{
- HDC hdc = GetHdcOf(dc);
- m_colFgOld = ::GetTextColor(hdc);
- m_colBgOld = ::GetBkColor(hdc);
-
// note that Windows convention is opposite to wxWidgets one, this is
// why text colour becomes the background one and vice versa
- const wxColour& colFg = dc.GetTextForeground();
- if ( colFg.IsOk() )
- {
- ::SetBkColor(hdc, colFg.GetPixel());
- }
-
- const wxColour& colBg = dc.GetTextBackground();
- if ( colBg.IsOk() )
- {
- ::SetTextColor(hdc, colBg.GetPixel());
- }
+ wxTextColoursChanger::Change(dc.GetTextBackground(),
+ dc.GetTextForeground());
- SetBkMode(hdc,
- dc.GetBackgroundMode() == wxTRANSPARENT ? TRANSPARENT
- : OPAQUE);
-
- // flag which telsl us to undo changes in the dtor
- m_changed = true;
- }
- else
- {
- // nothing done, nothing to undo
- m_changed = false;
+ wxBkModeChanger::Change(dc.GetBackgroundMode());
}
}
-wxColourChanger::~wxColourChanger()
-{
- if ( m_changed )
- {
- // restore the colours we changed
- HDC hdc = GetHdcOf(m_dc);
+// ----------------------------------------------------------------------------
+// wxDC MSW-specific methods
+// ----------------------------------------------------------------------------
- ::SetBkMode(hdc, TRANSPARENT);
- ::SetTextColor(hdc, m_colFgOld);
- ::SetBkColor(hdc, m_colBgOld);
- }
+WXHDC wxDC::GetHDC() const
+{
+ wxMSWDCImpl * const impl = wxDynamicCast(GetImpl(), wxMSWDCImpl);
+ return impl ? impl->GetHDC() : 0;
}
// ---------------------------------------------------------------------------
wxDCImpl::DoGetClippingBox(x, y, w, h);
}
-// common part of DoSetClippingRegion() and DoSetClippingRegionAsRegion()
+// common part of DoSetClippingRegion() and DoSetDeviceClippingRegion()
void wxMSWDCImpl::SetClippingHrgn(WXHRGN hrgn)
{
wxCHECK_RET( hrgn, wxT("invalid clipping region") );
}
}
-void wxMSWDCImpl::DoSetClippingRegionAsRegion(const wxRegion& region)
+void wxMSWDCImpl::DoSetDeviceClippingRegion(const wxRegion& region)
{
SetClippingHrgn(region.GetHRGN());
}
bool wxMSWDCImpl::DoFloodFill(wxCoord WXUNUSED_IN_WINCE(x),
wxCoord WXUNUSED_IN_WINCE(y),
const wxColour& WXUNUSED_IN_WINCE(col),
- int WXUNUSED_IN_WINCE(style))
+ wxFloodFillStyle WXUNUSED_IN_WINCE(style))
{
#ifdef __WXWINCE__
return false;
WXMICROWIN_CHECK_HDC
- wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
+ wxBrushAttrsSetter cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
double dx = xc - x1;
double dy = yc - y1;
wxCoord xxx2 = (wxCoord) (xxc+ray);
wxCoord yyy2 = (wxCoord) (yyc+ray);
- if ( m_brush.IsOk() && m_brush.GetStyle() != wxTRANSPARENT )
+ if ( m_brush.IsOk() && m_brush.GetStyle() != wxBRUSHSTYLE_TRANSPARENT )
{
// Have to add 1 to bottom-right corner of rectangle
// to make semi-circles look right (crooked line otherwise).
wxPoint points[],
wxCoord xoffset,
wxCoord yoffset,
- int WXUNUSED_IN_WINCE(fillStyle))
+ wxPolygonFillMode WXUNUSED_IN_WINCE(fillStyle))
{
WXMICROWIN_CHECK_HDC
- wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
+ wxBrushAttrsSetter cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
// Do things less efficiently if we have offsets
if (xoffset != 0 || yoffset != 0)
wxPoint points[],
wxCoord xoffset,
wxCoord yoffset,
- int fillStyle)
+ wxPolygonFillMode fillStyle)
{
#ifdef __WXWINCE__
wxDCImpl::DoDrawPolyPolygon(n, count, points, xoffset, yoffset, fillStyle);
#else
WXMICROWIN_CHECK_HDC
- wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
+ wxBrushAttrsSetter cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
int i, cnt;
for (i = cnt = 0; i < n; i++)
cnt += count[i];
{
WXMICROWIN_CHECK_HDC
- wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
+ wxBrushAttrsSetter cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
wxCoord x2 = x + width;
wxCoord y2 = y + height;
// (i.e. drawn with a transparent pen) one pixel smaller in both directions
// and we want them to have the same size regardless of which pen is used
#ifndef __WXWINCE__
- if ( m_pen.GetStyle() == wxTRANSPARENT )
+ if ( m_pen.IsOk() && m_pen.GetStyle() == wxPENSTYLE_TRANSPARENT )
{
x2dev++;
y2dev++;
{
WXMICROWIN_CHECK_HDC
- wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
+ wxBrushAttrsSetter cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
// Now, a negative radius value is interpreted to mean
// 'the proportion of the smallest X or Y dimension'
// Windows draws the filled rectangles without outline (i.e. drawn with a
// transparent pen) one pixel smaller in both directions and we want them
// to have the same size regardless of which pen is used - adjust
- if ( m_pen.GetStyle() == wxTRANSPARENT )
+ if ( m_pen.GetStyle() == wxPENSTYLE_TRANSPARENT )
{
x2++;
y2++;
{
WXMICROWIN_CHECK_HDC
- wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
+ wxBrushAttrsSetter cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
- wxCoord x2 = (x+width);
- wxCoord y2 = (y+height);
+ // +1 below makes the ellipse more similar to other platforms.
+ // In particular, DoDrawEllipse(x,y,1,1) should draw one point.
+ wxCoord x2 = x + width + 1;
+ wxCoord y2 = y + height + 1;
+
+ // Problem: Windows GDI Ellipse() with x2-x == y2-y == 3 and transparent
+ // pen doesn't draw anything. Should we provide a workaround?
- (void)Ellipse(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2));
+ ::Ellipse(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2));
CalcBoundingBox(x, y);
CalcBoundingBox(x2, y2);
}
-#if wxUSE_SPLINES
+#if wxUSE_SPLINES && !defined(__WXWINCE__)
void wxMSWDCImpl::DoDrawSpline(const wxPointList *points)
{
-#ifdef __WXWINCE__
- // WinCE does not support ::PolyBezier so use generic version
- wxDCImpl::DoDrawSpline(points);
-#else
// quadratic b-spline to cubic bezier spline conversion
//
// quadratic spline with control points P0,P1,P2
::PolyBezier( GetHdc(), lppt, bezier_pos );
free(lppt);
-#endif
}
-#endif
+#endif // wxUSE_SPLINES
// Chris Breeze 20/5/98: first implementation of DrawEllipticArc on Windows
void wxMSWDCImpl::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea)
WXMICROWIN_CHECK_HDC
- wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
+ wxBrushAttrsSetter cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
wxCoord x2 = x + w;
wxCoord y2 = y + h;
wxASSERT_MSG( hbitmap, wxT("bitmap is ok but HBITMAP is NULL?") );
- COLORREF old_textground = ::GetTextColor(GetHdc());
- COLORREF old_background = ::GetBkColor(GetHdc());
- if (m_textForegroundColour.IsOk())
- {
- ::SetTextColor(GetHdc(), m_textForegroundColour.GetPixel() );
- }
- if (m_textBackgroundColour.IsOk())
- {
- ::SetBkColor(GetHdc(), m_textBackgroundColour.GetPixel() );
- }
+ wxTextColoursChanger textCol(GetHdc(), *this);
#if wxUSE_PALETTE
wxPalette *pal = bmp.GetPalette();
::SelectObject( memdc, hOldBitmap );
::DeleteDC( memdc );
-
- ::SetTextColor(GetHdc(), old_textground);
- ::SetBkColor(GetHdc(), old_background);
}
}
WXMICROWIN_CHECK_HDC
// prepare for drawing the text
- if ( m_textForegroundColour.IsOk() )
- SetTextColor(GetHdc(), m_textForegroundColour.GetPixel());
-
- DWORD old_background = 0;
- if ( m_textBackgroundColour.IsOk() )
- {
- old_background = SetBkColor(GetHdc(), m_textBackgroundColour.GetPixel() );
- }
+ wxTextColoursChanger textCol(GetHdc(), *this);
- SetBkMode(GetHdc(), m_backgroundMode == wxTRANSPARENT ? TRANSPARENT
- : OPAQUE);
+ wxBkModeChanger bkMode(GetHdc(), m_backgroundMode);
-#ifdef __WXWINCE__
if ( ::ExtTextOut(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), 0, NULL,
text.c_str(), text.length(), NULL) == 0 )
{
wxLogLastError(wxT("TextOut"));
}
-#else
- if ( ::TextOut(GetHdc(), XLOG2DEV(x), YLOG2DEV(y),
- text.c_str(), text.length()) == 0 )
- {
- wxLogLastError(wxT("TextOut"));
- }
-#endif
-
- // restore the old parameters (text foreground colour may be left because
- // it never is set to anything else, but background should remain
- // transparent even if we just drew an opaque string)
- if ( m_textBackgroundColour.IsOk() )
- (void)SetBkColor(GetHdc(), old_background);
-
- SetBkMode(GetHdc(), TRANSPARENT);
}
void wxMSWDCImpl::DoDrawRotatedText(const wxString& text,
// and m_backgroundMode is used there
}
-void wxMSWDCImpl::SetLogicalFunction(int function)
+void wxMSWDCImpl::SetLogicalFunction(wxRasterOperationMode function)
{
WXMICROWIN_CHECK_HDC
if ( !dc || m_logicalFunction < 0 )
return;
- int rop;
+ int rop wxDUMMY_INITIALIZE(0);
switch (m_logicalFunction)
{
case wxNAND: rop = R2_NOTMASKPEN; break;
case wxOR: rop = R2_MERGEPEN; break;
case wxSET: rop = R2_WHITE; break;
-
- default:
- wxFAIL_MSG( wxT("unsupported logical function") );
- return;
}
SetROP2(GetHdc(), rop);
void wxMSWDCImpl::RealizeScaleAndOrigin()
{
- // VZ: it seems very wasteful to always use MM_ANISOTROPIC when in 99% of
- // cases we could do with MM_TEXT and in the remaining 0.9% with
- // MM_ISOTROPIC (TODO!)
+ // although it may seem wasteful to always use MM_ANISOTROPIC here instead
+ // of using MM_TEXT if there is no scaling, benchmarking doesn't detect any
+ // noticeable difference between these mapping modes
#ifndef __WXWINCE__
::SetMapMode(GetHdc(), MM_ANISOTROPIC);
#endif
}
-void wxMSWDCImpl::SetMapMode(int mode)
+void wxMSWDCImpl::SetMapMode(wxMappingMode mode)
{
WXMICROWIN_CHECK_HDC
wxDCImpl::SetLogicalOrigin( x, y );
-#ifndef __WXWINCE__
- ::SetWindowOrgEx(GetHdc(), (int)m_logicalOriginX, (int)m_logicalOriginY, NULL);
-#endif
+ RealizeScaleAndOrigin();
+}
+
+// For use by wxWidgets only, unless custom units are required.
+void wxMSWDCImpl::SetLogicalScale(double x, double y)
+{
+ WXMICROWIN_CHECK_HDC
+
+ wxDCImpl::SetLogicalScale(x,y);
}
void wxMSWDCImpl::SetDeviceOrigin(wxCoord x, wxCoord y)
wxCoord dstWidth, wxCoord dstHeight,
wxDC *source,
wxCoord srcX, wxCoord srcY,
- int rop, bool useMask,
+ wxRasterOperationMode rop, bool useMask,
wxCoord srcMaskX, wxCoord srcMaskY)
{
return DoStretchBlit(dstX, dstY, dstWidth, dstHeight, source, srcX, srcY, dstWidth, dstHeight, rop, useMask, srcMaskX, srcMaskY);
wxDC *source,
wxCoord xsrc, wxCoord ysrc,
wxCoord srcWidth, wxCoord srcHeight,
- int rop, bool useMask,
+ wxRasterOperationMode rop, bool useMask,
wxCoord xsrcMask, wxCoord ysrcMask)
{
wxCHECK_MSG( source, false, _T("wxMSWDCImpl::Blit(): NULL wxDC pointer") );
xsrcMask = xsrc; ysrcMask = ysrc;
}
- COLORREF old_textground = ::GetTextColor(GetHdc());
- COLORREF old_background = ::GetBkColor(GetHdc());
- if (m_textForegroundColour.IsOk())
- {
- ::SetTextColor(GetHdc(), m_textForegroundColour.GetPixel() );
- }
- if (m_textBackgroundColour.IsOk())
- {
- ::SetBkColor(GetHdc(), m_textBackgroundColour.GetPixel() );
- }
+ wxTextColoursChanger textCol(GetHdc(), *this);
DWORD dwRop;
switch (rop)
HGDIOBJ hOldBufferBitmap = ::SelectObject(dc_buffer, buffer_bmap);
// copy dest to buffer
- if ( !::BitBlt(dc_buffer, 0, 0, (int)dstWidth, (int)dstHeight,
+ if ( !::BitBlt(dc_buffer, 0, 0, dstWidth, dstHeight,
GetHdc(), xdest, ydest, SRCCOPY) )
{
wxLogLastError(wxT("BitBlt"));
#endif
// copy src to buffer using selected raster op
- if ( !::StretchBlt(dc_buffer, 0, 0, (int)dstWidth, (int)dstHeight,
+ if ( !::StretchBlt(dc_buffer, 0, 0, dstWidth, dstHeight,
hdcSrc, xsrc, ysrc, srcWidth, srcHeight, dwRop) )
{
wxLogLastError(wxT("StretchBlt"));
}
- // set masked area in buffer to BLACK (pixel value 0)
- COLORREF prevBkCol = ::SetBkColor(GetHdc(), RGB(255, 255, 255));
- COLORREF prevCol = ::SetTextColor(GetHdc(), RGB(0, 0, 0));
- if ( !::StretchBlt(dc_buffer, 0, 0, (int)dstWidth, (int)dstHeight,
- dc_mask, xsrcMask, ysrcMask, srcWidth, srcHeight, SRCAND) )
+ // set masked area in buffer to BLACK
{
- wxLogLastError(wxT("StretchBlt"));
- }
+ wxTextColoursChanger textCol2(GetHdc(), *wxBLACK, *wxWHITE);
+ if ( !::StretchBlt(dc_buffer, 0, 0, dstWidth, dstHeight,
+ dc_mask, xsrcMask, ysrcMask,
+ srcWidth, srcHeight, SRCAND) )
+ {
+ wxLogLastError(wxT("StretchBlt"));
+ }
- // set unmasked area in dest to BLACK
- ::SetBkColor(GetHdc(), RGB(0, 0, 0));
- ::SetTextColor(GetHdc(), RGB(255, 255, 255));
- if ( !::StretchBlt(GetHdc(), xdest, ydest, (int)dstWidth, (int)dstHeight,
- dc_mask, xsrcMask, ysrcMask, srcWidth, srcHeight, SRCAND) )
- {
- wxLogLastError(wxT("StretchBlt"));
- }
- ::SetBkColor(GetHdc(), prevBkCol); // restore colours to original values
- ::SetTextColor(GetHdc(), prevCol);
+ // set unmasked area in dest to BLACK
+ ::SetBkColor(GetHdc(), RGB(0, 0, 0));
+ ::SetTextColor(GetHdc(), RGB(255, 255, 255));
+ if ( !::StretchBlt(GetHdc(), xdest, ydest, dstWidth, dstHeight,
+ dc_mask, xsrcMask, ysrcMask,
+ srcWidth, srcHeight, SRCAND) )
+ {
+ wxLogLastError(wxT("StretchBlt"));
+ }
+ } // restore the original text and background colours
// OR buffer to dest
- success = ::BitBlt(GetHdc(), xdest, ydest,
- (int)dstWidth, (int)dstHeight,
+ success = ::BitBlt(GetHdc(), xdest, ydest, dstWidth, dstHeight,
dc_buffer, 0, 0, SRCPAINT) != 0;
if ( !success )
{
if ( !success )
{
- if ( !::BitBlt
- (
- GetHdc(),
- xdest, ydest,
- (int)dstWidth, (int)dstHeight,
- hdcSrc,
- xsrc, ysrc,
- dwRop
- ) )
+ if ( !::BitBlt(GetHdc(), xdest, ydest, dstWidth, dstHeight,
+ hdcSrc, xsrc, ysrc, dwRop) )
{
wxLogLastError(_T("BitBlt"));
}
}
}
- ::SetTextColor(GetHdc(), old_textground);
- ::SetBkColor(GetHdc(), old_background);
-
return success;
}
return wxSize(x, y);
}
-// For use by wxWidgets only, unless custom units are required.
-void wxMSWDCImpl::SetLogicalScale(double x, double y)
-{
- WXMICROWIN_CHECK_HDC
-
- wxDCImpl::SetLogicalScale(x,y);
-}
-
// ----------------------------------------------------------------------------
// DC caching
// ----------------------------------------------------------------------------
// 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,
}
}
-#endif // #ifdef wxHAVE_RAW_BITMAP
+#endif // wxHAS_RAW_BITMAP
void wxMSWDCImpl::DoGradientFillLinear (const wxRect& rect,
const wxColour& initialColour,
projects / wxWidgets.git / blobdiff