X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/213ad8e72cb6e838d15bf54145d661b081dca308..7f35e5eeca672d1772daec728fbea68d668bc4ea:/src/msw/dc.cpp diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp index 62d88bf832..f08a3b5984 100644 --- a/src/msw/dc.cpp +++ b/src/msw/dc.cpp @@ -25,6 +25,7 @@ #endif #ifndef WX_PRECOMP + #include "wx/msw/wrapcdlg.h" #include "wx/image.h" #include "wx/window.h" #include "wx/dc.h" @@ -35,12 +36,12 @@ #include "wx/dcmemory.h" #include "wx/log.h" #include "wx/icon.h" + #include "wx/dcprint.h" + #include "wx/module.h" #endif #include "wx/sysopt.h" -#include "wx/dcprint.h" -#include "wx/module.h" -#include "wx/dynload.h" +#include "wx/dynlib.h" #ifdef wxHAVE_RAW_BITMAP #include "wx/rawbmp.h" @@ -48,13 +49,16 @@ #include -#include "wx/msw/wrapcdlg.h" #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 */ @@ -72,7 +76,7 @@ #define WXMICROWIN_CHECK_HDC_RET(x) #endif -IMPLEMENT_ABSTRACT_CLASS(wxDC, wxDCBase) +IMPLEMENT_ABSTRACT_CLASS(wxMSWDCImpl, wxDCImpl) // --------------------------------------------------------------------------- // constants @@ -80,9 +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; - // 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 @@ -126,16 +127,21 @@ 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 // 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 @@ -152,11 +158,11 @@ wxAlphaBlend(HDC hdcDst, int x, int y, int w, int h, class wxColourChanger { public: - wxColourChanger(wxDC& dc); + wxColourChanger(wxMSWDCImpl& dc); ~wxColourChanger(); private: - wxDC& m_dc; + wxMSWDCImpl& m_dc; COLORREF m_colFgOld, m_colBgOld; @@ -196,36 +202,71 @@ private: DECLARE_NO_COPY_CLASS(StretchBltModeChanger) }; -// support for dynamic loading of msimg32.dll which we use for some functions -class wxMSImg32DLL +#if wxUSE_DYNLIB_CLASS + +// helper class to cache dynamically loaded libraries and not attempt reloading +// them if it fails +class wxOnceOnlyDLLLoader { public: - // return the symbol with the given name if the DLL not loaded or symbol - // not present - static void *GetSymbol(const wxChar *name) + // ctor argument must be a literal string as we don't make a copy of it! + wxOnceOnlyDLLLoader(const wxChar *dllName) + : m_dllName(dllName) + { + } + + + // return the symbol with the given name or NULL if the DLL not loaded + // or symbol not present + void *GetSymbol(const wxChar *name) { + // we're prepared to handle errors here wxLogNull noLog; - if ( !ms_triedToLoad ) + if ( m_dllName ) { - ms_triedToLoad = true; - ms_dll.Load(_T("msimg32")); + m_dll.Load(m_dllName); + + // reset the name whether we succeeded or failed so that we don't + // try again the next time + m_dllName = NULL; } - return ms_dll.IsLoaded() ? ms_dll.GetSymbol(name) : NULL; + return m_dll.IsLoaded() ? m_dll.GetSymbol(name) : NULL; + } + + void Unload() + { + if ( m_dll.IsLoaded() ) + { + m_dll.Unload(); + } } private: - static wxDynamicLibrary ms_dll; - static bool ms_triedToLoad; + wxDynamicLibrary m_dll; + const wxChar *m_dllName; }; -wxDynamicLibrary wxMSImg32DLL::ms_dll; -bool wxMSImg32DLL::ms_triedToLoad = false; +static wxOnceOnlyDLLLoader wxMSIMG32DLL(_T("msimg32")); -// helper macro for getting the symbols from msimg32.dll: it supposes that a -// type "name_t" is defined and casts the returned symbol to it automatically -#define wxMSIMG32_SYMBOL(name) (name ## _t)wxMSImg32DLL::GetSymbol(_T(#name)) +// 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 @@ -235,10 +276,10 @@ bool wxMSImg32DLL::ms_triedToLoad = false; // wxColourChanger // ---------------------------------------------------------------------------- -wxColourChanger::wxColourChanger(wxDC& dc) : m_dc(dc) +wxColourChanger::wxColourChanger(wxMSWDCImpl& dc) : m_dc(dc) { const wxBrush& brush = dc.GetBrush(); - if ( brush.Ok() && brush.GetStyle() == wxSTIPPLE_MASK_OPAQUE ) + if ( brush.IsOk() && brush.GetStyle() == wxSTIPPLE_MASK_OPAQUE ) { HDC hdc = GetHdcOf(dc); m_colFgOld = ::GetTextColor(hdc); @@ -247,13 +288,13 @@ wxColourChanger::wxColourChanger(wxDC& dc) : m_dc(dc) // 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() ) + if ( colFg.IsOk() ) { ::SetBkColor(hdc, colFg.GetPixel()); } const wxColour& colBg = dc.GetTextBackground(); - if ( colBg.Ok() ) + if ( colBg.IsOk() ) { ::SetTextColor(hdc, colBg.GetPixel()); } @@ -286,10 +327,17 @@ wxColourChanger::~wxColourChanger() } // --------------------------------------------------------------------------- -// wxDC +// wxMSWDCImpl // --------------------------------------------------------------------------- -wxDC::~wxDC() +wxMSWDCImpl::wxMSWDCImpl( wxDC *owner, WXHDC hDC ) : + wxDCImpl( owner ) +{ + Init(); + m_hDC = hDC; +} + +wxMSWDCImpl::~wxMSWDCImpl() { if ( m_hDC != 0 ) { @@ -303,9 +351,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,7 +367,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) { @@ -327,7 +375,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); } @@ -373,7 +421,7 @@ void wxDC::SelectOldObjects(WXHDC dc) // clipping // --------------------------------------------------------------------------- -void wxDC::UpdateClipBox() +void wxMSWDCImpl::UpdateClipBox() { WXMICROWIN_CHECK_HDC @@ -387,25 +435,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) +void wxMSWDCImpl::SetClippingHrgn(WXHRGN hrgn) { wxCHECK_RET( hrgn, wxT("invalid clipping region") ); @@ -450,7 +498,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 @@ -472,17 +520,25 @@ void wxDC::DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h) } } -void wxDC::DoSetClippingRegionAsRegion(const wxRegion& region) +void wxMSWDCImpl::DoSetClippingRegionAsRegion(const wxRegion& region) { SetClippingHrgn(region.GetHRGN()); } -void wxDC::DestroyClippingRegion() +void wxMSWDCImpl::DestroyClippingRegion() { 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 @@ -490,21 +546,22 @@ void wxDC::DestroyClippingRegion() HRGN rgn = CreateRectRgn(0, 0, 32000, 32000); ::SelectClipRgn(GetHdc(), rgn); ::DeleteObject(rgn); +#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 @@ -517,7 +574,7 @@ bool wxDC::CanGetTextExtent() const #endif } -int wxDC::GetDepth() const +int wxMSWDCImpl::GetDepth() const { WXMICROWIN_CHECK_HDC_RET(16) @@ -528,26 +585,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__ @@ -559,20 +616,10 @@ 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)) @@ -609,11 +656,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, _T("NULL colour parameter in wxMSWDCImpl::GetPixel") ); // get the color of the pixel COLORREF pixelcolor = ::GetPixel(GetHdc(), XLOG2DEV(x), YLOG2DEV(y)); @@ -623,7 +670,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 @@ -639,7 +686,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 @@ -651,7 +698,7 @@ 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) { @@ -676,7 +723,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; } @@ -693,7 +740,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() != wxTRANSPARENT ) { // Have to add 1 to bottom-right corner of rectangle // to make semi-circles look right (crooked line otherwise). @@ -712,15 +759,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) { - WXMICROWIN_CHECK_HDC - + // 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; @@ -732,33 +780,18 @@ void wxDC::DoDrawCheckMark(wxCoord x1, wxCoord y1, #else DrawFrameControl(GetHdc(), &rect, DFC_MENU, DFCS_MENUCHECK); #endif -#else // Symantec-MicroWin - // 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/Symantec-MicroWin CalcBoundingBox(x1, y1); CalcBoundingBox(x2, y2); +#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(); } @@ -768,7 +801,7 @@ void wxDC::DoDrawPoint(wxCoord x, wxCoord y) CalcBoundingBox(x, y); } -void wxDC::DoDrawPolygon(int n, +void wxMSWDCImpl::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, @@ -816,7 +849,7 @@ void wxDC::DoDrawPolygon(int n, } void -wxDC::DoDrawPolyPolygon(int n, +wxMSWDCImpl::DoDrawPolyPolygon(int n, int count[], wxPoint points[], wxCoord xoffset, @@ -870,7 +903,7 @@ wxDC::DoDrawPolyPolygon(int n, // __WXWINCE__ } -void wxDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset) +void wxMSWDCImpl::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset) { WXMICROWIN_CHECK_HDC @@ -899,7 +932,7 @@ 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 @@ -908,40 +941,27 @@ void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) 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.GetStyle() == wxTRANSPARENT ) + { + 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 @@ -975,7 +995,7 @@ 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 @@ -991,7 +1011,7 @@ void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) } #if wxUSE_SPLINES -void wxDC::DoDrawSpline(wxList *points) +void wxMSWDCImpl::DoDrawSpline(const wxPointList *points) { #ifdef __WXWINCE__ // WinCE does not support ::PolyBezier so use generic version @@ -1023,8 +1043,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++; @@ -1032,7 +1052,7 @@ void wxDC::DoDrawSpline(wxList *points) bezier_pos++; node = node->GetNext(); - p = (wxPoint *)node->GetData(); + p = node->GetData(); x2 = p->x; y2 = p->y; @@ -1090,7 +1110,7 @@ void wxDC::DoDrawSpline(wxList *points) #endif // 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 ); @@ -1116,6 +1136,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)); @@ -1140,11 +1171,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); @@ -1156,11 +1187,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(), _T("invalid bitmap in wxMSWDCImpl::DrawBitmap") ); int width = bmp.GetWidth(), height = bmp.GetHeight(); @@ -1176,7 +1207,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, 0, 0, hdcMem, bmp) ) + if ( AlphaBlt(GetHdc(), x, y, width, height, 0, 0, width, height, hdcMem, bmp) ) return; } @@ -1235,12 +1266,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); } @@ -1255,11 +1287,11 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask COLORREF old_textground = ::GetTextColor(GetHdc()); COLORREF old_background = ::GetBkColor(GetHdc()); - if (m_textForegroundColour.Ok()) + if (m_textForegroundColour.IsOk()) { ::SetTextColor(GetHdc(), m_textForegroundColour.GetPixel() ); } - if (m_textBackgroundColour.Ok()) + if (m_textBackgroundColour.IsOk()) { ::SetBkColor(GetHdc(), m_textBackgroundColour.GetPixel() ); } @@ -1289,7 +1321,7 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask } } -void wxDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y) +void wxMSWDCImpl::DoDrawText(const wxString& text, wxCoord x, wxCoord y) { WXMICROWIN_CHECK_HDC @@ -1299,20 +1331,20 @@ 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() ) + if ( m_textForegroundColour.IsOk() ) SetTextColor(GetHdc(), m_textForegroundColour.GetPixel()); DWORD old_background = 0; - if ( m_textBackgroundColour.Ok() ) + if ( m_textBackgroundColour.IsOk() ) { old_background = SetBkColor(GetHdc(), m_textBackgroundColour.GetPixel() ); } @@ -1337,13 +1369,13 @@ void wxDC::DrawAnyText(const wxString& text, wxCoord x, wxCoord y) // 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() ) + if ( m_textBackgroundColour.IsOk() ) (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) { @@ -1353,7 +1385,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); } @@ -1363,7 +1395,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 ) @@ -1395,7 +1427,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); @@ -1418,7 +1450,7 @@ void wxDC::DoDrawRotatedText(const wxString& text, #if wxUSE_PALETTE -void wxDC::DoSelectPalette(bool realize) +void wxMSWDCImpl::DoSelectPalette(bool realize) { WXMICROWIN_CHECK_HDC @@ -1430,7 +1462,7 @@ void wxDC::DoSelectPalette(bool realize) m_oldPalette = 0; } - if ( m_palette.Ok() ) + if ( m_palette.IsOk() ) { HPALETTE oldPal = ::SelectPalette(GetHdc(), GetHpaletteOf(m_palette), @@ -1443,22 +1475,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 ) @@ -1476,14 +1508,14 @@ 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 ) @@ -1493,7 +1525,7 @@ void wxDC::SetFont(const wxFont& font) else // selected ok { if ( !m_oldFont ) - m_oldFont = (WXHPEN)hfont; + m_oldFont = (WXHFONT)hfont; m_font = font; } @@ -1514,14 +1546,14 @@ 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 ) @@ -1552,19 +1584,19 @@ 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 wxBitmap *stipple = brush.GetStipple(); - if ( stipple && stipple->Ok() ) + if ( stipple && stipple->IsOk() ) { if ( !::SetBrushOrgEx ( @@ -1586,7 +1618,7 @@ void wxDC::SetBrush(const wxBrush& brush) else // selected ok { if ( !m_oldBrush ) - m_oldBrush = (WXHPEN)hbrush; + m_oldBrush = (WXHBRUSH)hbrush; m_brush = brush; } @@ -1607,19 +1639,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 @@ -1629,7 +1661,7 @@ void wxDC::SetBackgroundMode(int mode) // and m_backgroundMode is used there } -void wxDC::SetLogicalFunction(int function) +void wxMSWDCImpl::SetLogicalFunction(int function) { WXMICROWIN_CHECK_HDC @@ -1638,7 +1670,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; @@ -1672,21 +1704,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; } -void wxDC::EndDoc() +void wxMSWDCImpl::EndDoc() { } -void wxDC::StartPage() +void wxMSWDCImpl::StartPage() { } -void wxDC::EndPage() +void wxMSWDCImpl::EndPage() { } @@ -1694,7 +1726,7 @@ void wxDC::EndPage() // text metrics // --------------------------------------------------------------------------- -wxCoord wxDC::GetCharHeight() const +wxCoord wxMSWDCImpl::GetCharHeight() const { WXMICROWIN_CHECK_HDC_RET(0) @@ -1705,7 +1737,7 @@ wxCoord wxDC::GetCharHeight() const return lpTextMetric.tmHeight; } -wxCoord wxDC::GetCharWidth() const +wxCoord wxMSWDCImpl::GetCharWidth() const { WXMICROWIN_CHECK_HDC_RET(0) @@ -1716,9 +1748,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()) @@ -1734,7 +1766,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)); } @@ -1744,10 +1776,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()")); + } + +#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; - ::GetTextExtentPoint32(GetHdc(), string, string.length(), &sizeRect); - GetTextMetrics(GetHdc(), &tm); + 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; @@ -1768,7 +1832,7 @@ void wxDC::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y, // Each element of the array will be the width of the string up to and // including the coresoponding character in text. -bool wxDC::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const +bool wxMSWDCImpl::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const { static int maxLenText = -1; static int maxWidth = -1; @@ -1780,8 +1844,8 @@ bool wxDC::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) con { // Win9x and WinNT+ have different limits int version = wxGetOsVersion(); - maxLenText = version == wxWINDOWS_NT ? 65535 : 8192; - maxWidth = version == wxWINDOWS_NT ? INT_MAX : 32767; + maxLenText = version == wxOS_WINDOWS_NT ? 65535 : 8192; + maxWidth = version == wxOS_WINDOWS_NT ? INT_MAX : 32767; } widths.Empty(); @@ -1806,10 +1870,26 @@ bool wxDC::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) con return true; } +void wxMSWDCImpl::RealizeScaleAndOrigin() +{ + // VZ: it seems very wasteful to always use MM_ANISOTROPIC when in 99% of + // cases we could do with MM_TEXT and in the remaining 0.9% with + // MM_ISOTROPIC (TODO!) +#ifndef __WXWINCE__ + ::SetMapMode(GetHdc(), MM_ANISOTROPIC); + int width = DeviceToLogicalXRel(VIEWPORT_EXTENT)*m_signX, + height = DeviceToLogicalYRel(VIEWPORT_EXTENT)*m_signY; + + ::SetViewportExtEx(GetHdc(), VIEWPORT_EXTENT, VIEWPORT_EXTENT, NULL); + ::SetWindowExtEx(GetHdc(), width, height, NULL); + ::SetViewportOrgEx(GetHdc(), m_deviceOriginX, m_deviceOriginY, NULL); + ::SetWindowOrgEx(GetHdc(), m_logicalOriginX, m_logicalOriginY, NULL); +#endif +} -void wxDC::SetMapMode(int mode) +void wxMSWDCImpl::SetMapMode(int mode) { WXMICROWIN_CHECK_HDC @@ -1863,168 +1943,108 @@ 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); + ComputeScaleAndOrigin(); - 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 + 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; - - SetMapMode(m_mappingMode); - } -#endif -} - -void wxDC::SetSystemScale(double x, double y) -{ - WXMICROWIN_CHECK_HDC - - if ( x == m_scaleX && y == m_scaleY ) + if (signX == m_signX && signY == m_signY) return; - m_scaleX = x; - m_scaleY = y; + wxDCImpl::SetAxisOrientation( xLeftRight, yBottomUp ); -#ifndef __WXWINCE__ - SetMapMode(m_mappingMode); -#endif + RealizeScaleAndOrigin(); } -void wxDC::SetLogicalOrigin(wxCoord x, wxCoord y) +void wxMSWDCImpl::SetLogicalOrigin(wxCoord x, wxCoord y) { WXMICROWIN_CHECK_HDC if ( x == m_logicalOriginX && y == m_logicalOriginY ) return; - m_logicalOriginX = x; - m_logicalOriginY = y; + wxDCImpl::SetLogicalOrigin( x, y ); #ifndef __WXWINCE__ ::SetWindowOrgEx(GetHdc(), (int)m_logicalOriginX, (int)m_logicalOriginY, NULL); #endif } -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 +// bit blit // --------------------------------------------------------------------------- -wxCoord wxDCBase::DeviceToLogicalX(wxCoord x) const -{ - return DeviceToLogicalXRel(x - m_deviceOriginX)*m_signX + m_logicalOriginX; -} - -wxCoord wxDCBase::DeviceToLogicalXRel(wxCoord x) const -{ - // axis orientation is not taken into account for conversion of a distance - return (wxCoord)(x / (m_logicalScaleX*m_userScaleX*m_scaleX)); -} - -wxCoord wxDCBase::DeviceToLogicalY(wxCoord y) const -{ - return DeviceToLogicalYRel(y - m_deviceOriginY)*m_signY + m_logicalOriginY; -} - -wxCoord wxDCBase::DeviceToLogicalYRel(wxCoord y) const -{ - // axis orientation is not taken into account for conversion of a distance - return (wxCoord)( y / (m_logicalScaleY*m_userScaleY*m_scaleY)); -} - -wxCoord wxDCBase::LogicalToDeviceX(wxCoord x) const -{ - return LogicalToDeviceXRel(x - m_logicalOriginX)*m_signX + m_deviceOriginX; -} - -wxCoord wxDCBase::LogicalToDeviceXRel(wxCoord x) const -{ - // axis orientation is not taken into account for conversion of a distance - return (wxCoord) (x*m_logicalScaleX*m_userScaleX*m_scaleX); -} - -wxCoord wxDCBase::LogicalToDeviceY(wxCoord y) const +bool wxMSWDCImpl::DoBlit(wxCoord dstX, wxCoord dstY, + wxCoord dstWidth, wxCoord dstHeight, + wxDC *source, + wxCoord srcX, wxCoord srcY, + int rop, bool useMask, + wxCoord srcMaskX, wxCoord srcMaskY) { - return LogicalToDeviceYRel(y - m_logicalOriginY)*m_signY + m_deviceOriginY; + return DoStretchBlit(dstX, dstY, dstWidth, dstHeight, source, srcX, srcY, dstWidth, dstHeight, rop, useMask, srcMaskX, srcMaskY); } -wxCoord wxDCBase::LogicalToDeviceYRel(wxCoord y) const +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) { - // axis orientation is not taken into account for conversion of a distance - return (wxCoord) (y*m_logicalScaleY*m_userScaleY*m_scaleY); -} - -// --------------------------------------------------------------------------- -// bit blit -// --------------------------------------------------------------------------- - -bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, - wxCoord width, wxCoord height, - wxDC *source, wxCoord xsrc, wxCoord ysrc, - int rop, bool useMask, - wxCoord xsrcMask, wxCoord ysrcMask) -{ - wxCHECK_MSG( source, false, _T("wxDC::Blit(): NULL wxDC pointer") ); + wxCHECK_MSG( source, false, _T("wxMSWDCImpl::Blit(): NULL wxDC pointer") ); WXMICROWIN_CHECK_HDC_RET(false) + wxDCImpl *impl = source->GetImpl(); + wxMSWDCImpl *msw_impl = wxDynamicCast( impl, wxMSWDCImpl ); + if (!msw_impl) + { + // TODO: Do we want to be able to blit + // from other DCs too? + return false; + } + // 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 = msw_impl->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, GetHdcOf(*msw_impl), bmpSrc) ) return true; } @@ -2033,7 +2053,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 @@ -2048,11 +2068,11 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, COLORREF old_textground = ::GetTextColor(GetHdc()); COLORREF old_background = ::GetBkColor(GetHdc()); - if (m_textForegroundColour.Ok()) + if (m_textForegroundColour.IsOk()) { ::SetTextColor(GetHdc(), m_textForegroundColour.GetPixel() ); } - if (m_textBackgroundColour.Ok()) + if (m_textBackgroundColour.IsOk()) { ::SetBkColor(GetHdc(), m_textBackgroundColour.GetPixel() ); } @@ -2098,16 +2118,19 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, 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, + GetHdcOf(*msw_impl), xsrc, ysrc, (HBITMAP)mask->GetMaskBitmap(), xsrcMask, ysrcMask, MAKEROP4(dwRop, DSTCOPY) - ) != 0; + ) != 0; + } } if ( !success ) @@ -2120,62 +2143,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, msw_impl->GetHDC()); 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); + buffer_bmap = ::CreateCompatibleBitmap(GetHdc(), dstWidth, dstHeight); #endif // wxUSE_DC_CACHEING/!wxUSE_DC_CACHEING HGDIOBJ hOldMaskBitmap = ::SelectObject(dc_mask, (HBITMAP) mask->GetMaskBitmap()); HGDIOBJ hOldBufferBitmap = ::SelectObject(dc_buffer, buffer_bmap); // copy dest to buffer - if ( !::BitBlt(dc_buffer, 0, 0, (int)width, (int)height, + if ( !::BitBlt(dc_buffer, 0, 0, (int)dstWidth, (int)dstHeight, GetHdc(), xdest, ydest, SRCCOPY) ) { wxLogLastError(wxT("BitBlt")); } +#ifndef __WXWINCE__ + StretchBltModeChanger changeMode(dc_buffer, COLORONCOLOR); +#endif + // copy src to buffer using selected raster op - if ( !::BitBlt(dc_buffer, 0, 0, (int)width, (int)height, - GetHdcOf(*source), xsrc, ysrc, dwRop) ) + if ( !::StretchBlt(dc_buffer, 0, 0, (int)dstWidth, (int)dstHeight, + GetHdcOf(*msw_impl), xsrc, ysrc, srcWidth, srcHeight, dwRop) ) { - wxLogLastError(wxT("BitBlt")); + wxLogLastError(wxT("StretchBlt")); } // set masked area in buffer to BLACK (pixel value 0) COLORREF prevBkCol = ::SetBkColor(GetHdc(), RGB(255, 255, 255)); COLORREF prevCol = ::SetTextColor(GetHdc(), RGB(0, 0, 0)); - if ( !::BitBlt(dc_buffer, 0, 0, (int)width, (int)height, - dc_mask, xsrcMask, ysrcMask, SRCAND) ) + if ( !::StretchBlt(dc_buffer, 0, 0, (int)dstWidth, (int)dstHeight, + dc_mask, xsrcMask, ysrcMask, srcWidth, srcHeight, SRCAND) ) { - wxLogLastError(wxT("BitBlt")); + wxLogLastError(wxT("StretchBlt")); } // set unmasked area in dest to BLACK ::SetBkColor(GetHdc(), RGB(0, 0, 0)); ::SetTextColor(GetHdc(), RGB(255, 255, 255)); - if ( !::BitBlt(GetHdc(), xdest, ydest, (int)width, (int)height, - dc_mask, xsrcMask, ysrcMask, SRCAND) ) + if ( !::StretchBlt(GetHdc(), xdest, ydest, (int)dstWidth, (int)dstHeight, + dc_mask, xsrcMask, ysrcMask, srcWidth, srcHeight, SRCAND) ) { - wxLogLastError(wxT("BitBlt")); + wxLogLastError(wxT("StretchBlt")); } ::SetBkColor(GetHdc(), prevBkCol); // restore colours to original values ::SetTextColor(GetHdc(), prevCol); // OR buffer to dest success = ::BitBlt(GetHdc(), xdest, ydest, - (int)width, (int)height, + (int)dstWidth, (int)dstHeight, dc_buffer, 0, 0, SRCPAINT) != 0; if ( !success ) { @@ -2203,7 +2230,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); @@ -2220,18 +2247,18 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, if ( hDIB > 0 ) { // reflect ysrc - ysrc = hDIB - (ysrc + height); + ysrc = hDIB - (ysrc + dstHeight); } if ( ::StretchDIBits(GetHdc(), xdest, ydest, - width, height, + dstWidth, dstHeight, xsrc, ysrc, - width, height, + srcWidth, srcHeight, ds.dsBm.bmBits, (LPBITMAPINFO)&ds.dsBmih, DIB_RGB_COLORS, - SRCCOPY + dwRop ) == (int)GDI_ERROR ) { // On Win9x this API fails most (all?) of the time, so @@ -2258,9 +2285,9 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, if ( !::StretchBlt ( GetHdc(), - xdest, ydest, width, height, - GetHdcOf(*source), - xsrc, ysrc, width, height, + xdest, ydest, dstWidth, dstHeight, + GetHdcOf(*msw_impl), + xsrc, ysrc, srcWidth, srcHeight, dwRop ) ) { @@ -2278,8 +2305,8 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, ( GetHdc(), xdest, ydest, - (int)width, (int)height, - GetHdcOf(*source), + (int)dstWidth, (int)dstHeight, + GetHdcOf(*msw_impl), xsrc, ysrc, dwRop ) ) @@ -2299,7 +2326,7 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, return success; } -void wxDC::GetDeviceSize(int *width, int *height) const +void wxMSWDCImpl::GetDeviceSize(int *width, int *height) const { WXMICROWIN_CHECK_HDC @@ -2309,7 +2336,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 @@ -2339,7 +2366,7 @@ void wxDC::DoGetSizeMM(int *w, int *h) const } } -wxSize wxDC::GetPPI() const +wxSize wxMSWDCImpl::GetPPI() const { WXMICROWIN_CHECK_HDC_RET(wxSize(0,0)) @@ -2350,12 +2377,11 @@ wxSize wxDC::GetPPI() const } // For use by wxWidgets only, unless custom units are required. -void wxDC::SetLogicalScale(double x, double y) +void wxMSWDCImpl::SetLogicalScale(double x, double y) { WXMICROWIN_CHECK_HDC - m_logicalScaleX = x; - m_logicalScaleY = y; + wxDCImpl::SetLogicalScale(x,y); } // ---------------------------------------------------------------------------- @@ -2370,8 +2396,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) { @@ -2399,7 +2425,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(); @@ -2435,7 +2461,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(); @@ -2464,17 +2490,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); @@ -2485,7 +2511,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) @@ -2500,11 +2526,13 @@ 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( 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? @@ -2514,7 +2542,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(_T("AlphaBlend")); if ( pfnAlphaBlend ) { BLENDFUNCTION bf; @@ -2523,8 +2552,8 @@ 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 @@ -2540,7 +2569,7 @@ 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); + wxAlphaBlend(hdcDst, x, y, dstWidth, dstHeight, srcX, srcY, srcWidth, srcHeight, bmp); return true; #else // !wxHAVE_RAW_BITMAP @@ -2557,15 +2586,17 @@ static bool AlphaBlt(HDC hdcDst, 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")); } @@ -2580,15 +2611,17 @@ wxAlphaBlend(HDC hdcDst, int xDst, int yDst, 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(); @@ -2598,17 +2631,14 @@ 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")); } @@ -2616,7 +2646,7 @@ wxAlphaBlend(HDC hdcDst, int xDst, int yDst, #endif // #ifdef wxHAVE_RAW_BITMAP -void wxDC::DoGradientFillLinear (const wxRect& rect, +void wxMSWDCImpl::DoGradientFillLinear (const wxRect& rect, const wxColour& initialColour, const wxColour& destColour, wxDirection nDirection) @@ -2627,7 +2657,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(_T("GradientFill")); if ( pfnGradientFill ) { @@ -2644,20 +2675,18 @@ 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 = initialColour.Red() << 8; - vertices[firstVertex].Green = initialColour.Green() << 8; - vertices[firstVertex].Blue = initialColour.Blue() << 8; + 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 = destColour.Red() << 8; - vertices[1 - firstVertex].Green = destColour.Green() << 8; - vertices[1 - firstVertex].Blue = destColour.Blue() << 8; + 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 (nDirection == wxWEST || - nDirection == wxEAST) if ( (*pfnGradientFill) ( GetHdc(), @@ -2678,5 +2707,64 @@ void wxDC::DoGradientFillLinear (const wxRect& rect, } #endif // wxUSE_DYNLIB_CLASS - wxDCBase::DoGradientFillLinear(rect, initialColour, destColour, nDirection); + 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