X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2eb10e2a17a02acaaa32a41304243999f3a862a1..fe2fa280414bbb42ecd32d7c24ab8073e4182969:/src/msw/dc.cpp diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp index 52e247fce2..5a8608840b 100644 --- a/src/msw/dc.cpp +++ b/src/msw/dc.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dc.cpp -// Purpose: wxDC class +// Name: src/msw/dc.cpp +// Purpose: wxDC class for MSW port // Author: Julian Smart // Modified by: // Created: 01/02/97 @@ -17,10 +17,6 @@ // headers // --------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "dc.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -29,8 +25,9 @@ #endif #ifndef WX_PRECOMP + #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" @@ -38,32 +35,30 @@ #include "wx/dcmemory.h" #include "wx/log.h" #include "wx/icon.h" + #include "wx/dcprint.h" + #include "wx/module.h" #endif -#include "wx/msw/private.h" // needs to be before #include - +#include "wx/msw/dc.h" #include "wx/sysopt.h" -#include "wx/dcprint.h" -#include "wx/module.h" -#include "wx/dynload.h" +#include "wx/dynlib.h" -#ifdef wxHAVE_RAW_BITMAP +#ifdef wxHAS_RAW_BITMAP #include "wx/rawbmp.h" #endif #include -#include - -#if wxUSE_COMMON_DIALOGS && !defined(__WXMICROWIN__) - #include -#endif #ifndef __WIN32__ #include #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 */ @@ -71,7 +66,17 @@ #define MAKEROP4(fore,back) (DWORD)((((back) << 8) & 0xFF000000) | (fore)) #endif -IMPLEMENT_ABSTRACT_CLASS(wxDC, wxDCBase) +// apparently with MicroWindows it is possible that HDC is 0 so we have to +// check for this ourselves +#ifdef __WXMICROWIN__ + #define WXMICROWIN_CHECK_HDC if ( !GetHDC() ) return; + #define WXMICROWIN_CHECK_HDC_RET(x) if ( !GetHDC() ) return x; +#else + #define WXMICROWIN_CHECK_HDC + #define WXMICROWIN_CHECK_HDC_RET(x) +#endif + +IMPLEMENT_ABSTRACT_CLASS(wxMSWDCImpl, wxDCImpl) // --------------------------------------------------------------------------- // constants @@ -79,14 +84,6 @@ IMPLEMENT_ABSTRACT_CLASS(wxDC, wxDCBase) static const int VIEWPORT_EXTENT = 1000; -static const int MM_POINTS = 9; -static const int MM_METRIC = 10; - -// usually this is defined in math.h -#ifndef M_PI - static const double M_PI = 3.14159265358979323846; -#endif // M_PI - // 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) #define DSTCOPY 0x00AA0029 // a.k.a. NOP operation @@ -102,13 +99,17 @@ static const int MM_METRIC = 10; coordinates used. */ -// logical to device -#define XLOG2DEV(x) (x) -#define YLOG2DEV(y) (y) - -// device to logical -#define XDEV2LOG(x) (x) -#define YDEV2LOG(y) (y) +#ifdef __WXWINCE__ + #define XLOG2DEV(x) ((x-m_logicalOriginX)*m_signX) + #define YLOG2DEV(y) ((y-m_logicalOriginY)*m_signY) + #define XDEV2LOG(x) ((x)*m_signX+m_logicalOriginX) + #define YDEV2LOG(y) ((y)*m_signY+m_logicalOriginY) +#else + #define XLOG2DEV(x) (x) + #define YLOG2DEV(y) (y) + #define XDEV2LOG(x) (x) + #define YDEV2LOG(y) (y) +#endif // --------------------------------------------------------------------------- // private functions @@ -126,47 +127,163 @@ 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 x, int y, int dstWidth, int dstHeight, + int srcX, int srcY, + int srcWidth, int srcHeight, HDC hdcSrc, - const wxBitmap& bmpSrc); + const wxBitmap& bmp); + +#ifdef wxHAS_RAW_BITMAP -#ifdef wxHAVE_RAW_BITMAP -// our (limited) AlphaBlend() replacement +// our (limited) AlphaBlend() replacement for Windows versions not providing it static void -wxAlphaBlend(HDC hdcDst, int x, int y, int w, int h, const wxBitmap& bmp); -#endif +wxAlphaBlend(HDC hdcDst, int xDst, int yDst, + int dstWidth, int dstHeight, + int srcX, int srcY, + int srcWidth, int srcHeight, + const wxBitmap& bmpSrc); + +#endif // wxHAS_RAW_BITMAP // ---------------------------------------------------------------------------- // private classes // ---------------------------------------------------------------------------- +// various classes to change some DC property temporarily + +// text background and foreground colours +class wxTextColoursChanger +{ +public: + wxTextColoursChanger(HDC hdc, const wxMSWDCImpl& dc) + : m_hdc(hdc) + { + Change(dc.GetTextForeground(), dc.GetTextBackground()); + } + + wxTextColoursChanger(HDC hdc, const wxColour& colFg, const wxColour& colBg) + : m_hdc(hdc) + { + Change(colFg, colBg); + } + + ~wxTextColoursChanger() + { + if ( m_oldColFg != CLR_INVALID ) + ::SetTextColor(m_hdc, m_oldColFg); + if ( m_oldColBg != CLR_INVALID ) + ::SetBkColor(m_hdc, m_oldColBg); + } + +protected: + // this ctor doesn't change mode immediately, call Change() later to do it + // only if needed + wxTextColoursChanger(HDC hdc) + : m_hdc(hdc) + { + m_oldColFg = + m_oldColBg = CLR_INVALID; + } + + void Change(const wxColour& colFg, const wxColour& colBg) + { + if ( colFg.IsOk() ) + { + m_oldColFg = ::SetTextColor(m_hdc, colFg.GetPixel()); + if ( m_oldColFg == CLR_INVALID ) + { + wxLogLastError(_T("SetTextColor")); + } + } + else + { + m_oldColFg = CLR_INVALID; + } + + if ( colBg.IsOk() ) + { + m_oldColBg = ::SetBkColor(m_hdc, colBg.GetPixel()); + if ( m_oldColBg == CLR_INVALID ) + { + wxLogLastError(_T("SetBkColor")); + } + } + else + { + m_oldColBg = CLR_INVALID; + } + } + +private: + const HDC m_hdc; + COLORREF m_oldColFg, + m_oldColBg; + + DECLARE_NO_COPY_CLASS(wxTextColoursChanger) +}; + +// background mode +class wxBkModeChanger +{ +public: + // set background mode to opaque if mode != wxBRUSHSTYLE_TRANSPARENT + wxBkModeChanger(HDC hdc, int mode) + : m_hdc(hdc) + { + Change(mode); + } + + ~wxBkModeChanger() + { + if ( m_oldMode ) + ::SetBkMode(m_hdc, m_oldMode); + } + +protected: + // this ctor doesn't change mode immediately, call Change() later to do it + // only if needed + wxBkModeChanger(HDC hdc) : m_hdc(hdc) { m_oldMode = 0; } + + void Change(int mode) + { + m_oldMode = ::SetBkMode(m_hdc, mode == wxBRUSHSTYLE_TRANSPARENT + ? TRANSPARENT + : OPAQUE); + if ( !m_oldMode ) + { + wxLogLastError(_T("SetBkMode")); + } + } + +private: + const HDC m_hdc; + int m_oldMode; + + DECLARE_NO_COPY_CLASS(wxBkModeChanger) +}; + // instead of duplicating the same code which sets and then restores text // colours in each wxDC method working with wxSTIPPLE_MASK_OPAQUE brushes, // encapsulate this in a small helper class -// wxColourChanger: changes the text colours in the ctor if required and +// wxBrushAttrsSetter: changes the text colours in the ctor if required and // restores them in the dtor -class wxColourChanger +class wxBrushAttrsSetter : private wxBkModeChanger, + private wxTextColoursChanger { public: - wxColourChanger(wxDC& dc); - ~wxColourChanger(); + wxBrushAttrsSetter(wxMSWDCImpl& dc); private: - wxDC& m_dc; - - COLORREF m_colFgOld, m_colBgOld; - - bool m_changed; - - DECLARE_NO_COPY_CLASS(wxColourChanger) + DECLARE_NO_COPY_CLASS(wxBrushAttrsSetter) }; // this class saves the old stretch blit mode during its life time class StretchBltModeChanger { public: - StretchBltModeChanger(HDC hdc, int mode) + StretchBltModeChanger(HDC hdc, + int WXUNUSED_IN_WINCE(mode)) : m_hdc(hdc) { #ifndef __WXWINCE__ @@ -192,86 +309,108 @@ private: DECLARE_NO_COPY_CLASS(StretchBltModeChanger) }; -// =========================================================================== -// implementation -// =========================================================================== - -// ---------------------------------------------------------------------------- -// wxColourChanger -// ---------------------------------------------------------------------------- +#if wxUSE_DYNLIB_CLASS -wxColourChanger::wxColourChanger(wxDC& dc) : m_dc(dc) +// helper class to cache dynamically loaded libraries and not attempt reloading +// them if it fails +class wxOnceOnlyDLLLoader { - const wxBrush& brush = dc.GetBrush(); - if ( brush.Ok() && brush.GetStyle() == wxSTIPPLE_MASK_OPAQUE ) +public: + // ctor argument must be a literal string as we don't make a copy of it! + wxOnceOnlyDLLLoader(const wxChar *dllName) + : m_dllName(dllName) { - HDC hdc = GetHdcOf(dc); - m_colFgOld = ::GetTextColor(hdc); - m_colBgOld = ::GetBkColor(hdc); + } - // note that Windows convention is opposite to wxWindows 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()); - } - const wxColour& colBg = dc.GetTextBackground(); - if ( colBg.Ok() ) + // 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 ( m_dllName ) { - ::SetTextColor(hdc, colBg.GetPixel()); - } + m_dll.Load(m_dllName); - SetBkMode(hdc, - dc.GetBackgroundMode() == wxTRANSPARENT ? TRANSPARENT - : OPAQUE); + // reset the name whether we succeeded or failed so that we don't + // try again the next time + m_dllName = NULL; + } - // flag which telsl us to undo changes in the dtor - m_changed = TRUE; + return m_dll.IsLoaded() ? m_dll.GetSymbol(name) : NULL; } - else + + void Unload() { - // nothing done, nothing to undo - m_changed = FALSE; + if ( m_dll.IsLoaded() ) + { + m_dll.Unload(); + } } -} -wxColourChanger::~wxColourChanger() +private: + wxDynamicLibrary m_dll; + const wxChar *m_dllName; +}; + +static wxOnceOnlyDLLLoader wxMSIMG32DLL(_T("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) + +#endif // wxUSE_DYNLIB_CLASS + +// =========================================================================== +// implementation +// =========================================================================== + +// ---------------------------------------------------------------------------- +// wxBrushAttrsSetter +// ---------------------------------------------------------------------------- + +wxBrushAttrsSetter::wxBrushAttrsSetter(wxMSWDCImpl& dc) + : wxBkModeChanger(GetHdcOf(dc)), + wxTextColoursChanger(GetHdcOf(dc)) { - if ( m_changed ) + const wxBrush& brush = dc.GetBrush(); + if ( brush.IsOk() && brush.GetStyle() == wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE ) { - // restore the colours we changed - HDC hdc = GetHdcOf(m_dc); + // note that Windows convention is opposite to wxWidgets one, this is + // why text colour becomes the background one and vice versa + wxTextColoursChanger::Change(dc.GetTextBackground(), + dc.GetTextForeground()); - ::SetBkMode(hdc, TRANSPARENT); - ::SetTextColor(hdc, m_colFgOld); - ::SetBkColor(hdc, m_colBgOld); + wxBkModeChanger::Change(dc.GetBackgroundMode()); } } // --------------------------------------------------------------------------- -// wxDC +// wxMSWDCImpl // --------------------------------------------------------------------------- -// Default constructor -wxDC::wxDC() +wxMSWDCImpl::wxMSWDCImpl( wxDC *owner, WXHDC hDC ) : + wxDCImpl( owner ) { - m_canvas = NULL; - - m_oldBitmap = 0; - m_oldPen = 0; - m_oldBrush = 0; - m_oldFont = 0; -#if wxUSE_PALETTE - m_oldPalette = 0; -#endif // wxUSE_PALETTE - - m_bOwnsDC = FALSE; - m_hDC = 0; + Init(); + m_hDC = hDC; } -wxDC::~wxDC() +wxMSWDCImpl::~wxMSWDCImpl() { if ( m_hDC != 0 ) { @@ -285,9 +424,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 { @@ -301,7 +440,7 @@ 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) { @@ -309,7 +448,7 @@ void wxDC::SelectOldObjects(WXHDC dc) { ::SelectObject((HDC) dc, (HBITMAP) m_oldBitmap); #ifdef __WXDEBUG__ - if (m_selectedBitmap.Ok()) + if (m_selectedBitmap.IsOk()) { m_selectedBitmap.SetSelectedInto(NULL); } @@ -355,11 +494,9 @@ void wxDC::SelectOldObjects(WXHDC dc) // clipping // --------------------------------------------------------------------------- -void wxDC::UpdateClipBox() +void wxMSWDCImpl::UpdateClipBox() { -#ifdef __WXMICROWIN__ - if (!GetHDC()) return; -#endif + WXMICROWIN_CHECK_HDC RECT rect; ::GetClipBox(GetHdc(), &rect); @@ -370,23 +507,45 @@ void wxDC::UpdateClipBox() m_clipY2 = (wxCoord) YDEV2LOG(rect.bottom); } -// common part of DoSetClippingRegion() and DoSetClippingRegionAsRegion() -void wxDC::SetClippingHrgn(WXHRGN hrgn) +void +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 ) + { + wxMSWDCImpl *self = wxConstCast(this, wxMSWDCImpl); + self->UpdateClipBox(); + + if ( !m_clipX1 && !m_clipX2 ) + self->m_clipping = false; + } + + wxDCImpl::DoGetClippingBox(x, y, w, h); +} + +// common part of DoSetClippingRegion() and DoSetDeviceClippingRegion() +void wxMSWDCImpl::SetClippingHrgn(WXHRGN hrgn) { wxCHECK_RET( hrgn, wxT("invalid clipping region") ); -#ifdef __WXMICROWIN__ - if (!GetHdc()) return; -#endif // __WXMICROWIN__ + WXMICROWIN_CHECK_HDC // note that we combine the new clipping region with the existing one: this // is compatible with what the other ports do and is the documented // behaviour now (starting with 2.3.3) -#if defined(__WIN16__) || defined(__WXWINCE__) +#if defined(__WXWINCE__) RECT rectClip; if ( !::GetClipBox(GetHdc(), &rectClip) ) return; + // GetClipBox returns logical coordinates, so transform to device + rectClip.left = LogicalToDeviceX(rectClip.left); + rectClip.top = LogicalToDeviceY(rectClip.top); + rectClip.right = LogicalToDeviceX(rectClip.right); + rectClip.bottom = LogicalToDeviceY(rectClip.bottom); + HRGN hrgnDest = ::CreateRectRgn(0, 0, 0, 0); HRGN hrgnClipOld = ::CreateRectRgn(rectClip.left, rectClip.top, rectClip.right, rectClip.bottom); @@ -398,21 +557,21 @@ void wxDC::SetClippingHrgn(WXHRGN hrgn) ::DeleteObject(hrgnClipOld); ::DeleteObject(hrgnDest); -#else // Win32 +#else // !WinCE if ( ::ExtSelectClipRgn(GetHdc(), (HRGN)hrgn, RGN_AND) == ERROR ) { wxLogLastError(_T("ExtSelectClipRgn")); return; } -#endif // Win16/32 +#endif // WinCE/!WinCE - m_clipping = TRUE; + m_clipping = true; 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 @@ -434,19 +593,25 @@ 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() { -#ifdef __WXMICROWIN__ - if (!GetHDC()) return; -#endif + WXMICROWIN_CHECK_HDC if (m_clipping && m_hDC) { +#if 1 + // On a PocketPC device (not necessarily emulator), resetting + // the clip region as per the old method causes bad display + // problems. In fact setting a null region is probably OK + // on desktop WIN32 also, since the WIN32 docs imply that the user + // clipping region is independent from the paint clipping region. + ::SelectClipRgn(GetHdc(), 0); +#else // TODO: this should restore the previous clipping region, // so that OnPaint processing works correctly, and the update // clipping region doesn't get destroyed after the first @@ -454,25 +619,26 @@ void wxDC::DestroyClippingRegion() HRGN rgn = CreateRectRgn(0, 0, 32000, 32000); ::SelectClipRgn(GetHdc(), rgn); ::DeleteObject(rgn); +#endif } - m_clipping = FALSE; + wxDCImpl::DestroyClippingRegion(); } // --------------------------------------------------------------------------- // query capabilities // --------------------------------------------------------------------------- -bool wxDC::CanDrawBitmap() const +bool wxMSWDCImpl::CanDrawBitmap() const { - return TRUE; + return true; } -bool wxDC::CanGetTextExtent() const +bool wxMSWDCImpl::CanGetTextExtent() const { #ifdef __WXMICROWIN__ // TODO Extend MicroWindows' GetDeviceCaps function - return TRUE; + return true; #else // What sort of display is it? int technology = ::GetDeviceCaps(GetHdc(), TECHNOLOGY); @@ -481,11 +647,9 @@ bool wxDC::CanGetTextExtent() const #endif } -int wxDC::GetDepth() const +int wxMSWDCImpl::GetDepth() const { -#ifdef __WXMICROWIN__ - if (!GetHDC()) return 16; -#endif + WXMICROWIN_CHECK_HDC_RET(16) return (int)::GetDeviceCaps(GetHdc(), BITSPIXEL); } @@ -494,28 +658,26 @@ int wxDC::GetDepth() const // drawing // --------------------------------------------------------------------------- -void wxDC::Clear() +void wxMSWDCImpl::Clear() { -#ifdef __WXMICROWIN__ - if (!GetHDC()) return; -#endif + 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__ @@ -527,28 +689,18 @@ void wxDC::Clear() ::FillRect(GetHdc(), &rect, brush); ::DeleteObject(brush); - int width = DeviceToLogicalXRel(VIEWPORT_EXTENT)*m_signX, - height = DeviceToLogicalYRel(VIEWPORT_EXTENT)*m_signY; - -#ifndef __WXWINCE__ - ::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 x, wxCoord y, const wxColour& col, int style) +bool wxMSWDCImpl::DoFloodFill(wxCoord WXUNUSED_IN_WINCE(x), + wxCoord WXUNUSED_IN_WINCE(y), + const wxColour& WXUNUSED_IN_WINCE(col), + int WXUNUSED_IN_WINCE(style)) { #ifdef __WXWINCE__ - return FALSE; + return false; #else - -#ifdef __WXMICROWIN__ - if (!GetHDC()) return FALSE; -#endif + WXMICROWIN_CHECK_HDC_RET(false) bool success = (0 != ::ExtFloodFill(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), col.GetPixel(), @@ -572,32 +724,28 @@ bool wxDC::DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, int style) } CalcBoundingBox(x, y); - + return success; #endif } -bool wxDC::DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const +bool wxMSWDCImpl::DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const { -#ifdef __WXMICROWIN__ - if (!GetHDC()) return FALSE; -#endif + WXMICROWIN_CHECK_HDC_RET(false) - wxCHECK_MSG( col, FALSE, _T("NULL colour parameter in wxDC::GetPixel") ); + wxCHECK_MSG( col, false, _T("NULL colour parameter in wxMSWDCImpl::GetPixel") ); // get the color of the pixel COLORREF pixelcolor = ::GetPixel(GetHdc(), XLOG2DEV(x), YLOG2DEV(y)); wxRGBToColour(*col, pixelcolor); - return TRUE; + return true; } -void wxDC::DoCrossHair(wxCoord x, wxCoord y) +void wxMSWDCImpl::DoCrossHair(wxCoord x, wxCoord y) { -#ifdef __WXMICROWIN__ - if (!GetHDC()) return; -#endif + WXMICROWIN_CHECK_HDC wxCoord x1 = x-VIEWPORT_EXTENT; wxCoord y1 = y-VIEWPORT_EXTENT; @@ -611,11 +759,9 @@ 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) { -#ifdef __WXMICROWIN__ - if (!GetHDC()) return; -#endif + WXMICROWIN_CHECK_HDC wxDrawLine(GetHdc(), XLOG2DEV(x1), YLOG2DEV(y1), XLOG2DEV(x2), YLOG2DEV(y2)); @@ -625,19 +771,22 @@ 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) { #ifdef __WXWINCE__ - // FIXME: emulate Arc + // 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 + double ea = atan2(yc-y2, x2-xc)/M_PI*180; + DoDrawEllipticArcRot( xc-r, yc-r, 2*r, 2*r, sa, ea ); #else -#ifdef __WXMICROWIN__ - if (!GetHDC()) return; -#endif + WXMICROWIN_CHECK_HDC - wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling + wxBrushAttrsSetter cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling double dx = xc - x1; double dy = yc - y1; @@ -647,7 +796,7 @@ void wxDC::DoDrawArc(wxCoord x1, wxCoord y1, // 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; } @@ -664,7 +813,7 @@ void wxDC::DoDrawArc(wxCoord x1, wxCoord y1, wxCoord xxx2 = (wxCoord) (xxc+ray); wxCoord yyy2 = (wxCoord) (yyc+ray); - if ( m_brush.Ok() && m_brush.GetStyle() != wxTRANSPARENT ) + if ( m_brush.IsOk() && m_brush.GetStyle() != wxBRUSHSTYLE_TRANSPARENT ) { // Have to add 1 to bottom-right corner of rectangle // to make semi-circles look right (crooked line otherwise). @@ -683,17 +832,16 @@ 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) { -#ifdef __WXMICROWIN__ - if (!GetHDC()) return; -#endif - + // cases when we don't have DrawFrameControl() +#if defined(__SYMANTEC__) || defined(__WXMICROWIN__) + return wxDCBase::DoDrawCheckMark(x1, y1, width, height); +#else // normal case wxCoord x2 = x1 + width, y2 = y1 + height; -#if defined(__WIN32__) && !defined(__SYMANTEC__) && !defined(__WXMICROWIN__) RECT rect; rect.left = x1; rect.top = y1; @@ -701,39 +849,22 @@ 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 -#else // Win16 - // In WIN16, draw a cross - HPEN blackPen = ::CreatePen(PS_SOLID, 1, RGB(0, 0, 0)); - HPEN whiteBrush = (HPEN)::GetStockObject(WHITE_BRUSH); - HPEN hPenOld = (HPEN)::SelectObject(GetHdc(), blackPen); - HPEN hBrushOld = (HPEN)::SelectObject(GetHdc(), whiteBrush); - ::SetROP2(GetHdc(), R2_COPYPEN); - Rectangle(GetHdc(), x1, y1, x2, y2); - MoveToEx(GetHdc(), x1, y1, NULL); - LineTo(GetHdc(), x2, y2); - MoveToEx(GetHdc(), x2, y1, NULL); - LineTo(GetHdc(), x1, y2); - ::SelectObject(GetHdc(), hPenOld); - ::SelectObject(GetHdc(), hBrushOld); - ::DeleteObject(blackPen); -#endif // Win32/16 CalcBoundingBox(x1, y1); CalcBoundingBox(x2, y2); +#endif // Microwin/Normal } -void wxDC::DoDrawPoint(wxCoord x, wxCoord y) +void wxMSWDCImpl::DoDrawPoint(wxCoord x, wxCoord y) { -#ifdef __WXMICROWIN__ - if (!GetHDC()) return; -#endif + WXMICROWIN_CHECK_HDC COLORREF color = 0x00ffffff; - if (m_pen.Ok()) + if (m_pen.IsOk()) { color = m_pen.GetColour().GetPixel(); } @@ -743,13 +874,15 @@ void wxDC::DoDrawPoint(wxCoord x, wxCoord y) CalcBoundingBox(x, y); } -void wxDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset,int fillStyle) +void wxMSWDCImpl::DoDrawPolygon(int n, + wxPoint points[], + wxCoord xoffset, + wxCoord yoffset, + int WXUNUSED_IN_WINCE(fillStyle)) { -#ifdef __WXMICROWIN__ - if (!GetHDC()) return; -#endif + 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) @@ -788,11 +921,64 @@ void wxDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffs } } -void wxDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset) +void +wxMSWDCImpl::DoDrawPolyPolygon(int n, + int count[], + wxPoint points[], + wxCoord xoffset, + wxCoord yoffset, + int fillStyle) { -#ifdef __WXMICROWIN__ - if (!GetHDC()) return; +#ifdef __WXWINCE__ + wxDCImpl::DoDrawPolyPolygon(n, count, points, xoffset, yoffset, fillStyle); +#else + WXMICROWIN_CHECK_HDC + + wxBrushAttrsSetter cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling + int i, cnt; + for (i = cnt = 0; i < n; i++) + cnt += count[i]; + + // Do things less efficiently if we have offsets + if (xoffset != 0 || yoffset != 0) + { + POINT *cpoints = new POINT[cnt]; + for (i = 0; i < cnt; i++) + { + cpoints[i].x = (int)(points[i].x + xoffset); + cpoints[i].y = (int)(points[i].y + yoffset); + + CalcBoundingBox(cpoints[i].x, cpoints[i].y); + } +#ifndef __WXWINCE__ + int prev = SetPolyFillMode(GetHdc(),fillStyle==wxODDEVEN_RULE?ALTERNATE:WINDING); +#endif + (void)PolyPolygon(GetHdc(), cpoints, count, n); +#ifndef __WXWINCE__ + SetPolyFillMode(GetHdc(),prev); +#endif + delete[] cpoints; + } + else + { + for (i = 0; i < cnt; i++) + CalcBoundingBox(points[i].x, points[i].y); + +#ifndef __WXWINCE__ + int prev = SetPolyFillMode(GetHdc(),fillStyle==wxODDEVEN_RULE?ALTERNATE:WINDING); +#endif + (void)PolyPolygon(GetHdc(), (POINT*) points, count, n); +#ifndef __WXWINCE__ + SetPolyFillMode(GetHdc(),prev); +#endif + } #endif + // __WXWINCE__ +} + +void wxMSWDCImpl::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset) +{ + WXMICROWIN_CHECK_HDC // Do things less efficiently if we have offsets if (xoffset != 0 || yoffset != 0) @@ -819,65 +1005,47 @@ 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) { -#ifdef __WXMICROWIN__ - if (!GetHDC()) return; -#endif + 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 - - // I wonder if this shouldn´t be done after the LOG2DEV() conversions. RR. - if ( m_pen.GetStyle() == wxTRANSPARENT ) - { - x2++; - y2++; - } + wxCoord x2dev = XLOG2DEV(x2), + y2dev = YLOG2DEV(y2); - (void)Rectangle(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2)); + // 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__ + if ( m_pen.IsOk() && m_pen.GetStyle() == wxPENSTYLE_TRANSPARENT ) + { + 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) { -#ifdef __WXMICROWIN__ - if (!GetHDC()) return; -#endif + 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' if (radius < 0.0) { - double smallest = 0.0; - if (width < height) - smallest = width; - else - smallest = height; + double smallest = (width < height) ? width : height; radius = (- radius * smallest); } @@ -887,7 +1055,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.GetStyle() == wxPENSTYLE_TRANSPARENT ) { x2++; y2++; @@ -900,13 +1068,11 @@ 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) { -#ifdef __WXMICROWIN__ - if (!GetHDC()) return; -#endif + 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); @@ -917,18 +1083,110 @@ void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) CalcBoundingBox(x2, y2); } +#if wxUSE_SPLINES && !defined(__WXWINCE__) +void wxMSWDCImpl::DoDrawSpline(const wxPointList *points) +{ + // quadratic b-spline to cubic bezier spline conversion + // + // quadratic spline with control points P0,P1,P2 + // P(s) = P0*(1-s)^2 + P1*2*(1-s)*s + P2*s^2 + // + // bezier spline with control points B0,B1,B2,B3 + // B(s) = B0*(1-s)^3 + B1*3*(1-s)^2*s + B2*3*(1-s)*s^2 + B3*s^3 + // + // control points of bezier spline calculated from b-spline + // B0 = P0 + // B1 = (2*P1 + P0)/3 + // B2 = (2*P1 + P2)/3 + // B3 = P2 + + WXMICROWIN_CHECK_HDC + + wxASSERT_MSG( points, wxT("NULL pointer to spline points?") ); + + const size_t n_points = points->GetCount(); + wxASSERT_MSG( n_points > 2 , wxT("incomplete list of spline points?") ); + + const size_t n_bezier_points = n_points * 3 + 1; + POINT *lppt = (POINT *)malloc(n_bezier_points*sizeof(POINT)); + size_t bezier_pos = 0; + wxCoord x1, y1, x2, y2, cx1, cy1, cx4, cy4; + + 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++; + lppt[ bezier_pos ] = lppt[ bezier_pos-1 ]; + bezier_pos++; + + node = node->GetNext(); + p = node->GetData(); + + x2 = p->x; + y2 = p->y; + cx1 = ( x1 + x2 ) / 2; + cy1 = ( y1 + y2 ) / 2; + lppt[ bezier_pos ].x = XLOG2DEV(cx1); + lppt[ bezier_pos ].y = YLOG2DEV(cy1); + bezier_pos++; + lppt[ bezier_pos ] = lppt[ bezier_pos-1 ]; + bezier_pos++; + +#if !wxUSE_STL + while ((node = node->GetNext()) != NULL) +#else + while ((node = node->GetNext())) +#endif // !wxUSE_STL + { + p = (wxPoint *)node->GetData(); + x1 = x2; + y1 = y2; + x2 = p->x; + y2 = p->y; + cx4 = (x1 + x2) / 2; + cy4 = (y1 + y2) / 2; + // B0 is B3 of previous segment + // B1: + lppt[ bezier_pos ].x = XLOG2DEV((x1*2+cx1)/3); + lppt[ bezier_pos ].y = YLOG2DEV((y1*2+cy1)/3); + bezier_pos++; + // B2: + lppt[ bezier_pos ].x = XLOG2DEV((x1*2+cx4)/3); + lppt[ bezier_pos ].y = YLOG2DEV((y1*2+cy4)/3); + bezier_pos++; + // B3: + lppt[ bezier_pos ].x = XLOG2DEV(cx4); + lppt[ bezier_pos ].y = YLOG2DEV(cy4); + bezier_pos++; + cx1 = cx4; + cy1 = cy4; + } + + lppt[ bezier_pos ] = lppt[ bezier_pos-1 ]; + bezier_pos++; + lppt[ bezier_pos ].x = XLOG2DEV(x2); + lppt[ bezier_pos ].y = YLOG2DEV(y2); + bezier_pos++; + lppt[ bezier_pos ] = lppt[ bezier_pos-1 ]; + bezier_pos++; + + ::PolyBezier( GetHdc(), lppt, bezier_pos ); + + free(lppt); +} +#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__ - // FIXME + DoDrawEllipticArcRot( x, y, w, h, sa, ea ); #else -#ifdef __WXMICROWIN__ - if (!GetHDC()) return; -#endif + 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; @@ -946,6 +1204,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)); @@ -970,13 +1239,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) { -#ifdef __WXMICROWIN__ - if (!GetHDC()) return; -#endif + 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); @@ -988,13 +1255,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 ) { -#ifdef __WXMICROWIN__ - if (!GetHDC()) return; -#endif + WXMICROWIN_CHECK_HDC - wxCHECK_RET( bmp.Ok(), _T("invalid bitmap in wxDC::DrawBitmap") ); + wxCHECK_RET( bmp.IsOk(), _T("invalid bitmap in wxMSWDCImpl::DrawBitmap") ); int width = bmp.GetWidth(), height = bmp.GetHeight(); @@ -1010,7 +1275,7 @@ 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, hdcMem, bmp) ) + if ( AlphaBlt(GetHdc(), x, y, width, height, 0, 0, width, height, hdcMem, bmp) ) return; } @@ -1024,7 +1289,7 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask { // don't give assert here because this would break existing // programs - just silently ignore useMask parameter - useMask = FALSE; + useMask = false; } } if ( useMask ) @@ -1033,9 +1298,9 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask // use MaskBlt() with ROP which doesn't do anything to dst in the mask // points // On some systems, MaskBlt succeeds yet is much much slower - // than the wxWindows fall-back implementation. So we need + // than the wxWidgets fall-back implementation. So we need // to be able to switch this on and off at runtime. - bool ok = FALSE; + bool ok = false; #if wxUSE_SYSTEM_OPTIONS if (wxSystemOptions::GetOptionInt(wxT("no-maskblt")) == 0) #endif @@ -1069,12 +1334,13 @@ 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.SelectObjectAsSource(bmp); + + GetOwner()->Blit(x, y, width, height, &memDC, 0, 0, wxCOPY, useMask); memDC.SelectObject(wxNullBitmap); } @@ -1087,16 +1353,7 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask 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(); @@ -1117,17 +1374,12 @@ 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) { -#ifdef __WXMICROWIN__ - if (!GetHDC()) return; -#endif + WXMICROWIN_CHECK_HDC DrawAnyText(text, x, y); @@ -1135,65 +1387,37 @@ 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) { -#ifdef __WXMICROWIN__ - if (!GetHDC()) return; -#endif + 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) { -#ifdef __WXMICROWIN__ - if (!GetHDC()) return; -#endif + WXMICROWIN_CHECK_HDC // we test that we have some font because otherwise we should still use the // "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); } @@ -1203,7 +1427,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 ) @@ -1235,19 +1459,19 @@ 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); // "upper left" and "upper right" CalcBoundingBox(x, y); - CalcBoundingBox(x + wxCoord(w*cos(rad)), y - wxCoord(h*sin(rad))); + CalcBoundingBox(x + wxCoord(w*cos(rad)), y - wxCoord(w*sin(rad))); // "bottom left" and "bottom right" x += (wxCoord)(h*sin(rad)); y += (wxCoord)(h*cos(rad)); CalcBoundingBox(x, y); - CalcBoundingBox(x + wxCoord(h*sin(rad)), y + wxCoord(h*cos(rad))); + CalcBoundingBox(x + wxCoord(w*cos(rad)), y - wxCoord(w*sin(rad))); } #endif } @@ -1258,11 +1482,9 @@ void wxDC::DoDrawRotatedText(const wxString& text, #if wxUSE_PALETTE -void wxDC::DoSelectPalette(bool realize) +void wxMSWDCImpl::DoSelectPalette(bool realize) { -#ifdef __WXMICROWIN__ - if (!GetHDC()) return; -#endif + WXMICROWIN_CHECK_HDC // Set the old object temporarily, in case the assignment deletes an object // that's not yet selected out. @@ -1272,11 +1494,11 @@ void wxDC::DoSelectPalette(bool realize) m_oldPalette = 0; } - if ( m_palette.Ok() ) + if ( m_palette.IsOk() ) { HPALETTE oldPal = ::SelectPalette(GetHdc(), GetHpaletteOf(m_palette), - FALSE); + false); if (!m_oldPalette) m_oldPalette = (WXHPALETTE) oldPal; @@ -1285,22 +1507,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); + 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 ) @@ -1315,145 +1537,155 @@ void wxDC::InitializePalette() #endif // wxUSE_PALETTE -void wxDC::SetFont(const wxFont& the_font) -{ -#ifdef __WXMICROWIN__ - if (!GetHDC()) return; -#endif +// SetFont/Pen/Brush() really ask to be implemented as a single template +// function... but doing it is not worth breaking OpenWatcom build - // Set the old object temporarily, in case the assignment deletes an object - // that's not yet selected out. - if (m_oldFont) - { - ::SelectObject(GetHdc(), (HFONT) m_oldFont); - m_oldFont = 0; - } +void wxMSWDCImpl::SetFont(const wxFont& font) +{ + WXMICROWIN_CHECK_HDC - m_font = the_font; + if ( font == m_font ) + return; - if (!the_font.Ok()) + if ( font.IsOk() ) { - if (m_oldFont) - ::SelectObject(GetHdc(), (HFONT) m_oldFont); - m_oldFont = 0; - } + HGDIOBJ hfont = ::SelectObject(GetHdc(), GetHfontOf(font)); + if ( hfont == HGDI_ERROR ) + { + wxLogLastError(_T("SelectObject(font)")); + } + else // selected ok + { + if ( !m_oldFont ) + m_oldFont = (WXHFONT)hfont; - if (m_font.Ok() && m_font.GetResourceHandle()) + m_font = font; + } + } + else // invalid font, reset the current font { - HFONT f = (HFONT) ::SelectObject(GetHdc(), (HFONT) m_font.GetResourceHandle()); - if (f == (HFONT) NULL) + if ( m_oldFont ) { - wxLogDebug(wxT("::SelectObject failed in wxDC::SetFont.")); + if ( ::SelectObject(GetHdc(), (HPEN) m_oldFont) == HGDI_ERROR ) + { + wxLogLastError(_T("SelectObject(old font)")); + } + + m_oldFont = 0; } - if (!m_oldFont) - m_oldFont = (WXHFONT) f; + + m_font = wxNullFont; } } -void wxDC::SetPen(const wxPen& pen) +void wxMSWDCImpl::SetPen(const wxPen& pen) { -#ifdef __WXMICROWIN__ - if (!GetHDC()) return; -#endif + WXMICROWIN_CHECK_HDC - // Set the old object temporarily, in case the assignment deletes an object - // that's not yet selected out. - if (m_oldPen) - { - ::SelectObject(GetHdc(), (HPEN) m_oldPen); - m_oldPen = 0; - } - - m_pen = pen; + if ( pen == m_pen ) + return; - if (!m_pen.Ok()) + if ( pen.IsOk() ) { - if (m_oldPen) - ::SelectObject(GetHdc(), (HPEN) m_oldPen); - m_oldPen = 0; - } + HGDIOBJ hpen = ::SelectObject(GetHdc(), GetHpenOf(pen)); + if ( hpen == HGDI_ERROR ) + { + wxLogLastError(_T("SelectObject(pen)")); + } + else // selected ok + { + if ( !m_oldPen ) + m_oldPen = (WXHPEN)hpen; - if (m_pen.Ok()) + m_pen = pen; + } + } + else // invalid pen, reset the current pen { - if (m_pen.GetResourceHandle()) + if ( m_oldPen ) { - HPEN p = (HPEN) ::SelectObject(GetHdc(), (HPEN)m_pen.GetResourceHandle()); - if (!m_oldPen) - m_oldPen = (WXHPEN) p; + if ( ::SelectObject(GetHdc(), (HPEN) m_oldPen) == HGDI_ERROR ) + { + wxLogLastError(_T("SelectObject(old pen)")); + } + + m_oldPen = 0; } + + m_pen = wxNullPen; } } -void wxDC::SetBrush(const wxBrush& brush) +void wxMSWDCImpl::SetBrush(const wxBrush& brush) { -#ifdef __WXMICROWIN__ - if (!GetHDC()) return; -#endif - - // Set the old object temporarily, in case the assignment deletes an object - // that's not yet selected out. - if (m_oldBrush) - { - ::SelectObject(GetHdc(), (HBRUSH) m_oldBrush); - m_oldBrush = 0; - } + WXMICROWIN_CHECK_HDC - m_brush = brush; + if ( brush == m_brush ) + return; - if (!m_brush.Ok()) + if ( brush.IsOk() ) { - if (m_oldBrush) - ::SelectObject(GetHdc(), (HBRUSH) m_oldBrush); - m_oldBrush = 0; - } + // we must make sure the brush is aligned with the logical coordinates + // before selecting it + wxBitmap *stipple = brush.GetStipple(); + if ( stipple && stipple->IsOk() ) + { + if ( !::SetBrushOrgEx + ( + GetHdc(), + m_deviceOriginX % stipple->GetWidth(), + m_deviceOriginY % stipple->GetHeight(), + NULL // [out] previous brush origin + ) ) + { + wxLogLastError(_T("SetBrushOrgEx()")); + } + } - if (m_brush.Ok()) - { - // to make sure the brush is alligned with the logical coordinates - wxBitmap *stipple = m_brush.GetStipple(); - if ( stipple && stipple->Ok() ) + HGDIOBJ hbrush = ::SelectObject(GetHdc(), GetHbrushOf(brush)); + if ( hbrush == HGDI_ERROR ) { -#ifdef __WIN32__ - ::SetBrushOrgEx(GetHdc(), - m_deviceOriginX % stipple->GetWidth(), - m_deviceOriginY % stipple->GetHeight(), - NULL); // don't need previous brush origin -#else - ::SetBrushOrg(GetHdc(), - m_deviceOriginX % stipple->GetWidth(), - m_deviceOriginY % stipple->GetHeight()); -#endif + wxLogLastError(_T("SelectObject(brush)")); } + else // selected ok + { + if ( !m_oldBrush ) + m_oldBrush = (WXHBRUSH)hbrush; - if ( m_brush.GetResourceHandle() ) + m_brush = brush; + } + } + else // invalid brush, reset the current brush + { + if ( m_oldBrush ) { - HBRUSH b = 0; - b = (HBRUSH) ::SelectObject(GetHdc(), (HBRUSH)m_brush.GetResourceHandle()); - if (!m_oldBrush) - m_oldBrush = (WXHBRUSH) b; + if ( ::SelectObject(GetHdc(), (HPEN) m_oldBrush) == HGDI_ERROR ) + { + wxLogLastError(_T("SelectObject(old brush)")); + } + + m_oldBrush = 0; } + + m_brush = wxNullBrush; } } -void wxDC::SetBackground(const wxBrush& brush) +void wxMSWDCImpl::SetBackground(const wxBrush& brush) { -#ifdef __WXMICROWIN__ - if (!GetHDC()) return; -#endif + 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) { -#ifdef __WXMICROWIN__ - if (!GetHDC()) return; -#endif + WXMICROWIN_CHECK_HDC m_backgroundMode = mode; @@ -1461,18 +1693,16 @@ void wxDC::SetBackgroundMode(int mode) // and m_backgroundMode is used there } -void wxDC::SetLogicalFunction(int function) +void wxMSWDCImpl::SetLogicalFunction(int function) { -#ifdef __WXMICROWIN__ - if (!GetHDC()) return; -#endif + WXMICROWIN_CHECK_HDC m_logicalFunction = function; SetRop(m_hDC); } -void wxDC::SetRop(WXHDC dc) +void wxMSWDCImpl::SetRop(WXHDC dc) { if ( !dc || m_logicalFunction < 0 ) return; @@ -1506,21 +1736,21 @@ void wxDC::SetRop(WXHDC dc) 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; + // 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() { } @@ -1528,11 +1758,9 @@ void wxDC::EndPage() // text metrics // --------------------------------------------------------------------------- -wxCoord wxDC::GetCharHeight() const +wxCoord wxMSWDCImpl::GetCharHeight() const { -#ifdef __WXMICROWIN__ - if (!GetHDC()) return 0; -#endif + WXMICROWIN_CHECK_HDC_RET(0) TEXTMETRIC lpTextMetric; @@ -1541,11 +1769,9 @@ wxCoord wxDC::GetCharHeight() const return lpTextMetric.tmHeight; } -wxCoord wxDC::GetCharWidth() const +wxCoord wxMSWDCImpl::GetCharWidth() const { -#ifdef __WXMICROWIN__ - if (!GetHDC()) return 0; -#endif + WXMICROWIN_CHECK_HDC_RET(0) TEXTMETRIC lpTextMetric; @@ -1554,9 +1780,9 @@ wxCoord wxDC::GetCharWidth() const return lpTextMetric.tmAveCharWidth; } -void wxDC::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y, +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()) @@ -1572,7 +1798,7 @@ void wxDC::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y, HFONT hfontOld; if ( font ) { - wxASSERT_MSG( font->Ok(), _T("invalid font in wxDC::GetTextExtent") ); + wxASSERT_MSG( font->IsOk(), _T("invalid font in wxMSWDCImpl::GetTextExtent") ); hfontOld = (HFONT)::SelectObject(GetHdc(), GetHfontOf(*font)); } @@ -1582,10 +1808,42 @@ void wxDC::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y, } SIZE sizeRect; - TEXTMETRIC tm; + const size_t len = string.length(); + if ( !::GetTextExtentPoint32(GetHdc(), string.wx_str(), len, &sizeRect) ) + { + wxLogLastError(_T("GetTextExtentPoint32()")); + } - GetTextExtentPoint(GetHdc(), string, string.length(), &sizeRect); - GetTextMetrics(GetHdc(), &tm); +#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; + + 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) + + TEXTMETRIC tm; + ::GetTextMetrics(GetHdc(), &tm); if (x) *x = sizeRect.cx; @@ -1602,11 +1860,70 @@ void wxDC::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y, } } -void wxDC::SetMapMode(int mode) + +// Each element of the array will be the width of the string up to and +// including the coresoponding character in text. + +bool wxMSWDCImpl::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const { -#ifdef __WXMICROWIN__ - if (!GetHDC()) return; + 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; + + 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; + } + + return true; +} + +void wxMSWDCImpl::RealizeScaleAndOrigin() +{ + // 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); + + 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 wxMSWDCImpl::SetMapMode(int mode) +{ + WXMICROWIN_CHECK_HDC m_mappingMode = mode; @@ -1658,181 +1975,115 @@ void wxDC::SetMapMode(int mode) } } - // 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) { -#ifdef __WXMICROWIN__ - if (!GetHDC()) return; -#endif + WXMICROWIN_CHECK_HDC -#ifndef __WXWINCE__ if ( x == m_userScaleX && y == m_userScaleY ) return; - m_userScaleX = x; - m_userScaleY = y; + wxDCImpl::SetUserScale(x,y); - SetMapMode(m_mappingMode); -#endif + RealizeScaleAndOrigin(); } -void wxDC::SetAxisOrientation(bool xLeftRight, bool yBottomUp) +void wxMSWDCImpl::SetAxisOrientation(bool xLeftRight, + bool yBottomUp) { -#ifdef __WXMICROWIN__ - if (!GetHDC()) return; -#endif + 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) { -#ifdef __WXMICROWIN__ - if (!GetHDC()) return; -#endif + WXMICROWIN_CHECK_HDC -#ifndef __WXWINCE__ - 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 ); - 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) { -#ifdef __WXMICROWIN__ - if (!GetHDC()) return; -#endif - -#ifndef __WXWINCE__ - if ( x == m_logicalOriginX && y == m_logicalOriginY ) - return; + WXMICROWIN_CHECK_HDC - m_logicalOriginX = x; - m_logicalOriginY = y; - - ::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) { -#ifdef __WXMICROWIN__ - if (!GetHDC()) return; -#endif + WXMICROWIN_CHECK_HDC -#ifndef __WXWINCE__ 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); -#endif } // --------------------------------------------------------------------------- -// 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 +bool wxMSWDCImpl::DoBlit(wxCoord dstX, wxCoord dstY, + wxCoord dstWidth, wxCoord dstHeight, + wxDC *source, + wxCoord srcX, wxCoord srcY, + int rop, bool useMask, + wxCoord srcMaskX, wxCoord srcMaskY) { - // axis orientation is not taken into account for conversion of a distance - return (wxCoord) (x*m_logicalScaleX*m_userScaleX*m_scaleX); + return DoStretchBlit(dstX, dstY, dstWidth, dstHeight, source, srcX, srcY, dstWidth, dstHeight, rop, useMask, srcMaskX, srcMaskY); } -wxCoord wxDCBase::LogicalToDeviceY(wxCoord y) const +bool wxMSWDCImpl::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) { - return LogicalToDeviceYRel(y - m_logicalOriginY)*m_signY + m_deviceOriginY; -} + wxCHECK_MSG( source, false, _T("wxMSWDCImpl::Blit(): NULL wxDC pointer") ); -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); -} + WXMICROWIN_CHECK_HDC_RET(false) -// --------------------------------------------------------------------------- -// 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) -{ - wxCHECK_MSG( source, FALSE, _T("wxDC::Blit(): NULL wxDC pointer") ); + wxMSWDCImpl *implSrc = wxDynamicCast( source->GetImpl(), wxMSWDCImpl ); + if ( !implSrc ) + { + // TODO: Do we want to be able to blit from other DCs too? + return false; + } -#ifdef __WXMICROWIN__ - if (!GetHDC()) return FALSE; -#endif + const HDC hdcSrc = GetHdcOf(*implSrc); - const wxBitmap& bmpSrc = source->m_selectedBitmap; - if ( bmpSrc.Ok() && bmpSrc.HasAlpha() ) + // if either the source or destination has alpha channel, we must use + // AlphaBlt() as other function don't handle it correctly + const wxBitmap& bmpSrc = implSrc->GetSelectedBitmap(); + if ( bmpSrc.IsOk() && (bmpSrc.HasAlpha() || + (m_selectedBitmap.IsOk() && m_selectedBitmap.HasAlpha())) ) { - if ( AlphaBlt(GetHdc(), xdest, ydest, width, height, - GetHdcOf(*source), bmpSrc) ) - return TRUE; + if ( AlphaBlt(GetHdc(), xdest, ydest, dstWidth, dstHeight, + xsrc, ysrc, srcWidth, srcHeight, hdcSrc, bmpSrc) ) + return true; } wxMask *mask = NULL; @@ -1840,11 +2091,11 @@ 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 - useMask = FALSE; + useMask = false; } } @@ -1853,18 +2104,9 @@ 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 = SRCCOPY; + DWORD dwRop; switch (rop) { case wxXOR: dwRop = SRCINVERT; break; @@ -1885,10 +2127,10 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, case wxNOR: dwRop = NOTSRCCOPY; break; default: wxFAIL_MSG( wxT("unsupported logical function") ); - return FALSE; + return false; } - bool success = FALSE; + bool success = false; if (useMask) { @@ -1899,22 +2141,25 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, // of the mask which is also contrary to the Windows one) // On some systems, MaskBlt succeeds yet is much much slower - // than the wxWindows fall-back implementation. So we need + // 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) #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 ) @@ -1927,62 +2172,66 @@ 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_mask = ::CreateCompatibleDC(hdcSrc); 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, dstWidth, 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, 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 ) { @@ -2010,7 +2259,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); @@ -2021,36 +2270,53 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, { StretchBltModeChanger changeMode(GetHdc(), COLORONCOLOR); + // Figure out what co-ordinate system we're supposed to specify + // ysrc in. + const LONG hDIB = ds.dsBmih.biHeight; + if ( hDIB > 0 ) + { + // reflect ysrc + ysrc = hDIB - (ysrc + dstHeight); + } + if ( ::StretchDIBits(GetHdc(), xdest, ydest, - width, height, - 0, 0, - width, height, + dstWidth, dstHeight, + xsrc, ysrc, + srcWidth, srcHeight, ds.dsBm.bmBits, (LPBITMAPINFO)&ds.dsBmih, DIB_RGB_COLORS, - SRCCOPY + dwRop ) == (int)GDI_ERROR ) { - wxLogLastError(wxT("StretchDIBits")); + // On Win9x this API fails most (all?) of the time, so + // logging it becomes quite distracting. Since it falls + // back to the code below this is not really serious, so + // don't log it. + //wxLogLastError(wxT("StretchDIBits")); } else { - success = TRUE; + success = true; } } } if ( !success && (caps & RC_STRETCHBLT) ) +#endif + // __WXWINCE__ { +#ifndef __WXWINCE__ StretchBltModeChanger changeMode(GetHdc(), COLORONCOLOR); +#endif if ( !::StretchBlt ( GetHdc(), - xdest, ydest, width, height, - GetHdcOf(*source), - xsrc, ysrc, width, height, + xdest, ydest, dstWidth, dstHeight, + hdcSrc, + xsrc, ysrc, srcWidth, srcHeight, dwRop ) ) { @@ -2058,54 +2324,40 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, } else { - success = TRUE; + success = true; } } 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")); } else { - success = TRUE; + success = true; } } -#endif - // __WXWINCE__ } - ::SetTextColor(GetHdc(), old_textground); - ::SetBkColor(GetHdc(), old_background); - return success; } -void wxDC::DoGetSize(int *w, int *h) const +void wxMSWDCImpl::GetDeviceSize(int *width, int *height) const { -#ifdef __WXMICROWIN__ - if (!GetHDC()) return; -#endif + WXMICROWIN_CHECK_HDC - if ( w ) *w = ::GetDeviceCaps(GetHdc(), HORZRES); - if ( h ) *h = ::GetDeviceCaps(GetHdc(), VERTRES); + if ( width ) + *width = ::GetDeviceCaps(GetHdc(), HORZRES); + if ( height ) + *height = ::GetDeviceCaps(GetHdc(), VERTRES); } -void wxDC::DoGetSizeMM(int *w, int *h) const +void wxMSWDCImpl::DoGetSizeMM(int *w, int *h) const { -#ifdef __WXMICROWIN__ - if (!GetHDC()) return; -#endif + WXMICROWIN_CHECK_HDC // if we implement it in terms of DoGetSize() instead of directly using the // results returned by GetDeviceCaps(HORZ/VERTSIZE) as was done before, it @@ -2133,11 +2385,9 @@ void wxDC::DoGetSizeMM(int *w, int *h) const } } -wxSize wxDC::GetPPI() const +wxSize wxMSWDCImpl::GetPPI() const { -#ifdef __WXMICROWIN__ - if (!GetHDC()) return wxSize(); -#endif + WXMICROWIN_CHECK_HDC_RET(wxSize(0,0)) int x = ::GetDeviceCaps(GetHdc(), LOGPIXELSX); int y = ::GetDeviceCaps(GetHdc(), LOGPIXELSY); @@ -2145,17 +2395,6 @@ wxSize wxDC::GetPPI() const return wxSize(x, y); } -// For use by wxWindows only, unless custom units are required. -void wxDC::SetLogicalScale(double x, double y) -{ -#ifdef __WXMICROWIN__ - if (!GetHDC()) return; -#endif - - m_logicalScaleX = x; - m_logicalScaleY = y; -} - // ---------------------------------------------------------------------------- // DC caching // ---------------------------------------------------------------------------- @@ -2168,8 +2407,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) { @@ -2197,7 +2436,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(); @@ -2233,7 +2472,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(); @@ -2262,17 +2501,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); @@ -2282,8 +2521,8 @@ void wxDC::ClearCache() class wxDCModule : public wxModule { public: - virtual bool OnInit() { return TRUE; } - virtual void OnExit() { wxDC::ClearCache(); } + virtual bool OnInit() { return true; } + virtual void OnExit() { wxMSWDCImpl::ClearCache(); } private: DECLARE_DYNAMIC_CLASS(wxDCModule) @@ -2298,11 +2537,13 @@ IMPLEMENT_DYNAMIC_CLASS(wxDCModule, wxModule) // ---------------------------------------------------------------------------- static bool AlphaBlt(HDC hdcDst, - int x, int y, int width, int height, + 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( bmp.IsOk() && bmp.HasAlpha(), _T("AlphaBlt(): invalid bitmap") ); wxASSERT_MSG( hdcDst && hdcSrc, _T("AlphaBlt(): invalid HDC") ); // do we have AlphaBlend() and company in the headers? @@ -2312,32 +2553,8 @@ static bool AlphaBlt(HDC hdcDst, HDC,int,int,int,int, BLENDFUNCTION); - // bitmaps can be drawn only from GUI thread so there is no need to - // protect this static variable from multiple threads - static bool s_triedToLoad = FALSE; - static AlphaBlend_t pfnAlphaBlend = NULL; - if ( !s_triedToLoad ) - { - s_triedToLoad = TRUE; - - // don't give errors about the DLL being unavailable, we're - // prepared to handle this - wxLogNull nolog; - - wxDynamicLibrary dll(_T("msimg32.dll")); - if ( dll.IsLoaded() ) - { - pfnAlphaBlend = (AlphaBlend_t)dll.GetSymbol(_T("AlphaBlend")); - if ( pfnAlphaBlend ) - { - // we must keep the DLL loaded if we want to be able to - // call AlphaBlend() so just never unload it at all, not a - // big deal - dll.Detach(); - } - } - } - + static AlphaBlend_t + pfnAlphaBlend = (AlphaBlend_t)wxMSIMG32DLL.GetSymbol(_T("AlphaBlend")); if ( pfnAlphaBlend ) { BLENDFUNCTION bf; @@ -2346,44 +2563,51 @@ static bool AlphaBlt(HDC hdcDst, bf.SourceConstantAlpha = 0xff; bf.AlphaFormat = AC_SRC_ALPHA; - if ( pfnAlphaBlend(hdcDst, x, y, width, height, - hdcSrc, 0, 0, width, height, + if ( pfnAlphaBlend(hdcDst, x, y, dstWidth, dstHeight, + hdcSrc, srcX, srcY, srcWidth, srcHeight, bf) ) { // skip wxAlphaBlend() call below - return TRUE; + return true; } wxLogLastError(_T("AlphaBlend")); } +#else + wxUnusedVar(hdcSrc); #endif // defined(AC_SRC_OVER) // AlphaBlend() unavailable of failed: use our own (probably much slower) // implementation -#ifdef wxHAVE_RAW_BITMAP - wxAlphaBlend(hdcDst, x, y, width, height, bmp); +#ifdef wxHAS_RAW_BITMAP + wxAlphaBlend(hdcDst, x, y, dstWidth, dstHeight, srcX, srcY, srcWidth, srcHeight, bmp); - return TRUE; -#else // !wxHAVE_RAW_BITMAP + return true; +#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) - return FALSE; -#endif // wxHAVE_RAW_BITMAP + wxUnusedVar(bmp); + return false; +#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, const wxBitmap& bmpSrc) +wxAlphaBlend(HDC hdcDst, int xDst, int yDst, + 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, 0, 0, SRCCOPY) ) + if ( !::BitBlt(hdcMem, 0, 0, dstWidth, dstHeight, hdcDst, xDst, yDst, SRCCOPY) ) { wxLogLastError(_T("BitBlt")); } @@ -2398,13 +2622,17 @@ wxAlphaBlend(HDC hdcDst, int xDst, int yDst, int w, int h, const wxBitmap& bmpSr wxAlphaPixelData::Iterator pDst(dataDst), pSrc(dataSrc); - 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(); @@ -2414,20 +2642,140 @@ wxAlphaBlend(HDC hdcDst, int xDst, int yDst, int w, int h, const wxBitmap& bmpSr 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")); } } -#endif // #ifdef wxHAVE_RAW_BITMAP +#endif // wxHAS_RAW_BITMAP + +void wxMSWDCImpl::DoGradientFillLinear (const wxRect& rect, + const wxColour& initialColour, + const wxColour& destColour, + wxDirection nDirection) +{ + // use native function if we have compile-time support it and can load it + // during run-time (linking to it statically would make the program + // unusable on earlier Windows versions) +#if defined(GRADIENT_FILL_RECT_H) && wxUSE_DYNLIB_CLASS + typedef BOOL + (WINAPI *GradientFill_t)(HDC, PTRIVERTEX, ULONG, PVOID, ULONG, ULONG); + static GradientFill_t pfnGradientFill = + (GradientFill_t)wxMSIMG32DLL.GetSymbol(_T("GradientFill")); + + if ( pfnGradientFill ) + { + GRADIENT_RECT grect; + grect.UpperLeft = 0; + grect.LowerRight = 1; + + // invert colours direction if not filling from left-to-right or + // top-to-bottom + int firstVertex = nDirection == wxNORTH || nDirection == wxWEST ? 1 : 0; + + // one vertex for upper left and one for upper-right + TRIVERTEX vertices[2]; + + vertices[0].x = rect.GetLeft(); + vertices[0].y = rect.GetTop(); + 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); + vertices[firstVertex].Blue = (COLOR16)(initialColour.Blue() << 8); + vertices[firstVertex].Alpha = 0; + vertices[1 - firstVertex].Red = (COLOR16)(destColour.Red() << 8); + vertices[1 - firstVertex].Green = (COLOR16)(destColour.Green() << 8); + vertices[1 - firstVertex].Blue = (COLOR16)(destColour.Blue() << 8); + vertices[1 - firstVertex].Alpha = 0; + + if ( (*pfnGradientFill) + ( + GetHdc(), + vertices, + WXSIZEOF(vertices), + &grect, + 1, + nDirection == wxWEST || nDirection == wxEAST + ? GRADIENT_FILL_RECT_H + : GRADIENT_FILL_RECT_V + ) ) + { + // skip call of the base class version below + return; + } + + wxLogLastError(_T("GradientFill")); + } +#endif // wxUSE_DYNLIB_CLASS + + wxDCImpl::DoGradientFillLinear(rect, initialColour, destColour, nDirection); +} + +#if wxUSE_DYNLIB_CLASS + +static DWORD wxGetDCLayout(HDC hdc) +{ + typedef DWORD (WINAPI *GetLayout_t)(HDC); + static GetLayout_t + wxDL_INIT_FUNC(s_pfn, GetLayout, wxDynamicLibrary(_T("gdi32.dll"))); + + return s_pfnGetLayout ? s_pfnGetLayout(hdc) : (DWORD)-1; +} + +wxLayoutDirection wxMSWDCImpl::GetLayoutDirection() const +{ + DWORD layout = wxGetDCLayout(GetHdc()); + + if ( layout == (DWORD)-1 ) + return wxLayout_Default; + + return layout & LAYOUT_RTL ? wxLayout_RightToLeft : wxLayout_LeftToRight; +} + +void wxMSWDCImpl::SetLayoutDirection(wxLayoutDirection dir) +{ + typedef DWORD (WINAPI *SetLayout_t)(HDC, DWORD); + static SetLayout_t + wxDL_INIT_FUNC(s_pfn, SetLayout, wxDynamicLibrary(_T("gdi32.dll"))); + if ( !s_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; + + s_pfnSetLayout(GetHdc(), layout); +} + +#else // !wxUSE_DYNLIB_CLASS + +// 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