#endif
#ifndef WX_PRECOMP
+ #include "wx/msw/wrapcdlg.h"
#include "wx/image.h"
#include "wx/window.h"
#include "wx/dc.h"
#include "wx/dcmemory.h"
#include "wx/log.h"
#include "wx/icon.h"
+ #include "wx/dcprint.h"
+ #include "wx/module.h"
#endif
#include "wx/sysopt.h"
-#include "wx/dcprint.h"
-#include "wx/module.h"
#include "wx/dynlib.h"
#ifdef wxHAVE_RAW_BITMAP
#include <string.h>
-#include "wx/msw/wrapcdlg.h"
#ifndef __WIN32__
#include <print.h>
#endif
#ifndef AC_SRC_ALPHA
-#define AC_SRC_ALPHA 1
+ #define AC_SRC_ALPHA 1
+#endif
+
+#ifndef LAYOUT_RTL
+ #define LAYOUT_RTL 1
#endif
/* Quaternary raster codes */
// return true if we could draw the bitmap in one way or the other, false
// otherwise
static bool AlphaBlt(HDC hdcDst,
- int x, int y, int w, int h,
- int srcX, int srcY, HDC hdcSrc,
- const wxBitmap& bmpSrc);
+ int x, int y, int dstWidth, int dstHeight,
+ int srcX, int srcY,
+ int srcWidth, int srcHeight,
+ HDC hdcSrc,
+ const wxBitmap& bmp);
#ifdef wxHAVE_RAW_BITMAP
// our (limited) AlphaBlend() replacement for Windows versions not providing it
static void
-wxAlphaBlend(HDC hdcDst, int x, int y, int w, int h,
- int srcX, int srcY, const wxBitmap& bmp);
+wxAlphaBlend(HDC hdcDst, int xDst, int yDst,
+ int dstWidth, int dstHeight,
+ int srcX, int srcY,
+ int srcWidth, int srcHeight,
+ const wxBitmap& bmpSrc);
#endif // wxHAVE_RAW_BITMAP
DECLARE_NO_COPY_CLASS(StretchBltModeChanger)
};
-// support for dynamic loading of msimg32.dll which we use for some functions
-class wxMSImg32DLL
+#if wxUSE_DYNLIB_CLASS
+
+// helper class to cache dynamically loaded libraries and not attempt reloading
+// them if it fails
+class wxOnceOnlyDLLLoader
{
public:
- // return the symbol with the given name if the DLL not loaded or symbol
- // not present
- static void *GetSymbol(const wxChar *name)
+ // ctor argument must be a literal string as we don't make a copy of it!
+ wxOnceOnlyDLLLoader(const wxChar *dllName)
+ : m_dllName(dllName)
{
+ }
+
+
+ // return the symbol with the given name or NULL if the DLL not loaded
+ // or symbol not present
+ void *GetSymbol(const wxChar *name)
+ {
+ // we're prepared to handle errors here
wxLogNull noLog;
- if ( !ms_triedToLoad )
+ if ( m_dllName )
{
- ms_triedToLoad = true;
- ms_dll.Load(_T("msimg32"));
+ m_dll.Load(m_dllName);
+
+ // reset the name whether we succeeded or failed so that we don't
+ // try again the next time
+ m_dllName = NULL;
}
- return ms_dll.IsLoaded() ? ms_dll.GetSymbol(name) : NULL;
+ return m_dll.IsLoaded() ? m_dll.GetSymbol(name) : NULL;
}
private:
- static wxDynamicLibrary ms_dll;
- static bool ms_triedToLoad;
+ wxDynamicLibrary m_dll;
+ const wxChar *m_dllName;
};
-wxDynamicLibrary wxMSImg32DLL::ms_dll;
-bool wxMSImg32DLL::ms_triedToLoad = false;
+static wxOnceOnlyDLLLoader wxGDI32DLL(_T("gdi32"));
+static wxOnceOnlyDLLLoader wxMSIMG32DLL(_T("msimg32"));
-// helper macro for getting the symbols from msimg32.dll: it supposes that a
-// type "name_t" is defined and casts the returned symbol to it automatically
-#define wxMSIMG32_SYMBOL(name) (name ## _t)wxMSImg32DLL::GetSymbol(_T(#name))
+#endif // wxUSE_DYNLIB_CLASS
// ===========================================================================
// implementation
if (!m_selectedBitmap.Ok())
return;
- rect.left = 0; rect.top = 0;
- rect.right = m_selectedBitmap.GetWidth();
- rect.bottom = m_selectedBitmap.GetHeight();
+ rect.left = -m_deviceOriginX; rect.top = -m_deviceOriginY;
+ rect.right = m_selectedBitmap.GetWidth()-m_deviceOriginX;
+ rect.bottom = m_selectedBitmap.GetHeight()-m_deviceOriginY;
}
#ifndef __WXWINCE__
::FillRect(GetHdc(), &rect, brush);
::DeleteObject(brush);
-#ifndef __WXWINCE__
- int width = DeviceToLogicalXRel(VIEWPORT_EXTENT)*m_signX,
- height = DeviceToLogicalYRel(VIEWPORT_EXTENT)*m_signY;
-
- ::SetMapMode(GetHdc(), MM_ANISOTROPIC);
-
- ::SetViewportExtEx(GetHdc(), VIEWPORT_EXTENT, VIEWPORT_EXTENT, NULL);
- ::SetWindowExtEx(GetHdc(), width, height, NULL);
- ::SetViewportOrgEx(GetHdc(), (int)m_deviceOriginX, (int)m_deviceOriginY, NULL);
- ::SetWindowOrgEx(GetHdc(), (int)m_logicalOriginX, (int)m_logicalOriginY, NULL);
-#endif
+ RealizeScaleAndOrigin();
}
bool wxDC::DoFloodFill(wxCoord WXUNUSED_IN_WINCE(x),
// transparent pen) one pixel smaller in both directions and we want them
// to have the same size regardless of which pen is used - adjust
- // I wonder if this shouldnยดt be done after the LOG2DEV() conversions. RR.
+ // I wonder if this shouldnt be done after the LOG2DEV() conversions. RR.
if ( m_pen.GetStyle() == wxTRANSPARENT )
{
// Apparently not needed for WinCE (see e.g. Life! demo)
MemoryHDC hdcMem;
SelectInHDC select(hdcMem, GetHbitmapOf(bmp));
- if ( AlphaBlt(GetHdc(), x, y, width, height, 0, 0, hdcMem, bmp) )
+ if ( AlphaBlt(GetHdc(), x, y, width, height, 0, 0, width, height, hdcMem, bmp) )
return;
}
// Rather than reproduce wxDC::Blit, let's do it at the wxWin API
// level
wxMemoryDC memDC;
- memDC.SelectObject(bmp);
+
+ memDC.SelectObjectAsSource(bmp);
Blit(x, y, width, height, &memDC, 0, 0, wxCOPY, useMask);
else // selected ok
{
if ( !m_oldFont )
- m_oldFont = (WXHPEN)hfont;
+ m_oldFont = (WXHFONT)hfont;
m_font = font;
}
else // selected ok
{
if ( !m_oldBrush )
- m_oldBrush = (WXHPEN)hbrush;
+ m_oldBrush = (WXHBRUSH)hbrush;
m_brush = brush;
}
void wxDC::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,
wxCoord *descent, wxCoord *externalLeading,
- wxFont *font) const
+ const wxFont *font) const
{
#ifdef __WXMICROWIN__
if (!GetHDC())
SIZE sizeRect;
const size_t len = string.length();
- if ( !::GetTextExtentPoint32(GetHdc(), string, len, &sizeRect) )
+ if ( !::GetTextExtentPoint32(GetHdc(), string.wx_str(), len, &sizeRect) )
{
wxLogLastError(_T("GetTextExtentPoint32()"));
}
{
// Win9x and WinNT+ have different limits
int version = wxGetOsVersion();
- maxLenText = version == wxWINDOWS_NT ? 65535 : 8192;
- maxWidth = version == wxWINDOWS_NT ? INT_MAX : 32767;
+ maxLenText = version == wxOS_WINDOWS_NT ? 65535 : 8192;
+ maxWidth = version == wxOS_WINDOWS_NT ? INT_MAX : 32767;
}
widths.Empty();
return true;
}
+void wxDC::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!)
+#ifndef __WXWINCE__
+ ::SetMapMode(GetHdc(), MM_ANISOTROPIC);
+
+ int width = DeviceToLogicalXRel(VIEWPORT_EXTENT)*m_signX,
+ height = DeviceToLogicalYRel(VIEWPORT_EXTENT)*m_signY;
+ ::SetViewportExtEx(GetHdc(), VIEWPORT_EXTENT, VIEWPORT_EXTENT, NULL);
+ ::SetWindowExtEx(GetHdc(), width, height, NULL);
+ ::SetViewportOrgEx(GetHdc(), m_deviceOriginX, m_deviceOriginY, NULL);
+ ::SetWindowOrgEx(GetHdc(), m_logicalOriginX, m_logicalOriginY, NULL);
+#endif
+
+}
void wxDC::SetMapMode(int mode)
{
wxFAIL_MSG( _T("unknown mapping mode in SetMapMode") );
}
}
-
- // 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!)
-#ifndef __WXWINCE__
- ::SetMapMode(GetHdc(), MM_ANISOTROPIC);
-
- int width = DeviceToLogicalXRel(VIEWPORT_EXTENT)*m_signX,
- height = DeviceToLogicalYRel(VIEWPORT_EXTENT)*m_signY;
-
- ::SetViewportExtEx(GetHdc(), VIEWPORT_EXTENT, VIEWPORT_EXTENT, NULL);
- ::SetWindowExtEx(GetHdc(), width, height, NULL);
-
- ::SetViewportOrgEx(GetHdc(), m_deviceOriginX, m_deviceOriginY, NULL);
- ::SetWindowOrgEx(GetHdc(), m_logicalOriginX, m_logicalOriginY, NULL);
-#endif
+
+ ComputeScaleAndOrigin();
+
+ RealizeScaleAndOrigin();
}
void wxDC::SetUserScale(double x, double y)
if ( x == m_userScaleX && y == m_userScaleY )
return;
- m_userScaleX = x;
- m_userScaleY = y;
-
- this->SetMapMode(m_mappingMode);
+ wxDCBase::SetUserScale(x,y);
+
+ RealizeScaleAndOrigin();
}
-void wxDC::SetAxisOrientation(bool WXUNUSED_IN_WINCE(xLeftRight),
- bool WXUNUSED_IN_WINCE(yBottomUp))
+void wxDC::SetAxisOrientation(bool xLeftRight,
+ bool yBottomUp)
{
WXMICROWIN_CHECK_HDC
-#ifndef __WXWINCE__
int signX = xLeftRight ? 1 : -1,
signY = yBottomUp ? -1 : 1;
-
- if ( signX != m_signX || signY != m_signY )
- {
- m_signX = signX;
- m_signY = signY;
-
- SetMapMode(m_mappingMode);
- }
-#endif
-}
-
-void wxDC::SetSystemScale(double x, double y)
-{
- WXMICROWIN_CHECK_HDC
-
- if ( x == m_scaleX && y == m_scaleY )
+
+ if (signX == m_signX && signY == m_signY)
return;
+
+ wxDCBase::SetAxisOrientation( xLeftRight, yBottomUp );
- m_scaleX = x;
- m_scaleY = y;
-
-#ifndef __WXWINCE__
- SetMapMode(m_mappingMode);
-#endif
+ RealizeScaleAndOrigin();
}
void wxDC::SetLogicalOrigin(wxCoord x, wxCoord y)
if ( x == m_logicalOriginX && y == m_logicalOriginY )
return;
- m_logicalOriginX = x;
- m_logicalOriginY = y;
+ wxDCBase::SetLogicalOrigin( x, y );
#ifndef __WXWINCE__
::SetWindowOrgEx(GetHdc(), (int)m_logicalOriginX, (int)m_logicalOriginY, NULL);
if ( x == m_deviceOriginX && y == m_deviceOriginY )
return;
-
- m_deviceOriginX = x;
- m_deviceOriginY = y;
+
+ wxDCBase::SetDeviceOrigin( x, y );
::SetViewportOrgEx(GetHdc(), (int)m_deviceOriginX, (int)m_deviceOriginY, NULL);
}
// ---------------------------------------------------------------------------
-// coordinates transformations
+// bit blit
// ---------------------------------------------------------------------------
-wxCoord wxDCBase::DeviceToLogicalX(wxCoord x) const
-{
- return DeviceToLogicalXRel(x - m_deviceOriginX)*m_signX + m_logicalOriginX;
-}
-
-wxCoord wxDCBase::DeviceToLogicalXRel(wxCoord x) const
-{
- // axis orientation is not taken into account for conversion of a distance
- return (wxCoord)(x / (m_logicalScaleX*m_userScaleX*m_scaleX));
-}
-
-wxCoord wxDCBase::DeviceToLogicalY(wxCoord y) const
-{
- return DeviceToLogicalYRel(y - m_deviceOriginY)*m_signY + m_logicalOriginY;
-}
-
-wxCoord wxDCBase::DeviceToLogicalYRel(wxCoord y) const
-{
- // axis orientation is not taken into account for conversion of a distance
- return (wxCoord)( y / (m_logicalScaleY*m_userScaleY*m_scaleY));
-}
-
-wxCoord wxDCBase::LogicalToDeviceX(wxCoord x) const
-{
- return LogicalToDeviceXRel(x - m_logicalOriginX)*m_signX + m_deviceOriginX;
-}
-
-wxCoord wxDCBase::LogicalToDeviceXRel(wxCoord x) const
-{
- // axis orientation is not taken into account for conversion of a distance
- return (wxCoord) (x*m_logicalScaleX*m_userScaleX*m_scaleX);
-}
-
-wxCoord wxDCBase::LogicalToDeviceY(wxCoord y) const
+bool wxDC::DoBlit(wxCoord dstX, wxCoord dstY,
+ wxCoord dstWidth, wxCoord dstHeight,
+ wxDC *source,
+ wxCoord srcX, wxCoord srcY,
+ int rop, bool useMask,
+ wxCoord srcMaskX, wxCoord srcMaskY)
{
- return LogicalToDeviceYRel(y - m_logicalOriginY)*m_signY + m_deviceOriginY;
+ return DoStretchBlit(dstX, dstY, dstWidth, dstHeight, source, srcX, srcY, dstWidth, dstHeight, rop, useMask, srcMaskX, srcMaskY);
}
-wxCoord wxDCBase::LogicalToDeviceYRel(wxCoord y) const
-{
- // axis orientation is not taken into account for conversion of a distance
- return (wxCoord) (y*m_logicalScaleY*m_userScaleY*m_scaleY);
-}
-
-// ---------------------------------------------------------------------------
-// bit blit
-// ---------------------------------------------------------------------------
-
-bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
- wxCoord width, wxCoord height,
- wxDC *source, wxCoord xsrc, wxCoord ysrc,
- int rop, bool useMask,
- wxCoord xsrcMask, wxCoord ysrcMask)
+bool wxDC::DoStretchBlit(wxCoord xdest, wxCoord ydest,
+ wxCoord dstWidth, wxCoord dstHeight,
+ wxDC *source,
+ wxCoord xsrc, wxCoord ysrc,
+ wxCoord srcWidth, wxCoord srcHeight,
+ int rop, bool useMask,
+ wxCoord xsrcMask, wxCoord ysrcMask)
{
wxCHECK_MSG( source, false, _T("wxDC::Blit(): NULL wxDC pointer") );
if ( bmpSrc.Ok() && (bmpSrc.HasAlpha() ||
(m_selectedBitmap.Ok() && m_selectedBitmap.HasAlpha())) )
{
- if ( AlphaBlt(GetHdc(), xdest, ydest, width, height,
- xsrc, ysrc, GetHdcOf(*source), bmpSrc) )
+ if ( AlphaBlt(GetHdc(), xdest, ydest, dstWidth, dstHeight,
+ xsrc, ysrc, srcWidth, srcHeight, GetHdcOf(*source), bmpSrc) )
return true;
}
if (wxSystemOptions::GetOptionInt(wxT("no-maskblt")) == 0)
#endif
{
- success = ::MaskBlt
- (
+ if ( dstWidth == srcWidth && dstHeight == srcHeight )
+ {
+ success = ::MaskBlt
+ (
GetHdc(),
- xdest, ydest, width, height,
+ xdest, ydest, dstWidth, dstHeight,
GetHdcOf(*source),
xsrc, ysrc,
(HBITMAP)mask->GetMaskBitmap(),
xsrcMask, ysrcMask,
MAKEROP4(dwRop, DSTCOPY)
- ) != 0;
+ ) != 0;
+ }
}
if ( !success )
dc_buffer = (HDC) dcCacheEntry2->m_dc;
wxDCCacheEntry* bitmapCacheEntry = FindBitmapInCache(GetHDC(),
- width, height);
+ dstWidth, dstHeight);
buffer_bmap = (HBITMAP) bitmapCacheEntry->m_bitmap;
#else // !wxUSE_DC_CACHEING
// create a temp buffer bitmap and DCs to access it and the mask
dc_mask = ::CreateCompatibleDC(GetHdcOf(*source));
dc_buffer = ::CreateCompatibleDC(GetHdc());
- buffer_bmap = ::CreateCompatibleBitmap(GetHdc(), width, height);
+ buffer_bmap = ::CreateCompatibleBitmap(GetHdc(), dstWidth, dstHeight);
#endif // wxUSE_DC_CACHEING/!wxUSE_DC_CACHEING
HGDIOBJ hOldMaskBitmap = ::SelectObject(dc_mask, (HBITMAP) mask->GetMaskBitmap());
HGDIOBJ hOldBufferBitmap = ::SelectObject(dc_buffer, buffer_bmap);
// copy dest to buffer
- if ( !::BitBlt(dc_buffer, 0, 0, (int)width, (int)height,
+ if ( !::BitBlt(dc_buffer, 0, 0, (int)dstWidth, (int)dstHeight,
GetHdc(), xdest, ydest, SRCCOPY) )
{
wxLogLastError(wxT("BitBlt"));
}
+#ifndef __WXWINCE__
+ StretchBltModeChanger changeMode(dc_buffer, COLORONCOLOR);
+#endif
+
// copy src to buffer using selected raster op
- if ( !::BitBlt(dc_buffer, 0, 0, (int)width, (int)height,
- GetHdcOf(*source), xsrc, ysrc, dwRop) )
+ if ( !::StretchBlt(dc_buffer, 0, 0, (int)dstWidth, (int)dstHeight,
+ GetHdcOf(*source), xsrc, ysrc, srcWidth, srcHeight, dwRop) )
{
- wxLogLastError(wxT("BitBlt"));
+ 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 ( !::BitBlt(dc_buffer, 0, 0, (int)width, (int)height,
- dc_mask, xsrcMask, ysrcMask, SRCAND) )
+ if ( !::StretchBlt(dc_buffer, 0, 0, (int)dstWidth, (int)dstHeight,
+ dc_mask, xsrcMask, ysrcMask, srcWidth, srcHeight, SRCAND) )
{
- wxLogLastError(wxT("BitBlt"));
+ wxLogLastError(wxT("StretchBlt"));
}
// set unmasked area in dest to BLACK
::SetBkColor(GetHdc(), RGB(0, 0, 0));
::SetTextColor(GetHdc(), RGB(255, 255, 255));
- if ( !::BitBlt(GetHdc(), xdest, ydest, (int)width, (int)height,
- dc_mask, xsrcMask, ysrcMask, SRCAND) )
+ if ( !::StretchBlt(GetHdc(), xdest, ydest, (int)dstWidth, (int)dstHeight,
+ dc_mask, xsrcMask, ysrcMask, srcWidth, srcHeight, SRCAND) )
{
- wxLogLastError(wxT("BitBlt"));
+ wxLogLastError(wxT("StretchBlt"));
}
::SetBkColor(GetHdc(), prevBkCol); // restore colours to original values
::SetTextColor(GetHdc(), prevCol);
// OR buffer to dest
success = ::BitBlt(GetHdc(), xdest, ydest,
- (int)width, (int)height,
+ (int)dstWidth, (int)dstHeight,
dc_buffer, 0, 0, SRCPAINT) != 0;
if ( !success )
{
if ( hDIB > 0 )
{
// reflect ysrc
- ysrc = hDIB - (ysrc + height);
+ ysrc = hDIB - (ysrc + dstHeight);
}
if ( ::StretchDIBits(GetHdc(),
xdest, ydest,
- width, height,
+ dstWidth, dstHeight,
xsrc, ysrc,
- width, height,
+ srcWidth, srcHeight,
ds.dsBm.bmBits,
(LPBITMAPINFO)&ds.dsBmih,
DIB_RGB_COLORS,
- SRCCOPY
+ dwRop
) == (int)GDI_ERROR )
{
// On Win9x this API fails most (all?) of the time, so
if ( !::StretchBlt
(
GetHdc(),
- xdest, ydest, width, height,
+ xdest, ydest, dstWidth, dstHeight,
GetHdcOf(*source),
- xsrc, ysrc, width, height,
+ xsrc, ysrc, srcWidth, srcHeight,
dwRop
) )
{
(
GetHdc(),
xdest, ydest,
- (int)width, (int)height,
+ (int)dstWidth, (int)dstHeight,
GetHdcOf(*source),
xsrc, ysrc,
dwRop
{
WXMICROWIN_CHECK_HDC
- m_logicalScaleX = x;
- m_logicalScaleY = y;
+ wxDCBase::SetLogicalScale(x,y);
}
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
static bool AlphaBlt(HDC hdcDst,
- int x, int y, int width, int height,
- int srcX, int srcY, HDC hdcSrc,
+ int x, int y, int dstWidth, int dstHeight,
+ int srcX, int srcY,
+ int srcWidth, int srcHeight,
+ HDC hdcSrc,
const wxBitmap& bmp)
{
wxASSERT_MSG( bmp.Ok() && bmp.HasAlpha(), _T("AlphaBlt(): invalid bitmap") );
HDC,int,int,int,int,
BLENDFUNCTION);
- static AlphaBlend_t pfnAlphaBlend = wxMSIMG32_SYMBOL(AlphaBlend);
+ static AlphaBlend_t
+ pfnAlphaBlend = (AlphaBlend_t)wxMSIMG32DLL.GetSymbol(_T("AlphaBlend"));
if ( pfnAlphaBlend )
{
BLENDFUNCTION bf;
bf.SourceConstantAlpha = 0xff;
bf.AlphaFormat = AC_SRC_ALPHA;
- if ( pfnAlphaBlend(hdcDst, x, y, width, height,
- hdcSrc, srcX, srcY, width, height,
+ if ( pfnAlphaBlend(hdcDst, x, y, dstWidth, dstHeight,
+ hdcSrc, srcX, srcY, srcWidth, srcHeight,
bf) )
{
// skip wxAlphaBlend() call below
// AlphaBlend() unavailable of failed: use our own (probably much slower)
// implementation
#ifdef wxHAVE_RAW_BITMAP
- wxAlphaBlend(hdcDst, x, y, width, height, srcX, srcY, bmp);
+ wxAlphaBlend(hdcDst, x, y, dstWidth, dstHeight, srcX, srcY, srcWidth, srcHeight, bmp);
return true;
#else // !wxHAVE_RAW_BITMAP
static void
wxAlphaBlend(HDC hdcDst, int xDst, int yDst,
- int w, int h,
- int srcX, int srcY, const wxBitmap& bmpSrc)
+ int dstWidth, int dstHeight,
+ int srcX, int srcY,
+ int srcWidth, int srcHeight,
+ const wxBitmap& bmpSrc)
{
// get the destination DC pixels
- wxBitmap bmpDst(w, h, 32 /* force creating RGBA DIB */);
+ wxBitmap bmpDst(dstWidth, dstHeight, 32 /* force creating RGBA DIB */);
MemoryHDC hdcMem;
SelectInHDC select(hdcMem, GetHbitmapOf(bmpDst));
- if ( !::BitBlt(hdcMem, 0, 0, w, h, hdcDst, xDst, yDst, SRCCOPY) )
+ if ( !::BitBlt(hdcMem, 0, 0, dstWidth, dstHeight, hdcDst, xDst, yDst, SRCCOPY) )
{
wxLogLastError(_T("BitBlt"));
}
wxAlphaPixelData::Iterator pDst(dataDst),
pSrc(dataSrc);
- pSrc.Offset(dataSrc, srcX, srcY);
- for ( int y = 0; y < h; y++ )
+ for ( int y = 0; y < dstHeight; y++ )
{
- wxAlphaPixelData::Iterator pDstRowStart = pDst,
- pSrcRowStart = pSrc;
+ wxAlphaPixelData::Iterator pDstRowStart = pDst;
- for ( int x = 0; x < w; x++ )
+ for ( int x = 0; x < dstWidth; x++ )
{
+ // source is point sampled, Alpha StretchBlit is ugly on Win95
+ // (but does not impact performance)
+ pSrc.MoveTo(dataSrc, srcX + (srcWidth*x/dstWidth), srcY + (srcHeight*y/dstHeight));
+
// note that source bitmap uses premultiplied alpha (as required by
// the real AlphaBlend)
const unsigned beta = 255 - pSrc.Alpha();
pDst.Green() = pSrc.Green() + (beta * pDst.Green() + 127) / 255;
++pDst;
- ++pSrc;
}
pDst = pDstRowStart;
- pSrc = pSrcRowStart;
pDst.OffsetY(dataDst, 1);
- pSrc.OffsetY(dataSrc, 1);
}
// and finally blit them back to the destination DC
- if ( !::BitBlt(hdcDst, xDst, yDst, w, h, hdcMem, 0, 0, SRCCOPY) )
+ if ( !::BitBlt(hdcDst, xDst, yDst, dstWidth, dstHeight, hdcMem, 0, 0, SRCCOPY) )
{
wxLogLastError(_T("BitBlt"));
}
#if defined(GRADIENT_FILL_RECT_H) && wxUSE_DYNLIB_CLASS
typedef BOOL
(WINAPI *GradientFill_t)(HDC, PTRIVERTEX, ULONG, PVOID, ULONG, ULONG);
- static GradientFill_t pfnGradientFill = wxMSIMG32_SYMBOL(GradientFill);
+ static GradientFill_t pfnGradientFill =
+ (GradientFill_t)wxMSIMG32DLL.GetSymbol(_T("GradientFill"));
if ( pfnGradientFill )
{
vertices[0].x = rect.GetLeft();
vertices[0].y = rect.GetTop();
- vertices[1].x = rect.GetRight();
- vertices[1].y = rect.GetBottom();
+ vertices[1].x = rect.GetRight()+1;
+ vertices[1].y = rect.GetBottom()+1;
vertices[firstVertex].Red = (COLOR16)(initialColour.Red() << 8);
vertices[firstVertex].Green = (COLOR16)(initialColour.Green() << 8);
wxDCBase::DoGradientFillLinear(rect, initialColour, destColour, nDirection);
}
+
+#if wxUSE_DYNLIB_CLASS
+
+static DWORD wxGetDCLayout(HDC hdc)
+{
+ typedef DWORD (WINAPI *GetLayout_t)(HDC);
+ static GetLayout_t
+ pfnGetLayout = (GetLayout_t)wxGDI32DLL.GetSymbol(_T("GetLayout"));
+
+ return pfnGetLayout ? pfnGetLayout(hdc) : (DWORD)-1;
+}
+
+wxLayoutDirection wxDC::GetLayoutDirection() const
+{
+ DWORD layout = wxGetDCLayout(GetHdc());
+
+ if ( layout == (DWORD)-1 )
+ return wxLayout_Default;
+
+ return layout & LAYOUT_RTL ? wxLayout_RightToLeft : wxLayout_LeftToRight;
+}
+
+void wxDC::SetLayoutDirection(wxLayoutDirection dir)
+{
+ typedef DWORD (WINAPI *SetLayout_t)(HDC, DWORD);
+ static SetLayout_t
+ pfnSetLayout = (SetLayout_t)wxGDI32DLL.GetSymbol(_T("SetLayout"));
+ if ( !pfnSetLayout )
+ return;
+
+ if ( dir == wxLayout_Default )
+ {
+ dir = wxTheApp->GetLayoutDirection();
+ if ( dir == wxLayout_Default )
+ return;
+ }
+
+ DWORD layout = wxGetDCLayout(GetHdc());
+ if ( dir == wxLayout_RightToLeft )
+ layout |= LAYOUT_RTL;
+ else
+ layout &= ~LAYOUT_RTL;
+
+ pfnSetLayout(GetHdc(), layout);
+}
+
+#else // !wxUSE_DYNLIB_CLASS
+
+// we can't provide RTL support without dynamic loading, so stub it out
+wxLayoutDirection wxDC::GetLayoutDirection() const
+{
+ return wxLayout_Default;
+}
+
+void wxDC::SetLayoutDirection(wxLayoutDirection WXUNUSED(dir))
+{
+}
+
+#endif // wxUSE_DYNLIB_CLASS/!wxUSE_DYNLIB_CLASS
projects / wxWidgets.git / blobdiff