X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/57bd4c6031d438f11af0ec540136f49a928b923c..d485bda109d5ef0fef36a3f737549e9b9f54baab:/src/msw/dc.cpp diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp index 4f2367b426..b828f025e1 100644 --- a/src/msw/dc.cpp +++ b/src/msw/dc.cpp @@ -28,33 +28,39 @@ #include "wx/msw/wrapcdlg.h" #include "wx/image.h" #include "wx/window.h" - #include "wx/dc.h" #include "wx/utils.h" #include "wx/dialog.h" #include "wx/app.h" #include "wx/bitmap.h" #include "wx/dcmemory.h" #include "wx/log.h" + #include "wx/math.h" #include "wx/icon.h" #include "wx/dcprint.h" #include "wx/module.h" #endif +#include "wx/msw/dc.h" #include "wx/sysopt.h" #include "wx/dynlib.h" -#ifdef wxHAVE_RAW_BITMAP -#include "wx/rawbmp.h" +#ifdef wxHAS_RAW_BITMAP + #include "wx/rawbmp.h" #endif #include -#ifndef __WIN32__ - #include -#endif +#include "wx/msw/private/dc.h" +#include "wx/private/textmeasure.h" + +using namespace wxMSWImpl; #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 */ @@ -72,16 +78,15 @@ #define WXMICROWIN_CHECK_HDC_RET(x) #endif -IMPLEMENT_ABSTRACT_CLASS(wxDC, wxDCBase) +IMPLEMENT_ABSTRACT_CLASS(wxMSWDCImpl, wxDCImpl) // --------------------------------------------------------------------------- // constants // --------------------------------------------------------------------------- -static const int VIEWPORT_EXTENT = 1000; - -static const int MM_POINTS = 9; -static const int MM_METRIC = 10; +// The device space in Win32 GDI measures 2^27*2^27 , so we use 2^27-1 as the +// maximal possible view port extent. +static const int VIEWPORT_EXTENT = 134217727; // ROPs which don't have standard names (see "Ternary Raster Operations" in the // MSDN docs for how this and other numbers in wxDC::Blit() are obtained) @@ -126,18 +131,39 @@ static inline double DegToRad(double deg) { return (deg * M_PI) / 180.0; } // 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 +#ifdef wxHAS_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 +#endif // wxHAS_RAW_BITMAP + +namespace wxMSW +{ + +// Wrappers for the dynamically loaded {Set,Get}Layout() functions. They work +// in exactly the same way as the standard functions and return GDI_ERROR if +// they're not actually available. +DWORD GetLayout(HDC hdc); +DWORD SetLayout(HDC hdc, DWORD dwLayout); + +// Create a compatible HDC and copy the layout of the source DC to it. This is +// necessary in order to draw bitmaps (which are usually blitted from a +// temporary compatible memory DC to the real target DC) using the same layout. +HDC CreateCompatibleDCWithLayout(HDC hdc); + +} // namespace wxMSW // ---------------------------------------------------------------------------- // private classes @@ -147,45 +173,47 @@ wxAlphaBlend(HDC hdcDst, int x, int y, int w, int h, // 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(wxDC& dc); - ~wxColourChanger(); + wxBrushAttrsSetter(wxMSWDCImpl& dc); private: - wxDC& m_dc; + wxDECLARE_NO_COPY_CLASS(wxBrushAttrsSetter); +}; - COLORREF m_colFgOld, m_colBgOld; +#ifdef __WXWINCE__ - bool m_changed; +#define SET_STRETCH_BLT_MODE(hdc) - DECLARE_NO_COPY_CLASS(wxColourChanger) -}; +#else // !__WXWINCE__ -// this class saves the old stretch blit mode during its life time +// this class sets the stretch blit mode to COLORONCOLOR during its lifetime +// +// don't use it directly, use SET_STRETCH_BLT_MODE() macro instead as it +// expands to nothing under WinCE which doesn't have SetStretchBltMode() class StretchBltModeChanger { public: - StretchBltModeChanger(HDC hdc, - int WXUNUSED_IN_WINCE(mode)) + StretchBltModeChanger(HDC hdc) : m_hdc(hdc) { -#ifndef __WXWINCE__ - m_modeOld = ::SetStretchBltMode(m_hdc, mode); + m_modeOld = ::SetStretchBltMode(m_hdc, COLORONCOLOR); if ( !m_modeOld ) - wxLogLastError(_T("SetStretchBltMode")); -#endif + { + wxLogLastError(wxT("SetStretchBltMode")); + } } ~StretchBltModeChanger() { -#ifndef __WXWINCE__ if ( !::SetStretchBltMode(m_hdc, m_modeOld) ) - wxLogLastError(_T("SetStretchBltMode")); -#endif + { + wxLogLastError(wxT("SetStretchBltMode")); + } } private: @@ -193,103 +221,218 @@ private: int m_modeOld; - DECLARE_NO_COPY_CLASS(StretchBltModeChanger) + wxDECLARE_NO_COPY_CLASS(StretchBltModeChanger); }; -// support for dynamic loading of msimg32.dll which we use for some functions -class wxMSImg32DLL +#define SET_STRETCH_BLT_MODE(hdc) \ + StretchBltModeChanger wxMAKE_UNIQUE_NAME(stretchModeChanger)(hdc) + +#endif // __WXWINCE__/!__WXWINCE__ + +#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; + } + + void Unload() + { + if ( m_dll.IsLoaded() ) + { + m_dll.Unload(); + } + } + +private: + wxDynamicLibrary m_dll; + const wxChar *m_dllName; +}; + +static wxOnceOnlyDLLLoader wxMSIMG32DLL(wxT("msimg32")); + +// we must ensure that DLLs are unloaded before the static objects cleanup time +// because we may hit the notorious DllMain() dead lock in this case if wx is +// used as a DLL (attempting to unload another DLL from inside DllMain() hangs +// under Windows because it tries to reacquire the same lock) +class wxGDIDLLsCleanupModule : public wxModule +{ +public: + virtual bool OnInit() { return true; } + virtual void OnExit() { wxMSIMG32DLL.Unload(); } + +private: + DECLARE_DYNAMIC_CLASS(wxGDIDLLsCleanupModule) +}; + +IMPLEMENT_DYNAMIC_CLASS(wxGDIDLLsCleanupModule, wxModule) + +namespace +{ + +#if wxUSE_DC_TRANSFORM_MATRIX + +// Class used to dynamically load world transform related API functions. +class GdiWorldTransformFuncs +{ +public: + static bool IsOk() + { + if ( !ms_worldTransformSymbolsLoaded ) + LoadWorldTransformSymbols(); + + return ms_pfnSetGraphicsMode && + ms_pfnSetWorldTransform && + ms_pfnGetWorldTransform && + ms_pfnModifyWorldTransform; + } + + typedef int (WINAPI *SetGraphicsMode_t)(HDC, int); + static SetGraphicsMode_t SetGraphicsMode() + { + if ( !ms_worldTransformSymbolsLoaded ) + LoadWorldTransformSymbols(); + + return ms_pfnSetGraphicsMode; + } + + typedef BOOL (WINAPI *SetWorldTransform_t)(HDC, const XFORM *); + static SetWorldTransform_t SetWorldTransform() + { + if ( !ms_worldTransformSymbolsLoaded ) + LoadWorldTransformSymbols(); + + return ms_pfnSetWorldTransform; + } + + typedef BOOL (WINAPI *GetWorldTransform_t)(HDC, LPXFORM); + static GetWorldTransform_t GetWorldTransform() + { + if ( !ms_worldTransformSymbolsLoaded ) + LoadWorldTransformSymbols(); + + return ms_pfnGetWorldTransform; + } + + typedef BOOL (WINAPI *ModifyWorldTransform_t)(HDC, const XFORM *, DWORD); + static ModifyWorldTransform_t ModifyWorldTransform() + { + if ( !ms_worldTransformSymbolsLoaded ) + LoadWorldTransformSymbols(); + + return ms_pfnModifyWorldTransform; } private: - static wxDynamicLibrary ms_dll; - static bool ms_triedToLoad; + static void LoadWorldTransformSymbols() + { + wxDynamicLibrary dll(wxT("gdi32.dll")); + + wxDL_INIT_FUNC(ms_pfn, SetGraphicsMode, dll); + wxDL_INIT_FUNC(ms_pfn, SetWorldTransform, dll); + wxDL_INIT_FUNC(ms_pfn, GetWorldTransform, dll); + wxDL_INIT_FUNC(ms_pfn, ModifyWorldTransform, dll); + + ms_worldTransformSymbolsLoaded = true; + } + + static SetGraphicsMode_t ms_pfnSetGraphicsMode; + static SetWorldTransform_t ms_pfnSetWorldTransform; + static GetWorldTransform_t ms_pfnGetWorldTransform; + static ModifyWorldTransform_t ms_pfnModifyWorldTransform; + + static bool ms_worldTransformSymbolsLoaded; }; -wxDynamicLibrary wxMSImg32DLL::ms_dll; -bool wxMSImg32DLL::ms_triedToLoad = false; +GdiWorldTransformFuncs::SetGraphicsMode_t + GdiWorldTransformFuncs::ms_pfnSetGraphicsMode = NULL; +GdiWorldTransformFuncs::SetWorldTransform_t + GdiWorldTransformFuncs::ms_pfnSetWorldTransform = NULL; +GdiWorldTransformFuncs::GetWorldTransform_t + GdiWorldTransformFuncs::ms_pfnGetWorldTransform = NULL; +GdiWorldTransformFuncs::ModifyWorldTransform_t + GdiWorldTransformFuncs::ms_pfnModifyWorldTransform = NULL; + +bool GdiWorldTransformFuncs::ms_worldTransformSymbolsLoaded = false; + +#endif // wxUSE_DC_TRANSFORM_MATRIX -// 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)) +} // anonymous namespace + +#endif // wxUSE_DYNLIB_CLASS // =========================================================================== // implementation // =========================================================================== // ---------------------------------------------------------------------------- -// wxColourChanger +// wxBrushAttrsSetter // ---------------------------------------------------------------------------- -wxColourChanger::wxColourChanger(wxDC& dc) : m_dc(dc) +wxBrushAttrsSetter::wxBrushAttrsSetter(wxMSWDCImpl& dc) + : wxBkModeChanger(GetHdcOf(dc)), + wxTextColoursChanger(GetHdcOf(dc)) { const wxBrush& brush = dc.GetBrush(); - if ( brush.Ok() && 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.Ok() ) - { - ::SetBkColor(hdc, colFg.GetPixel()); - } + wxTextColoursChanger::Change(dc.GetTextBackground(), + dc.GetTextForeground()); - const wxColour& colBg = dc.GetTextBackground(); - if ( colBg.Ok() ) - { - ::SetTextColor(hdc, colBg.GetPixel()); - } - - 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; } // --------------------------------------------------------------------------- -// wxDC +// wxMSWDCImpl // --------------------------------------------------------------------------- -wxDC::~wxDC() +wxMSWDCImpl::wxMSWDCImpl( wxDC *owner, WXHDC hDC ) : + wxDCImpl( owner ) +{ + Init(); + m_hDC = hDC; +} + +wxMSWDCImpl::~wxMSWDCImpl() { if ( m_hDC != 0 ) { @@ -303,9 +446,9 @@ wxDC::~wxDC() } else // we don't own our HDC { - if (m_canvas) + if (m_window) { - ::ReleaseDC(GetHwndOf(m_canvas), GetHdc()); + ::ReleaseDC(GetHwndOf(m_window), GetHdc()); } else { @@ -319,19 +462,17 @@ wxDC::~wxDC() // This will select current objects out of the DC, // which is what you have to do before deleting the // DC. -void wxDC::SelectOldObjects(WXHDC dc) +void wxMSWDCImpl::SelectOldObjects(WXHDC dc) { if (dc) { if (m_oldBitmap) { ::SelectObject((HDC) dc, (HBITMAP) m_oldBitmap); -#ifdef __WXDEBUG__ - if (m_selectedBitmap.Ok()) + if (m_selectedBitmap.IsOk()) { m_selectedBitmap.SetSelectedInto(NULL); } -#endif } m_oldBitmap = 0; if (m_oldPen) @@ -373,7 +514,7 @@ void wxDC::SelectOldObjects(WXHDC dc) // clipping // --------------------------------------------------------------------------- -void wxDC::UpdateClipBox() +void wxMSWDCImpl::UpdateClipBox() { WXMICROWIN_CHECK_HDC @@ -387,25 +528,25 @@ void wxDC::UpdateClipBox() } void -wxDC::DoGetClippingBox(wxCoord *x, wxCoord *y, wxCoord *w, wxCoord *h) const +wxMSWDCImpl::DoGetClippingBox(wxCoord *x, wxCoord *y, wxCoord *w, wxCoord *h) const { // check if we should try to retrieve the clipping region possibly not set // by our SetClippingRegion() but preset by Windows:this can only happen // when we're associated with an existing HDC usign SetHDC(), see there if ( m_clipping && !m_clipX1 && !m_clipX2 ) { - wxDC *self = wxConstCast(this, wxDC); + wxMSWDCImpl *self = wxConstCast(this, wxMSWDCImpl); self->UpdateClipBox(); if ( !m_clipX1 && !m_clipX2 ) self->m_clipping = false; } - wxDCBase::DoGetClippingBox(x, y, w, h); + wxDCImpl::DoGetClippingBox(x, y, w, h); } -// common part of DoSetClippingRegion() and DoSetClippingRegionAsRegion() -void wxDC::SetClippingHrgn(WXHRGN hrgn) +// common part of DoSetClippingRegion() and DoSetDeviceClippingRegion() +void wxMSWDCImpl::SetClippingHrgn(WXHRGN hrgn) { wxCHECK_RET( hrgn, wxT("invalid clipping region") ); @@ -439,7 +580,7 @@ void wxDC::SetClippingHrgn(WXHRGN hrgn) #else // !WinCE if ( ::ExtSelectClipRgn(GetHdc(), (HRGN)hrgn, RGN_AND) == ERROR ) { - wxLogLastError(_T("ExtSelectClipRgn")); + wxLogLastError(wxT("ExtSelectClipRgn")); return; } @@ -450,7 +591,7 @@ void wxDC::SetClippingHrgn(WXHRGN hrgn) UpdateClipBox(); } -void wxDC::DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h) +void wxMSWDCImpl::DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h) { // the region coords are always the device ones, so do the translation // manually @@ -462,7 +603,7 @@ void wxDC::DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h) LogicalToDeviceY(y + h)); if ( !hrgn ) { - wxLogLastError(_T("CreateRectRgn")); + wxLogLastError(wxT("CreateRectRgn")); } else { @@ -472,12 +613,12 @@ void wxDC::DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h) } } -void wxDC::DoSetClippingRegionAsRegion(const wxRegion& region) +void wxMSWDCImpl::DoSetDeviceClippingRegion(const wxRegion& region) { SetClippingHrgn(region.GetHRGN()); } -void wxDC::DestroyClippingRegion() +void wxMSWDCImpl::DestroyClippingRegion() { WXMICROWIN_CHECK_HDC @@ -501,19 +642,19 @@ void wxDC::DestroyClippingRegion() #endif } - wxDCBase::DestroyClippingRegion(); + wxDCImpl::DestroyClippingRegion(); } // --------------------------------------------------------------------------- // query capabilities // --------------------------------------------------------------------------- -bool wxDC::CanDrawBitmap() const +bool wxMSWDCImpl::CanDrawBitmap() const { return true; } -bool wxDC::CanGetTextExtent() const +bool wxMSWDCImpl::CanGetTextExtent() const { #ifdef __WXMICROWIN__ // TODO Extend MicroWindows' GetDeviceCaps function @@ -526,7 +667,7 @@ bool wxDC::CanGetTextExtent() const #endif } -int wxDC::GetDepth() const +int wxMSWDCImpl::GetDepth() const { WXMICROWIN_CHECK_HDC_RET(16) @@ -537,26 +678,26 @@ int wxDC::GetDepth() const // drawing // --------------------------------------------------------------------------- -void wxDC::Clear() +void wxMSWDCImpl::Clear() { WXMICROWIN_CHECK_HDC RECT rect; - if ( m_canvas ) + if (m_window) { - GetClientRect((HWND) m_canvas->GetHWND(), &rect); + GetClientRect((HWND) m_window->GetHWND(), &rect); } else { // No, I think we should simply ignore this if printing on e.g. // a printer DC. - // wxCHECK_RET( m_selectedBitmap.Ok(), wxT("this DC can't be cleared") ); - if (!m_selectedBitmap.Ok()) + // wxCHECK_RET( m_selectedBitmap.IsOk(), wxT("this DC can't be cleared") ); + if (!m_selectedBitmap.IsOk()) 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__ @@ -568,23 +709,13 @@ void wxDC::Clear() ::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), +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; @@ -618,11 +749,11 @@ bool wxDC::DoFloodFill(wxCoord WXUNUSED_IN_WINCE(x), #endif } -bool wxDC::DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const +bool wxMSWDCImpl::DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const { WXMICROWIN_CHECK_HDC_RET(false) - wxCHECK_MSG( col, false, _T("NULL colour parameter in wxDC::GetPixel") ); + wxCHECK_MSG( col, false, wxT("NULL colour parameter in wxMSWDCImpl::GetPixel") ); // get the color of the pixel COLORREF pixelcolor = ::GetPixel(GetHdc(), XLOG2DEV(x), YLOG2DEV(y)); @@ -632,7 +763,7 @@ bool wxDC::DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const return true; } -void wxDC::DoCrossHair(wxCoord x, wxCoord y) +void wxMSWDCImpl::DoCrossHair(wxCoord x, wxCoord y) { WXMICROWIN_CHECK_HDC @@ -648,7 +779,7 @@ void wxDC::DoCrossHair(wxCoord x, wxCoord y) CalcBoundingBox(x2, y2); } -void wxDC::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) +void wxMSWDCImpl::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) { WXMICROWIN_CHECK_HDC @@ -660,32 +791,32 @@ void wxDC::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) // Draws an arc of a circle, centred on (xc, yc), with starting point (x1, y1) // and ending at (x2, y2) -void wxDC::DoDrawArc(wxCoord x1, wxCoord y1, +void wxMSWDCImpl::DoDrawArc(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCoord xc, wxCoord yc) { + double dx = xc - x1; + double dy = yc - y1; + wxCoord r = (wxCoord)sqrt(dx*dx + dy*dy); + + #ifdef __WXWINCE__ // Slower emulation since WinCE doesn't support Pie and Arc - double r = sqrt( (x1-xc)*(x1-xc) + (y1-yc)*(y1-yc) ); double sa = acos((x1-xc)/r)/M_PI*180; // between 0 and 180 - if( y1>yc ) sa = -sa; // below center + if( y1>yc ) + sa = -sa; // below center double ea = atan2(yc-y2, x2-xc)/M_PI*180; DoDrawEllipticArcRot( xc-r, yc-r, 2*r, 2*r, sa, ea ); #else WXMICROWIN_CHECK_HDC - wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling - - double dx = xc - x1; - double dy = yc - y1; - double radius = (double)sqrt(dx*dx+dy*dy); - wxCoord r = (wxCoord)radius; + wxBrushAttrsSetter cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling // treat the special case of full circle separately if ( x1 == x2 && y1 == y2 ) { - DrawEllipse(xc - r, yc - r, 2*r, 2*r); + GetOwner()->DrawEllipse(xc - r, yc - r, 2*r, 2*r); return; } @@ -695,14 +826,16 @@ void wxDC::DoDrawArc(wxCoord x1, wxCoord y1, wxCoord yy2 = YLOG2DEV(y2); wxCoord xxc = XLOG2DEV(xc); wxCoord yyc = YLOG2DEV(yc); - wxCoord ray = (wxCoord) sqrt(double((xxc-xx1)*(xxc-xx1)+(yyc-yy1)*(yyc-yy1))); + dx = xxc - xx1; + dy = yyc - yy1; + wxCoord ray = (wxCoord)sqrt(dx*dx + dy*dy); wxCoord xxx1 = (wxCoord) (xxc-ray); wxCoord yyy1 = (wxCoord) (yyc-ray); wxCoord xxx2 = (wxCoord) (xxc+ray); wxCoord yyy2 = (wxCoord) (yyc+ray); - if ( m_brush.Ok() && m_brush.GetStyle() != wxTRANSPARENT ) + if ( m_brush.IsNonTransparent() ) { // Have to add 1 to bottom-right corner of rectangle // to make semi-circles look right (crooked line otherwise). @@ -721,7 +854,7 @@ void wxDC::DoDrawArc(wxCoord x1, wxCoord y1, #endif } -void wxDC::DoDrawCheckMark(wxCoord x1, wxCoord y1, +void wxMSWDCImpl::DoDrawCheckMark(wxCoord x1, wxCoord y1, wxCoord width, wxCoord height) { // cases when we don't have DrawFrameControl() @@ -738,7 +871,7 @@ void wxDC::DoDrawCheckMark(wxCoord x1, wxCoord y1, rect.bottom = y2; #ifdef __WXWINCE__ - DrawFrameControl(GetHdc(), &rect, DFC_BUTTON, DFCS_BUTTONCHECK); + DrawFrameControl(GetHdc(), &rect, DFC_BUTTON, DFCS_BUTTONCHECK | DFCS_CHECKED); #else DrawFrameControl(GetHdc(), &rect, DFC_MENU, DFCS_MENUCHECK); #endif @@ -748,12 +881,12 @@ void wxDC::DoDrawCheckMark(wxCoord x1, wxCoord y1, #endif // Microwin/Normal } -void wxDC::DoDrawPoint(wxCoord x, wxCoord y) +void wxMSWDCImpl::DoDrawPoint(wxCoord x, wxCoord y) { WXMICROWIN_CHECK_HDC COLORREF color = 0x00ffffff; - if (m_pen.Ok()) + if (m_pen.IsOk()) { color = m_pen.GetColour().GetPixel(); } @@ -763,15 +896,15 @@ void wxDC::DoDrawPoint(wxCoord x, wxCoord y) CalcBoundingBox(x, y); } -void wxDC::DoDrawPolygon(int n, - wxPoint points[], +void wxMSWDCImpl::DoDrawPolygon(int n, + const 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) @@ -811,19 +944,19 @@ void wxDC::DoDrawPolygon(int n, } void -wxDC::DoDrawPolyPolygon(int n, - int count[], - wxPoint points[], +wxMSWDCImpl::DoDrawPolyPolygon(int n, + const int count[], + const wxPoint points[], wxCoord xoffset, wxCoord yoffset, - int fillStyle) + wxPolygonFillMode fillStyle) { #ifdef __WXWINCE__ - wxDCBase::DoDrawPolyPolygon(n, count, points, xoffset, yoffset, fillStyle); + 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]; @@ -865,7 +998,7 @@ wxDC::DoDrawPolyPolygon(int n, // __WXWINCE__ } -void wxDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset) +void wxMSWDCImpl::DoDrawLines(int n, const wxPoint points[], wxCoord xoffset, wxCoord yoffset) { WXMICROWIN_CHECK_HDC @@ -894,53 +1027,40 @@ void wxDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset } } -void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) +void wxMSWDCImpl::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { 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; - if ((m_logicalFunction == wxCOPY) && (m_pen.GetStyle() == wxTRANSPARENT)) - { - RECT rect; - rect.left = XLOG2DEV(x); - rect.top = YLOG2DEV(y); - rect.right = XLOG2DEV(x2); - rect.bottom = YLOG2DEV(y2); - (void)FillRect(GetHdc(), &rect, (HBRUSH)m_brush.GetResourceHandle() ); - } - else - { - // 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 + wxCoord x2dev = XLOG2DEV(x2), + y2dev = YLOG2DEV(y2); - // I wonder if this shouldn´t be done after the LOG2DEV() conversions. RR. - if ( m_pen.GetStyle() == wxTRANSPARENT ) - { - // Apparently not needed for WinCE (see e.g. Life! demo) + // Windows (but not Windows CE) 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 #ifndef __WXWINCE__ - x2++; - y2++; -#endif - } - - (void)Rectangle(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2)); + if ( m_pen.IsTransparent() ) + { + x2dev++; + y2dev++; } +#endif // !__WXWINCE__ + (void)Rectangle(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), x2dev, y2dev); CalcBoundingBox(x, y); CalcBoundingBox(x2, y2); } -void wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius) +void wxMSWDCImpl::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius) { 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' @@ -957,7 +1077,7 @@ void wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord h // 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.IsTransparent() ) { x2++; y2++; @@ -970,28 +1090,29 @@ void wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord h CalcBoundingBox(x2, y2); } -void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) +void wxMSWDCImpl::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { 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; - (void)Ellipse(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2)); + // Problem: Windows GDI Ellipse() with x2-x == y2-y == 3 and transparent + // pen doesn't draw anything. Should we provide a workaround? + + ::Ellipse(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2)); CalcBoundingBox(x, y); CalcBoundingBox(x2, y2); } -#if wxUSE_SPLINES -void wxDC::DoDrawSpline(wxList *points) +#if wxUSE_SPLINES && !defined(__WXWINCE__) +void wxMSWDCImpl::DoDrawSpline(const wxPointList *points) { -#ifdef __WXWINCE__ - // WinCE does not support ::PolyBezier so use generic version - wxDCBase::DoDrawSpline(points); -#else // quadratic b-spline to cubic bezier spline conversion // // quadratic spline with control points P0,P1,P2 @@ -1018,8 +1139,8 @@ void wxDC::DoDrawSpline(wxList *points) size_t bezier_pos = 0; wxCoord x1, y1, x2, y2, cx1, cy1, cx4, cy4; - wxList::compatibility_iterator node = points->GetFirst(); - wxPoint *p = (wxPoint *)node->GetData(); + wxPointList::compatibility_iterator node = points->GetFirst(); + wxPoint *p = node->GetData(); lppt[ bezier_pos ].x = x1 = p->x; lppt[ bezier_pos ].y = y1 = p->y; bezier_pos++; @@ -1027,7 +1148,7 @@ void wxDC::DoDrawSpline(wxList *points) bezier_pos++; node = node->GetNext(); - p = (wxPoint *)node->GetData(); + p = node->GetData(); x2 = p->x; y2 = p->y; @@ -1039,11 +1160,11 @@ void wxDC::DoDrawSpline(wxList *points) lppt[ bezier_pos ] = lppt[ bezier_pos-1 ]; bezier_pos++; -#if !wxUSE_STL +#if !wxUSE_STD_CONTAINERS while ((node = node->GetNext()) != NULL) #else while ((node = node->GetNext())) -#endif // !wxUSE_STL +#endif // !wxUSE_STD_CONTAINERS { p = (wxPoint *)node->GetData(); x1 = x2; @@ -1080,12 +1201,11 @@ void wxDC::DoDrawSpline(wxList *points) ::PolyBezier( GetHdc(), lppt, bezier_pos ); free(lppt); -#endif } -#endif +#endif // wxUSE_SPLINES // Chris Breeze 20/5/98: first implementation of DrawEllipticArc on Windows -void wxDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea) +void wxMSWDCImpl::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea) { #ifdef __WXWINCE__ DoDrawEllipticArcRot( x, y, w, h, sa, ea ); @@ -1093,7 +1213,7 @@ void wxDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,d 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; @@ -1111,6 +1231,17 @@ void wxDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,d rx2 += (int)(100.0 * abs(w) * cos(ea)); ry2 -= (int)(100.0 * abs(h) * m_signY * sin(ea)); + // Swap start and end positions if the end angle is less than the start angle. + if (ea < sa) { + int temp; + temp = rx2; + rx2 = rx1; + rx1 = temp; + temp = ry2; + ry2 = ry1; + ry1 = temp; + } + // draw pie with NULL_PEN first and then outline otherwise a line is // drawn from the start and end points to the centre HPEN hpenOld = (HPEN) ::SelectObject(GetHdc(), (HPEN) ::GetStockObject(NULL_PEN)); @@ -1135,11 +1266,11 @@ void wxDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,d #endif } -void wxDC::DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y) +void wxMSWDCImpl::DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y) { WXMICROWIN_CHECK_HDC - wxCHECK_RET( icon.Ok(), wxT("invalid icon in DrawIcon") ); + wxCHECK_RET( icon.IsOk(), wxT("invalid icon in DrawIcon") ); #ifdef __WIN32__ ::DrawIconEx(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), GetHiconOf(icon), icon.GetWidth(), icon.GetHeight(), 0, NULL, DI_NORMAL); @@ -1151,11 +1282,11 @@ void wxDC::DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y) CalcBoundingBox(x + icon.GetWidth(), y + icon.GetHeight()); } -void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask ) +void wxMSWDCImpl::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask ) { WXMICROWIN_CHECK_HDC - wxCHECK_RET( bmp.Ok(), _T("invalid bitmap in wxDC::DrawBitmap") ); + wxCHECK_RET( bmp.IsOk(), wxT("invalid bitmap in wxMSWDCImpl::DrawBitmap") ); int width = bmp.GetWidth(), height = bmp.GetHeight(); @@ -1171,10 +1302,12 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask 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; } + SET_STRETCH_BLT_MODE(GetHdc()); + if ( useMask ) { wxMask *mask = bmp.GetMask(); @@ -1193,16 +1326,23 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask #ifdef __WIN32__ // use MaskBlt() with ROP which doesn't do anything to dst in the mask // points + bool ok = false; + +#if wxUSE_SYSTEM_OPTIONS // On some systems, MaskBlt succeeds yet is much much slower // than the wxWidgets fall-back implementation. So we need // to be able to switch this on and off at runtime. - bool ok = false; -#if wxUSE_SYSTEM_OPTIONS - if (wxSystemOptions::GetOptionInt(wxT("no-maskblt")) == 0) -#endif + // + // NB: don't query the value of the option every time but do it only + // once as otherwise it can have real (and bad) performance + // implications (see #11172) + static bool + s_maskBltAllowed = wxSystemOptions::GetOptionInt("no-maskblt") == 0; + if ( s_maskBltAllowed ) +#endif // wxUSE_SYSTEM_OPTIONS { HDC cdc = GetHdc(); - HDC hdcMem = ::CreateCompatibleDC(GetHdc()); + HDC hdcMem = wxMSW::CreateCompatibleDCWithLayout(cdc); HGDIOBJ hOldBitmap = ::SelectObject(hdcMem, GetHbitmapOf(bmp)); #if wxUSE_PALETTE wxPalette *pal = bmp.GetPalette(); @@ -1230,34 +1370,25 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask if ( !ok ) #endif // Win32 { - // Rather than reproduce wxDC::Blit, let's do it at the wxWin API + // Rather than reproduce wxMSWDCImpl::Blit, let's do it at the wxWin API // level wxMemoryDC memDC; - memDC.SelectObject(bmp); - Blit(x, y, width, height, &memDC, 0, 0, wxCOPY, useMask); + memDC.SetLayoutDirection(GetLayoutDirection()); + memDC.SelectObjectAsSource(bmp); - memDC.SelectObject(wxNullBitmap); + GetOwner()->Blit(x, y, width, height, &memDC, 0, 0, wxCOPY, useMask); } } else // no mask, just use BitBlt() { HDC cdc = GetHdc(); - HDC memdc = ::CreateCompatibleDC( cdc ); + HDC memdc = wxMSW::CreateCompatibleDCWithLayout( cdc ); HBITMAP hbitmap = (HBITMAP) bmp.GetHBITMAP( ); wxASSERT_MSG( hbitmap, wxT("bitmap is ok but HBITMAP is NULL?") ); - COLORREF old_textground = ::GetTextColor(GetHdc()); - COLORREF old_background = ::GetBkColor(GetHdc()); - if (m_textForegroundColour.Ok()) - { - ::SetTextColor(GetHdc(), m_textForegroundColour.GetPixel() ); - } - if (m_textBackgroundColour.Ok()) - { - ::SetBkColor(GetHdc(), m_textBackgroundColour.GetPixel() ); - } + wxTextColoursChanger textCol(GetHdc(), *this); #if wxUSE_PALETTE wxPalette *pal = bmp.GetPalette(); @@ -1278,14 +1409,23 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask ::SelectObject( memdc, hOldBitmap ); ::DeleteDC( memdc ); - - ::SetTextColor(GetHdc(), old_textground); - ::SetBkColor(GetHdc(), old_background); } } -void wxDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y) +void wxMSWDCImpl::DoDrawText(const wxString& text, wxCoord x, wxCoord y) { + // For compatibility with other ports (notably wxGTK) and because it's + // genuinely useful, we allow passing multiline strings to DrawText(). + // However there is no native MSW function to draw them directly so we + // instead reuse the generic DrawLabel() method to render them. Of course, + // DrawLabel() itself will call back to us but with single line strings + // only so there won't be any infinite recursion here. + if ( text.find('\n') != wxString::npos ) + { + GetOwner()->DrawLabel(text, wxRect(x, y, 0, 0)); + return; + } + WXMICROWIN_CHECK_HDC DrawAnyText(text, x, y); @@ -1294,51 +1434,27 @@ void wxDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y) CalcBoundingBox(x, y); wxCoord w, h; - GetTextExtent(text, &w, &h); + GetOwner()->GetTextExtent(text, &w, &h); CalcBoundingBox(x + w, y + h); } -void wxDC::DrawAnyText(const wxString& text, wxCoord x, wxCoord y) +void wxMSWDCImpl::DrawAnyText(const wxString& text, wxCoord x, wxCoord y) { WXMICROWIN_CHECK_HDC // prepare for drawing the text - if ( m_textForegroundColour.Ok() ) - SetTextColor(GetHdc(), m_textForegroundColour.GetPixel()); + wxTextColoursChanger textCol(GetHdc(), *this); - DWORD old_background = 0; - if ( m_textBackgroundColour.Ok() ) - { - old_background = SetBkColor(GetHdc(), m_textBackgroundColour.GetPixel() ); - } - - 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.Ok() ) - (void)SetBkColor(GetHdc(), old_background); - - SetBkMode(GetHdc(), TRANSPARENT); } -void wxDC::DoDrawRotatedText(const wxString& text, +void wxMSWDCImpl::DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle) { @@ -1348,7 +1464,7 @@ void wxDC::DoDrawRotatedText(const wxString& text, // "else" part below to avoid that DrawRotatedText(angle = 180) and // DrawRotatedText(angle = 0) use different fonts (we can't use the default // font for drawing rotated fonts unfortunately) - if ( (angle == 0.0) && m_font.Ok() ) + if ( (angle == 0.0) && m_font.IsOk() ) { DoDrawText(text, x, y); } @@ -1358,7 +1474,7 @@ void wxDC::DoDrawRotatedText(const wxString& text, // NB: don't take DEFAULT_GUI_FONT (a.k.a. wxSYS_DEFAULT_GUI_FONT) // because it's not TrueType and so can't have non zero // orientation/escapement under Win9x - wxFont font = m_font.Ok() ? m_font : *wxSWISS_FONT; + wxFont font = m_font.IsOk() ? m_font : *wxSWISS_FONT; HFONT hfont = (HFONT)font.GetResourceHandle(); LOGFONT lf; if ( ::GetObject(hfont, sizeof(lf), &lf) == 0 ) @@ -1390,7 +1506,7 @@ void wxDC::DoDrawRotatedText(const wxString& text, // containing the text to it (simpler and probably not slower than // determining which of them is really topmost/leftmost/...) wxCoord w, h; - GetTextExtent(text, &w, &h); + GetOwner()->GetTextExtent(text, &w, &h); double rad = DegToRad(angle); @@ -1413,7 +1529,7 @@ void wxDC::DoDrawRotatedText(const wxString& text, #if wxUSE_PALETTE -void wxDC::DoSelectPalette(bool realize) +void wxMSWDCImpl::DoSelectPalette(bool realize) { WXMICROWIN_CHECK_HDC @@ -1425,7 +1541,7 @@ void wxDC::DoSelectPalette(bool realize) m_oldPalette = 0; } - if ( m_palette.Ok() ) + if ( m_palette.IsOk() ) { HPALETTE oldPal = ::SelectPalette(GetHdc(), GetHpaletteOf(m_palette), @@ -1438,22 +1554,22 @@ void wxDC::DoSelectPalette(bool realize) } } -void wxDC::SetPalette(const wxPalette& palette) +void wxMSWDCImpl::SetPalette(const wxPalette& palette) { - if ( palette.Ok() ) + if ( palette.IsOk() ) { m_palette = palette; DoSelectPalette(true); } } -void wxDC::InitializePalette() +void wxMSWDCImpl::InitializePalette() { if ( wxDisplayDepth() <= 8 ) { // look for any window or parent that has a custom palette. If any has // one then we need to use it in drawing operations - wxWindow *win = m_canvas->GetAncestorWithCustomPalette(); + wxWindow *win = m_window->GetAncestorWithCustomPalette(); m_hasCustomPalette = win && win->HasCustomPalette(); if ( m_hasCustomPalette ) @@ -1471,19 +1587,19 @@ void wxDC::InitializePalette() // SetFont/Pen/Brush() really ask to be implemented as a single template // function... but doing it is not worth breaking OpenWatcom build -void wxDC::SetFont(const wxFont& font) +void wxMSWDCImpl::SetFont(const wxFont& font) { WXMICROWIN_CHECK_HDC if ( font == m_font ) return; - if ( font.Ok() ) + if ( font.IsOk() ) { HGDIOBJ hfont = ::SelectObject(GetHdc(), GetHfontOf(font)); if ( hfont == HGDI_ERROR ) { - wxLogLastError(_T("SelectObject(font)")); + wxLogLastError(wxT("SelectObject(font)")); } else // selected ok { @@ -1499,7 +1615,7 @@ void wxDC::SetFont(const wxFont& font) { if ( ::SelectObject(GetHdc(), (HPEN) m_oldFont) == HGDI_ERROR ) { - wxLogLastError(_T("SelectObject(old font)")); + wxLogLastError(wxT("SelectObject(old font)")); } m_oldFont = 0; @@ -1509,19 +1625,19 @@ void wxDC::SetFont(const wxFont& font) } } -void wxDC::SetPen(const wxPen& pen) +void wxMSWDCImpl::SetPen(const wxPen& pen) { WXMICROWIN_CHECK_HDC if ( pen == m_pen ) return; - if ( pen.Ok() ) + if ( pen.IsOk() ) { HGDIOBJ hpen = ::SelectObject(GetHdc(), GetHpenOf(pen)); if ( hpen == HGDI_ERROR ) { - wxLogLastError(_T("SelectObject(pen)")); + wxLogLastError(wxT("SelectObject(pen)")); } else // selected ok { @@ -1537,7 +1653,7 @@ void wxDC::SetPen(const wxPen& pen) { if ( ::SelectObject(GetHdc(), (HPEN) m_oldPen) == HGDI_ERROR ) { - wxLogLastError(_T("SelectObject(old pen)")); + wxLogLastError(wxT("SelectObject(old pen)")); } m_oldPen = 0; @@ -1547,36 +1663,43 @@ void wxDC::SetPen(const wxPen& pen) } } -void wxDC::SetBrush(const wxBrush& brush) +void wxMSWDCImpl::SetBrush(const wxBrush& brush) { WXMICROWIN_CHECK_HDC if ( brush == m_brush ) return; - if ( brush.Ok() ) + if ( brush.IsOk() ) { // we must make sure the brush is aligned with the logical coordinates - // before selecting it + // before selecting it or using the same brush for the background of + // different windows would result in discontinuities + wxSize sizeBrushBitmap = wxDefaultSize; wxBitmap *stipple = brush.GetStipple(); - if ( stipple && stipple->Ok() ) + if ( stipple && stipple->IsOk() ) + sizeBrushBitmap = stipple->GetSize(); + else if ( brush.IsHatch() ) + sizeBrushBitmap = wxSize(8, 8); + + if ( sizeBrushBitmap.IsFullySpecified() ) { if ( !::SetBrushOrgEx ( GetHdc(), - m_deviceOriginX % stipple->GetWidth(), - m_deviceOriginY % stipple->GetHeight(), + m_deviceOriginX % sizeBrushBitmap.x, + m_deviceOriginY % sizeBrushBitmap.y, NULL // [out] previous brush origin ) ) { - wxLogLastError(_T("SetBrushOrgEx()")); + wxLogLastError(wxT("SetBrushOrgEx()")); } } HGDIOBJ hbrush = ::SelectObject(GetHdc(), GetHbrushOf(brush)); if ( hbrush == HGDI_ERROR ) { - wxLogLastError(_T("SelectObject(brush)")); + wxLogLastError(wxT("SelectObject(brush)")); } else // selected ok { @@ -1592,7 +1715,7 @@ void wxDC::SetBrush(const wxBrush& brush) { if ( ::SelectObject(GetHdc(), (HPEN) m_oldBrush) == HGDI_ERROR ) { - wxLogLastError(_T("SelectObject(old brush)")); + wxLogLastError(wxT("SelectObject(old brush)")); } m_oldBrush = 0; @@ -1602,19 +1725,19 @@ void wxDC::SetBrush(const wxBrush& brush) } } -void wxDC::SetBackground(const wxBrush& brush) +void wxMSWDCImpl::SetBackground(const wxBrush& brush) { WXMICROWIN_CHECK_HDC m_backgroundBrush = brush; - if ( m_backgroundBrush.Ok() ) + if ( m_backgroundBrush.IsOk() ) { (void)SetBkColor(GetHdc(), m_backgroundBrush.GetColour().GetPixel()); } } -void wxDC::SetBackgroundMode(int mode) +void wxMSWDCImpl::SetBackgroundMode(int mode) { WXMICROWIN_CHECK_HDC @@ -1624,7 +1747,7 @@ void wxDC::SetBackgroundMode(int mode) // and m_backgroundMode is used there } -void wxDC::SetLogicalFunction(int function) +void wxMSWDCImpl::SetLogicalFunction(wxRasterOperationMode function) { WXMICROWIN_CHECK_HDC @@ -1633,7 +1756,7 @@ void wxDC::SetLogicalFunction(int function) SetRop(m_hDC); } -void wxDC::SetRop(WXHDC dc) +void wxMSWDCImpl::SetRop(WXHDC dc) { if ( !dc || m_logicalFunction < 0 ) return; @@ -1658,30 +1781,29 @@ void wxDC::SetRop(WXHDC dc) 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; + wxFAIL_MSG( wxS("unknown logical function") ); + return; } SetROP2(GetHdc(), rop); } -bool wxDC::StartDoc(const wxString& WXUNUSED(message)) +bool wxMSWDCImpl::StartDoc(const wxString& WXUNUSED(message)) { // We might be previewing, so return true to let it continue. return true; } -void wxDC::EndDoc() +void wxMSWDCImpl::EndDoc() { } -void wxDC::StartPage() +void wxMSWDCImpl::StartPage() { } -void wxDC::EndPage() +void wxMSWDCImpl::EndPage() { } @@ -1689,7 +1811,7 @@ void wxDC::EndPage() // text metrics // --------------------------------------------------------------------------- -wxCoord wxDC::GetCharHeight() const +wxCoord wxMSWDCImpl::GetCharHeight() const { WXMICROWIN_CHECK_HDC_RET(0) @@ -1700,7 +1822,7 @@ wxCoord wxDC::GetCharHeight() const return lpTextMetric.tmHeight; } -wxCoord wxDC::GetCharWidth() const +wxCoord wxMSWDCImpl::GetCharWidth() const { WXMICROWIN_CHECK_HDC_RET(0) @@ -1711,9 +1833,34 @@ wxCoord wxDC::GetCharWidth() const return lpTextMetric.tmAveCharWidth; } -void wxDC::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y, +void wxMSWDCImpl::DoGetFontMetrics(int *height, + int *ascent, + int *descent, + int *internalLeading, + int *externalLeading, + int *averageWidth) const +{ + TEXTMETRIC tm; + + GetTextMetrics(GetHdc(), &tm); + + if ( height ) + *height = tm.tmHeight; + if ( ascent ) + *ascent = tm.tmAscent; + if ( descent ) + *descent = tm.tmDescent; + if ( internalLeading ) + *internalLeading = tm.tmInternalLeading; + if ( externalLeading ) + *externalLeading = tm.tmExternalLeading; + if ( averageWidth ) + *averageWidth = tm.tmAveCharWidth; +} + +void wxMSWDCImpl::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y, wxCoord *descent, wxCoord *externalLeading, - wxFont *font) const + const wxFont *font) const { #ifdef __WXMICROWIN__ if (!GetHDC()) @@ -1726,117 +1873,71 @@ void wxDC::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y, } #endif // __WXMICROWIN__ - HFONT hfontOld; - if ( font ) - { - wxASSERT_MSG( font->Ok(), _T("invalid font in wxDC::GetTextExtent") ); + wxASSERT_MSG( !font || font->IsOk(), wxT("invalid font in wxMSWDCImpl::GetTextExtent") ); - hfontOld = (HFONT)::SelectObject(GetHdc(), GetHfontOf(*font)); - } - else // don't change the font - { - hfontOld = 0; - } - - SIZE sizeRect; - const size_t len = string.length(); - if ( !::GetTextExtentPoint32(GetHdc(), string, len, &sizeRect) ) - { - wxLogLastError(_T("GetTextExtentPoint32()")); - } - -#if !defined(_WIN32_WCE) || (_WIN32_WCE >= 400) - // the result computed by GetTextExtentPoint32() may be too small as it - // accounts for under/overhang of the first/last character while we want - // just the bounding rect for this string so adjust the width as needed - // (using API not available in 2002 SDKs of WinCE) - if ( len > 0 ) - { - ABC width; - const wxChar chFirst = *string.begin(); - if ( ::GetCharABCWidths(GetHdc(), chFirst, chFirst, &width) ) - { - if ( width.abcA < 0 ) - sizeRect.cx -= width.abcA; + wxTextMeasure txm(GetOwner(), font); + txm.GetTextExtent(string, x, y, descent, externalLeading); +} - if ( len > 1 ) - { - const wxChar chLast = *string.rbegin(); - ::GetCharABCWidths(GetHdc(), chLast, chLast, &width); - } - //else: we already have the width of the last character - if ( width.abcC < 0 ) - sizeRect.cx -= width.abcC; - } - //else: GetCharABCWidths() failed, not a TrueType font? - } -#endif // !defined(_WIN32_WCE) || (_WIN32_WCE >= 400) +bool wxMSWDCImpl::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const +{ + wxTextMeasure txm(GetOwner(), NULL); // don't change the font + return txm.GetPartialTextExtents(text, widths, 1.0); +} - TEXTMETRIC tm; - ::GetTextMetrics(GetHdc(), &tm); +namespace +{ - if (x) - *x = sizeRect.cx; - if (y) - *y = sizeRect.cy; - if (descent) - *descent = tm.tmDescent; - if (externalLeading) - *externalLeading = tm.tmExternalLeading; +void ApplyEffectiveScale(double scale, int sign, int *device, int *logical) +{ + // To reduce rounding errors as much as possible, we try to use the largest + // possible extent (2^27-1) for the device space but we must also avoid + // overflowing the int range i.e. ensure that logical extents are less than + // 2^31 in magnitude. So the minimal scale we can use is 1/16 as for + // anything smaller VIEWPORT_EXTENT/scale would overflow the int range. + static const double MIN_LOGICAL_SCALE = 1./16; - if ( hfontOld ) + double physExtent = VIEWPORT_EXTENT; + if ( scale < MIN_LOGICAL_SCALE ) { - ::SelectObject(GetHdc(), hfontOld); + physExtent *= scale/MIN_LOGICAL_SCALE; + scale = MIN_LOGICAL_SCALE; } -} + *device = wxRound(physExtent); + *logical = sign*wxRound(VIEWPORT_EXTENT/scale); +} -// Each element of the array will be the width of the string up to and -// including the coresoponding character in text. +} // anonymous namespace -bool wxDC::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const +void wxMSWDCImpl::RealizeScaleAndOrigin() { - static int maxLenText = -1; - static int maxWidth = -1; - int fit = 0; - SIZE sz = {0,0}; - int stlen = text.length(); - - if (maxLenText == -1) - { - // Win9x and WinNT+ have different limits - int version = wxGetOsVersion(); - maxLenText = version == wxOS_WINDOWS_NT ? 65535 : 8192; - maxWidth = version == wxOS_WINDOWS_NT ? INT_MAX : 32767; - } - - widths.Empty(); - widths.Add(0, stlen); // fill the array with zeros - if (stlen == 0) - return true; + // 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); - if (!::GetTextExtentExPoint(GetHdc(), - text.c_str(), // string to check - wxMin(stlen, maxLenText), - maxWidth, - &fit, // [out] count of chars - // that will fit - &widths[0], // array to fill - &sz)) - { - // API failed - wxLogLastError(wxT("GetTextExtentExPoint")); - return false; - } + // wxWidgets API assumes that the coordinate space is "infinite" (i.e. only + // limited by 2^32 range of the integer coordinates) but in MSW API we must + // actually specify the extents that we use so compute them here. - return true; -} + int devExtX, devExtY, // Viewport, i.e. device space, extents. + logExtX, logExtY; // Window, i.e. logical coordinate space, extents. + ApplyEffectiveScale(m_scaleX, m_signX, &devExtX, &logExtX); + ApplyEffectiveScale(m_scaleY, m_signY, &devExtY, &logExtY); + ::SetViewportExtEx(GetHdc(), devExtX, devExtY, NULL); + ::SetWindowExtEx(GetHdc(), logExtX, logExtY, NULL); + ::SetViewportOrgEx(GetHdc(), m_deviceOriginX, m_deviceOriginY, NULL); + ::SetWindowOrgEx(GetHdc(), m_logicalOriginX, m_logicalOriginY, NULL); +#endif +} -void wxDC::SetMapMode(int mode) +void wxMSWDCImpl::SetMapMode(wxMappingMode mode) { WXMICROWIN_CHECK_HDC @@ -1886,172 +1987,199 @@ void wxDC::SetMapMode(int mode) break; default: - wxFAIL_MSG( _T("unknown mapping mode in SetMapMode") ); + wxFAIL_MSG( wxT("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); + ComputeScaleAndOrigin(); - ::SetViewportOrgEx(GetHdc(), m_deviceOriginX, m_deviceOriginY, NULL); - ::SetWindowOrgEx(GetHdc(), m_logicalOriginX, m_logicalOriginY, NULL); -#endif + RealizeScaleAndOrigin(); } -void wxDC::SetUserScale(double x, double y) +void wxMSWDCImpl::SetUserScale(double x, double y) { WXMICROWIN_CHECK_HDC if ( x == m_userScaleX && y == m_userScaleY ) return; - m_userScaleX = x; - m_userScaleY = y; + wxDCImpl::SetUserScale(x,y); - this->SetMapMode(m_mappingMode); + RealizeScaleAndOrigin(); } -void wxDC::SetAxisOrientation(bool WXUNUSED_IN_WINCE(xLeftRight), - bool WXUNUSED_IN_WINCE(yBottomUp)) +void wxMSWDCImpl::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; + if (signX == m_signX && signY == m_signY) + return; - SetMapMode(m_mappingMode); - } -#endif + wxDCImpl::SetAxisOrientation( xLeftRight, yBottomUp ); + + RealizeScaleAndOrigin(); } -void wxDC::SetSystemScale(double x, double y) +void wxMSWDCImpl::SetLogicalOrigin(wxCoord x, wxCoord y) { WXMICROWIN_CHECK_HDC - if ( x == m_scaleX && y == m_scaleY ) + if ( x == m_logicalOriginX && y == m_logicalOriginY ) return; - m_scaleX = x; - m_scaleY = y; + wxDCImpl::SetLogicalOrigin( x, y ); -#ifndef __WXWINCE__ - SetMapMode(m_mappingMode); -#endif + RealizeScaleAndOrigin(); } -void wxDC::SetLogicalOrigin(wxCoord x, wxCoord y) +// For use by wxWidgets only, unless custom units are required. +void wxMSWDCImpl::SetLogicalScale(double x, double y) { WXMICROWIN_CHECK_HDC - if ( x == m_logicalOriginX && y == m_logicalOriginY ) - return; - - m_logicalOriginX = x; - m_logicalOriginY = y; - -#ifndef __WXWINCE__ - ::SetWindowOrgEx(GetHdc(), (int)m_logicalOriginX, (int)m_logicalOriginY, NULL); -#endif + wxDCImpl::SetLogicalScale(x,y); } -void wxDC::SetDeviceOrigin(wxCoord x, wxCoord y) +void wxMSWDCImpl::SetDeviceOrigin(wxCoord x, wxCoord y) { WXMICROWIN_CHECK_HDC if ( x == m_deviceOriginX && y == m_deviceOriginY ) return; - m_deviceOriginX = x; - m_deviceOriginY = y; + wxDCImpl::SetDeviceOrigin( x, y ); ::SetViewportOrgEx(GetHdc(), (int)m_deviceOriginX, (int)m_deviceOriginY, NULL); } -// --------------------------------------------------------------------------- -// coordinates transformations -// --------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- +// Transform matrix +// ---------------------------------------------------------------------------- -wxCoord wxDCBase::DeviceToLogicalX(wxCoord x) const -{ - return DeviceToLogicalXRel(x - m_deviceOriginX)*m_signX + m_logicalOriginX; -} +#if wxUSE_DC_TRANSFORM_MATRIX -wxCoord wxDCBase::DeviceToLogicalXRel(wxCoord x) const +bool wxMSWDCImpl::CanUseTransformMatrix() const { - // axis orientation is not taken into account for conversion of a distance - return (wxCoord)(x / (m_logicalScaleX*m_userScaleX*m_scaleX)); + return GdiWorldTransformFuncs::IsOk(); } -wxCoord wxDCBase::DeviceToLogicalY(wxCoord y) const +bool wxMSWDCImpl::SetTransformMatrix(const wxAffineMatrix2D &matrix) { - return DeviceToLogicalYRel(y - m_deviceOriginY)*m_signY + m_logicalOriginY; -} + if ( !GdiWorldTransformFuncs::IsOk() ) + return false; -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)); -} + if ( matrix.IsIdentity() ) + { + ResetTransformMatrix(); + return true; + } -wxCoord wxDCBase::LogicalToDeviceX(wxCoord x) const -{ - return LogicalToDeviceXRel(x - m_logicalOriginX)*m_signX + m_deviceOriginX; -} + if ( !GdiWorldTransformFuncs::SetGraphicsMode()(GetHdc(), GM_ADVANCED) ) + { + wxLogLastError(wxT("SetGraphicsMode")); + return false; + } -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); + wxMatrix2D mat; + wxPoint2DDouble tr; + matrix.Get(&mat, &tr); + + XFORM xform; + xform.eM11 = mat.m_11; + xform.eM12 = mat.m_12; + xform.eM21 = mat.m_21; + xform.eM22 = mat.m_22; + xform.eDx = tr.m_x; + xform.eDy = tr.m_y; + + if ( !GdiWorldTransformFuncs::SetWorldTransform()(GetHdc(), &xform) ) + { + wxLogLastError(wxT("SetWorldTransform")); + return false; + } + + return true; } -wxCoord wxDCBase::LogicalToDeviceY(wxCoord y) const +wxAffineMatrix2D wxMSWDCImpl::GetTransformMatrix() const { - return LogicalToDeviceYRel(y - m_logicalOriginY)*m_signY + m_deviceOriginY; + wxAffineMatrix2D transform; + + if ( !GdiWorldTransformFuncs::IsOk() ) + return transform; + + XFORM xform; + if ( !GdiWorldTransformFuncs::GetWorldTransform()(GetHdc(), &xform) ) + { + wxLogLastError(wxT("GetWorldTransform")); + return transform; + } + + wxMatrix2D m(xform.eM11, xform.eM12, xform.eM21, xform.eM22); + wxPoint2DDouble p(xform.eDx, xform.eDy); + transform.Set(m, p); + + return transform; } -wxCoord wxDCBase::LogicalToDeviceYRel(wxCoord y) const +void wxMSWDCImpl::ResetTransformMatrix() { - // axis orientation is not taken into account for conversion of a distance - return (wxCoord) (y*m_logicalScaleY*m_userScaleY*m_scaleY); + if ( GdiWorldTransformFuncs::IsOk() ) + { + GdiWorldTransformFuncs::ModifyWorldTransform()(GetHdc(), NULL, MWT_IDENTITY); + GdiWorldTransformFuncs::SetGraphicsMode()(GetHdc(), GM_COMPATIBLE); + } } +#endif // wxUSE_DC_TRANSFORM_MATRIX + // --------------------------------------------------------------------------- // 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 wxMSWDCImpl::DoBlit(wxCoord dstX, wxCoord dstY, + wxCoord dstWidth, wxCoord dstHeight, + wxDC *source, + wxCoord srcX, wxCoord srcY, + wxRasterOperationMode rop, bool useMask, + wxCoord srcMaskX, wxCoord srcMaskY) +{ + return DoStretchBlit(dstX, dstY, dstWidth, dstHeight, source, srcX, srcY, dstWidth, dstHeight, rop, useMask, srcMaskX, srcMaskY); +} + +bool wxMSWDCImpl::DoStretchBlit(wxCoord xdest, wxCoord ydest, + wxCoord dstWidth, wxCoord dstHeight, + wxDC *source, + wxCoord xsrc, wxCoord ysrc, + wxCoord srcWidth, wxCoord srcHeight, + wxRasterOperationMode rop, bool useMask, + wxCoord xsrcMask, wxCoord ysrcMask) { - wxCHECK_MSG( source, false, _T("wxDC::Blit(): NULL wxDC pointer") ); + wxCHECK_MSG( source, false, wxT("wxMSWDCImpl::Blit(): NULL wxDC pointer") ); WXMICROWIN_CHECK_HDC_RET(false) + wxMSWDCImpl *implSrc = wxDynamicCast( source->GetImpl(), wxMSWDCImpl ); + if ( !implSrc ) + { + // TODO: Do we want to be able to blit from other DCs too? + return false; + } + + const HDC hdcSrc = GetHdcOf(*implSrc); + // if either the source or destination has alpha channel, we must use // AlphaBlt() as other function don't handle it correctly - const wxBitmap& bmpSrc = source->m_selectedBitmap; - if ( bmpSrc.Ok() && (bmpSrc.HasAlpha() || - (m_selectedBitmap.Ok() && m_selectedBitmap.HasAlpha())) ) + const wxBitmap& bmpSrc = implSrc->GetSelectedBitmap(); + if ( bmpSrc.IsOk() && (bmpSrc.HasAlpha() || + (m_selectedBitmap.IsOk() && 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, hdcSrc, bmpSrc) ) return true; } @@ -2060,7 +2188,7 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, { mask = bmpSrc.GetMask(); - if ( !(bmpSrc.Ok() && mask && mask->GetMaskBitmap()) ) + if ( !(bmpSrc.IsOk() && mask && mask->GetMaskBitmap()) ) { // don't give assert here because this would break existing // programs - just silently ignore useMask parameter @@ -2073,16 +2201,7 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, xsrcMask = xsrc; ysrcMask = ysrc; } - COLORREF old_textground = ::GetTextColor(GetHdc()); - COLORREF old_background = ::GetBkColor(GetHdc()); - if (m_textForegroundColour.Ok()) - { - ::SetTextColor(GetHdc(), m_textForegroundColour.GetPixel() ); - } - if (m_textBackgroundColour.Ok()) - { - ::SetBkColor(GetHdc(), m_textBackgroundColour.GetPixel() ); - } + wxTextColoursChanger textCol(GetHdc(), *this); DWORD dwRop; switch (rop) @@ -2122,19 +2241,23 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, // than the wxWidgets fall-back implementation. So we need // to be able to switch this on and off at runtime. #if wxUSE_SYSTEM_OPTIONS - if (wxSystemOptions::GetOptionInt(wxT("no-maskblt")) == 0) + static bool s_maskBltAllowed = wxSystemOptions::GetOptionInt("no-maskblt") == 0; + if ( s_maskBltAllowed ) #endif { - success = ::MaskBlt - ( + if ( dstWidth == srcWidth && dstHeight == srcHeight ) + { + success = ::MaskBlt + ( GetHdc(), - xdest, ydest, width, height, - GetHdcOf(*source), + xdest, ydest, dstWidth, dstHeight, + hdcSrc, xsrc, ysrc, (HBITMAP)mask->GetMaskBitmap(), xsrcMask, ysrcMask, MAKEROP4(dwRop, DSTCOPY) - ) != 0; + ) != 0; + } } if ( !success ) @@ -2147,62 +2270,64 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, #if wxUSE_DC_CACHEING // create a temp buffer bitmap and DCs to access it and the mask - wxDCCacheEntry* dcCacheEntry1 = FindDCInCache(NULL, source->GetHDC()); + wxDCCacheEntry* dcCacheEntry1 = FindDCInCache(NULL, hdcSrc); dc_mask = (HDC) dcCacheEntry1->m_dc; wxDCCacheEntry* dcCacheEntry2 = FindDCInCache(dcCacheEntry1, GetHDC()); 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); + dc_mask = wxMSW::CreateCompatibleDCWithLayout(hdcSrc); + dc_buffer = wxMSW::CreateCompatibleDCWithLayout(GetHdc()); + 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, dstWidth, dstHeight, GetHdc(), xdest, ydest, SRCCOPY) ) { wxLogLastError(wxT("BitBlt")); } + SET_STRETCH_BLT_MODE(GetHdc()); + // 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, dstWidth, dstHeight, + hdcSrc, 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) ) + // set masked area in buffer to BLACK { - wxLogLastError(wxT("BitBlt")); - } + 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 ( !::BitBlt(GetHdc(), xdest, ydest, (int)width, (int)height, - dc_mask, xsrcMask, ysrcMask, SRCAND) ) - { - wxLogLastError(wxT("BitBlt")); - } - ::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)width, (int)height, + success = ::BitBlt(GetHdc(), xdest, ydest, dstWidth, dstHeight, dc_buffer, 0, 0, SRCPAINT) != 0; if ( !success ) { @@ -2230,7 +2355,7 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, // FIXME: use appropriate WinCE functions #ifndef __WXWINCE__ const int caps = ::GetDeviceCaps(GetHdc(), RASTERCAPS); - if ( bmpSrc.Ok() && (caps & RC_STRETCHDIB) ) + if ( bmpSrc.IsOk() && (caps & RC_STRETCHDIB) ) { DIBSECTION ds; wxZeroMemory(ds); @@ -2239,7 +2364,18 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, sizeof(ds), &ds) == sizeof(ds) ) { - StretchBltModeChanger changeMode(GetHdc(), COLORONCOLOR); + SET_STRETCH_BLT_MODE(GetHdc()); + + // Unlike all the other functions used here (i.e. AlphaBlt(), + // MaskBlt(), BitBlt() and StretchBlt()), StretchDIBits() does + // not take into account the source DC logical coordinates + // automatically as it doesn't even work with the source HDC. + // So do this manually to ensure that the coordinates are + // interpreted in the same way here as in all the other cases. + xsrc = source->LogicalToDeviceX(xsrc); + ysrc = source->LogicalToDeviceY(ysrc); + srcWidth = source->LogicalToDeviceXRel(srcWidth); + srcHeight = source->LogicalToDeviceYRel(srcHeight); // Figure out what co-ordinate system we're supposed to specify // ysrc in. @@ -2247,18 +2383,18 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, if ( hDIB > 0 ) { // reflect ysrc - ysrc = hDIB - (ysrc + height); + ysrc = hDIB - (ysrc + srcHeight); } 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 @@ -2278,20 +2414,18 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, #endif // __WXWINCE__ { -#ifndef __WXWINCE__ - StretchBltModeChanger changeMode(GetHdc(), COLORONCOLOR); -#endif + SET_STRETCH_BLT_MODE(GetHdc()); if ( !::StretchBlt ( GetHdc(), - xdest, ydest, width, height, - GetHdcOf(*source), - xsrc, ysrc, width, height, + xdest, ydest, dstWidth, dstHeight, + hdcSrc, + xsrc, ysrc, srcWidth, srcHeight, dwRop ) ) { - wxLogLastError(_T("StretchBlt")); + wxLogLastError(wxT("StretchBlt")); } else { @@ -2301,17 +2435,10 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, if ( !success ) { - if ( !::BitBlt - ( - GetHdc(), - xdest, ydest, - (int)width, (int)height, - GetHdcOf(*source), - xsrc, ysrc, - dwRop - ) ) + if ( !::BitBlt(GetHdc(), xdest, ydest, dstWidth, dstHeight, + hdcSrc, xsrc, ysrc, dwRop) ) { - wxLogLastError(_T("BitBlt")); + wxLogLastError(wxT("BitBlt")); } else { @@ -2320,13 +2447,10 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, } } - ::SetTextColor(GetHdc(), old_textground); - ::SetBkColor(GetHdc(), old_background); - return success; } -void wxDC::GetDeviceSize(int *width, int *height) const +void wxMSWDCImpl::GetDeviceSize(int *width, int *height) const { WXMICROWIN_CHECK_HDC @@ -2336,7 +2460,7 @@ void wxDC::GetDeviceSize(int *width, int *height) const *height = ::GetDeviceCaps(GetHdc(), VERTRES); } -void wxDC::DoGetSizeMM(int *w, int *h) const +void wxMSWDCImpl::DoGetSizeMM(int *w, int *h) const { WXMICROWIN_CHECK_HDC @@ -2351,7 +2475,7 @@ void wxDC::DoGetSizeMM(int *w, int *h) const { int wTotal = ::GetDeviceCaps(GetHdc(), HORZRES); - wxCHECK_RET( wTotal, _T("0 width device?") ); + wxCHECK_RET( wTotal, wxT("0 width device?") ); *w = (wPixels * ::GetDeviceCaps(GetHdc(), HORZSIZE)) / wTotal; } @@ -2360,13 +2484,13 @@ void wxDC::DoGetSizeMM(int *w, int *h) const { int hTotal = ::GetDeviceCaps(GetHdc(), VERTRES); - wxCHECK_RET( hTotal, _T("0 height device?") ); + wxCHECK_RET( hTotal, wxT("0 height device?") ); *h = (hPixels * ::GetDeviceCaps(GetHdc(), VERTSIZE)) / hTotal; } } -wxSize wxDC::GetPPI() const +wxSize wxMSWDCImpl::GetPPI() const { WXMICROWIN_CHECK_HDC_RET(wxSize(0,0)) @@ -2376,15 +2500,6 @@ wxSize wxDC::GetPPI() const return wxSize(x, y); } -// For use by wxWidgets only, unless custom units are required. -void wxDC::SetLogicalScale(double x, double y) -{ - WXMICROWIN_CHECK_HDC - - m_logicalScaleX = x; - m_logicalScaleY = y; -} - // ---------------------------------------------------------------------------- // DC caching // ---------------------------------------------------------------------------- @@ -2397,8 +2512,8 @@ void wxDC::SetLogicalScale(double x, double y) * entry for the bitmap, and two for the DCs. -- JACS */ -wxList wxDC::sm_bitmapCache; -wxList wxDC::sm_dcCache; +wxObjectList wxMSWDCImpl::sm_bitmapCache; +wxObjectList wxMSWDCImpl::sm_dcCache; wxDCCacheEntry::wxDCCacheEntry(WXHBITMAP hBitmap, int w, int h, int depth) { @@ -2426,7 +2541,7 @@ wxDCCacheEntry::~wxDCCacheEntry() ::DeleteDC((HDC) m_dc); } -wxDCCacheEntry* wxDC::FindBitmapInCache(WXHDC dc, int w, int h) +wxDCCacheEntry* wxMSWDCImpl::FindBitmapInCache(WXHDC dc, int w, int h) { int depth = ::GetDeviceCaps((HDC) dc, PLANES) * ::GetDeviceCaps((HDC) dc, BITSPIXEL); wxList::compatibility_iterator node = sm_bitmapCache.GetFirst(); @@ -2462,7 +2577,7 @@ wxDCCacheEntry* wxDC::FindBitmapInCache(WXHDC dc, int w, int h) return entry; } -wxDCCacheEntry* wxDC::FindDCInCache(wxDCCacheEntry* notThis, WXHDC dc) +wxDCCacheEntry* wxMSWDCImpl::FindDCInCache(wxDCCacheEntry* notThis, WXHDC dc) { int depth = ::GetDeviceCaps((HDC) dc, PLANES) * ::GetDeviceCaps((HDC) dc, BITSPIXEL); wxList::compatibility_iterator node = sm_dcCache.GetFirst(); @@ -2481,7 +2596,7 @@ wxDCCacheEntry* wxDC::FindDCInCache(wxDCCacheEntry* notThis, WXHDC dc) node = node->GetNext(); } - WXHDC hDC = (WXHDC) ::CreateCompatibleDC((HDC) dc); + WXHDC hDC = (WXHDC) wxMSW::CreateCompatibleDCWithLayout((HDC) dc); if ( !hDC) { wxLogLastError(wxT("CreateCompatibleDC")); @@ -2491,17 +2606,17 @@ wxDCCacheEntry* wxDC::FindDCInCache(wxDCCacheEntry* notThis, WXHDC dc) return entry; } -void wxDC::AddToBitmapCache(wxDCCacheEntry* entry) +void wxMSWDCImpl::AddToBitmapCache(wxDCCacheEntry* entry) { sm_bitmapCache.Append(entry); } -void wxDC::AddToDCCache(wxDCCacheEntry* entry) +void wxMSWDCImpl::AddToDCCache(wxDCCacheEntry* entry) { sm_dcCache.Append(entry); } -void wxDC::ClearCache() +void wxMSWDCImpl::ClearCache() { WX_CLEAR_LIST(wxList, sm_dcCache); WX_CLEAR_LIST(wxList, sm_bitmapCache); @@ -2512,7 +2627,7 @@ class wxDCModule : public wxModule { public: virtual bool OnInit() { return true; } - virtual void OnExit() { wxDC::ClearCache(); } + virtual void OnExit() { wxMSWDCImpl::ClearCache(); } private: DECLARE_DYNAMIC_CLASS(wxDCModule) @@ -2527,12 +2642,14 @@ IMPLEMENT_DYNAMIC_CLASS(wxDCModule, wxModule) // ---------------------------------------------------------------------------- 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") ); - wxASSERT_MSG( hdcDst && hdcSrc, _T("AlphaBlt(): invalid HDC") ); + wxASSERT_MSG( bmp.IsOk() && bmp.HasAlpha(), wxT("AlphaBlt(): invalid bitmap") ); + wxASSERT_MSG( hdcDst && hdcSrc, wxT("AlphaBlt(): invalid HDC") ); // do we have AlphaBlend() and company in the headers? #if defined(AC_SRC_OVER) && wxUSE_DYNLIB_CLASS @@ -2541,7 +2658,8 @@ static bool AlphaBlt(HDC hdcDst, HDC,int,int,int,int, BLENDFUNCTION); - static AlphaBlend_t pfnAlphaBlend = wxMSIMG32_SYMBOL(AlphaBlend); + static AlphaBlend_t + pfnAlphaBlend = (AlphaBlend_t)wxMSIMG32DLL.GetSymbol(wxT("AlphaBlend")); if ( pfnAlphaBlend ) { BLENDFUNCTION bf; @@ -2550,15 +2668,15 @@ static bool AlphaBlt(HDC hdcDst, 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 return true; } - wxLogLastError(_T("AlphaBlend")); + wxLogLastError(wxT("AlphaBlend")); } #else wxUnusedVar(hdcSrc); @@ -2566,35 +2684,37 @@ static bool AlphaBlt(HDC hdcDst, // AlphaBlend() unavailable of failed: use our own (probably much slower) // implementation -#ifdef wxHAVE_RAW_BITMAP - wxAlphaBlend(hdcDst, x, y, width, height, srcX, srcY, bmp); +#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, - 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")); + wxLogLastError(wxT("BitBlt")); } // combine them with the source bitmap using alpha @@ -2602,20 +2722,22 @@ wxAlphaBlend(HDC hdcDst, int xDst, int yDst, dataSrc((wxBitmap &)bmpSrc); wxCHECK_RET( dataDst && dataSrc, - _T("failed to get raw data in wxAlphaBlend") ); + wxT("failed to get raw data in wxAlphaBlend") ); 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(); @@ -2625,25 +2747,22 @@ wxAlphaBlend(HDC hdcDst, int xDst, int yDst, 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")); + wxLogLastError(wxT("BitBlt")); } } -#endif // #ifdef wxHAVE_RAW_BITMAP +#endif // wxHAS_RAW_BITMAP -void wxDC::DoGradientFillLinear (const wxRect& rect, +void wxMSWDCImpl::DoGradientFillLinear (const wxRect& rect, const wxColour& initialColour, const wxColour& destColour, wxDirection nDirection) @@ -2654,7 +2773,8 @@ void wxDC::DoGradientFillLinear (const wxRect& rect, #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(wxT("GradientFill")); if ( pfnGradientFill ) { @@ -2671,8 +2791,8 @@ void wxDC::DoGradientFillLinear (const wxRect& rect, 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); @@ -2699,9 +2819,113 @@ void wxDC::DoGradientFillLinear (const wxRect& rect, return; } - wxLogLastError(_T("GradientFill")); + wxLogLastError(wxT("GradientFill")); } #endif // wxUSE_DYNLIB_CLASS - wxDCBase::DoGradientFillLinear(rect, initialColour, destColour, nDirection); + wxDCImpl::DoGradientFillLinear(rect, initialColour, destColour, nDirection); } + +#if wxUSE_DYNLIB_CLASS + +namespace wxMSW +{ + +DWORD GetLayout(HDC hdc) +{ + typedef DWORD (WINAPI *GetLayout_t)(HDC); + static GetLayout_t + wxDL_INIT_FUNC(s_pfn, GetLayout, wxDynamicLibrary(wxT("gdi32.dll"))); + + return s_pfnGetLayout ? s_pfnGetLayout(hdc) : GDI_ERROR; +} + +DWORD SetLayout(HDC hdc, DWORD dwLayout) +{ + typedef DWORD (WINAPI *SetLayout_t)(HDC, DWORD); + static SetLayout_t + wxDL_INIT_FUNC(s_pfn, SetLayout, wxDynamicLibrary(wxT("gdi32.dll"))); + + return s_pfnSetLayout ? s_pfnSetLayout(hdc, dwLayout) : GDI_ERROR; +} + +HDC CreateCompatibleDCWithLayout(HDC hdc) +{ + HDC hdcNew = ::CreateCompatibleDC(hdc); + if ( hdcNew ) + { + DWORD dwLayout = wxMSW::GetLayout(hdc); + if ( dwLayout != GDI_ERROR ) + wxMSW::SetLayout(hdcNew, dwLayout); + } + + return hdcNew; +} + +} // namespace wxMSW + +wxLayoutDirection wxMSWDCImpl::GetLayoutDirection() const +{ + DWORD layout = wxMSW::GetLayout(GetHdc()); + + if ( layout == GDI_ERROR ) + return wxLayout_Default; + + return layout & LAYOUT_RTL ? wxLayout_RightToLeft : wxLayout_LeftToRight; +} + +void wxMSWDCImpl::SetLayoutDirection(wxLayoutDirection dir) +{ + if ( dir == wxLayout_Default ) + { + dir = wxTheApp->GetLayoutDirection(); + if ( dir == wxLayout_Default ) + return; + } + + DWORD layout = wxMSW::GetLayout(GetHdc()); + if ( layout == GDI_ERROR ) + return; + + if ( dir == wxLayout_RightToLeft ) + layout |= LAYOUT_RTL; + else + layout &= ~LAYOUT_RTL; + + wxMSW::SetLayout(GetHdc(), layout); +} + +#else // !wxUSE_DYNLIB_CLASS + +// Provide stubs to avoid ifdefs in the code using these functions. +namespace wxMSW +{ + +DWORD GetLayout(HDC WXUNUSED(hdc)) +{ + return GDI_ERROR; +} + +DWORD SetLayout(HDC WXUNUSED(hdc), DWORD WXUNUSED(dwLayout)) +{ + return GDI_ERROR; +} + +HDC CreateCompatibleDCWithLayout(HDC hdc) +{ + return ::CreateCompatibleDC(hdc); +} + +} // namespace wxMSW + +// we can't provide RTL support without dynamic loading, so stub it out +wxLayoutDirection wxMSWDCImpl::GetLayoutDirection() const +{ + return wxLayout_Default; +} + +void wxMSWDCImpl::SetLayoutDirection(wxLayoutDirection WXUNUSED(dir)) +{ +} + +#endif // wxUSE_DYNLIB_CLASS/!wxUSE_DYNLIB_CLASS